update SGI build files to latest source

8 files changed, 166 insertions, 69 deletions

diff --git a/packaging/SGI/Makefile b/packaging/SGI/Makefile
index 8caa9ba212f..09dbe87a6d7 100644
--- a/packaging/SGI/Makefile
+++ b/packaging/SGI/Makefile
@@ -27,9 +27,6 @@ INSTALLPERMS = 0755
 
 # Add any optimisation or debugging flags here
 # add -DSYSLOG for syslog support
-# RPM_OPT_FLAGS is needed when building an RPM distribution package
-# for RedHat Linux.
-# FLAGS1 = $(RPM_OPT_FLAGS)
 FLAGS1 = -O
 LIBS1 = 
 
@@ -52,10 +49,17 @@ SMBLOGFILE = $(VARDIR)/log.smb
 NMBLOGFILE = $(VARDIR)/log.nmb
 CONFIGFILE = $(LIBDIR)/smb.conf
 LMHOSTSFILE = $(LIBDIR)/lmhosts
+SMB_PASSWD = $(BINDIR)/smbpasswd
+SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
 
 # the directory where lock files go
 LOCKDIR = $(VARDIR)/locks
 
+# The directory where code page definition files go
+CODEPAGEDIR = $(LIBDIR)/codepages
+# The current codepage definition list.
+CODEPAGELIST= 437 850 852 932
+
 # set this to the default group you want your machine to appear in
 # for browsing. This can also be set in nmbd (see nmbd(8))
 WORKGROUP = WORKGROUP
@@ -101,7 +105,7 @@ SMBRUN = $(BINDIR)/smbrun
 # operate as an authenticated user identity to operate on files that
 # live in the DCE Distributed Filesystem.
 # DCE_BASE = /opt/dcelocal
-# DCE_FLAGS = -I$(DCE_BASE)/include
+# DCE_FLAGS = -DDFS_AUTH -I$(DCE_BASE)/include
 # DCE_LIBDIR = -L$(DCE_BASE)/lib
 # DCE_LIBS =
 
@@ -111,14 +115,6 @@ SMBRUN = $(BINDIR)/smbrun
 # KRB5_FLAGS = -DKRB5_AUTH -I$(KRB5_BASE)/include
 # KRB5_LIBS = -L$(KRB5_BASE)/lib -ldes425 -lkrb5 -lcrypto -lcom_err
 
-# This is for SMB encrypted (lanman) passwords.
-# you may wish to add -DREPLACE_GETPASS if your getpass() is limited
-# to 8 chars
-# DES_BASE=/usr/local/libdes
-# DES_FLAGS= -I$(DES_BASE)
-# DES_LIB= -L$(DES_BASE) -ldes
-# PASSWD_FLAGS=-DUSE_LIBDES -DSMB_PASSWD=\"$(BINDIR)/smbpasswd\" -DSMB_PASSWD_FILE=\"$(BASEDIR)/private/smbpasswd\"
-
 ######################################
 # VTP-Support
 #
@@ -189,21 +185,24 @@ AWK = awk
 # LIBSM =   
 # AWK = nawk 
 
-# Use this for Linux with shadow passwords
+# Use this for Linux with shadow passwords - but not using PAM!
 # contributed by Andrew.Tridgell@anu.edu.au
 # add -DLINUX_BIGCRYPT is you have shadow passwords but don't have the
 # right libraries and includes
 # FLAGSM = -DLINUX -DSHADOW_PWD -DFAST_SHARE_MODES
 # LIBSM = -lshadow
 
-# Use this for Linux without shadow passwords
-# contributed by Andrew.Tridgell@anu.edu.au
+# Use this for Linux without shadow passwords or for any Linux
+# system that uses PAM (eg: RedHat) in which case it handles ALL
+# authentication methods that are supported by the version of
+# PAM that is available on your system.
+# contributed by Andrew.Tridgell@anu.edu.au & John.Terpstra@aquasoft.com.au
 # AXPROC defines DEC Alpha Processor
 # FLAGSM = -DLINUX -DAXPROC -DFAST_SHARE_MODES
 # FLAGSM = -DLINUX -DFAST_SHARE_MODES
 # LIBSM = 
 
-# Use this for Linux with shadow passwords and quota
+# Use this for Linux with shadow passwords and quota - but not using PAM!
 # contributed by xeno@mix.hive.no
 # Tested on the 1.3.57 kernel and ext2fs filesystem.
 # Notes:
@@ -213,12 +212,22 @@ AWK = awk
 # FLAGSM = -O3 -m486 -DLINUX -DSHADOW_PWD -DQUOTAS -DFAST_SHARE_MODES
 # LIBSM = -lshadow
 
-# Use this for Linux with quota and glibc2
+# Use this for Linux with quota and glibc2 - not using PAM!
 # contributed by Thorvald Natvig <slicer@bimbo.hive.no>
 # Tested on the 2.0.30 kernel and ext2fs filesystem.
 # FLAGSM = -DLINUX -DQUOTAS -DNO_ASMSIGNALH -DGLIBC2 -DFAST_SHARE_MODES
 # LIBSM = -L/lib/libc5-compat -lcrypt
 
+# Use this for Linux with glibc2 (libc6)
+# contributed by Eloy Paris <peloy@ven.ra.rockwell.com>
+# FLAGSM = -DLINUX -DNETGROUP -DSHADOW_PWD -DALLOW_CHANGE_PASSWORD -DFAST_SHARE_MODES -DNO_ASMSIGNALH -DGLIBC2
+# LIBSM = -lnsl -lcrypt
+
+# Use this for Linux with glibc2 (libc6) - RedHat Linux v5.0 with PAM
+# contributed by John H Terpstra <jht@aquasoft.com.au>
+# FLAGSM = -DLINUX -DNETGROUP -DALLOW_CHANGE_PASSWORD -DFAST_SHARE_MODES -DNO_ASMSIGNALH -DGLIBC2
+# LIBSM = -lnsl -lcrypt
+
 # This is for SUNOS5.4 and later (also known as Solaris 2.4 and later)
 # contributed by Andrew.Tridgell@anu.edu.au
 # FLAGSM = -DSUNOS5 -DSHADOW_PWD -DNETGROUP -DFAST_SHARE_MODES
