summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2004-11-05 22:53:35 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:53:09 -0500
commit55fe875a44bd63de766d4fbdb91bcc26be146a21 (patch)
tree0b8eb62dd8490ee22cdc2d36dba7cc9295ad3cd6 /source3/lib
parent9c61daf667ca0ac939f4bd724d1c0f708983f82a (diff)
downloadsamba-55fe875a44bd63de766d4fbdb91bcc26be146a21.tar.gz
samba-55fe875a44bd63de766d4fbdb91bcc26be146a21.tar.bz2
samba-55fe875a44bd63de766d4fbdb91bcc26be146a21.zip
r3563: During a typical logon a modern workstation makes a lot of anonymous session
setups on its way to open a pipe. This gets rid of many round-trips to the LDAP server during logon by setting up the server_info_guest once and not asking the LDAP server and nss every time. Make sure that the ldap connection is reopened in the child. (I did not look at the sql backends.) Volker (This used to be commit 3298f6105e6a88c9390cac02245c8f2eee1e5046)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/smbldap.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index 624ce22d22..a1f42d92ee 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -907,6 +907,7 @@ static int smbldap_open(struct smbldap_state *ldap_state)
ldap_state->last_ping = time(NULL);
+ ldap_state->pid = sys_getpid();
DEBUG(4,("The LDAP server is succesfully connected\n"));
return LDAP_SUCCESS;
@@ -965,6 +966,9 @@ static int another_ldap_try(struct smbldap_state *ldap_state, int *rc,
got_alarm = False;
old_handler = CatchSignal(SIGALRM, gotalarm_sig);
alarm(endtime - now);
+
+ if (ldap_state->pid != sys_getpid())
+ smbldap_close(ldap_state);
}
while (1) {