diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-18 09:41:39 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-05-07 19:49:14 +0200 |
| commit | 29cdb716d0283d1cb67713f4bb6eb08e28dd98d5 (patch) | |
| tree | 393b3ba79c8e3d8c73a8f57b12d2b4f7748dc7fd /source3/param/loadparm.c | |
| parent | a39d56933660e72742d9b438ae9c6b4c513c1449 (diff) | |
| download | samba-29cdb716d0283d1cb67713f4bb6eb08e28dd98d5.tar.gz samba-29cdb716d0283d1cb67713f4bb6eb08e28dd98d5.tar.xz samba-29cdb716d0283d1cb67713f4bb6eb08e28dd98d5.zip | |
param: consolidate handle_realm between the two loadparms
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-on: https://gerrit.samba.org/105
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/param/loadparm.c')
| -rw-r--r-- | source3/param/loadparm.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index bbb2144cf6..efaa93b237 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -265,7 +265,6 @@ static bool handle_copy(struct loadparm_context *unused, int snum, const char *p static bool handle_idmap_backend(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr); static bool handle_idmap_uid(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr); static bool handle_idmap_gid(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr); -static bool handle_realm(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr ); static bool handle_netbios_aliases(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr ); static bool handle_charset(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr ); static bool handle_dos_charset(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr ); @@ -2726,21 +2725,6 @@ static bool handle_dos_charset(struct loadparm_context *unused, int snum, const return true; } -static bool handle_realm(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr) -{ - bool ret = true; - TALLOC_CTX *frame = talloc_stackframe(); - char *realm = strupper_talloc(frame, pszParmValue); - char *dnsdomain = strlower_talloc(realm, pszParmValue); - - ret &= string_set(Globals.ctx, &Globals.realm_original, pszParmValue); - ret &= string_set(Globals.ctx, &Globals.realm, realm); - ret &= string_set(Globals.ctx, &Globals.dnsdomain, dnsdomain); - TALLOC_FREE(frame); - - return ret; -} - static bool handle_netbios_aliases(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr) { TALLOC_FREE(Globals.netbios_aliases); |