From a5731907d2b0a154f930d12943c55d4969fcdf6e Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 27 Sep 2002 02:09:57 +0000 Subject: 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) --- source3/param/loadparm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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, ""); -- cgit