Vicentiu Ciorbaru [Wed, 13 Jul 2011 21:01:15 +0000 (00:01 +0300)]
s3-net: Added net rpc conf drop command to net rpc conf
The function only appears in the commands list usage of net rpc conf.
Signed-off-by: Michael Adam <obnox@samba.org>
Vicentiu Ciorbaru [Wed, 17 Aug 2011 13:42:48 +0000 (16:42 +0300)]
s3-net: Implemented net rpc conf showshare command
The function has the same logic as net rpc conf list, however it
only loads the specific share.
Signed-off-by: Michael Adam <obnox@samba.org>
Vicentiu Ciorbaru [Wed, 13 Jul 2011 20:18:00 +0000 (23:18 +0300)]
s3-net: Added net rpc conf showshare command to net rpc conf
The function only appears in the commands list usage of net rpc conf.
Signed-off-by: Michael Adam <obnox@samba.org>
Vicentiu Ciorbaru [Wed, 13 Jul 2011 20:04:18 +0000 (23:04 +0300)]
s3-net: Implemented net rpc conf listshares command.
The function prints the names of the remote shares found, one per line.
Signed-off-by: Michael Adam <obnox@samba.org>
Vicentiu Ciorbaru [Wed, 13 Jul 2011 20:01:35 +0000 (23:01 +0300)]
s3-net: Added net rpc conf listshares command to net rpc conf
The function only appears in the commands list usage of net rpc conf.
Signed-off-by: Michael Adam <obnox@samba.org>
Vicentiu Ciorbaru [Wed, 13 Jul 2011 19:57:08 +0000 (22:57 +0300)]
s3-net: rpc_conf_list now uses the wrapper rpc_conf_open_conf
Signed-off-by: Michael Adam <obnox@samba.org>
Vicentiu Ciorbaru [Wed, 13 Jul 2011 19:49:59 +0000 (22:49 +0300)]
s3-net: Added rpc_conf_open_conf function
The function is used as a wrapper to open the HKLM hive key and
the smbconf key.
Signed-off-by: Michael Adam <obnox@samba.org>
Vicentiu Ciorbaru [Mon, 25 Jul 2011 21:11:15 +0000 (00:11 +0300)]
s3-net: Added the net rpc conf list command.
The command make use of the smbconf_service struct,
via the function rpc_conf_get_share(). This allows for
further expansion with the use of smbconf.
Signed-off-by: Michael Adam <obnox@samba.org>
Vicentiu Ciorbaru [Wed, 13 Jul 2011 18:17:08 +0000 (21:17 +0300)]
s3-net: Added the command rpc conf to the net binary.
The net binary now has an extra item linked to it, the
net_rpc_conf.c module.
Signed-off-by: Michael Adam <obnox@samba.org>
Vicentiu Ciorbaru [Sun, 21 Aug 2011 16:37:10 +0000 (19:37 +0300)]
s3-net: Fixed whitespace errors
Fixed previously existing whitespace errors in net_rpc.c
Signed-off-by: Michael Adam <obnox@samba.org>
Andrew Bartlett [Mon, 22 Aug 2011 00:05:02 +0000 (10:05 +1000)]
set passdb backend in Samba4 make test environments too
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Mon Aug 22 03:46:21 CEST 2011 on sn-devel-104
Andrew Bartlett [Mon, 22 Aug 2011 00:00:25 +0000 (10:00 +1000)]
selftest: skip all plugin_s4_dc tests if we do not have LDAP libs
This is needed as otherwise make test fails on any system without
OpenLDAP libs and headers, which causes our users concern.
Andrew Bartlett
Andrew Bartlett [Fri, 19 Aug 2011 07:36:57 +0000 (17:36 +1000)]
s4-provision set passdb backend to 'samba4' in template smb.conf files
This will allow smbpasswd, net sam and pdbedit to 'just work' against
the newly created databases.
Andrew Bartlett
Andreas Schneider [Sat, 20 Aug 2011 14:19:43 +0000 (16:19 +0200)]
s3-passdb: Only delete 1 entry from memcache.
If we delete or update one user we shouldn't flush the complete
memcache.
Signed-off-by: Simo Sorce <idra@samba.org>
Autobuild-User: Simo Sorce <idra@samba.org>
Autobuild-Date: Sun Aug 21 16:39:10 CEST 2011 on sn-devel-104
Andreas Schneider [Sat, 20 Aug 2011 12:48:38 +0000 (14:48 +0200)]
s3-passdb: Remove always the user from getpwsid cache.
We should do it always, not only in the pdb_default_delete_user()
function.
Signed-off-by: Simo Sorce <idra@samba.org>
Andreas Schneider [Fri, 19 Aug 2011 15:36:53 +0000 (17:36 +0200)]
s3-passdb: Keep caches coherent
When deleting a user send a message to all interested parties so they can
purge their caches. Otherwise some processes may positively respond with a
cached getpwnam, when the user have actully been removed.
Without this some tests that remove and then immediately create users are
flakey.
Signed-off-by: Simo Sorce <idra@samba.org>
Andreas Schneider [Fri, 19 Aug 2011 16:10:29 +0000 (18:10 +0200)]
s3-id_cache: Use better names for id cache management ops
The IDMAP term is normally associated with Winbind's idmap stuff.
These functions deal with id caching not id mapping.
Signed-off-by: Simo Sorce <idra@samba.org>
Andreas Schneider [Fri, 19 Aug 2011 15:28:37 +0000 (17:28 +0200)]
s3-id_cache: Move id caches mgmt out of smbd
We must leave the MSG_IDMAP_KILL operation in SMBD as it uses smbd
specific internal globals and makes sense only in the context of a smbd
daemon.
The rest is moved under lib/ as we need to deal with id cache cleanups
in other daemons too (like lsasd).
Signed-off-by: Simo Sorce <idra@samba.org>
Andreas Schneider [Sun, 21 Aug 2011 09:58:36 +0000 (11:58 +0200)]
s3-lsasd: Listen on \PIPE\lsass.
Signed-off-by: Simo Sorce <idra@samba.org>
Andreas Schneider [Thu, 18 Aug 2011 17:05:27 +0000 (19:05 +0200)]
s3-lsasd: Add missing ncalrpc listeners.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Andreas Schneider [Thu, 18 Aug 2011 17:05:10 +0000 (19:05 +0200)]
s3-rpc_server: Add create_dcerpc_ncalrpc_socket().
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Andreas Schneider [Thu, 18 Aug 2011 16:46:16 +0000 (18:46 +0200)]
s3-rpc_server: Increase epm monitor wait time.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Thu, 18 Aug 2011 16:35:02 +0000 (12:35 -0400)]
s3-prefork: Listening fds must be in non-blocking mode
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Thu, 18 Aug 2011 14:39:13 +0000 (10:39 -0400)]
s3-spoolss: Remove useless check
If we *really* are a bout to exit (PF_WORKER_EXITING) then the event will not
be called as the loop will exit. Otherwise PF_SRV_MSG_EXIT may not be honoured
for a long time if we have cients connected, therefore keep handling SIGHUP
properly in those cases.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Thu, 18 Aug 2011 14:35:19 +0000 (10:35 -0400)]
s3-lsasd: Remove useless check
If we *really* are a bout to exit (PF_WORKER_EXITING) then the event will not
be called as the loop will exit. Otherwise PF_SRV_MSG_EXIT may not be honoured
for a long time if we have cients connected, therefore keep handling SIGHUP
properly in those cases.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Thu, 18 Aug 2011 14:31:36 +0000 (10:31 -0400)]
s3-prefork: Fix code to retire children
We have to be more careful when retiring children. We cannot stop
accepting connections as soon as the server tells us to quit because if
max_children is reached and we still have clients connected, the server will
not be able to spawn new children until one exits. And children will not exit
until all the clients closed the connections. So we keep operating past our
recall until we have 0 connections.
Also do not try to recall children that still have >= 1 clients connected, they
couldn't anyway.
Also use messaging to warn children and not SIGHUP.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Wed, 17 Aug 2011 20:17:10 +0000 (16:17 -0400)]
s3-spoolssd: Listen on parent messages
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Wed, 17 Aug 2011 19:21:52 +0000 (15:21 -0400)]
s3-lsasd: Listen on parent messages
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Wed, 17 Aug 2011 19:21:12 +0000 (15:21 -0400)]
s3-prefork: Add parent->client messaging
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Tue, 16 Aug 2011 21:34:30 +0000 (17:34 -0400)]
s3-lsasd: Send a message to the parent when we accept a connection
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Tue, 16 Aug 2011 20:36:43 +0000 (16:36 -0400)]
s3-spoolssd: Send a message to the parent when we accept a connection
Every time we accept a connection wanr the parent, so it can run management
routines and reallocate more resources if necessary.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Tue, 16 Aug 2011 20:36:12 +0000 (16:36 -0400)]
s3-messaging: Add preforked child-parent message types
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Wed, 17 Aug 2011 14:53:38 +0000 (10:53 -0400)]
s3-prefork: Improve error detection when handling new connections
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Tue, 16 Aug 2011 22:20:51 +0000 (18:20 -0400)]
s3-prefork: Improve heuristics
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Tue, 16 Aug 2011 16:01:02 +0000 (12:01 -0400)]
s3-lsasd: User new prefork helpers to simplify code.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Tue, 16 Aug 2011 15:38:03 +0000 (11:38 -0400)]
s3-spoolssd: User new prefork helpers to simplify code.
Also stop using the listening as now the prefork code properly sets
the PF_WORKER_ACCEPTING flag and it can be relied upon without having to keep
additional status around.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Tue, 16 Aug 2011 15:09:20 +0000 (11:09 -0400)]
s3-prefork: add a few more utility functions
Add a few util functions children side so that daemons do not have
to care about properly setting num_clients and state. Let a common
helper do it so that they are all consistent.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Tue, 16 Aug 2011 15:07:27 +0000 (11:07 -0400)]
s3-prefrok: Handle only valid children
Children that are about to exit shouldn't be counted as a source of
connections, and also makes no sense to chenge their allowances if they are
about to exit.
Also children with negative num_clients are faulty, exclude them as well.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Tue, 16 Aug 2011 15:37:41 +0000 (11:37 -0400)]
s3-prefork: Fix worker flags handling.
We can't have a clear idea of wether the worker is IDLE or BUSY.
The only things we can tell is if it is Alive, whether it is currently
Accepting connections or wether it is Exiting soon.
Remove PF_WORKER_IDLE, PF_WORKER_BUSY and replace their use with
PF_WORKER_ALIVE. Also properly assign PF_WORKER_ACCEPTING so that
users of the API can rely on the flag.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Tue, 16 Aug 2011 13:30:28 +0000 (09:30 -0400)]
s3-prefork: do not use a lock_fd, just race on accept()
We used a lock mimicking what apache does for preforked children.
But it doesn't work properly in our case because we do not stop once a request
has been served. Clients are allowed to perform multiple requests and keep the
connection open.
This means that if we allow multiple clients per children, then a child could
take the lock and then be asked to do a long or even locking operation by a
client it already is serving. This woulkd cause the whole server to deadlock,
as the child is now busy and also holding on the lock.
Using a race on accept() by having a tevent_fd on the listening socket wait
for read events we never deadlock. At most we cause a bit of contention among
children. But in the generic case connections are much less frequent for us as
clients tend to be long lived. So the little contention we may have is not a
big deal.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Andreas Schneider [Tue, 16 Aug 2011 07:52:42 +0000 (09:52 +0200)]
rpc_server: Add forward declaration for dcerpc_transport_t.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Andreas Schneider [Mon, 15 Aug 2011 11:25:37 +0000 (13:25 +0200)]
s3-waf: Fix build with lsasd.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Fri, 12 Aug 2011 21:21:50 +0000 (17:21 -0400)]
s3-lsasd: Use prefrok utils to manage children
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Fri, 12 Aug 2011 19:25:48 +0000 (15:25 -0400)]
s3-spoolssd: Use prefrok utils to manage children
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Fri, 12 Aug 2011 19:24:17 +0000 (15:24 -0400)]
s3-prefork: Add common utilities for daemons
Daemons using the prefork infrastructure may want to use these utils to
configure and manage a pool of children.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Fri, 12 Aug 2011 16:24:48 +0000 (12:24 -0400)]
s3-spoolss: Introduce helper function to manage pool.
We were not properly managing allowed clients and pool management was
duplicated across a few callers.
Concentrate all management heuristics in one single function.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Fri, 12 Aug 2011 16:24:13 +0000 (12:24 -0400)]
s3-prefork: Allow better management of allowed_clients
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Andreas Schneider [Fri, 12 Aug 2011 09:19:09 +0000 (11:19 +0200)]
s3-winbind: We need to use internal rpc connections in winbind.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Thu, 11 Aug 2011 18:23:19 +0000 (14:23 -0400)]
s3-spoolssd: Fix spoolss logging.
Use the same code as in lsasd.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Thu, 11 Aug 2011 18:24:05 +0000 (14:24 -0400)]
s3-lsasd: Import fixes from spoolssd
Properly rotate log files in children by using a gloabl lsasd_child_id
variable.
Simplify code by using a global lsasd_pool variable, we can never use
more than one prefork pool in the same process anyway.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Andreas Schneider [Thu, 11 Aug 2011 07:51:16 +0000 (09:51 +0200)]
selftest: Enable testing of the lsa service daemon.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Wed, 10 Aug 2011 20:17:44 +0000 (16:17 -0400)]
s3-rpc_server: Use rpc_epmapper_mode() in ep_register()
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Wed, 10 Aug 2011 20:13:42 +0000 (16:13 -0400)]
s3-rpc_server: Use rpc_service_mode() in np_open()
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Wed, 10 Aug 2011 19:34:37 +0000 (15:34 -0400)]
s3-rpc_server: Use rpc_service_mode() in rpc_pipe_open_interface()
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Thu, 11 Aug 2011 02:04:19 +0000 (22:04 -0400)]
selftest: Fix daemon testing to use the new syntax.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Wed, 10 Aug 2011 19:23:20 +0000 (15:23 -0400)]
s3-rpc_server: Replace RPC_SERVICE_MODE_DAEMON checks
Use rpc_daemon_type() macros where appropriate instead.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Wed, 10 Aug 2011 20:33:22 +0000 (16:33 -0400)]
s3-rpc_server: Move config helpers in one place.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Wed, 10 Aug 2011 19:02:24 +0000 (15:02 -0400)]
s3-rpc_server: Add helper to define/retrieve daemons configuration
Wtith this set of helper functions we make it easy to configure if we want to
use an embedded rpc server, or if we want to fork one. Or even just disable it
and let a third party server be used when the service is configured as
"external".
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Simo Sorce [Wed, 10 Aug 2011 18:25:56 +0000 (14:25 -0400)]
s3-rpc_server: Reduce code duplication
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Andreas Schneider [Tue, 2 Aug 2011 08:59:05 +0000 (10:59 +0200)]
s3-smbd: Start lsasd as deamon.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Andreas Schneider [Fri, 15 Jul 2011 16:34:17 +0000 (18:34 +0200)]
s3-rpc_server: Correctly register lsa, samr and netlogon.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Andreas Schneider [Mon, 23 May 2011 10:39:07 +0000 (12:39 +0200)]
s3-lsasd: Create a lsa service daemon.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Andreas Schneider [Fri, 15 Jul 2011 16:08:35 +0000 (18:08 +0200)]
s3-spoolssd: Check if we were able to create the prefork pool.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Andreas Schneider [Wed, 20 Jul 2011 12:24:15 +0000 (14:24 +0200)]
s3-prefork: Fix cast warning.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Andreas Schneider [Wed, 20 Jul 2011 14:26:48 +0000 (16:26 +0200)]
s3-rpc_server: Make dcerpc_ncacn_accept() public.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Andreas Schneider [Wed, 3 Aug 2011 10:14:16 +0000 (12:14 +0200)]
s3-rpc_server: Check explicit for external and daemon server type.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Andreas Schneider [Wed, 3 Aug 2011 10:13:56 +0000 (12:13 +0200)]
s3-rpc_server: Fix include order in srv_pipe_hnd.c.
Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Simo Sorce <idra@samba.org>
Jelmer Vernooij [Sun, 21 Aug 2011 01:19:17 +0000 (03:19 +0200)]
talloc: Fix talloc-compat pc files/headers.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun Aug 21 04:53:07 CEST 2011 on sn-devel-104
Jelmer Vernooij [Sun, 21 Aug 2011 01:02:58 +0000 (03:02 +0200)]
wafsamba: Only install .pc files if libraries are public.
Jelmer Vernooij [Sun, 21 Aug 2011 00:54:53 +0000 (02:54 +0200)]
tdb: Install pkg-config file.
Jelmer Vernooij [Sun, 21 Aug 2011 00:26:51 +0000 (02:26 +0200)]
wafsamba: Require public libraries to have headers.
Jelmer Vernooij [Sun, 21 Aug 2011 00:24:50 +0000 (02:24 +0200)]
dcerpc-binding: Install header file.
Jelmer Vernooij [Sun, 21 Aug 2011 00:24:36 +0000 (02:24 +0200)]
gensec: Install header file.
Jelmer Vernooij [Sun, 21 Aug 2011 00:24:25 +0000 (02:24 +0200)]
samdb: Install header file.
Jelmer Vernooij [Sun, 21 Aug 2011 00:24:12 +0000 (02:24 +0200)]
s4/libpolicy: Install header file.
Jelmer Vernooij [Sun, 21 Aug 2011 00:09:14 +0000 (02:09 +0200)]
wafsamba: Require public libraries to have a pc file specified, or explicitly specified that they don't need one.
Jelmer Vernooij [Sat, 20 Aug 2011 00:34:16 +0000 (02:34 +0200)]
wbclient: Add pkg-config file.
Jelmer Vernooij [Sat, 20 Aug 2011 00:32:58 +0000 (02:32 +0200)]
samba-credentials: Add pkg-config file.
Jeremy Allison [Sat, 20 Aug 2011 16:37:04 +0000 (09:37 -0700)]
Ensure we never wait past absolute entime to do a get_cached_ldap_connect().
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Sat Aug 20 20:09:37 CEST 2011 on sn-devel-104
Jeremy Allison [Sat, 20 Aug 2011 04:40:54 +0000 (21:40 -0700)]
Remove the tortured logic in another_ldap_try() and turn it into
get_cached_ldap_connect(), which much better describes it's function.
Now we always break at the right places in the loop, we can replace
the while (another_ldap_try(ldap_state, &rc, &attempts, abs_endtime))
construct with simply while (1).
Jeremy Allison [Sat, 20 Aug 2011 04:30:04 +0000 (21:30 -0700)]
Factor out the ldap_get_option calls into a function.
Jeremy Allison [Sat, 20 Aug 2011 04:27:18 +0000 (21:27 -0700)]
Simplify the logic on the another_ldap_try() loops by breaking
early out of the loop on success.
Jeremy Allison [Sat, 20 Aug 2011 04:19:28 +0000 (21:19 -0700)]
Move the alarm setup/teardown out of another_ldap_try() and into separate
functions that bracket the another_ldap_try() loop. We now never leave a
dangling alarm pending on success.
Jeremy Allison [Sat, 20 Aug 2011 04:08:10 +0000 (21:08 -0700)]
Allow the timeout pointer to ldap_search_ext_s() to be NULL if lp_ldap_timeout() == 0.
Jeremy Allison [Sat, 20 Aug 2011 04:01:49 +0000 (21:01 -0700)]
Make it clear the time here is an absolute endtime. Don't set the alarm if the LDAP timeout is zero.
Jeremy Allison [Sat, 20 Aug 2011 03:55:41 +0000 (20:55 -0700)]
Always remove the alarm before changing the handler, not the other way around.
Jeremy Allison [Sat, 20 Aug 2011 03:54:41 +0000 (20:54 -0700)]
Remove old_handler as alarms can't be nested. Use SIG_IGN instead.
Jeremy Allison [Sat, 20 Aug 2011 03:53:49 +0000 (20:53 -0700)]
Change got_alarm from bool to the correct type of SIG_ATOMIC_T.
Jeremy Allison [Sat, 20 Aug 2011 01:43:51 +0000 (18:43 -0700)]
If "ldap timeout" is non-zero, set the local search timeout to
be one second longer than the remote search timeout (which is
set to the "ldap timeout" value). This allows the remote search
timeout to fire in preference.
Allow lp_ldap_timeout() to be zero. Don't set the any local alarm
if so.
Ira Cooper [Fri, 19 Aug 2011 17:32:29 +0000 (10:32 -0700)]
Re-arrange the optimization to reduce tdb fcntl calls if smbd is not
clustered. procid_is_me() is much cheaper to test and can optimize
up to 50% of the calls to serverid_exists(). Volker please check.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Sat Aug 20 01:15:07 CEST 2011 on sn-devel-104
Matthias Dieter Wallnöfer [Fri, 19 Aug 2011 17:27:32 +0000 (19:27 +0200)]
s3:passdb/py_passdb.c - restore Python >= 2.4 compatibility
Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Fri Aug 19 21:03:44 CEST 2011 on sn-devel-104
Matthias Dieter Wallnöfer [Wed, 22 Jun 2011 12:46:09 +0000 (14:46 +0200)]
ldb:ldb_controls.c - cosmetic indentation fix
Matthias Dieter Wallnöfer [Tue, 21 Jun 2011 09:32:02 +0000 (11:32 +0200)]
ldb - two cosmetic fixes
@ldb.h: Removes an invalid comment line
@pyldb.c: Fixes indentation
Simo Sorce [Fri, 19 Aug 2011 12:07:30 +0000 (08:07 -0400)]
Revert "s3-messaging: IDMAP_ messages belongs to the Winbind range"
This reverts commit
102f39ae3e7df26faf81595c8e0120b2e2a45bbd.
These messages are handled by smbd not winbind, and could potentially be of
general interest.
Autobuild-User: Simo Sorce <idra@samba.org>
Autobuild-Date: Fri Aug 19 16:16:05 CEST 2011 on sn-devel-104
Andrew Bartlett [Mon, 15 Aug 2011 08:07:09 +0000 (18:07 +1000)]
s3-passdb pdb_samba4 handles PDB_PWHISTORY already
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Aug 19 10:40:16 CEST 2011 on sn-devel-104
Amitay Isaacs [Fri, 19 Aug 2011 05:53:28 +0000 (15:53 +1000)]
s3_upgrade: Set the administrator password on upgrade
In the upgrade process, set the administrator password from the
existing root or administrator account.
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Amitay Isaacs [Fri, 19 Aug 2011 05:50:49 +0000 (15:50 +1000)]
s3-passdb: Fix the get/set routines for pw_history for samu
Return pw_history with current string length (which is a multiple
of PW_HISTORY_ENTRY_LEN) and same thing for setting the pw_history.
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Amitay Isaacs [Fri, 19 Aug 2011 02:33:15 +0000 (12:33 +1000)]
s3_upgrade: Do not add administrator and root accounts from s3 to s4
Need to copy the password from s3 for administrator/root to s4.
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Amitay Isaacs [Fri, 19 Aug 2011 02:30:19 +0000 (12:30 +1000)]
python-samba3: Secrets file loaded from private dir, not lib dir
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Amitay Isaacs [Fri, 19 Aug 2011 02:27:42 +0000 (12:27 +1000)]
s3-passdb: Display username when reporting error on add_sam_account.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
git.samba.org / amitay / samba.git / log