diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-03-11 16:49:16 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:18:33 -0500 |
| commit | 0d91334fe799f6b50a8265f9dc097411c3a29e18 (patch) | |
| tree | c86395688b41edd01055a2a75ac0ba7f6113ad18 /source3/nsswitch | |
| parent | 5214cb6782b1ac01b4b23d53478fa11ad00915fe (diff) | |
| download | samba-0d91334fe799f6b50a8265f9dc097411c3a29e18.tar.gz samba-0d91334fe799f6b50a8265f9dc097411c3a29e18.tar.bz2 samba-0d91334fe799f6b50a8265f9dc097411c3a29e18.zip | |
r21784: Replace smb_register_idle_event() with event_add_timed(). This fixes winbind
who did not run the idle events to drop ldap connections.
Volker
(This used to be commit af3308ce5a21220ff4c510de356dbaa6cf9ff997)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/idmap_ldap.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/nsswitch/idmap_ldap.c b/source3/nsswitch/idmap_ldap.c index f74372ecea..15f88d28c7 100644 --- a/source3/nsswitch/idmap_ldap.c +++ b/source3/nsswitch/idmap_ldap.c @@ -24,6 +24,7 @@ */ #include "includes.h" +#include "winbindd.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_IDMAP @@ -295,8 +296,9 @@ static NTSTATUS idmap_ldap_alloc_init(const char *params) idmap_alloc_ldap->suffix = talloc_strdup(idmap_alloc_ldap, tmp); CHECK_ALLOC_DONE( idmap_alloc_ldap->suffix ); - ret = smbldap_init(idmap_alloc_ldap, idmap_alloc_ldap->url, - &idmap_alloc_ldap->smbldap_state); + ret = smbldap_init(idmap_alloc_ldap, winbind_event_context(), + idmap_alloc_ldap->url, + &idmap_alloc_ldap->smbldap_state); if (!NT_STATUS_IS_OK(ret)) { DEBUG(1, ("ERROR: smbldap_init (%s) failed!\n", idmap_alloc_ldap->url)); @@ -766,7 +768,8 @@ static NTSTATUS idmap_ldap_db_init(struct idmap_domain *dom, const char *params) ctx->suffix = talloc_strdup(ctx, tmp); CHECK_ALLOC_DONE(ctx->suffix); - ret = smbldap_init(ctx, ctx->url, &ctx->smbldap_state); + ret = smbldap_init(ctx, winbind_event_context(), ctx->url, + &ctx->smbldap_state); if (!NT_STATUS_IS_OK(ret)) { DEBUG(1, ("ERROR: smbldap_init (%s) failed!\n", ctx->url)); goto done; |