s3:param Allow lp_security() and lp_passdb_backend to be omited for s3compat
authorAndrew Bartlett <abartlet@samba.org>
Sun, 23 May 2010 15:13:54 +0000 (01:13 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 8 Jun 2010 01:46:51 +0000 (11:46 +1000)
When we build s3compat into the source4 code, we will provide a
replacement for both these functions.

Andrew Bartlett

source3/param/loadparm.c

index f65a9d50e95f7b5b74842223c6ef81834bb587e4..06803b68fe75d4057a663e55bc1d561b7fdefcaf 100644 (file)
@@ -5443,6 +5443,7 @@ FN_GLOBAL_LIST(lp_netbios_aliases, &Globals.szNetbiosAliases)
  * lp_passdb_backend() should be replace by the this macro again after
  * some releases.
  * */
+#ifndef ENABLE_S3COMPAT
 const char *lp_passdb_backend(void)
 {
        char *delim, *quote;
@@ -5481,6 +5482,7 @@ warn:
 out:
        return Globals.szPassdbBackend;
 }
+#endif
 FN_GLOBAL_LIST(lp_preload_modules, &Globals.szPreloadModules)
 FN_GLOBAL_STRING(lp_panic_action, &Globals.szPanicAction)
 FN_GLOBAL_STRING(lp_adduser_script, &Globals.szAddUserScript)
@@ -5634,7 +5636,9 @@ FN_GLOBAL_INTEGER(lp_deadtime, &Globals.deadtime)
 FN_GLOBAL_BOOL(lp_getwd_cache, &Globals.getwd_cache)
 FN_GLOBAL_INTEGER(lp_maxprotocol, &Globals.maxprotocol)
 FN_GLOBAL_INTEGER(lp_minprotocol, &Globals.minprotocol)
+#ifndef ENABLE_S3COMPAT
 FN_GLOBAL_INTEGER(lp_security, &Globals.security)
+#endif
 FN_GLOBAL_LIST(lp_auth_methods, &Globals.AuthMethods)
 FN_GLOBAL_BOOL(lp_paranoid_server_security, &Globals.paranoid_server_security)
 FN_GLOBAL_INTEGER(lp_maxdisksize, &Globals.maxdisksize)