@@ -291,9 +300,9 @@ AWK = awk
 # LIBSM =
 
 
-# This is for OSF1 (Alpha) V2.0 Enhanced Security 
+# This is for OSF1 (Alpha) V2.0/V4.0 Enhanced Security 
 # contributed by Udo Linauer <ul@eacpc4.tuwien.ac.at>
-# FLAGSM = -DOSF1 -DOSF1_ENH_SEC
+# FLAGSM = -DOSF1 -DOSF1_ENH_SEC -DFAST_SHARE_MODES
 # LIBSM = -lsecurity
 
 
@@ -365,16 +374,18 @@ AWK = awk
 # This is for SGI.
 # contributed by lpc@solomon.technet.sg (Michael Chua)
 # FOR SGI IRIX 4.x.x, use the following line
-# FLAGSM = -DSGI -DHAVE_TIMEZONE 
+# FLAGSM = -DSGI4 -DHAVE_TIMEZONE 
 # LIBSM = -lsun
+# FLAGS1 = -O -g3
 
 # FOR SGI IRIX 5.x.x, use this line instead
 # FLAGSM = -DSGI5 -DSHADOW_PWD -DHAVE_TIMEZONE -DFAST_SHARE_MODES
 # LIBSM =
+# FLAGS1 = -O -g3
 
 # FOR SGI IRIX 6.2 using the system compiler (*NOT* gcc), use this line instead
 # Contributed by David.Billinghurst@restech.cra.com.au
-FLAGSM = -DSGI5 -DSHADOW_PWD -DHAVE_TIMEZONE -DFAST_SHARE_MODES
+FLAGSM = -DSGI6 -DSHADOW_PWD -DHAVE_TIMEZONE -DFAST_SHARE_MODES
 LIBSM = 
 FLAGS1 = -O -n32 -g3
 
@@ -601,16 +612,17 @@ FLAGS1 = -O -n32 -g3
 # DON'T EDIT BELOW THIS LINE
 ######################################################################
 
+PASSWD_FLAGS = -DSMB_PASSWD=\"$(SMB_PASSWD)\" -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\"
 CFLAGS1 = $(FLAGS1) -DSMBLOGFILE=\"$(SMBLOGFILE)\" -DNMBLOGFILE=\"$(NMBLOGFILE)\"
 CFLAGS2 = -DCONFIGFILE=\"$(CONFIGFILE)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" 
-CFLAGS3 = -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\"
+CFLAGS3 = -DLOCKDIR=\"$(LOCKDIR)\" -DSMBRUN=\"$(SMBRUN)\" -DCODEPAGEDIR=\"$(CODEPAGEDIR)\"
 CFLAGS4 = -DWORKGROUP=\"$(WORKGROUP)\" -DGUEST_ACCOUNT=\"$(GUESTACCOUNT)\" 
-CFLAGS5 = $(CFLAGS1) $(CFLAGS2) $(CFLAGS3) $(CFLAGS4) $(FLAGSM) $(AFS_FLAGS) $(KRB5_FLAGS)
+CFLAGS5 = $(CFLAGS1) $(CFLAGS2) $(CFLAGS3) $(CFLAGS4) $(FLAGSM) $(AFS_FLAGS) $(KRB5_FLAGS) $(RPM_OPT_FLAGS)
 CFLAGS  = $(CFLAGS5) $(PAM_FLAGS) $(DCE_FLAGS) $(DES_FLAGS) $(PASSWD_FLAGS) $(VTP_FLAGS)
 LIBS = $(LIBS1) $(LIBSM) $(PAM_LIBS) $(DCE_LIBS) $(KRB5_LIBS) $(DES_LIB)
 
 SPROGS = smbd nmbd
-PROGS1 = smbclient testparm testprns smbrun smbstatus smbpasswd 
+PROGS1 = smbclient testparm testprns smbrun smbstatus smbpasswd make_smbcodepage
 PROGS = $(PROGS1) nmblookup
 SCRIPTS = smbtar addtosmbpass
 
@@ -622,20 +634,25 @@ CHECK :
 	@echo "Using LIBS = $(LIBS)"
 
 INCLUDES1 = version.h local.h includes.h smb.h 
-INCLUDES2 = trans2.h 
+INCLUDES2 = trans2.h ubi_dLinkList.h
 INCLUDES = $(INCLUDES1) $(INCLUDES2)
 
-UTILOBJ1 = util.o system.o charset.o kanji.o fault.o smbencrypt.o charcnv.o
+UTILOBJ1 = util.o system.o charset.o kanji.o fault.o smbencrypt.o smbdes.o charcnv.o
 UTILOBJ2 = $(UTILOBJ1) md4.o loadparm.o params.o pcap.o username.o time.o
-UTILOBJ = $(UTILOBJ2) interface.o replace.o
+UTILOBJ = $(UTILOBJ2) interface.o replace.o ubi_dLinkList.o
 PARAMOBJ = $(UTILOBJ) ufc.o smbpass.o access.o shmem.o
-SMBDOBJ1 = $(PARAMOBJ) trans2.o pipes.o message.o dir.o printing.o locking.o
+SMBDOBJ1 = $(PARAMOBJ) trans2.o pipes.o message.o dir.o printing.o 
 SMBDOBJ2 = ipc.o reply.o mangle.o chgpasswd.o password.o quotas.o uid.o
-SMBDOBJ = predict.o $(SMBDOBJ1) $(SMBDOBJ2) $(VTP_OBJ)
+SMBDOBJ3 = predict.o smbparse.o lsaparse.o credentials.o pipeutil.o pipentlsa.o pipenetlog.o
+SMBDOBJ4 = pipesrvsvc.o srvparse.o clientgen.o
+SMBDOBJ = $(SMBDOBJ1) $(SMBDOBJ2) $(SMBDOBJ3) $(SMBDOBJ4) $(VTP_OBJ)
+LOCKOBJ = locking_shm.o locking_slow.o locking.o
 NMBDOBJ1 = nmblib.o namepacket.o nameresp.o nmbsync.o nameannounce.o nameelect.o
 NMBDOBJ2 = namedbresp.o namedbwork.o namedbserver.o namedbsubnet.o namedbname.o 
