diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-20 00:28:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:58:52 -0500 |
| commit | 18cddd580e04344e05593d9f63beb9ead53cfab2 (patch) | |
| tree | 7e49547cc37afcf2f3b974bf21d3bfd3ebcdfb20 /source4/param/loadparm.c | |
| parent | 679a993329fddc320e4c67d2b66b5874c189b142 (diff) | |
| download | samba-18cddd580e04344e05593d9f63beb9ead53cfab2.tar.gz samba-18cddd580e04344e05593d9f63beb9ead53cfab2.tar.bz2 samba-18cddd580e04344e05593d9f63beb9ead53cfab2.zip | |
r14575: Move some path-related functions to libsamba-config so libsamba-util
doesn't have to depend on the lp_* functions.
(This used to be commit f97df7d90a41b77a9edd2d6bdc47c27bf1b6bb07)
Diffstat (limited to 'source4/param/loadparm.c')
| -rw-r--r-- | source4/param/loadparm.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 931eed626f..21d1e0d57d 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -103,7 +103,6 @@ typedef struct char *szServerString; char *szAutoServices; char *szPasswdChat; - char *szLogFile; char *szConfigFile; char *szSAM_URL; char *szSPOOLSS_URL; @@ -124,7 +123,6 @@ typedef struct char *szNetbiosScope; char *szDomainOtherSIDs; char **szNameResolveOrder; - char *szPanicAction; char **dcerpc_ep_servers; char **server_services; char *ntptr_providor; @@ -431,7 +429,7 @@ static struct parm_struct parm_table[] = { {"log level", P_INTEGER, P_GLOBAL, &DEBUGLEVEL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"debuglevel", P_INTEGER, P_GLOBAL, &DEBUGLEVEL, NULL, NULL, FLAG_HIDE}, - {"log file", P_STRING, P_GLOBAL, &Globals.szLogFile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, + {"log file", P_STRING, P_GLOBAL, &logfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"Protocol Options", P_SEP, P_SEPARATOR}, @@ -544,7 +542,7 @@ static struct parm_struct parm_table[] = { {"volume", P_STRING, P_LOCAL, &sDefault.volume, NULL, NULL, FLAG_SHARE }, {"fstype", P_STRING, P_LOCAL, &sDefault.fstype, NULL, NULL, FLAG_SHARE}, - {"panic action", P_STRING, P_GLOBAL, &Globals.szPanicAction, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, + {"panic action", P_STRING, P_GLOBAL, &panic_action, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"msdfs root", P_BOOL, P_LOCAL, &sDefault.bMSDfsRoot, NULL, NULL, FLAG_SHARE}, {"host msdfs", P_BOOL, P_GLOBAL, &Globals.bHostMSDfs, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, @@ -819,7 +817,6 @@ _PUBLIC_ FN_GLOBAL_STRING(lp_tls_cafile, &Globals.tls_cafile) _PUBLIC_ FN_GLOBAL_STRING(lp_tls_crlfile, &Globals.tls_crlfile) _PUBLIC_ FN_GLOBAL_STRING(lp_unix_charset, &Globals.unix_charset) _PUBLIC_ FN_GLOBAL_STRING(lp_display_charset, &Globals.display_charset) -_PUBLIC_ FN_GLOBAL_STRING(lp_logfile, &Globals.szLogFile) _PUBLIC_ FN_GLOBAL_STRING(lp_configfile, &Globals.szConfigFile) _PUBLIC_ FN_GLOBAL_STRING(lp_sam_url, &Globals.szSAM_URL) _PUBLIC_ FN_GLOBAL_STRING(lp_spoolss_url, &Globals.szSPOOLSS_URL) @@ -850,7 +847,6 @@ _PUBLIC_ FN_GLOBAL_LIST(lp_wins_server_list, &Globals.szWINSservers) _PUBLIC_ FN_GLOBAL_LIST(lp_interfaces, &Globals.szInterfaces) _PUBLIC_ FN_GLOBAL_STRING(lp_socket_address, &Globals.szSocketAddress) _PUBLIC_ FN_GLOBAL_LIST(lp_netbios_aliases, &Globals.szNetbiosAliases) -_PUBLIC_ FN_GLOBAL_STRING(lp_panic_action, &Globals.szPanicAction) _PUBLIC_ FN_GLOBAL_BOOL(lp_disable_netbios, &Globals.bDisableNetbios) _PUBLIC_ FN_GLOBAL_BOOL(lp_wins_support, &Globals.bWINSsupport) |