8bb635e398
response to the recent symlink attack problem approved by Takahiro Kambe bump PKGREVISION
77 lines
3.9 KiB
Text
77 lines
3.9 KiB
Text
$NetBSD: patch-bs,v 1.6 2010/02/09 16:08:36 drochner Exp $
|
|
|
|
--- param/loadparm.c.orig 2009-09-30 12:21:56.000000000 +0000
|
|
+++ param/loadparm.c
|
|
@@ -109,6 +109,7 @@ typedef struct {
|
|
char *szDeletePrinterCommand;
|
|
char *szOs2DriverMap;
|
|
char *szLockDir;
|
|
+ char *szStateDir;
|
|
char *szPidDir;
|
|
char *szRootdir;
|
|
char *szDefaultService;
|
|
@@ -276,6 +277,7 @@ typedef struct {
|
|
BOOL bUnixPasswdSync;
|
|
BOOL bPasswdChatDebug;
|
|
int iPasswdChatTimeout;
|
|
+ BOOL bPasswdExpandGecos;
|
|
BOOL bTimestampLogs;
|
|
BOOL bNTSmbSupport;
|
|
BOOL bNTPipeSupport;
|
|
@@ -564,7 +566,7 @@ static service sDefault = {
|
|
True, /* bLevel2OpLocks */
|
|
False, /* bOnlyUser */
|
|
True, /* bMangledNames */
|
|
- True, /* bWidelinks */
|
|
+ False, /* bWidelinks */
|
|
True, /* bSymlinks */
|
|
False, /* bSyncAlways */
|
|
False, /* bStrictAllocate */
|
|
@@ -890,6 +892,7 @@ static struct parm_struct parm_table[] =
|
|
{"passwd chat", P_STRING, P_GLOBAL, &Globals.szPasswdChat, NULL, NULL, FLAG_ADVANCED},
|
|
{"passwd chat debug", P_BOOL, P_GLOBAL, &Globals.bPasswdChatDebug, NULL, NULL, FLAG_ADVANCED},
|
|
{"passwd chat timeout", P_INTEGER, P_GLOBAL, &Globals.iPasswdChatTimeout, NULL, NULL, FLAG_ADVANCED},
|
|
+ {"passwd expand gecos", P_BOOL, P_GLOBAL, &Globals.bPasswdExpandGecos, NULL, NULL, FLAG_ADVANCED},
|
|
{"check password script", P_STRING, P_GLOBAL, &Globals.szCheckPasswordScript, NULL, NULL, FLAG_ADVANCED},
|
|
{"username map", P_STRING, P_GLOBAL, &Globals.szUsernameMap, NULL, NULL, FLAG_ADVANCED},
|
|
{"password level", P_INTEGER, P_GLOBAL, &Globals.pwordlevel, NULL, NULL, FLAG_ADVANCED},
|
|
@@ -1212,6 +1215,7 @@ static struct parm_struct parm_table[] =
|
|
{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED},
|
|
{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED},
|
|
{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_HIDE},
|
|
+ {"state directory", P_STRING, P_GLOBAL, &Globals.szStateDir, NULL, NULL, FLAG_ADVANCED},
|
|
{"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED},
|
|
#ifdef WITH_UTMP
|
|
{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED},
|
|
@@ -1476,6 +1480,7 @@ static void init_globals(BOOL first_time
|
|
string_set(&Globals.szPasswdProgram, "");
|
|
string_set(&Globals.szPidDir, dyn_PIDDIR);
|
|
string_set(&Globals.szLockDir, dyn_LOCKDIR);
|
|
+ string_set(&Globals.szStateDir, dyn_STATEDIR);
|
|
string_set(&Globals.szSocketAddress, "0.0.0.0");
|
|
pstrcpy(s, "Samba ");
|
|
pstrcat(s, SAMBA_VERSION_STRING);
|
|
@@ -1559,6 +1564,7 @@ static void init_globals(BOOL first_time
|
|
Globals.bPamPasswordChange = False;
|
|
Globals.bPasswdChatDebug = False;
|
|
Globals.iPasswdChatTimeout = 2; /* 2 second default. */
|
|
+ Globals.bPasswdExpandGecos = False;
|
|
Globals.bNTPipeSupport = True; /* Do NT pipes by default. */
|
|
Globals.bNTStatusSupport = True; /* Use NT status by default. */
|
|
Globals.bStatCache = True; /* use stat cache by default */
|
|
@@ -1806,6 +1812,7 @@ FN_GLOBAL_STRING(lp_addprinter_cmd, &Glo
|
|
FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
|
|
FN_GLOBAL_STRING(lp_os2_driver_map, &Globals.szOs2DriverMap)
|
|
FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
|
|
+FN_GLOBAL_STRING(lp_statedir, &Globals.szStateDir)
|
|
FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
|
|
FN_GLOBAL_STRING(lp_mangling_method, &Globals.szManglingMethod)
|
|
FN_GLOBAL_INTEGER(lp_mangle_prefix, &Globals.mangle_prefix)
|
|
@@ -1979,6 +1986,7 @@ FN_GLOBAL_BOOL(lp_pam_password_change, &
|
|
FN_GLOBAL_BOOL(lp_unix_password_sync, &Globals.bUnixPasswdSync)
|
|
FN_GLOBAL_BOOL(lp_passwd_chat_debug, &Globals.bPasswdChatDebug)
|
|
FN_GLOBAL_INTEGER(lp_passwd_chat_timeout, &Globals.iPasswdChatTimeout)
|
|
+FN_GLOBAL_BOOL(lp_passwd_expand_gecos, &Globals.bPasswdExpandGecos)
|
|
FN_GLOBAL_BOOL(lp_nt_pipe_support, &Globals.bNTPipeSupport)
|
|
FN_GLOBAL_BOOL(lp_nt_status_support, &Globals.bNTStatusSupport)
|
|
FN_GLOBAL_BOOL(lp_stat_cache, &Globals.bStatCache)
|