diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-08 15:42:22 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-09 12:40:09 +0200 |
| commit | 3ccc7609476139bc6a906110a2623605f3802159 (patch) | |
| tree | a1f464a10296ef6f9b17f405eb605180f2f30a7f /source3/lib | |
| parent | acdf5b0d4c188c0ca9ac17caedd1b53ae241acd6 (diff) | |
| download | samba-3ccc7609476139bc6a906110a2623605f3802159.tar.gz samba-3ccc7609476139bc6a906110a2623605f3802159.tar.bz2 samba-3ccc7609476139bc6a906110a2623605f3802159.zip | |
s3-param Remove special case for lp_workgroup()
There is no reason this can't be a normal constant string in the
loadparm system, now that we have lp_set_cmdline() to handle overrides
correctly.
Andrew Bartlett
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/popt_common.c | 4 | ||||
| -rw-r--r-- | source3/lib/util_names.c | 19 |
2 files changed, 2 insertions, 21 deletions
diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c index 8416d70bc4..628ed65820 100644 --- a/source3/lib/popt_common.c +++ b/source3/lib/popt_common.c @@ -149,7 +149,7 @@ static void popt_common_callback(poptContext con, case 'W': if (arg) { - set_global_myworkgroup(arg); + lp_set_cmdline("workgroup", arg); } break; } @@ -473,7 +473,7 @@ static void get_credentials_file(struct user_auth_info *auth_info, } else if (strwicmp("username", param) == 0) { set_cmdline_auth_info_username(auth_info, val); } else if (strwicmp("domain", param) == 0) { - set_cmdline_auth_info_domain(val); + set_cmdline_auth_info_domain(auth_info, val); } memset(buf, 0, sizeof(buf)); } diff --git a/source3/lib/util_names.c b/source3/lib/util_names.c index 8170c8bb11..d8ebf213cf 100644 --- a/source3/lib/util_names.c +++ b/source3/lib/util_names.c @@ -207,25 +207,6 @@ const char *global_myname(void) return smb_myname; } -/*********************************************************************** - Allocate and set myworkgroup. Ensure upper case. -***********************************************************************/ - -bool set_global_myworkgroup(const char *myworkgroup) -{ - SAFE_FREE(smb_myworkgroup); - smb_myworkgroup = SMB_STRDUP(myworkgroup); - if (!smb_myworkgroup) - return False; - strupper_m(smb_myworkgroup); - return True; -} - -const char *lp_workgroup(void) -{ - return smb_myworkgroup; -} - /****************************************************************** get the default domain/netbios name to be used when dealing with our passdb list of accounts |