-NMBDOBJ3 = nameservresp.o nameservreply.o namelogon.o namebrowse.o namework.o nameserv.o clientutil.o
+NMBDOBJ3 = nameservresp.o nameservreply.o namelogon.o namebrowse.o namework.o nameserv.o clientutil.o  smbpass.o
 NMBDOBJ = $(UTILOBJ) $(NMBDOBJ1) $(NMBDOBJ2) $(NMBDOBJ3)
+BINOBJS = server.o smbrun.o nmblookup.o namequery.o nmbd.o client.o clitar.o nmblib.o status.o testparm.o testprns.o smbpasswd.o getsmbpass.o
+
 .SUFFIXES:
 .SUFFIXES: .c .o .h
 
@@ -643,9 +660,9 @@ NMBDOBJ = $(UTILOBJ) $(NMBDOBJ1) $(NMBDOBJ2) $(NMBDOBJ3)
 	@echo Compiling $*.c
 	@$(CC) $(CFLAGS) -c $(srcdir)$*.c
 
-smbd: server.o $(SMBDOBJ)
+smbd: server.o $(SMBDOBJ) $(LOCKOBJ)
 	@echo Linking smbd
-	@$(CC) $(CFLAGS) -o smbd server.o $(SMBDOBJ) $(LIBS) $(AFS_LIBS)
+	@$(CC) $(CFLAGS) -o smbd server.o $(SMBDOBJ) $(LOCKOBJ) $(LIBS) $(AFS_LIBS)
 
 smbrun: smbrun.o
 	@echo Linking smbrun
@@ -663,9 +680,9 @@ smbclient: client.o clitar.o getsmbpass.o namequery.o nmblib.o $(UTILOBJ)
 	@echo Linking smbclient
 	@$(CC) $(CFLAGS) -o smbclient client.o clitar.o getsmbpass.o namequery.o nmblib.o $(UTILOBJ) $(LIBS)
 
-smbstatus: status.o $(PARAMOBJ) 
+smbstatus: status.o $(PARAMOBJ) $(LOCKOBJ)
 	@echo Linking smbstatus
-	@$(CC) $(CFLAGS) -o smbstatus status.o $(PARAMOBJ) $(LIBS)
+	@$(CC) $(CFLAGS) -o smbstatus status.o $(PARAMOBJ) $(LOCKOBJ) $(LIBS)
 
 testparm: testparm.o $(PARAMOBJ)
 	@echo Linking testparm
@@ -679,7 +696,19 @@ smbpasswd: smbpasswd.o getsmbpass.o $(PARAMOBJ)
 	@echo Linking smbpasswd
 	@$(CC) $(CFLAGS) -o smbpasswd smbpasswd.o getsmbpass.o $(PARAMOBJ) $(LIBS)
 
