diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-01-16 13:44:22 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-02-12 13:17:14 +1300 |
| commit | 8c22634559820fee9d2007816174263fafc41c6a (patch) | |
| tree | 7ccfcd5b44117c5e360868db2f9424431e70c182 | |
| parent | 6e954a560521a459ef4a72faeca39b16ca0fed36 (diff) | |
| download | samba-8c22634559820fee9d2007816174263fafc41c6a.tar.gz | |
param: Move LOADPARM_EXTRA_GLOBALS to lib/param/loadparm.h to be shared between loadparms
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | lib/param/loadparm.c | 17 | ||||
| -rw-r--r-- | lib/param/loadparm.h | 17 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 17 |
3 files changed, 17 insertions, 34 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 038f5dc2850..1d5ae9e0ca2 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -72,23 +72,6 @@ static bool do_parameter(const char *, const char *, void *); static bool defaults_saved = false; -#define LOADPARM_EXTRA_GLOBALS \ - struct parmlist_entry *param_opt; \ - char *realm_original; \ - int iminreceivefile; \ - char *szPrintcapname; \ - int CupsEncrypt; \ - int iPreferredMaster; \ - char *szLdapMachineSuffix; \ - char *szLdapUserSuffix; \ - char *szLdapIdmapSuffix; \ - char *szLdapGroupSuffix; \ - char *szIdmapUID; \ - char *szIdmapGID; \ - char *szIdmapBackend; \ - int winbindMaxDomainConnections; \ - int ismb2_max_credits; - #include "lib/param/param_global.h" #define NUMPARAMETERS (sizeof(parm_table) / sizeof(struct parm_struct)) diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index 56ffec524db..8a04b3f86c8 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -230,6 +230,23 @@ enum case_handling {CASE_LOWER,CASE_UPPER}; #include "lib/param/param_local.h" +#define LOADPARM_EXTRA_GLOBALS \ + struct parmlist_entry *param_opt; \ + char *realm_original; \ + int iminreceivefile; \ + char *szPrintcapname; \ + int CupsEncrypt; \ + int iPreferredMaster; \ + char *szLdapMachineSuffix; \ + char *szLdapUserSuffix; \ + char *szLdapIdmapSuffix; \ + char *szLdapGroupSuffix; \ + char *szIdmapUID; \ + char *szIdmapGID; \ + char *szIdmapBackend; \ + int winbindMaxDomainConnections; \ + int ismb2_max_credits; + const char* server_role_str(uint32_t role); int lp_find_server_role(int server_role, int security, int domain_logons, int domain_master); int lp_find_security(int server_role, int security); diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index c780f4e72ca..f2d1e6b792e 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -108,23 +108,6 @@ static int config_backend = CONFIG_BACKEND_FILE; static bool defaults_saved = false; -#define LOADPARM_EXTRA_GLOBALS \ - struct parmlist_entry *param_opt; \ - char *realm_original; \ - int iminreceivefile; \ - char *szPrintcapname; \ - int CupsEncrypt; \ - int iPreferredMaster; \ - char *szLdapMachineSuffix; \ - char *szLdapUserSuffix; \ - char *szLdapIdmapSuffix; \ - char *szLdapGroupSuffix; \ - char *szIdmapUID; \ - char *szIdmapGID; \ - char *szIdmapBackend; \ - int winbindMaxDomainConnections; \ - int ismb2_max_credits; - #include "lib/param/param_global.h" static struct loadparm_global Globals; |