7 files changed, 66 insertions, 76 deletions

diff --git a/net/samba3/files/patch-aa b/net/samba3/files/patch-aa
index 3633f55c7b8f..6ba160fb1b10 100644
--- a/net/samba3/files/patch-aa
+++ b/net/samba3/files/patch-aa
@@ -1,23 +1,23 @@
---- Makefile.in.orig	Wed Apr 26 02:06:11 2000
-+++ Makefile.in	Thu Apr 27 11:08:08 2000
-@@ -25,7 +25,7 @@
+--- Makefile.in.orig	Mon Jan 29 19:42:53 2001
++++ Makefile.in	Fri Feb  2 10:42:21 2001
+@@ -30,9 +30,9 @@
  BINDIR = @bindir@
  # we don't use sbindir because we want full compatibility with
  # the previous releases of Samba
 -SBINDIR = @bindir@
 +SBINDIR = @sbindir@
  LIBDIR = @libdir@
- VARDIR = @localstatedir@
+-VARDIR = @localstatedir@
++VARDIR = /var
  MANDIR = @mandir@
-@@ -37,12 +37,13 @@
+ 
+ # The permissions to give the executables
+@@ -41,11 +41,11 @@
  # set these to where to find various files
  # These can be overridden by command line switches (see smbd(8))
  # or in smb.conf (see smb.conf(5))
--SMBLOGFILE = $(VARDIR)/log.smb
--NMBLOGFILE = $(VARDIR)/log.nmb
-+LOGDIR=$(VARDIR)/log
-+SMBLOGFILE = $(LOGDIR)/log.smb
-+NMBLOGFILE = $(LOGDIR)/log.nmb
+-LOGFILEBASE = $(VARDIR)
++LOGFILEBASE = $(VARDIR)/log
  CONFIGFILE = $(LIBDIR)/smb.conf
  LMHOSTSFILE = $(LIBDIR)/lmhosts
  DRIVERFILE = $(LIBDIR)/printers.def
@@ -26,7 +26,7 @@
  # This is where smbpasswd et al go
  PRIVATEDIR = @privatedir@
  
-@@ -54,6 +55,9 @@
+@@ -58,6 +58,9 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
  
@@ -36,12 +36,12 @@
  # The directory where code page definition files go
  CODEPAGEDIR = $(LIBDIR)/codepages
  
-@@ -71,7 +75,7 @@
- PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\"
- FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\"
+@@ -75,7 +78,7 @@
+ PASSWD_FLAGS = -DPASSWD_PROGRAM=\"$(PASSWD_PROGRAM)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DTDB_PASSWD_FILE=\"$(TDB_PASSWD_FILE)\"
+ FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -DLOGFILEBASE=\"$(LOGFILEBASE)\"
  FLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\"  
 -FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
 +FLAGS3 = -DSWATDIR=\"$(SWATDIR)\" -DSBINDIR=\"$(SBINDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" -DPIDFILEDIR=\"$(PIDFILEDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
- FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\"
+ FLAGS4 = -DDRIVERFILE=\"$(DRIVERFILE)\" -DBINDIR=\"$(BINDIR)\" -DFORMSFILE=\"$(FORMSFILE)\" -DNTDRIVERSDIR=\"$(NTDRIVERSDIR)\"
  FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H
  FLAGS  = $(ISA) $(FLAGS5) $(PASSWD_FLAGS)