-install: installbin installman installscripts
+make_smbcodepage: make_smbcodepage.o $(PARAMOBJ)
+	@echo Linking make_smbcodepage
+	@$(CC) $(CFLAGS) -o make_smbcodepage make_smbcodepage.o $(PARAMOBJ) $(LIBS)
+
+wsmbstatus: wsmbstatus.o $(PARAMOBJ) 
+	@echo Linking wsmbstatus
+	@$(CC) $(CFLAGS) -o wsmbstatus wsmbstatus.o $(PARAMOBJ) $(LIBS)
+
+wsmbconf: wsmbconf.o $(PARAMOBJ) cgi.o
+	@echo Linking wsmbconf
+	@$(CC) $(CFLAGS) -o wsmbconf wsmbconf.o $(PARAMOBJ) cgi.o $(LIBS)
+
+install: installbin installman installscripts installcp
 
 installbin: all
 	@$(SHELL) $(srcdir)installbin.sh $(INSTALLPERMS) $(BASEDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(SPROGS)
@@ -688,6 +717,9 @@ installbin: all
 installscripts:
 	@$(SHELL) $(srcdir)installscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
 
+installcp:
+	@$(SHELL) $(srcdir)installcp.sh $(LIBDIR) $(CODEPAGEDIR) $(BINDIR) $(CODEPAGELIST)
+
 # revert to the previously installed version
 revert:
 	@$(SHELL) $(srcdir)revert.sh $(SBINDIR) $(SPROGS) $(SCRIPTS)
@@ -696,7 +728,7 @@ revert:
 installman:
 	@$(SHELL) $(srcdir)installman.sh $(MANDIR) $(srcdir)
 
-uninstall: uninstallman uninstallbin uninstallscripts
+uninstall: uninstallman uninstallbin uninstallscripts uninstallcp
 
 uninstallman:
 	@$(SHELL) $(srcdir)uninstallman.sh $(MANDIR) $(srcdir)
@@ -708,6 +740,9 @@ uninstallbin:
 uninstallscripts:
 	@$(SHELL) $(srcdir)uninstallscripts.sh $(INSTALLPERMS) $(BINDIR) $(SCRIPTS)
 
+uninstallcp:
+	@$(SHELL) $(srcdir)uninstallcp.sh $(CODEPAGEDIR) $(CODEPAGELIST)
+
 clean:
 	rm -f core *.o *~ $(PROGS) $(SPROGS)
 
@@ -716,7 +751,7 @@ cleandir:  clean
 
 proto:
 	@$(SHELL) $(srcdir)checkos.sh $(FLAGSM)
-	$(AWK) -f mkproto.awk *.c > proto.h
+	$(AWK) -f mkproto.awk `echo $(BINOBJS) $(UTILOBJ) $(PARAMOBJ) $(SMBDOBJ) $(NMBDOBJ) $(LOCKOBJ) | sed -e 's/\.o/\.c/g' | tr ' ' '\n' | sort | uniq` > proto.h
 
 realclean: clean
 
diff --git a/packaging/SGI/psfixes.pl b/packaging/SGI/psfixes.pl
new file mode 100755
index 00000000000..c64b67c8d40
--- /dev/null
+++ b/packaging/SGI/psfixes.pl
@@ -0,0 +1,28 @@
+#!/usr/bin/perl
+
+$found_vm = 0;
+
+while (<>) {
+  if (not $found_vm) {
+    if (not /^%/) {
+	if (/^%%Title:/) {
+	    s/.
$/
/;
+	    print;
+	}
+	else {
+	    if (/^\/VM?/) {
+		print "/VM? { pop } bind def
\n";
+		$found_vm = 1;
+	    }
+	    else {
+		print;
+	    }
+	}
+    }
+  }
+  else {
+    if (/def
/) {
+	$found_vm = 0;
+    }
+  }
+}
diff --git a/packaging/SGI/psfixes.sed b/packaging/SGI/psfixes.sed
deleted file mode 100644
index cf5ce889145..00000000000
--- a/packaging/SGI/psfixes.sed
+++ /dev/null
@@ -1,4 +0,0 @@
-/^%/,/
/d
-/^%%Title:/s/.
$/
/
-/^\/VM?/,/ VM?/c\
-/VM? { pop } def

diff --git a/packaging/SGI/relnotes.html b/packaging/SGI/relnotes.html
index 71140420fe0..eea4cefd0b6 100644
--- a/packaging/SGI/relnotes.html
+++ b/packaging/SGI/relnotes.html
@@ -1,12 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <HTML>
 <HEAD>
-   <TITLE>Samba 1.9.17 Release Notes</TITLE>
-   <META NAME="GENERATOR" CONTENT="Mozilla/3.0GoldC-SGI (X11; I; IRIX 6.2 IP22) [Netscape]">
+   <TITLE>Samba Release Notes</TITLE>
 </HEAD>
 <BODY>
 
-<H1>Samba 1.9.17 Release Notes</H1>
+<H1>Samba Release Notes</H1>
 
 <P>
 <HR></P>
@@ -130,7 +129,7 @@ commercial support for a fee.
 <TR>
 <TD ALIGN=left><B>samba.man.manpages</B>(<I>default</I>)</TD>
 
-<TD>Samba 1.9.17's online manual pages (preformatted).</TD>
+<TD>Samba's online manual pages (preformatted).</TD>
 </TR>
 
 <TR>
@@ -149,7 +148,7 @@ commercial support for a fee.
 <TR>
 <TD ALIGN=LEFT VALIGN=TOP><B>samba.src.samba</B> </TD>
 
-<TD>The Samba 1.9.17 software distribution from which this product was
+<TD>The Samba software distribution from which this product was
 built (including the packaging/SGI directory which will allow this distribution
 to be rebuilt).</TD>
 </TR>
diff --git a/packaging/SGI/samba.idb b/packaging/SGI/samba.idb
index dbf9f3b10ff..358f3499ca9 100644
--- a/packaging/SGI/samba.idb
+++ b/packaging/SGI/samba.idb
@@ -12,7 +12,7 @@ d 0755 root sys usr/samba/bin packaging/SGI samba.sw.base
 f 0755 root sys usr/samba/bin/addtosmbpass source/addtosmbpass samba.sw.base
 f 0775 root sys usr/samba/bin/nmbd source/nmbd samba.sw.base
 f 0755 root sys usr/samba/bin/nmblookup source/nmblookup samba.sw.base
-f 0644 root sys usr/samba/bin/psfixes.sed packaging/SGI/psfixes.sed samba.sw.base
+f 0644 root sys usr/samba/bin/psfixes.pl packaging/SGI/psfixes.pl samba.sw.base
 f 0755 root sys usr/samba/bin/sambalp packaging/SGI/sambalp samba.sw.base
 f 0755 root sys usr/samba/bin/smbclient source/smbclient samba.sw.base
 f 0775 root sys usr/samba/bin/smbd source/smbd samba.sw.base
@@ -36,7 +36,7 @@ f 0644 root sys usr/samba/docs/Faxing.txt docs/Faxing.txt samba.man.doc
 f 0644 root sys usr/samba/docs/GOTCHAS.txt docs/GOTCHAS.txt samba.man.doc
 f 0644 root sys usr/samba/docs/HINTS.txt docs/HINTS.txt samba.man.doc
 f 0644 root sys usr/samba/docs/INSTALL.sambatar docs/INSTALL.sambatar samba.man.doc
-f 0644 root sys usr/samba/docs/MIRRORS docs/MIRRORS samba.man.doc
+f 0644 root sys usr/samba/docs/MIRRORS.txt docs/MIRRORS.txt samba.man.doc
 f 0644 root sys usr/samba/docs/NT4_PlainPassword.reg docs/NT4_PlainPassword.reg samba.man.doc
 f 0644 root sys usr/samba/docs/NetBIOS.txt docs/NetBIOS.txt samba.man.doc
 f 0644 root sys usr/samba/docs/OS2-Client-HOWTO.txt docs/OS2-Client-HOWTO.txt samba.man.doc
@@ -97,7 +97,6 @@ f 0644 root sys usr/samba/docs/nameservresp.doc source/nameservresp.doc samba.ma
 f 0644 root sys usr/samba/docs/namework.doc source/namework.doc samba.man.doc
 f 0644 root sys usr/samba/docs/nmbd.8 docs/nmbd.8 samba.man.doc
 f 0644 root sys usr/samba/docs/samba.7 docs/samba.7 samba.man.doc
-f 0644 root sys usr/samba/docs/samba.faq docs/samba.faq samba.man.doc
 f 0644 root sys usr/samba/docs/samba.lsm docs/samba.lsm samba.man.doc
 f 0644 root sys usr/samba/docs/security_level.txt docs/security_level.txt samba.man.doc
 f 0644 root sys usr/samba/docs/smb.conf.5 docs/smb.conf.5 samba.man.doc
@@ -116,8 +115,10 @@ f 0644 root sys usr/samba/lib/smb.conf packaging/SGI/smb.conf samba.sw.base conf
 f 0775 root sys usr/samba/mkprintcap.sh packaging/SGI/mkprintcap.sh samba.sw.base exitop(/usr/samba/mkprintcap.sh) removeop(rm /usr/samba/printcap)
 d 0755 root sys usr/samba/src source samba.src.samba
 f 0644 root sys usr/samba/src/COPYING COPYING samba.src.samba
+f 0644 root sys usr/samba/src/COPYING.LGPL COPYING.LGPL samba.src.samba
 f 0644 root sys usr/samba/src/Manifest Manifest samba.src.samba
 f 0644 root sys usr/samba/src/README README samba.src.samba
+f 0644 root sys usr/samba/src/README.UBI README.UBI samba.src.samba
 f 0644 root sys usr/samba/src/Read-Manifest-Now Read-Manifest-Now samba.src.samba
 f 0644 root sys usr/samba/src/Roadmap Roadmap samba.src.samba
 f 0644 root sys usr/samba/src/WHATSNEW.txt WHATSNEW.txt samba.src.samba
@@ -134,8 +135,9 @@ f 0644 root sys usr/samba/src/docs/Faxing.txt docs/Faxing.txt samba.src.samba
 f 0644 root sys usr/samba/src/docs/GOTCHAS.txt docs/GOTCHAS.txt samba.src.samba
 f 0644 root sys usr/samba/src/docs/HINTS.txt docs/HINTS.txt samba.src.samba
 f 0644 root sys usr/samba/src/docs/INSTALL.sambatar docs/INSTALL.sambatar samba.src.samba
-f 0644 root sys usr/samba/src/docs/MIRRORS docs/MIRRORS samba.src.samba
+f 0644 root sys usr/samba/src/docs/MIRRORS.txt docs/MIRRORS.txt samba.src.samba
 f 0644 root sys usr/samba/src/docs/NT4_PlainPassword.reg docs/NT4_PlainPassword.reg samba.src.samba
+f 0644 root sys usr/samba/src/docs/NTDOMAIN.txt docs/NTDOMAIN.txt samba.src.samba
 f 0644 root sys usr/samba/src/docs/NetBIOS.txt docs/NetBIOS.txt samba.src.samba
 f 0644 root sys usr/samba/src/docs/OS2-Client-HOWTO.txt docs/OS2-Client-HOWTO.txt samba.src.samba
 f 0644 root sys usr/samba/src/docs/PROJECTS docs/PROJECTS samba.src.samba
@@ -156,6 +158,7 @@ f 0644 root sys usr/samba/src/docs/Win95.txt docs/Win95.txt samba.src.samba
 f 0644 root sys usr/samba/src/docs/Win95_PlainPassword.reg docs/Win95_PlainPassword.reg samba.src.samba
 f 0644 root sys usr/samba/src/docs/WinNT.txt docs/WinNT.txt samba.src.samba
 f 0644 root sys usr/samba/src/docs/announce docs/announce samba.src.samba
+f 0644 root sys usr/samba/src/docs/cifsntdomain.txt docs/cifsntdomain.txt samba.src.samba
 d 0755 root sys usr/samba/src/docs/faq docs/faq samba.src.samba
 f 0644 root sys usr/samba/src/docs/faq/Samba-Server-FAQ-1.html docs/faq/Samba-Server-FAQ-1.html samba.src.samba
 f 0644 root sys usr/samba/src/docs/faq/Samba-Server-FAQ-2.html docs/faq/Samba-Server-FAQ-2.html samba.src.samba
@@ -179,9 +182,9 @@ f 0644 root sys usr/samba/src/docs/faq/sambafaq.html docs/faq/sambafaq.html samb
 f 0644 root sys usr/samba/src/docs/faq/sambafaq.sgml docs/faq/sambafaq.sgml samba.src.samba
 f 0644 root sys usr/samba/src/docs/faq/sambafaq.txt docs/faq/sambafaq.txt samba.src.samba
 f 0644 root sys usr/samba/src/docs/history docs/history samba.src.samba
+f 0644 root sys usr/samba/src/docs/make_smbcodepage.1 docs/make_smbcodepage.1 samba.src.samba
 f 0644 root sys usr/samba/src/docs/nmbd.8 docs/nmbd.8 samba.src.samba
 f 0644 root sys usr/samba/src/docs/samba.7 docs/samba.7 samba.src.samba
-f 0644 root sys usr/samba/src/docs/samba.faq docs/samba.faq samba.src.samba
 f 0644 root sys usr/samba/src/docs/samba.lsm docs/samba.lsm samba.src.samba
 f 0644 root sys usr/samba/src/docs/security_level.txt docs/security_level.txt samba.src.samba
 f 0644 root sys usr/samba/src/docs/smb.conf.5 docs/smb.conf.5 samba.src.samba
@@ -215,6 +218,7 @@ f 0644 root sys usr/samba/src/examples/printing/smbprint.sysv examples/printing/
 d 0755 root sys usr/samba/src/examples/simple examples/simple samba.src.samba
 f 0644 root sys usr/samba/src/examples/simple/README examples/simple/README samba.src.samba
 f 0644 root sys usr/samba/src/examples/simple/smb.conf examples/simple/smb.conf samba.src.samba
+f 0664 root sys usr/samba/src/examples/smb.conf.default examples/smb.conf.default samba.src.samba
 d 0775 root sys usr/samba/src/examples/svr4-startup examples/svr4-startup samba.src.samba
 f 0664 root sys usr/samba/src/examples/svr4-startup/README examples/svr4-startup/README samba.src.samba
 f 0775 root sys usr/samba/src/examples/svr4-startup/samba.server examples/svr4-startup/samba.server samba.src.samba
@@ -244,7 +248,7 @@ f 0755 root sys usr/samba/src/packaging/SGI/mkman packaging/SGI/mkman samba.src.
 f 0755 root sys usr/samba/src/packaging/SGI/mkprintcap.sh packaging/SGI/mkprintcap.sh samba.src.samba
 f 0755 root sys usr/samba/src/packaging/SGI/mkrelease.sh packaging/SGI/mkrelease.sh samba.src.samba
 f 0644 root sys usr/samba/src/packaging/SGI/printcap packaging/SGI/printcap samba.src.samba
-f 0644 root sys usr/samba/src/packaging/SGI/psfixes.sed packaging/SGI/psfixes.sed samba.src.samba
+f 0644 root sys usr/samba/src/packaging/SGI/psfixes.pl packaging/SGI/psfixes.pl samba.src.samba
 f 0644 root sys usr/samba/src/packaging/SGI/relnotes.html packaging/SGI/relnotes.html samba.src.samba
 f 0644 root sys usr/samba/src/packaging/SGI/samba.config packaging/SGI/samba.config samba.src.samba
 f 0644 root sys usr/samba/src/packaging/SGI/samba.idb packaging/SGI/samba.idb samba.src.samba
@@ -254,9 +258,16 @@ f 0644 root sys usr/samba/src/packaging/SGI/sambalp packaging/SGI/sambalp samba.
 f 0644 root sys usr/samba/src/packaging/SGI/smb.conf packaging/SGI/smb.conf samba.src.samba
 f 0644 root sys usr/samba/src/packaging/SGI/smbpasswd packaging/SGI/smbpasswd samba.src.samba
 f 0644 root sys usr/samba/src/packaging/SGI/smbprint packaging/SGI/smbprint samba.src.samba
+d 0755 root sys usr/samba/src/packaging/Solaris packaging/Solaris samba.src.samba
+d 0755 root sys usr/samba/src/packaging/Solaris/pkg-specs packaging/Solaris/pkg-specs samba.src.samba
+f 0644 root sys usr/samba/src/packaging/Solaris/pkg-specs/Packaging.script packaging/Solaris/pkg-specs/Packaging.script samba.src.samba
+f 0644 root sys usr/samba/src/packaging/Solaris/pkg-specs/mkprototype packaging/Solaris/pkg-specs/mkprototype samba.src.samba
+f 0644 root sys usr/samba/src/packaging/Solaris/pkg-specs/pkginfo packaging/Solaris/pkg-specs/pkginfo samba.src.samba
+f 0644 root sys usr/samba/src/packaging/Solaris/pkg-specs/postinstall packaging/Solaris/pkg-specs/postinstall samba.src.samba
+f 0644 root sys usr/samba/src/packaging/Solaris/pkg-specs/postremove packaging/Solaris/pkg-specs/postremove samba.src.samba
 d 0755 root sys usr/samba/src/packaging/redhat packaging/redhat samba.src.samba
 f 0644 root sys usr/samba/src/packaging/redhat/Instructions packaging/redhat/Instructions samba.src.samba
-f 0755 root sys usr/samba/src/packaging/redhat/makeldirp.sh packaging/redhat/makeldirs.sh samba.src.samba
+f 0755 root sys usr/samba/src/packaging/redhat/makeldirs.sh packaging/redhat/makeldirs.sh samba.src.samba
 f 0755 root sys usr/samba/src/packaging/redhat/makerpms.sh packaging/redhat/makerpms.sh samba.src.samba
 f 0644 root sys usr/samba/src/packaging/redhat/samba-axp.patch packaging/redhat/samba-axp.patch samba.src.samba
 f 0644 root sys usr/samba/src/packaging/redhat/samba-make.patch packaging/redhat/samba-make.patch samba.src.samba
@@ -265,6 +276,7 @@ f 0644 root sys usr/samba/src/packaging/redhat/samba.pamd packaging/redhat/samba
 f 0644 root sys usr/samba/src/packaging/redhat/samba.spec packaging/redhat/samba.spec samba.src.samba
 f 0644 root sys usr/samba/src/packaging/redhat/smb.conf packaging/redhat/smb.conf samba.src.samba
 f 0755 root sys usr/samba/src/packaging/redhat/smb.init packaging/redhat/smb.init samba.src.samba
+f 0755 root sys usr/samba/src/packaging/redhat/smbadduser packaging/redhat/smbadduser samba.src.samba
 f 0755 root sys usr/samba/src/packaging/redhat/smbprint packaging/redhat/smbprint samba.src.samba
 d 0755 root sys usr/samba/src/source source samba.src.samba
 f 0644 root sys usr/samba/src/source/Makefile source/Makefile samba.src.samba
@@ -272,6 +284,7 @@ f 0644 root sys usr/samba/src/source/Makefile.OS2 source/Makefile.OS2 samba.src.
 f 0644 root sys usr/samba/src/source/access.c source/access.c samba.src.samba
 f 0644 root sys usr/samba/src/source/addtosmbpass source/addtosmbpass samba.src.samba
 f 0644 root sys usr/samba/src/source/byteorder.h source/byteorder.h samba.src.samba
+f 0644 root sys usr/samba/src/source/cgi.c source/cgi.c samba.src.samba
 f 0644 root sys usr/samba/src/source/change-log source/change-log samba.src.samba
 f 0644 root sys usr/samba/src/source/charcnv.c source/charcnv.c samba.src.samba
 f 0644 root sys usr/samba/src/source/charset.c source/charset.c samba.src.samba
@@ -279,14 +292,22 @@ f 0644 root sys usr/samba/src/source/charset.h source/charset.h samba.src.samba
 f 0644 root sys usr/samba/src/source/checkos.sh source/checkos.sh samba.src.samba
 f 0644 root sys usr/samba/src/source/chgpasswd.c source/chgpasswd.c samba.src.samba
 f 0644 root sys usr/samba/src/source/client.c source/client.c samba.src.samba
+f 0644 root sys usr/samba/src/source/clientgen.c source/clientgen.c samba.src.samba
 f 0644 root sys usr/samba/src/source/clientutil.c source/clientutil.c samba.src.samba
 f 0644 root sys usr/samba/src/source/clitar.c source/clitar.c samba.src.samba
 f 0644 root sys usr/samba/src/source/clitar.h source/clitar.h samba.src.samba
+f 0644 root sys usr/samba/src/source/codepage_def.437 source/codepage_def.437 samba.src.samba
+f 0644 root sys usr/samba/src/source/codepage_def.850 source/codepage_def.850 samba.src.samba
+f 0644 root sys usr/samba/src/source/codepage_def.852 source/codepage_def.852 samba.src.samba
+f 0644 root sys usr/samba/src/source/codepage_def.932 source/codepage_def.932 samba.src.samba
+f 0644 root sys usr/samba/src/source/credentials.c source/credentials.c samba.src.samba
+f 0644 root sys usr/samba/src/source/cvs.log source/cvs.log samba.src.samba
 f 0644 root sys usr/samba/src/source/dir.c source/dir.c samba.src.samba
 f 0644 root sys usr/samba/src/source/fault.c source/fault.c samba.src.samba
 f 0644 root sys usr/samba/src/source/getsmbpass.c source/getsmbpass.c samba.src.samba
 f 0644 root sys usr/samba/src/source/includes.h source/includes.h samba.src.samba
 f 0644 root sys usr/samba/src/source/installbin.sh source/installbin.sh samba.src.samba
+f 0644 root sys usr/samba/src/source/installcp.sh source/installcp.sh samba.src.samba
 f 0644 root sys usr/samba/src/source/installman.sh source/installman.sh samba.src.samba
 f 0644 root sys usr/samba/src/source/installscripts.sh source/installscripts.sh samba.src.samba
 f 0644 root sys usr/samba/src/source/interface.c source/interface.c samba.src.samba
@@ -297,9 +318,12 @@ f 0644 root sys usr/samba/src/source/kanji.h source/kanji.h samba.src.samba
 f 0644 root sys usr/samba/src/source/loadparm.c source/loadparm.c samba.src.samba
 f 0644 root sys usr/samba/src/source/local.h source/local.h samba.src.samba
 f 0644 root sys usr/samba/src/source/locking.c source/locking.c samba.src.samba
+f 0644 root sys usr/samba/src/source/locking_shm.c source/locking_shm.c samba.src.samba
+f 0644 root sys usr/samba/src/source/locking_slow.c source/locking_slow.c samba.src.samba
+f 0644 root sys usr/samba/src/source/lsaparse.c source/lsaparse.c samba.src.samba
+f 0644 root sys usr/samba/src/source/make_smbcodepage.c source/make_smbcodepage.c samba.src.samba
 f 0644 root sys usr/samba/src/source/mangle.c source/mangle.c samba.src.samba
 f 0644 root sys usr/samba/src/source/md4.c source/md4.c samba.src.samba
-f 0644 root sys usr/samba/src/source/md4.h source/md4.h samba.src.samba
 f 0644 root sys usr/samba/src/source/message.c source/message.c samba.src.samba
 f 0644 root sys usr/samba/src/source/mkproto.awk source/mkproto.awk samba.src.samba
 f 0644 root sys usr/samba/src/source/mksmbpasswd.sh source/mksmbpasswd.sh samba.src.samba
@@ -338,10 +362,15 @@ f 0644 root sys usr/samba/src/source/nmbd.c source/nmbd.c samba.src.samba
 f 0644 root sys usr/samba/src/source/nmblib.c source/nmblib.c samba.src.samba
 f 0644 root sys usr/samba/src/source/nmblookup.c source/nmblookup.c samba.src.samba
 f 0644 root sys usr/samba/src/source/nmbsync.c source/nmbsync.c samba.src.samba
+f 0644 root sys usr/samba/src/source/nterr.h source/nterr.h samba.src.samba
 f 0644 root sys usr/samba/src/source/params.c source/params.c samba.src.samba
 f 0644 root sys usr/samba/src/source/password.c source/password.c samba.src.samba
 f 0644 root sys usr/samba/src/source/pcap.c source/pcap.c samba.src.samba
+f 0644 root sys usr/samba/src/source/pipenetlog.c source/pipenetlog.c samba.src.samba
+f 0644 root sys usr/samba/src/source/pipentlsa.c source/pipentlsa.c samba.src.samba
 f 0644 root sys usr/samba/src/source/pipes.c source/pipes.c samba.src.samba
+f 0644 root sys usr/samba/src/source/pipesrvsvc.c source/pipesrvsvc.c samba.src.samba
+f 0644 root sys usr/samba/src/source/pipeutil.c source/pipeutil.c samba.src.samba
 f 0644 root sys usr/samba/src/source/predict.c source/predict.c samba.src.samba
 f 0644 root sys usr/samba/src/source/printing.c source/printing.c samba.src.samba
 f 0644 root sys usr/samba/src/source/proto.h source/proto.h samba.src.samba
@@ -352,11 +381,15 @@ f 0644 root sys usr/samba/src/source/revert.sh source/revert.sh samba.src.samba
 f 0644 root sys usr/samba/src/source/server.c source/server.c samba.src.samba
 f 0644 root sys usr/samba/src/source/shmem.c source/shmem.c samba.src.samba
 f 0644 root sys usr/samba/src/source/smb.h source/smb.h samba.src.samba
+f 0644 root sys usr/samba/src/source/smbadduser source/smbadduser samba.src.samba
+f 0644 root sys usr/samba/src/source/smbdes.c source/smbdes.c samba.src.samba
 f 0644 root sys usr/samba/src/source/smbencrypt.c source/smbencrypt.c samba.src.samba
+f 0644 root sys usr/samba/src/source/smbparse.c source/smbparse.c samba.src.samba
 f 0644 root sys usr/samba/src/source/smbpass.c source/smbpass.c samba.src.samba
 f 0644 root sys usr/samba/src/source/smbpasswd.c source/smbpasswd.c samba.src.samba
 f 0644 root sys usr/samba/src/source/smbrun.c source/smbrun.c samba.src.samba
 f 0644 root sys usr/samba/src/source/smbtar source/smbtar samba.src.samba
+f 0644 root sys usr/samba/src/source/srvparse.c source/srvparse.c samba.src.samba
 f 0644 root sys usr/samba/src/source/status.c source/status.c samba.src.samba
 f 0644 root sys usr/samba/src/source/system.c source/system.c samba.src.samba
 f 0644 root sys usr/samba/src/source/testparm.c source/testparm.c samba.src.samba
@@ -364,9 +397,12 @@ f 0644 root sys usr/samba/src/source/testprns.c source/testprns.c samba.src.samb
 f 0644 root sys usr/samba/src/source/time.c source/time.c samba.src.samba
 f 0644 root sys usr/samba/src/source/trans2.c source/trans2.c samba.src.samba
 f 0644 root sys usr/samba/src/source/trans2.h source/trans2.h samba.src.samba
+f 0644 root sys usr/samba/src/source/ubi_dLinkList.c source/ubi_dLinkList.c samba.src.samba
+f 0644 root sys usr/samba/src/source/ubi_dLinkList.h source/ubi_dLinkList.h samba.src.samba
 f 0644 root sys usr/samba/src/source/ufc.c source/ufc.c samba.src.samba
 f 0644 root sys usr/samba/src/source/uid.c source/uid.c samba.src.samba
 f 0644 root sys usr/samba/src/source/uninstallbin.sh source/uninstallbin.sh samba.src.samba
+f 0644 root sys usr/samba/src/source/uninstallcp.sh source/uninstallcp.sh samba.src.samba
 f 0644 root sys usr/samba/src/source/uninstallman.sh source/uninstallman.sh samba.src.samba
 f 0644 root sys usr/samba/src/source/uninstallscripts.sh source/uninstallscripts.sh samba.src.samba
 f 0644 root sys usr/samba/src/source/updatesmbpasswd.sh source/updatesmbpasswd.sh samba.src.samba
@@ -375,6 +411,8 @@ f 0644 root sys usr/samba/src/source/util.c source/util.c samba.src.samba
 f 0644 root sys usr/samba/src/source/version.h source/version.h samba.src.samba
 f 0644 root sys usr/samba/src/source/vt_mode.c source/vt_mode.c samba.src.samba
 f 0644 root sys usr/samba/src/source/vt_mode.h source/vt_mode.h samba.src.samba
+f 0644 root sys usr/samba/src/source/wsmbconf.c source/wsmbconf.c samba.src.samba
+f 0644 root sys usr/samba/src/source/wsmbstatus.c source/wsmbstatus.c samba.src.samba
 d 0775 root sys usr/samba/var/locks packaging/SGI samba.sw.base
 d 0755 root sys usr/share/catman/u_man packaging/SGI/catman samba.man.manpages
 d 0755 root sys usr/share/catman/u_man/cat1 packaging/SGI/catman samba.man.manpages
diff --git a/packaging/SGI/samba.spec b/packaging/SGI/samba.spec
index 1940e93e935..62941a2711c 100644
--- a/packaging/SGI/samba.spec
+++ b/packaging/SGI/samba.spec
@@ -1,8 +1,8 @@
 product samba
-    id "Samba version 1.9.17"
+    id "Samba version 1.9.18alpha3"
     image sw
         id "Samba Execution Environment"
-        version 0109170006
+        version 0109180003
         order 0
         subsys base default
             id "Samba Execution Environment"
@@ -13,7 +13,7 @@ product samba
     endimage
     image man
         id "Samba Online Documentation"
-        version 0109170006
+        version 0109180003
         order 1
         subsys manpages default
             id "Samba Man Page"
@@ -34,7 +34,7 @@ product samba
     endimage
     image src
         id "Samba Source Code"
-        version 0109170006
+        version 0109180003
         order 2
         subsys samba
             id "Samba Source Code"
diff --git a/packaging/SGI/sambalp b/packaging/SGI/sambalp
index d7c6be2a2d4..cb95ef089f2 100644
--- a/packaging/SGI/sambalp
+++ b/packaging/SGI/sambalp
@@ -7,15 +7,14 @@
 # printer type I configure on the Win95-side for printing with
 # Samba).
 #
-# the sed script fixes 3 different bugs. The first line removes
-# the JCL statements added by some HP printer drivers to the
-# beginning of the postscript output. The second line fixes a
-# bug in output from word files with long filenames. A non-printing
+# the perl script fixes 3 different bugs. 
+# 1. remove the JCL statements added by some HP printer drivers to the
+# beginning of the postscript output. 
+# 2. Fix a bug in output from word files with long filenames. A non-printing
 # character added to the end of the title comment by word is 
-# removed. The third and fourth lines are the VM fix described
-# above.
+# removed. 
+# 3. The VM fix described above.
 #
-TITLE="$3 on $4"
 
-sed -f /usr/samba/bin/psfixes.sed $2 | /usr/bin/lp -c -d$1 -t"$TITLE"
+/usr/samba/bin/psfixes.pl $2 | /usr/bin/lp -c -d$1 -t"$3 on $4"
 rm $2
diff --git a/packaging/SGI/smb.conf b/packaging/SGI/smb.conf
index 178231d2cd1..b484cc918b2 100644
--- a/packaging/SGI/smb.conf
+++ b/packaging/SGI/smb.conf
@@ -20,18 +20,20 @@
 ;
    printcap name = /usr/samba/printcap
 ;
-; If you are using Impressario then you'll want to use the
+; If you are using Impressario 1.x then you'll want to use the
 ; sambalp script provided with this package.  It works around
 ; a problem in the PostScript generated by the standard Windows
 ; drivers--there is a check to verify sufficient virtual memory
 ; is available in the printer to print the job, but this fails
-; under Impressario because of a bug in Impressario.  The sambalp
+; under Impressario because of a bug in Impressario 1.x.  The sambalp
 ; script strips out the vmstatus check.  BTW, when using this
 ; setup to print be sure to configure a Windows printer driver
 ; that generates PostScript--QMS-PS 810 is one that should work
 ; with the sambalp script.
 ;
-   print command = /usr/samba/bin/sambalp %p %s %U %m
+;   print command = /usr/samba/bin/sambalp %p %s %U %m
+   print command = /usr/bin/lp -c -d%p -t"%U on machine %m" %s ; rm %s
+
    load printers = yes
    guest account = nobody
    browseable = yes