From 15b8cfcd83ab502c99bb5c02d2198c46a22f165e Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 10 Nov 2011 15:19:33 +1100 Subject: param: Move enum values into a common (included) .c file This #include hack is required as it is not possible to declare a compile-time sized array in a header file. Andrew Bartlett Pair-Programmed-With: Amitay Isaacs --- source3/param/loadparm.c | 84 +----------------------------------------------- 1 file changed, 1 insertion(+), 83 deletions(-) (limited to 'source3/param/loadparm.c') diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 3cbc70f997..c044f655a4 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -313,29 +313,7 @@ static void add_to_file_list(const char *fname, const char *subfname); static bool lp_set_cmdline_helper(const char *pszParmName, const char *pszParmValue, bool store_values); static void free_param_opts(struct parmlist_entry **popts); -static const struct enum_list enum_protocol[] = { - {PROTOCOL_SMB2_02, "SMB2"}, /* for now keep PROTOCOL_SMB2_02 */ - {PROTOCOL_SMB2_10, "SMB2_10"}, - {PROTOCOL_SMB2_02, "SMB2_02"}, - {PROTOCOL_NT1, "NT1"}, - {PROTOCOL_LANMAN2, "LANMAN2"}, - {PROTOCOL_LANMAN1, "LANMAN1"}, - {PROTOCOL_CORE, "CORE"}, - {PROTOCOL_COREPLUS, "COREPLUS"}, - {PROTOCOL_COREPLUS, "CORE+"}, - {-1, NULL} -}; - -static const struct enum_list enum_security[] = { - {SEC_SHARE, "SHARE"}, - {SEC_USER, "USER"}, - {SEC_SERVER, "SERVER"}, - {SEC_DOMAIN, "DOMAIN"}, -#ifdef HAVE_ADS - {SEC_ADS, "ADS"}, -#endif - {-1, NULL} -}; +#include "lib/param/param_enums.c" static const struct enum_list enum_printing[] = { {PRINT_SYSV, "sysv"}, @@ -413,49 +391,6 @@ static const struct enum_list enum_case[] = { }; - -static const struct enum_list enum_bool_auto[] = { - {false, "No"}, - {false, "False"}, - {false, "0"}, - {true, "Yes"}, - {true, "True"}, - {true, "1"}, - {Auto, "Auto"}, - {-1, NULL} -}; - -static const struct enum_list enum_csc_policy[] = { - {CSC_POLICY_MANUAL, "manual"}, - {CSC_POLICY_DOCUMENTS, "documents"}, - {CSC_POLICY_PROGRAMS, "programs"}, - {CSC_POLICY_DISABLE, "disable"}, - {-1, NULL} -}; - -/* SMB signing types. */ -static const struct enum_list enum_smb_signing_vals[] = { - {SMB_SIGNING_DEFAULT, "default"}, - {SMB_SIGNING_OFF, "No"}, - {SMB_SIGNING_OFF, "False"}, - {SMB_SIGNING_OFF, "0"}, - {SMB_SIGNING_OFF, "Off"}, - {SMB_SIGNING_OFF, "disabled"}, - {SMB_SIGNING_IF_REQUIRED, "if_required"}, - {SMB_SIGNING_IF_REQUIRED, "Yes"}, - {SMB_SIGNING_IF_REQUIRED, "True"}, - {SMB_SIGNING_IF_REQUIRED, "1"}, - {SMB_SIGNING_IF_REQUIRED, "On"}, - {SMB_SIGNING_IF_REQUIRED, "enabled"}, - {SMB_SIGNING_IF_REQUIRED, "auto"}, - {SMB_SIGNING_REQUIRED, "required"}, - {SMB_SIGNING_REQUIRED, "mandatory"}, - {SMB_SIGNING_REQUIRED, "force"}, - {SMB_SIGNING_REQUIRED, "forced"}, - {SMB_SIGNING_REQUIRED, "enforced"}, - {-1, NULL} -}; - /* ACL compatibility options. */ static const struct enum_list enum_acl_compat_vals[] = { { ACL_COMPAT_AUTO, "auto" }, @@ -512,23 +447,6 @@ static const struct enum_list enum_kerberos_method[] = { {-1, NULL} }; -/* Server role options */ -static const struct enum_list enum_server_role[] = { - {ROLE_AUTO, "auto"}, - {ROLE_STANDALONE, "standalone"}, - {ROLE_DOMAIN_MEMBER, "member server"}, - {ROLE_DOMAIN_MEMBER, "member"}, - /* note that currently - ROLE_DOMAIN_CONTROLLER == ROLE_DOMAIN_BDC */ - {ROLE_DOMAIN_CONTROLLER, "domain controller"}, - {ROLE_DOMAIN_BDC, "backup domain controller"}, - {ROLE_DOMAIN_BDC, "bdc"}, - {ROLE_DOMAIN_BDC, "dc"}, - {ROLE_DOMAIN_PDC, "primary domain controller"}, - {ROLE_DOMAIN_PDC, "pdc"}, - {-1, NULL} -}; - /* Note: We do not initialise the defaults union - it is not allowed in ANSI C * * The FLAG_HIDE is explicit. Parameters set this way do NOT appear in any edit -- cgit