diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-08 16:27:06 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-09 12:40:09 +0200 |
| commit | f348d148b463ca61cbc48d2aadeaa099f7150425 (patch) | |
| tree | 0c9dd77dca2448a025df3293ccc7850281b8591d /source3/param | |
| parent | 3ccc7609476139bc6a906110a2623605f3802159 (diff) | |
| download | samba-f348d148b463ca61cbc48d2aadeaa099f7150425.tar.gz samba-f348d148b463ca61cbc48d2aadeaa099f7150425.tar.bz2 samba-f348d148b463ca61cbc48d2aadeaa099f7150425.zip | |
s3-param Remove special case for global_scope()
There is no reason this can't be a normal constant string in the
loadparm system. (Past reasons were that we didn't have lp_set_cmdline())
Andrew Bartlett
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 14 | ||||
| -rw-r--r-- | source3/param/loadparm_ctx.c | 2 |
2 files changed, 3 insertions, 13 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 56f039f46e..619faf69eb 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -708,7 +708,6 @@ static bool handle_idmap_gid( int snum, const char *pszParmValue, char **ptr); static bool handle_debug_list( int snum, const char *pszParmValue, char **ptr ); static bool handle_realm( int snum, const char *pszParmValue, char **ptr ); static bool handle_netbios_aliases( int snum, const char *pszParmValue, char **ptr ); -static bool handle_netbios_scope( int snum, const char *pszParmValue, char **ptr ); static bool handle_charset( int snum, const char *pszParmValue, char **ptr ); static bool handle_dos_charset( int snum, const char *pszParmValue, char **ptr ); static bool handle_printing( int snum, const char *pszParmValue, char **ptr); @@ -1048,7 +1047,7 @@ static struct parm_struct parm_table[] = { .type = P_USTRING, .p_class = P_GLOBAL, .ptr = &Globals.szNetbiosScope, - .special = handle_netbios_scope, + .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED, }, @@ -5618,6 +5617,7 @@ FN_GLOBAL_STRING(lp_passwd_chat, &Globals.szPasswdChat) FN_GLOBAL_CONST_STRING(lp_passwordserver, &Globals.szPasswordServer) FN_GLOBAL_CONST_STRING(lp_name_resolve_order, &Globals.szNameResolveOrder) FN_GLOBAL_CONST_STRING(lp_workgroup, &Globals.szWorkgroup) +FN_GLOBAL_CONST_STRING(lp_netbios_scope, &Globals.szNetbiosScope) FN_GLOBAL_CONST_STRING(lp_realm, &Globals.szRealmUpper) FN_GLOBAL_CONST_STRING(lp_dnsdomain, &Globals.szDnsDomain) FN_GLOBAL_CONST_STRING(lp_afs_username_map, &Globals.szAfsUsernameMap) @@ -7599,16 +7599,6 @@ static bool handle_realm(int snum, const char *pszParmValue, char **ptr) return ret; } -static bool handle_netbios_scope(int snum, const char *pszParmValue, char **ptr) -{ - bool ret; - - ret = set_global_scope(pszParmValue); - string_set(&Globals.szNetbiosScope,global_scope()); - - return ret; -} - static bool handle_netbios_aliases(int snum, const char *pszParmValue, char **ptr) { TALLOC_FREE(Globals.szNetbiosAliases); diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c index cc2468651a..d07ef45d36 100644 --- a/source3/param/loadparm_ctx.c +++ b/source3/param/loadparm_ctx.c @@ -49,7 +49,7 @@ static const struct loadparm_s3_context s3_fns = .workgroup = lp_workgroup, .netbios_name = global_myname, - .netbios_scope = global_scope, + .netbios_scope = lp_netbios_scope, .lanman_auth = lp_lanman_auth, .ntlm_auth = lp_ntlm_auth, |