summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* ntlm_auth: Remove two uses of hex_encode()Volker Lendecke2015-05-131-10/+8
| | | | | Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* lib: Make sid_binstring_hex use TALLOCVolker Lendecke2015-05-133-8/+6
| | | | | | | talloc_tos() is better than plain malloc... Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* lib: Simplify sid_binstring_hex()Volker Lendecke2015-05-131-5/+2
| | | | | Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* Add IPv6 support for determining FQDN during ADS join.David Holder2015-05-121-21/+33
| | | | | | | | | Signed-off-by: David Holder <david.holder@erion.co.uk> Reviewed-by: Jeremy Allison <jra@samba.org> Reviewed-by: Ralph Böhme <rb@sernet.de> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Tue May 12 23:35:32 CEST 2015 on sn-devel-104
* Add IPv6 support to ADS client side LDAP connects. Corrected format for IPv6 ↵David Holder2015-05-121-1/+7
| | | | | | | | LDAP URI. Signed-off-by: David Holder <david.holder@erion.co.uk> Signed-off-by: David Holder <david.holder@erion.co.uk> Reviewed-by: Jeremy Allison <jra@samba.org> Reviewed-by: Ralph Böhme <rb@sernet.de>
* Convert all uint32/16/8 to _t in a couple of include files.Richard Sharpe2015-05-122-3/+3
| | | | | | | | Signed-off-by: Richard Sharpe <rsharpe@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Tue May 12 04:22:55 CEST 2015 on sn-devel-104
* Convert all uses of uint32/16/8 to _t in source3/passdb.Richard Sharpe2015-05-1215-82/+82
| | | | | Signed-off-by: Richard Sharpe <rsharpe@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* Convert all (remaining) uses of uint32/16/8 to _t in source3/printing.Richard Sharpe2015-05-126-49/+49
| | | | | Signed-off-by: Richard Sharpe <rsharpe@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* Convert all uses of uint32/16/8 to _t in source3/registry.Richard Sharpe2015-05-128-42/+42
| | | | | Signed-off-by: Richard Sharpe <rsharpe@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* Convert all uses of uint32/16/8 to _t in source3/rpc_server.Richard Sharpe2015-05-124-10/+10
| | | | | Signed-off-by: Richard Sharpe <rsharpe@gmail.com> Reviewed-by: Jeremy Allison <jra@samba.org>
* Convert all uses of uint32/16/8 to _t in source3/rpc_client.Richard Sharpe2015-05-126-16/+16
| | | | | Signed-off-by: Richard Sharpe <rsharpe@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* Convert all uint32/16/8 to _t in source3/rpcclient.Richard Sharpe2015-05-128-82/+82
| | | | | Signed-off-by: Richard Sharpe <rsharpe@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* Convert all uses of uint32/16/8 to _t in source3/torture.Richard Sharpe2015-05-127-53/+53
| | | | | Signed-off-by: Richard Sharpe <rsharpe@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* Change all uses of uint32 to uint32_t in vfs.h. This is part of a general ↵Richard Sharpe2015-05-122-30/+30
| | | | | | | cleanup if people approve. This time around get both vfs.h and vfs.c and all instances of uint8, uint16 and uint32. Signed-off-by: Richard Sharpe <rsharpe@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* ctdb-daemon: Remove obsolete IPv4 only controlsAmitay Isaacs2015-05-125-317/+49
| | | | | Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Jeremy Allison <jra@samba.org>
* ctdb-daemon: Remove older data structure that supports only IPv4 addressesAmitay Isaacs2015-05-124-46/+7
| | | | | Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Jeremy Allison <jra@samba.org>
* ctdb-daemon: Fix typo in debug messageMartin Schwenke2015-05-101-1/+1
| | | | | | | | Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com> Autobuild-User(master): Amitay Isaacs <amitay@samba.org> Autobuild-Date(master): Sun May 10 06:10:21 CEST 2015 on sn-devel-104
* ctdb-daemon: Initialise eventscript status earlierMartin Schwenke2015-05-101-4/+4
| | | | | | | | | Don't initialise it after ctdb_event_script_callback_v() may have short-circuited. This can stop ctdb_event_script_args() from ever terminating. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-daemon: Make ctdb_event_script_args() terminate if no scriptsMartin Schwenke2015-05-101-0/+1
| | | | | | | | | | | | | status.done is never set to true unless event_script_callback() is invoked. The short-circuit in ctdb_event_script_callback_v() means that this doesn't happen. CTDB can't work very well without 00.ctdb (for tunable initialisation and the like) but it shouldn't get stuck. So call the callback when there are no scripts in event_script_callback(). Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-daemon: Drop interface monitoringMartin Schwenke2015-05-102-48/+0
| | | | | | | | | This is done by 10.interace where the monitor event fails when there is a missing interface. The in-daemon interface checking adds no value. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-common: Reimplement external tracing using ctdb_set_helper()Martin Schwenke2015-05-101-3/+5
| | | | | Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-scripts: Drop update of public address configuration from config.tdbMartin Schwenke2015-05-101-22/+0
| | | | | | | | | | | | | | | | | This isn't used or documented anywhere. 2 differing points of view: * This is a very good idea but it should probably be generalised to cover more configuration items. This would end up like the Samba registry configuration and would use a tool to support setting configuration values. * If people really want to update configuration while a node is down then they should fix the configuration before bringing up that node. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-recoverd: Short circuit takeover run if no nodes are RUNNINGMartin Schwenke2015-05-101-0/+17
| | | | | | | | | | | | | | | | | If all nodes are still in, say, FIRST_RECOVERY runstate, then the logs contain unfortunate noise like: recoverd:Failed to find node to cover ip 10.0.2.131 This avoids that by adding an early exit that avoids running takeover_run_core() when there are no nodes in the CTDB_RUNSTATE_RUNNING. To support this add the runstate to the ipflags structure. There are clearly other ways of hacking this but this seems the simplest. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-recoverd: Remove redundant condition when checking recovery lockMartin Schwenke2015-05-101-6/+4
| | | | | | | | | | | | It isn't possible to hold the recovery lock without having a lock file set. This is part of a goal to generalise the recovery lock mechanism to just use a helper program, which may use a lock file or may use something else. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-recoverd: Simplify using TALLOC_FREE()Martin Schwenke2015-05-101-2/+1
| | | | | Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-recoverd: Drop redundant condition in election handlerMartin Schwenke2015-05-101-2/+1
| | | | | | | | Election packets from the current node are ignored at the beginning of the function, so this does not need to be checked. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-recoverd: Remove unused memory context variableMartin Schwenke2015-05-101-6/+0
| | | | | | | It is set, memory is allocated but it is never used. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-daemon: Broadcast IP rellocation request from monitor codeMartin Schwenke2015-05-101-4/+7
| | | | | | | | | | | | | No need to just send it to the recovery master. This reduces the need for main daemon code to know which node is the recovery master. The end goal is for the main daemon to not need to know which node is the recovery master - this information would be stored in the recovery daemon (and subsequently a separate cluster management daemon). Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-recoverd: Replace unnecessary use of ctdb->recovery_masterMartin Schwenke2015-05-101-6/+7
| | | | | | | | Databases are only pulled by the recovery master, so it can compare with current node PNN. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-recoverd: Rename some local variables to avoid conflict with conventionMartin Schwenke2015-05-101-20/+20
| | | | | | | rec is always a (struct ctdb_recoverd *) Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb_recoverd: Move num_lmasters calculation to near where it is usedMartin Schwenke2015-05-101-13/+13
| | | | | | | Unless this node is the recovery master then this is not needed. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-recoverd: Make num_lmasters a local variableMartin Schwenke2015-05-101-5/+5
| | | | | | | It isn't used anywhere else and is always re-initialised to 0. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-recoverd: Remove unused struct members num_active and num_connectedMartin Schwenke2015-05-101-8/+0
| | | | | | | They are initialised and updated but the values are never used. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-tests: Test stub for ctdb_get_capabilities()Martin Schwenke2015-05-102-0/+17
| | | | | Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-daemon: Remove unused capabilities field from struct ctdb_nodeMartin Schwenke2015-05-102-7/+17
| | | | | | | Update the ctdb tool test stub code to cope. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-recoverd: Use capabilities APIMartin Schwenke2015-05-101-32/+38
| | | | | | | | | Simplify update_capabilities() using the capabilities API and store the capabilities in new field rec->caps rather than scattered around ctdb->nodes. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* ctdb-client: Add API for retrieving and checking capabilitiesMartin Schwenke2015-05-102-0/+100
| | | | | | | | | | ctdb_get_capabilities() gets capabilities from all connected nodes into an array. ctdb_get_node_capabilities() gets capabilities for a particular node from array. ctdb_node_has_capabilities() returns true if given node has all of the given capabilities. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
* vfs_fruit: comment fix: the options are documentedRalph Boehme2015-05-081-1/+1
| | | | | | | | Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Fri May 8 21:27:45 CEST 2015 on sn-devel-104
* vfs_fruit: add option "nfs_aces" that controls the NFS ACEs stuffRalph Boehme2015-05-082-2/+16
| | | | | | | Bug: https://bugzilla.samba.org/show_bug.cgi?id=11213 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
* smbd: Offer SMB 3.1.1 by default.Stefan Metzmacher2015-05-084-4/+4
| | | | | | | | | Pair-Programmed-With: Michael Adam <obnox@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org> Autobuild-User(master): Michael Adam <obnox@samba.org> Autobuild-Date(master): Fri May 8 15:49:32 CEST 2015 on sn-devel-104
* s3:smb2_negprot: add support for negotiating SMB 3.1.0 and SMB 3.1.1Stefan Metzmacher2015-05-082-0/+8
| | | | | | | | | Note: SMB 3.1.0 was used in a early preview versions of Windows 10. Was later superseded by 3.1.1. Pair-Programmed-With: Michael Adam <obnox@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
* s3:smb2_sesssetup.c: For SMB >= 3.1, derive crypto keys from preauthStefan Metzmacher2015-05-083-16/+94
| | | | | | | | | | | This protects the full connection setup including a posteriori verification of the negotiate messages, by signing the final session setup response with a signing key derived from the preauth hash and the authentication session key. Pair-Programmed-With: Michael Adam <obnox@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
* s3:smb2_negprot.c: add support SMB 3.1 negotiate contextsMichael Adam2015-05-083-4/+274
| | | | | | | | | | Used for: - preauthentication validation - negotiation of ciphers for sigingn and encryprtion Pair-Programmed-With: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org>
* s3:smb2_server: allow SMB2_HDR_FLAG_PRIORITY_MASK for SMB >= 3.1.1Stefan Metzmacher2015-05-081-0/+8
| | | | | Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
* smbd: offer SMB 3.0.2 by default.Michael Adam2015-05-084-4/+4
| | | | | Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
* s3:smb2_negprot: add support for negotiating SMB 3.0.2Stefan Metzmacher2015-05-082-0/+4
| | | | | | Pair-Programmed-With: Michael Adam <obnox@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org>
* s3:smb2_read: pass in_flags to smbd_smb2_read_send()Stefan Metzmacher2015-05-081-0/+11
| | | | | | For now we still ignore the flags. Signed-off-by: Stefan Metzmacher <metze@samba.org>
* s3:smb2_write: add simplified support for SMB2_WRITEFLAG_WRITE_UNBUFFEREDStefan Metzmacher2015-05-081-0/+5
| | | | | | TODO: we should add alignment checks. Signed-off-by: Stefan Metzmacher <metze@samba.org>
* s3:smb2_create: treat the SVHDX_OPEN_DEVICE_CONTEXT in smb2_create (not ↵Michael Adam2015-05-081-0/+15
| | | | | | | | | supported) Pair-Programmed-With: Stefan Metzmacher <metze@samba.org> Signed-off-by: Michael Adam <obnox@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org>
* libcli/smb: SMB 3.0.2: define SVHDX_OPEN_DEVICE_CONTEXTMichael Adam2015-05-081-0/+1
| | | | | Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>