summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorSamba Release Account <samba-bugs@samba.org>1996-08-24 01:41:46 +0000
committerSamba Release Account <samba-bugs@samba.org>1996-08-24 01:41:46 +0000
commit9ad5a3fe36ac2b32bcb7a50c608ec586629f2125 (patch)
tree133871efd2c12d360a4ff585f9ab96f7db91c5ea /source3/param
parent8c41ad5614f4b3e6218cc7a3a21526122b202709 (diff)
downloadsamba-9ad5a3fe36ac2b32bcb7a50c608ec586629f2125.tar.gz
samba-9ad5a3fe36ac2b32bcb7a50c608ec586629f2125.tar.bz2
samba-9ad5a3fe36ac2b32bcb7a50c608ec586629f2125.zip
removed all of lukes recent changes. I need to do a p2 release but
can't test the multi group changes. I also found that some of lukes changes wiped out some recent bug fixes. Is your CVS tree ok luke? (This used to be commit 8b7fe224bce64803d55ae279fa61ef3ebbbb0241)
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c52
1 files changed, 21 insertions, 31 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 2a76ce70f7..87209d1bb7 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -106,34 +106,33 @@ extern int coding_system;
*/
typedef struct
{
- char *szAutoServices;
- char *szCharacterSet;
- char *szConfigFile;
+ char *szPrintcapname;
+ char *szLockDir;
+ char *szRootdir;
char *szDefaultService;
char *szDfree;
- char *szDomainController;
- char *szHostsEquiv;
- char *szInterfaces;
- char *szLockDir;
- char *szLogFile;
- char *szLogonScript;
char *szMsgCommand;
- char *szPasswdChat;
- char *szPasswdProgram;
- char *szPasswordServer;
- char *szPrintcapname;
- char *szRemoteAnnounce;
- char *szRootdir;
- char *szServerComment;
+ char *szHostsEquiv;
char *szServerString;
- char *szSmbrun;
+ char *szAutoServices;
+ char *szPasswdProgram;
+ char *szPasswdChat;
+ char *szLogFile;
+ char *szConfigFile;
char *szSMBPasswdFile;
- char *szSocketAddress;
+ char *szPasswordServer;
char *szSocketOptions;
- char *szUsernameMap;
char *szValidChars;
- char *szWINSserver;
char *szWorkGroup;
+ char *szDomainController;
+ char *szUsernameMap;
+ char *szCharacterSet;
+ char *szLogonScript;
+ char *szSmbrun;
+ char *szWINSserver;
+ char *szInterfaces;
+ char *szRemoteAnnounce;
+ char *szSocketAddress;
int max_log_size;
int mangled_stack;
int max_xmit;
@@ -153,7 +152,6 @@ typedef struct
BOOL bWINSsupport;
BOOL bWINSproxy;
BOOL bPreferredMaster;
- BOOL bLocalMaster;
BOOL bDomainMaster;
BOOL bDomainLogons;
BOOL bEncryptPasswords;
@@ -384,7 +382,6 @@ struct parm_struct
{"hosts equiv", P_STRING, P_GLOBAL, &Globals.szHostsEquiv, NULL},
{"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL},
{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL},
- {"server comment", P_STRING, P_GLOBAL, &Globals.szServerComment, NULL},
{"server string", P_STRING, P_GLOBAL, &Globals.szServerString, NULL},
{"printcap name", P_STRING, P_GLOBAL, &Globals.szPrintcapname, NULL},
{"printcap", P_STRING, P_GLOBAL, &Globals.szPrintcapname, NULL},
@@ -428,7 +425,6 @@ struct parm_struct
{"wins server", P_STRING, P_GLOBAL, &Globals.szWINSserver, NULL},
{"preferred master", P_BOOL, P_GLOBAL, &Globals.bPreferredMaster, NULL},
{"prefered master", P_BOOL, P_GLOBAL, &Globals.bPreferredMaster, NULL},
- {"local master", P_BOOL, P_GLOBAL, &Globals.bLocalMaster, NULL},
{"domain master", P_BOOL, P_GLOBAL, &Globals.bDomainMaster, NULL},
{"domain logons", P_BOOL, P_GLOBAL, &Globals.bDomainLogons, NULL},
{"browse list", P_BOOL, P_GLOBAL, &Globals.bBrowseList, NULL},
@@ -564,9 +560,6 @@ static void init_globals(void)
string_set(&Globals.szSocketAddress, "0.0.0.0");
sprintf(s,"Samba %s",VERSION);
string_set(&Globals.szServerString,s);
- strcpy(s,"Samba %v"); /* samba comment */
- string_sub(s,"%v",VERSION);
- string_set(&Globals.szServerComment,s);
Globals.bLoadPrinters = True;
Globals.bUseRhosts = False;
Globals.max_packet = 65535;
@@ -591,9 +584,8 @@ static void init_globals(void)
Globals.bSyslogOnly = False;
Globals.os_level = 0;
Globals.max_ttl = 60*60*4; /* 2 hours default */
- Globals.bPreferredMaster = True; /* force election on startup */
- Globals.bLocalMaster = True; /* master browser on local subnet */
- Globals.bDomainMaster = False; /* maintain wide area network browse list */
+ Globals.bPreferredMaster = True;
+ Globals.bDomainMaster = False;
Globals.bDomainLogons = False;
Globals.bBrowseList = True;
Globals.bWINSsupport = True;
@@ -732,7 +724,6 @@ 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_serverstring,&Globals.szServerString)
-FN_GLOBAL_STRING(lp_server_comment,&Globals.szServerComment)
FN_GLOBAL_STRING(lp_printcapname,&Globals.szPrintcapname)
FN_GLOBAL_STRING(lp_lockdir,&Globals.szLockDir)
FN_GLOBAL_STRING(lp_rootdir,&Globals.szRootdir)
@@ -756,7 +747,6 @@ FN_GLOBAL_STRING(lp_socket_address,&Globals.szSocketAddress)
FN_GLOBAL_BOOL(lp_wins_support,&Globals.bWINSsupport)
FN_GLOBAL_BOOL(lp_wins_proxy,&Globals.bWINSproxy)
-FN_GLOBAL_BOOL(lp_local_master,&Globals.bLocalMaster)
FN_GLOBAL_BOOL(lp_domain_master,&Globals.bDomainMaster)
FN_GLOBAL_BOOL(lp_domain_logons,&Globals.bDomainLogons)
FN_GLOBAL_BOOL(lp_preferred_master,&Globals.bPreferredMaster)