diff --git a/net/samba3/files/patch-ab b/net/samba3/files/patch-ab
index 40158831ba75..7cc000262680 100644
--- a/net/samba3/files/patch-ab
+++ b/net/samba3/files/patch-ab
@@ -1,35 +1,35 @@
---- param/loadparm.c.orig	Wed Apr 26 02:07:00 2000
-+++ param/loadparm.c	Thu Apr 27 11:12:03 2000
-@@ -105,6 +105,7 @@
- {
-   char *szPrintcapname;
-   char *szLockDir;
-+  char *szPidDir;
-   char *szRootdir;
-   char *szDefaultService;
-   char *szDfree;
-@@ -820,6 +821,8 @@
-   {"preload",          P_STRING,  P_GLOBAL, &Globals.szAutoServices,    NULL,   NULL,  0},
-   {"lock directory",   P_STRING,  P_GLOBAL, &Globals.szLockDir,         NULL,   NULL,  0},
-   {"lock dir",         P_STRING,  P_GLOBAL, &Globals.szLockDir,         NULL,   NULL,  0},
-+  {"pidfile dir",      P_STRING,  P_GLOBAL, &Globals.szPidDir,          NULL,   NULL,  0},
-+  {"pidfile directory",P_STRING,  P_GLOBAL, &Globals.szPidDir,          NULL,   NULL,  0},
+--- param/loadparm.c.orig	Fri Feb  2 00:42:53 2001
++++ param/loadparm.c	Fri Feb  2 00:45:23 2001
+@@ -108,6 +108,7 @@
+ 	char *szAddPrinterCommand;
+ 	char *szDeletePrinterCommand;
+ 	char *szLockDir;
++	char *szPidDir;
+ 	char *szRootdir;
+ 	char *szDefaultService;
+ 	char *szDfree;
+@@ -948,6 +949,8 @@
+ 	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING},
+ 	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0}, 
+ 	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, 0},
++	{"pidfile dir", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
++	{"pidfile directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, 0},
  #ifdef WITH_UTMP
-   {"utmp directory",   P_STRING,  P_GLOBAL, &Globals.szUtmpDir,         NULL,   NULL,  0},
-   {"utmp dir",         P_STRING,  P_GLOBAL, &Globals.szUtmpDir,         NULL,   NULL,  0},
-@@ -911,6 +914,7 @@
-   string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
-   string_set(&Globals.szDriverFile, DRIVERFILE);
-   string_set(&Globals.szLockDir, LOCKDIR);
-+  string_set(&Globals.szPidDir, PIDFILEDIR);
-   string_set(&Globals.szRootdir, "/");
+ 	{"utmp dir", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
+ 	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, 0},
+@@ -1171,6 +1174,7 @@
+ 	string_set(&Globals.szPasswdProgram, PASSWD_PROGRAM);
+ 	string_set(&Globals.szPrintcapname, PRINTCAP_NAME);
+ 	string_set(&Globals.szLockDir, LOCKDIR);
++	string_set(&Globals.szPidDir, PIDFILEDIR);
  #ifdef WITH_UTMP
-   string_set(&Globals.szUtmpDir, "");
-@@ -1185,6 +1189,7 @@
- FN_GLOBAL_STRING(lp_serverstring,&Globals.szServerString)
- FN_GLOBAL_STRING(lp_printcapname,&Globals.szPrintcapname)
- FN_GLOBAL_STRING(lp_lockdir,&Globals.szLockDir)
-+FN_GLOBAL_STRING(lp_piddir,&Globals.szPidDir)
+ 	string_set(&Globals.szUtmpDir, "");
+ 	string_set(&Globals.szWtmpDir, "");
+@@ -1403,6 +1407,7 @@
+ FN_GLOBAL_STRING(lp_addprinter_cmd, &Globals.szAddPrinterCommand)
+ FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
+ FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
++FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir)
  #ifdef WITH_UTMP
- FN_GLOBAL_STRING(lp_utmpdir,&Globals.szUtmpDir)
- FN_GLOBAL_STRING(lp_wtmpdir,&Globals.szWtmpDir)
+ FN_GLOBAL_STRING(lp_utmpdir, &Globals.szUtmpDir)
+ FN_GLOBAL_STRING(lp_wtmpdir, &Globals.szWtmpDir)
diff --git a/net/samba3/files/patch-ac b/net/samba3/files/patch-ac
index dd53b8418c1e..0527cb5a32f8 100644
--- a/net/samba3/files/patch-ac
+++ b/net/samba3/files/patch-ac
@@ -1,6 +1,6 @@
---- lib/pidfile.c.orig	Fri Jan 15 22:40:47 1999
-+++ lib/pidfile.c	Fri Jan 15 22:41:05 1999
-@@ -37,7 +37,7 @@
+--- lib/pidfile.c.orig	Fri Feb  2 00:38:09 2001
++++ lib/pidfile.c	Fri Feb  2 00:38:26 2001
+@@ -39,7 +39,7 @@
  	unsigned ret;
  	pstring pidFile;
  
@@ -9,9 +9,9 @@
  
  	fd = sys_open(pidFile, O_NONBLOCK | O_RDWR, 0644);
  	if (fd == -1) {
-@@ -78,7 +78,7 @@
+@@ -80,7 +80,7 @@
  	pstring pidFile;
- 	int pid;
+ 	pid_t pid;
  
 -	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_lockdir(), name);
 +	slprintf(pidFile, sizeof(pidFile)-1, "%s/%s.pid", lp_piddir(), name);
diff --git a/net/samba3/files/patch-ag b/net/samba3/files/patch-ag
deleted file mode 100644
index eac80026a659..000000000000
--- a/net/samba3/files/patch-ag
+++ /dev/null
@@ -1,20 +0,0 @@
---- nmbd/nmbd_winsserver.c.orig	Wed Jul 21 10:25:11 1999
-+++ nmbd/nmbd_winsserver.c	Fri Jul 23 15:14:33 1999
-@@ -152,7 +152,7 @@
-   start_async_dns();
- #endif
- 
--  pstrcpy(fname,lp_lockdir());
-+  pstrcpy(fname,"/var/db");
-   trim_string(fname,NULL,"/");
-   pstrcat(fname,"/");
-   pstrcat(fname,WINS_LIST);
-@@ -1551,7 +1551,7 @@
- 	  }
-   }
- 
--  slprintf(fname,sizeof(fname),"%s/%s", lp_lockdir(), WINS_LIST);
-+  slprintf(fname,sizeof(fname),"%s/%s", "/var/db", WINS_LIST);
-   all_string_sub(fname,"//", "/", 0);
-   slprintf(fnamenew,sizeof(fnamenew),"%s.%u", fname, (unsigned int)getpid());
- 
diff --git a/net/samba3/files/patch-ah b/net/samba3/files/patch-ah
index 81b1f75158a4..e97b12388c05 100644
--- a/net/samba3/files/patch-ah
+++ b/net/samba3/files/patch-ah
@@ -1,5 +1,5 @@
---- lib/util_sock.c.orig	Wed Sep 22 10:52:50 1999
-+++ lib/util_sock.c	Wed Sep 22 11:30:18 1999
+--- lib/util_sock.c.orig	Fri Feb  2 12:09:17 2001
++++ lib/util_sock.c	Fri Feb  2 12:09:36 2001
 @@ -28,6 +28,9 @@
  extern int  sslFd;
  #endif  /* WITH_SSL */
