summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-12-25 23:11:07 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-12-25 23:11:07 +0000
commit38b17cb1531806f177ff828944d78e887b066a05 (patch)
tree994ad04d43ea0551ac4839c2eb2f73b4e4399319
parent3a1b189a9f3d2dab1fcadc5277546baa2f88cdfa (diff)
downloadsamba-38b17cb1531806f177ff828944d78e887b066a05.tar.gz
samba-38b17cb1531806f177ff828944d78e887b066a05.tar.bz2
samba-38b17cb1531806f177ff828944d78e887b066a05.zip
ldap rebind sleep -> ldap replication sleep
While writing documentation for metze's patch, it became clear that this is a better name. Andrew Bartlett (This used to be commit 6f828ff3d3622c56ee732b976e7ab90b7897a8d3)
-rw-r--r--source3/lib/smbldap.c2
-rw-r--r--source3/param/loadparm.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index d1117046c3..d4cf378e49 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -926,7 +926,7 @@ int smbldap_search(struct smbldap_state *ldap_state,
tdiff = 1000000 *(tval.tv_sec - ldap_state->last_rebind.tv_sec) +
(tval.tv_usec - ldap_state->last_rebind.tv_usec);
- sleep_time = ((1000*lp_ldap_rebind_sleep())-tdiff)/1000;
+ sleep_time = ((1000*lp_ldap_replication_sleep())-tdiff)/1000;
if (sleep_time > 0) {
/* we wait for the LDAP replication */
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 31348b559d..669d0c16c1 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -233,7 +233,7 @@ typedef struct
char *szLdapAdminDn;
char *szAclCompat;
int ldap_passwd_sync;
- int ldap_rebind_sleep;
+ int ldap_replication_sleep;
BOOL ldap_delete_dn;
BOOL bMsAddPrinterWizard;
BOOL bDNSproxy;
@@ -1078,7 +1078,7 @@ static struct parm_struct parm_table[] = {
{"ldap ssl", P_ENUM, P_GLOBAL, &Globals.ldap_ssl, NULL, enum_ldap_ssl, FLAG_ADVANCED},
{"ldap passwd sync", P_ENUM, P_GLOBAL, &Globals.ldap_passwd_sync, NULL, enum_ldap_passwd_sync, FLAG_ADVANCED},
{"ldap delete dn", P_BOOL, P_GLOBAL, &Globals.ldap_delete_dn, NULL, NULL, FLAG_ADVANCED},
- {"ldap rebind sleep", P_INTEGER, P_GLOBAL, &Globals.ldap_rebind_sleep, NULL, NULL, FLAG_ADVANCED},
+ {"ldap replication sleep", P_INTEGER, P_GLOBAL, &Globals.ldap_replication_sleep, NULL, NULL, FLAG_ADVANCED},
{N_("Miscellaneous Options"), P_SEP, P_SEPARATOR},
{"add share command", P_STRING, P_GLOBAL, &Globals.szAddShareCommand, NULL, NULL, FLAG_ADVANCED},
@@ -1471,7 +1471,7 @@ static void init_globals(void)
Globals.ldap_ssl = LDAP_SSL_ON;
Globals.ldap_passwd_sync = LDAP_PASSWD_SYNC_OFF;
Globals.ldap_delete_dn = False;
- Globals.ldap_rebind_sleep = 1000; /* wait 1 sec for replication */
+ Globals.ldap_replication_sleep = 1000; /* wait 1 sec for replication */
/* these parameters are set to defaults that are more appropriate
for the increasing samba install base:
@@ -1701,7 +1701,7 @@ FN_GLOBAL_STRING(lp_ldap_admin_dn, &Globals.szLdapAdminDn)
FN_GLOBAL_INTEGER(lp_ldap_ssl, &Globals.ldap_ssl)
FN_GLOBAL_INTEGER(lp_ldap_passwd_sync, &Globals.ldap_passwd_sync)
FN_GLOBAL_BOOL(lp_ldap_delete_dn, &Globals.ldap_delete_dn)
-FN_GLOBAL_INTEGER(lp_ldap_rebind_sleep, &Globals.ldap_rebind_sleep)
+FN_GLOBAL_INTEGER(lp_ldap_replication_sleep, &Globals.ldap_replication_sleep)
FN_GLOBAL_STRING(lp_add_share_cmd, &Globals.szAddShareCommand)
FN_GLOBAL_STRING(lp_change_share_cmd, &Globals.szChangeShareCommand)
FN_GLOBAL_STRING(lp_delete_share_cmd, &Globals.szDeleteShareCommand)