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)

4 files changed, 5 insertions, 5 deletions

diff --git a/source3/utils/net.c b/source3/utils/net.c
index 068af2626f..5a9b7d31ec 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -602,7 +602,7 @@ static int net_getlocalsid(int argc, const char **argv)
 		name = global_myname();
 	}
 
-	if(!initialize_password_db(False)) {
+	if(!initialize_password_db(False, NULL)) {
 		DEBUG(0, ("WARNING: Could not open passdb - local sid may not reflect passdb\n"
 			  "backend knowlege (such as the sid stored in LDAP)\n"));
 	}
@@ -672,7 +672,7 @@ static int net_getdomainsid(int argc, const char **argv)
 	DOM_SID domain_sid;
 	fstring sid_str;
 
-	if(!initialize_password_db(False)) {
+	if(!initialize_password_db(False, NULL)) {
 		DEBUG(0, ("WARNING: Could not open passdb - domain sid may not reflect passdb\n"
 			  "backend knowlege (such as the sid stored in LDAP)\n"));
 	}
diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index bf397803bc..3b7d604dc6 100644
--- a/source3/utils/net_sam.c
+++ b/source3/utils/net_sam.c
@@ -990,7 +990,7 @@ static int net_sam_provision(int argc, const char **argv)
 		goto failed;
 	}
 
-	if (!NT_STATUS_IS_OK(smbldap_init(tc, ldap_uri, &ls))) {
+	if (!NT_STATUS_IS_OK(smbldap_init(tc, NULL, ldap_uri, &ls))) {
 		d_fprintf(stderr, "Unable to connect to the LDAP server.\n");
 		goto failed;
 	}
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index d1a87260fa..0e8de82043 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -831,7 +831,7 @@ int main (int argc, char **argv)
 		exit(1);
 	}
 
-	if(!initialize_password_db(False))
+	if(!initialize_password_db(False, NULL))
 		exit(1);
 
 	if (!init_names())
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index da9ac8d279..e7bd0e5fae 100644
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -305,7 +305,7 @@ static int process_root(int local_flags)
 	}
 
 	/* Ensure passdb startup(). */
-	if(!initialize_password_db(False)) {
+	if(!initialize_password_db(False, NULL)) {
 		DEBUG(0, ("Failed to open passdb!\n"));
 		exit(1);
 	}