summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-03-02 12:30:06 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-03-02 12:30:06 +0000
commitf0765f4efeb7f42d846cfd389667bf13ceced8d8 (patch)
tree21e2b7e86e19ae2dac578a063996bd90e19b62ed
parent72c49d2c097a9840aedf24649a725aa81a0bb2cd (diff)
downloadsamba-f0765f4efeb7f42d846cfd389667bf13ceced8d8.tar.gz
samba-f0765f4efeb7f42d846cfd389667bf13ceced8d8.tar.bz2
samba-f0765f4efeb7f42d846cfd389667bf13ceced8d8.zip
Move these inside the #ifdef to fix the compile on non-LDAPsam systems.
(This used to be commit 75f72f0b6a698e462a0567674613319dde789084)
-rw-r--r--source3/param/loadparm.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 5698eed20d..919527040d 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -199,8 +199,8 @@ typedef struct
int oplock_break_wait_time;
int winbind_cache_time;
#ifdef WITH_LDAP_SAM
- char *szLdapMachineSuffix;
- char *szLdapUserSuffix;
+ char *szLdapMachineSuffix;
+ char *szLdapUserSuffix;
int ldap_port;
int ldap_ssl;
char *szLdapSuffix;
@@ -1319,14 +1319,15 @@ static void init_globals(void)
Globals.bUseMmap = True;
#endif
- string_set(&Globals.szLdapMachineSuffix, "");
- string_set(&Globals.szLdapUserSuffix, "");
/* hostname lookups can be very expensive and are broken on
a large number of sites (tridge) */
Globals.bHostnameLookups = False;
#ifdef WITH_LDAP_SAM
string_set(&Globals.szLdapSuffix, "");
+ string_set(&Globals.szLdapMachineSuffix, "");
+ string_set(&Globals.szLdapUserSuffix, "");
+
string_set(&Globals.szLdapFilter, "(&(uid=%u)(objectclass=sambaAccount))");
string_set(&Globals.szLdapAdminDn, "");
Globals.ldap_ssl = LDAP_SSL_ON;