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/rpcclient | |
| 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/rpcclient')
| -rw-r--r-- | source3/rpcclient/rpcclient.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index 466212b23a..5808f371f0 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/rpcclient/rpcclient.c @@ -975,21 +975,13 @@ out_free: goto done; } - /* save the workgroup... - - FIXME!! do we need to do this for other options as well - (or maybe a generic way to keep lp_load() from overwriting - everything)? */ - - fstrcpy( new_workgroup, lp_workgroup() ); - /* Load smb.conf file */ if (!lp_load(get_dyn_CONFIGFILE(),True,False,False,True)) fprintf(stderr, "Can't load %s\n", get_dyn_CONFIGFILE()); if ( strlen(new_workgroup) != 0 ) - set_global_myworkgroup( new_workgroup ); + lp_set_cmdline("workgroup", new_workgroup ); /* * Get password |