diff options
Diffstat (limited to 'net/samba/patches/patch-bs')
| -rw-r--r-- | net/samba/patches/patch-bs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/net/samba/patches/patch-bs b/net/samba/patches/patch-bs index 25b979e37e5..853dee52039 100644 --- a/net/samba/patches/patch-bs +++ b/net/samba/patches/patch-bs @@ -1,8 +1,8 @@ -$NetBSD: patch-bs,v 1.3 2006/04/01 04:55:35 jlam Exp $ +$NetBSD: patch-bs,v 1.3.12.1 2007/11/16 15:19:26 ghen Exp $ ---- param/loadparm.c.orig 2006-02-20 15:33:21.000000000 -0500 +--- param/loadparm.c.orig 2007-09-11 23:17:48.000000000 +0900 +++ param/loadparm.c -@@ -106,6 +106,7 @@ typedef struct +@@ -109,6 +109,7 @@ typedef struct { char *szDeletePrinterCommand; char *szOs2DriverMap; char *szLockDir; @@ -10,7 +10,7 @@ $NetBSD: patch-bs,v 1.3 2006/04/01 04:55:35 jlam Exp $ char *szPidDir; char *szRootdir; char *szDefaultService; -@@ -270,6 +271,7 @@ typedef struct +@@ -274,6 +275,7 @@ typedef struct { BOOL bUnixPasswdSync; BOOL bPasswdChatDebug; int iPasswdChatTimeout; @@ -18,7 +18,7 @@ $NetBSD: patch-bs,v 1.3 2006/04/01 04:55:35 jlam Exp $ BOOL bTimestampLogs; BOOL bNTSmbSupport; BOOL bNTPipeSupport; -@@ -861,6 +863,7 @@ static struct parm_struct parm_table[] = +@@ -880,6 +882,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}, @@ -26,7 +26,7 @@ $NetBSD: patch-bs,v 1.3 2006/04/01 04:55:35 jlam Exp $ {"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[] = +@@ -1196,6 +1199,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}, @@ -34,7 +34,7 @@ $NetBSD: patch-bs,v 1.3 2006/04/01 04:55:35 jlam Exp $ {"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) +@@ -1460,6 +1464,7 @@ static void init_globals(BOOL first_time string_set(&Globals.szPasswdProgram, ""); string_set(&Globals.szPidDir, dyn_PIDDIR); string_set(&Globals.szLockDir, dyn_LOCKDIR); @@ -42,7 +42,7 @@ $NetBSD: patch-bs,v 1.3 2006/04/01 04:55:35 jlam Exp $ 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) +@@ -1543,6 +1548,7 @@ static void init_globals(BOOL first_time Globals.bPamPasswordChange = False; Globals.bPasswdChatDebug = False; Globals.iPasswdChatTimeout = 2; /* 2 second default. */ @@ -50,7 +50,7 @@ $NetBSD: patch-bs,v 1.3 2006/04/01 04:55:35 jlam Exp $ 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 +@@ -1787,6 +1793,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) @@ -58,7 +58,7 @@ $NetBSD: patch-bs,v 1.3 2006/04/01 04:55:35 jlam Exp $ 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, & +@@ -1958,6 +1965,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) |