diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-12-25 23:35:27 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-12-25 23:35:27 +0000 |
| commit | 4205973b4315300860b512193b389fbb683cf3a0 (patch) | |
| tree | d5cb4650f686fdf50d9555973689670f94103c72 | |
| parent | 3dba56747d3d34b6ccfeea24f53e38c1554f8f4a (diff) | |
| download | samba-4205973b4315300860b512193b389fbb683cf3a0.tar.gz samba-4205973b4315300860b512193b389fbb683cf3a0.tar.bz2 samba-4205973b4315300860b512193b389fbb683cf3a0.zip | |
(merge from 3.0)
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 bac2c20adf6a8f541f227652d4da3d8f31f1a648)
| -rw-r--r-- | source3/lib/smbldap.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c index 9dca043584..944f60c689 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 1fbd54419c..67012ee087 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -235,7 +235,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; @@ -1076,7 +1076,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}, @@ -1472,7 +1472,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: @@ -1704,7 +1704,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) |