[s3]loadparm: Remove occurrences of config_backend / ConfigBackend

Michael

diff --git a/source3/include/proto.h b/source3/include/proto.h
index c5db0902f94889e3523f4196d53cfefa900ab96a..6642883baf55941a3d299810e8e71fce1f3248c1 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4078,7 +4078,6 @@ int lp_oplock_break_wait_time(void);
 int lp_lock_spin_time(void);
 int lp_usershare_max_shares(void);
 const char *lp_socket_options(void);
-int lp_config_backend(void);
 char *lp_preexec(int );
 char *lp_postexec(int );
 char *lp_rootpreexec(int );
@@ -4244,8 +4243,6 @@ bool lp_string_is_valid_boolean(const char *parm_value);
 bool lp_invert_boolean(const char *str, const char **inverse_str);
 bool lp_canonicalize_boolean(const char *str, const char**canon_str);
 bool service_ok(int iService);
-bool lp_config_backend_is_registry(void);
-bool lp_config_backend_is_file(void);
 bool lp_source_list_changed(void);
 bool lp_idmap_uid(uid_t *low, uid_t *high);
 bool lp_idmap_gid(gid_t *low, gid_t *high);

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 2d8324df6f7befa5a821912512c9ab39bab1d8b8..96ee746e1b886c231c5b1cba03f22c56c39f58a5 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -87,11 +87,6 @@ static bool in_client = False;               /* Not in the client by default */
  */
 static bool allow_messaging_sources = true;
 
-#define CONFIG_BACKEND_FILE 0
-#define CONFIG_BACKEND_REGISTRY 1
-
-static int config_backend = CONFIG_BACKEND_FILE;
-
 /**
  * a lists of config sources with attached smbconf contexts.
  */
@@ -130,7 +125,6 @@ struct param_opt_struct {
  * This structure describes global (ie., server-wide) parameters.
  */
 struct global {
-       int ConfigBackend;
        char *smb_ports;
        char *dos_charset;
        char *unix_charset;
@@ -880,14 +874,6 @@ static const struct enum_list enum_map_to_guest[] = {
        {-1, NULL}
 };
 
-/* Config backend options */
-
-static const struct enum_list enum_config_backend[] = {
-       {CONFIG_BACKEND_FILE, "file"},
-       {CONFIG_BACKEND_REGISTRY, "registry"},
-       {-1, NULL}
-};
-
 /* Note: We do not initialise the defaults union - it is not allowed in ANSI C
  *
  * The FLAG_HIDE is explicit. Paramters set this way do NOT appear in any edit
@@ -1037,15 +1023,6 @@ static struct parm_struct parm_table[] = {
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_WIZARD,
        },
-       {
-               .label          = "config backend",
-               .type           = P_ENUM,
-               .p_class        = P_GLOBAL,
-               .ptr            = &Globals.ConfigBackend,
-               .special        = NULL,
-               .enum_list      = enum_config_backend,
-               .flags          = FLAG_ADVANCED,
-       },
 
        {N_("Security Options"), P_SEP, P_SEPARATOR},
 
@@ -4768,8 +4745,6 @@ static void init_globals(bool first_time_only)
        Globals.bLoadPrinters = True;
        Globals.PrintcapCacheTime = 750;        /* 12.5 minutes */
 
-       Globals.ConfigBackend = config_backend;
-
        /* Was 65535 (0xFFFF). 0x4101 matches W2K and causes major speed improvements... */
        /* Discovered by 2 days of pain by Don McCall @ HP :-). */
        Globals.max_xmit = 0x4104;
@@ -5303,7 +5278,6 @@ FN_GLOBAL_INTEGER(lp_oplock_break_wait_time, &Globals.oplock_break_wait_time)
 FN_GLOBAL_INTEGER(lp_lock_spin_time, &Globals.iLockSpinTime)
 FN_GLOBAL_INTEGER(lp_usershare_max_shares, &Globals.iUsershareMaxShares)
 FN_GLOBAL_CONST_STRING(lp_socket_options, &Globals.szSocketOptions)
-FN_GLOBAL_INTEGER(lp_config_backend, &Globals.ConfigBackend)
 
 FN_LOCAL_STRING(lp_preexec, szPreExec)
 FN_LOCAL_STRING(lp_postexec, szPostExec)
@@ -6619,22 +6593,6 @@ static bool process_smbconf_service(struct smbconf_service *service)
        return true;
 }
 
-/**
- * Utility function for outsiders to check if we're running on registry.
- */
-bool lp_config_backend_is_registry(void)
-{
-       return (lp_config_backend() == CONFIG_BACKEND_REGISTRY);
-}
-
-/**
- * Utility function to check if the config backend is FILE.
- */
-bool lp_config_backend_is_file(void)
-{
-       return (lp_config_backend() == CONFIG_BACKEND_FILE);
-}
-
 /***************************************************************************
  Run standard_sub_basic on netbios name... needed because global_myname
  is not accessed through any lp_ macro.