@@ -9,4 +9,4 @@
 +
  extern int DEBUGLEVEL;
  
- BOOL passive = False;
+ /* the last IP received from */
diff --git a/net/samba3/files/patch-aj b/net/samba3/files/patch-aj
index 5e31ad8ebaa7..ad93c26811da 100644
--- a/net/samba3/files/patch-aj
+++ b/net/samba3/files/patch-aj
@@ -1,6 +1,6 @@
 --- include/local.h.orig	Thu Nov 11 03:36:00 1999
 +++ include/local.h	Fri Feb  4 11:33:01 2000
-@@ -178,9 +178,9 @@
+@@ -171,9 +171,9 @@
   * Default passwd chat script.
   */
  
diff --git a/net/samba3/files/patch-bb b/net/samba3/files/patch-bb
new file mode 100644
index 000000000000..0f70c69c78f4
--- /dev/null
+++ b/net/samba3/files/patch-bb
@@ -0,0 +1,10 @@
+--- include/proto.h.orig	Fri Feb  2 15:34:50 2001
++++ include/proto.h	Fri Feb  2 16:13:03 2001
+@@ -1420,6 +1420,7 @@
+ char *lp_addprinter_cmd(void);
+ char *lp_deleteprinter_cmd(void);
+ char *lp_lockdir(void);
++char *lp_piddir(void);
+ char *lp_utmpdir(void);
+ char *lp_wtmpdir(void);
+ char *lp_utmp_hostname(void);