28a7e3eb15
* Fix CAN-2006-1059 -- samba<3.0.22 exposes the clear text of the
server's machine account credentials in the winbind log files when
the log level is set to 5 or higher.
* Append "-pkgsrc" to the Samba version string so as to distinguish
the official version from the pkgsrc version, which has the
modifications for "state directory" and "passwd expand gecos".
* Modify package so that we automatically determine the name of the
nsswitch modules that are installed by samba with the winbind
option. We extract this information by invoking the config.status
script to get the value that the configure script determined.
o Access checks when deleting printer driver meta-data.
o Several non-default combinations schannel and SPNEGO support.
o Password changes with NT4 and Win2k pre-SP4 clients.
o High load issues on IRIX caused by a bug when interfacing
with kernel oplocks.
o Server crashes in smbd.
o Compile issues on 64-bit platforms.
o Crash bugs on big-endian systems.
o Packaging fixes for RHEL/Fedora, Solaris, & Debian.
o Over 30 bugzilla reports closed.
68 lines
3.6 KiB
Text
68 lines
3.6 KiB
Text
$NetBSD: patch-bs,v 1.3 2006/04/01 04:55:35 jlam Exp $
|
|
|
|
--- param/loadparm.c.orig 2006-02-20 15:33:21.000000000 -0500
|
|
+++ param/loadparm.c
|
|
@@ -106,6 +106,7 @@ typedef struct
|
|
char *szDeletePrinterCommand;
|
|
char *szOs2DriverMap;
|
|
char *szLockDir;
|
|
+ char *szStateDir;
|
|
char *szPidDir;
|
|
char *szRootdir;
|
|
char *szDefaultService;
|
|
@@ -270,6 +271,7 @@ typedef struct
|
|
BOOL bUnixPasswdSync;
|
|
BOOL bPasswdChatDebug;
|
|
int iPasswdChatTimeout;
|
|
+ BOOL bPasswdExpandGecos;
|
|
BOOL bTimestampLogs;
|
|
BOOL bNTSmbSupport;
|
|
BOOL bNTPipeSupport;
|
|
@@ -861,6 +863,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},
|
|
@@ -1176,6 +1179,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},
|
|
@@ -1421,6 +1425,7 @@ static void init_globals(void)
|
|
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);
|
|
@@ -1503,6 +1508,7 @@ static void init_globals(void)
|
|
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 */
|
|
@@ -1721,6 +1727,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)
|
|
@@ -1845,6 +1852,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)
|