summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-09-27 02:09:57 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-09-27 02:09:57 +0000
commita5731907d2b0a154f930d12943c55d4969fcdf6e (patch)
treee15dcb381844b3f743faa2bcf20c8643cb391603 /source3
parent9e7a6d6b8b4f5bf38d6faa2fca211657fc8b2959 (diff)
downloadsamba-a5731907d2b0a154f930d12943c55d4969fcdf6e.tar.gz
samba-a5731907d2b0a154f930d12943c55d4969fcdf6e.tar.bz2
samba-a5731907d2b0a154f930d12943c55d4969fcdf6e.zip
When compiled --with-ldapsam, make ldapsam the default passdb backend.
This is to allow painless upgrades from 2.2, and so people don't get a shock when they follow old docs. If ldap has been detected on the system, ldapsam is always available, just not the default. Andrew Bartlett (This used to be commit 0a6a0c88d0972fcea4aead7115929f96c0d23cbc)
Diffstat (limited to 'source3')
-rw-r--r--source3/param/loadparm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index ba16d68624..eb910a1245 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1252,7 +1252,6 @@ static void init_globals(void)
string_set(&Globals.szSMBPasswdFile, dyn_SMB_PASSWD_FILE);
string_set(&Globals.szPrivateDir, dyn_PRIVATE_DIR);
- Globals.szPassdbBackend = str_list_make("smbpasswd unixsam", NULL);
/* use the new 'hash2' method by default */
string_set(&Globals.szManglingMethod, "hash2");
@@ -1378,6 +1377,9 @@ static void init_globals(void)
#ifdef WITH_LDAP_SAMCONFIG
string_set(&Globals.szLdapServer, "localhost");
Globals.ldap_port = 636;
+ Globals.szPassdbBackend = str_list_make("ldapsam unixsam", NULL);
+#else
+ Globals.szPassdbBackend = str_list_make("smbpasswd unixsam", NULL);
#endif /* WITH_LDAP_SAMCONFIG */
string_set(&Globals.szLdapSuffix, "");