diff options
author | Jeremy Allison <jra@samba.org> | 2001-04-13 19:12:06 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2001-04-13 19:12:06 +0000 |
commit | 2ef68c7e92d4661664f0410509f7cb551e74a198 (patch) | |
tree | 7a3ea392bf8664e28ad46b2edb1afd750335ccc9 /source3/param | |
parent | 14748b0bf56239695cadb6aa40d9095259ebb6e2 (diff) | |
download | samba-2ef68c7e92d4661664f0410509f7cb551e74a198.tar.gz samba-2ef68c7e92d4661664f0410509f7cb551e74a198.tar.xz samba-2ef68c7e92d4661664f0410509f7cb551e74a198.zip |
Merge of Andrew's changes in 2.2.
Jeremy.
(This used to be commit fc76681812b1469208ad6c8847afdfc68bc6db49)
Diffstat (limited to 'source3/param')
-rw-r--r-- | source3/param/loadparm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 5407db5024f..022154f1d81 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -966,7 +966,6 @@ static struct parm_struct parm_table[] = { {"add share command", P_STRING, P_GLOBAL, &Globals.szAddShareCommand, NULL, NULL, 0}, {"change share command", P_STRING, P_GLOBAL, &Globals.szChangeShareCommand, NULL, NULL, 0}, {"delete share command", P_STRING, P_GLOBAL, &Globals.szDeleteShareCommand, NULL, NULL, 0}, - {"smbrun", P_STRING, P_GLOBAL, &Globals.szSmbrun, NULL, NULL, 0}, {"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE}, {"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING}, @@ -1433,7 +1432,6 @@ static char *lp_string(const char *s) int fn_name(int i) {return(LP_SNUM_OK(i)? pSERVICE(i)->val : sDefault.val);} FN_GLOBAL_STRING(lp_logfile, &Globals.szLogFile) -FN_GLOBAL_STRING(lp_smbrun, &Globals.szSmbrun) FN_GLOBAL_STRING(lp_configfile, &Globals.szConfigFile) FN_GLOBAL_STRING(lp_smb_passwd_file, &Globals.szSMBPasswdFile) FN_GLOBAL_STRING(lp_private_dir, &Globals.szPrivateDir) |