Software Package:       
	samba

Release/Version:
	1.9.15.4

Retrieved from:
	 ftp://nimbus.anu.edu.au/pub/tridge/samba/

Bug reports:
	This software package is maintained by the software contributor,
	not BSDI.  Please send any bug reports to both support@BSDI.COM
	and Andrew.Tridgell@anu.edu.au or, probably more appropriately, 
	the samba mailing list:

	There is a mailing list for discussion of Samba. To subscribe send
	mail to listproc@anu.edu.au with a body of "subscribe samba Your Name"

Comments:

=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
Modifications to this version made by BSDI:

The file "makefile" to do man page formatting and provide the 
standard BSDI targets.  The addtosmbpasswd.1 man page was moved
to a DO_NOT_INSTALL extension since we don't use an external 
password file.  The other changes to the makefile and man installation
script are below.

diff -c -r samba/source/Makefile samba-1.9.15p4/source/Makefile
*** samba/source/Makefile	Thu Dec  7 09:48:11 1995
--- samba-1.9.15p4/source/Makefile	Thu Nov 23 06:42:24 1995
***************
*** 1,5 ****
- #	BSDI	BSDI_CONTRIB,v 1.1.1.1 1995/12/07 16:54:29 polk Exp
- 
  ###########################################################################
  # Makefile for Samba SMB client/server for unix
  # Copyright Andrew Tridgell 1992,1993,1994
--- 1,3 ----
***************
*** 7,21 ****
  
  # The base manpages directory to put the man pages in
  # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
! MANDIR = /usr/contrib/man
  
  # The directories to put things in. If you use multiple
  # architectures or share the samba binaries across NFS then
  # you will probably want to change this layout.
! BASEDIR = /usr/contrib
  BINDIR = $(BASEDIR)/bin
  LIBDIR = $(BASEDIR)/lib
! VARDIR = /var
  
  # WARNING: If you are upgrading, make sure you put all the files
  # in the right spot! The default positions have changed!
--- 5,19 ----
  
  # The base manpages directory to put the man pages in
  # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
! MANDIR = /usr/local/man
  
  # The directories to put things in. If you use multiple
  # architectures or share the samba binaries across NFS then
  # you will probably want to change this layout.
! BASEDIR = /usr/local/samba
  BINDIR = $(BASEDIR)/bin
  LIBDIR = $(BASEDIR)/lib
! VARDIR = $(BASEDIR)/var
  
  # WARNING: If you are upgrading, make sure you put all the files
  # in the right spot! The default positions have changed!
***************
*** 31,37 ****
  
  # You will need to use a ANSI C compiler. This means under SunOS 4 you can't 
  # use cc, instead you will have to use gcc. 
! CC = shlicc
  
  # This may help with some versions of make
  SHELL = /bin/sh
--- 29,35 ----
  
  # You will need to use a ANSI C compiler. This means under SunOS 4 you can't 
  # use cc, instead you will have to use gcc. 
! # CC = gcc
  
  # This may help with some versions of make
  SHELL = /bin/sh
***************
*** 40,58 ****
  # 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/smblog
! NMBLOGFILE = $(VARDIR)/log/nmblog
! CONFIGFILE = /etc/smb.conf
! LMHOSTSFILE = /etc/lmhosts
  
  # the directory where lock files go
! LOCKDIR = $(VARDIR)/run
  
  # 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))
  # NOTE: If you set it to * then nmbd will try to find a workgroup on
  # the local net
! WORKGROUP = *
  
  # set this to the name of the default account, which is the one
  # to use when no username or password is specified.  This can be overridden
--- 38,56 ----
  # 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
! CONFIGFILE = $(LIBDIR)/smb.conf
! LMHOSTSFILE = $(LIBDIR)/lmhosts
  
  # the directory where lock files go
! LOCKDIR = $(VARDIR)/locks
  
  # 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))
  # NOTE: If you set it to * then nmbd will try to find a workgroup on
  # the local net
! WORKGROUP = WORKGROUP
  
  # set this to the name of the default account, which is the one
  # to use when no username or password is specified.  This can be overridden
***************
*** 232,239 ****
  # contributed by tomh@metrics.com
  # versions of BSDI prior to 2.0 may need to add -DUSE_F_FSIZE for 
  # disk usage stats to be correct
! FLAGSM = -DBSDI
! LIBSM =   
  
  
  # This is for NetBSD. Add -DNETBSD_1_0 if you are using 1.0
--- 230,237 ----
  # contributed by tomh@metrics.com
  # versions of BSDI prior to 2.0 may need to add -DUSE_F_FSIZE for 
  # disk usage stats to be correct
! # FLAGSM = -DBSDI
! # LIBSM =   
  
  
  # This is for NetBSD. Add -DNETBSD_1_0 if you are using 1.0
***************
*** 427,434 ****
  CFLAGS  = $(CFLAGS5) $(DCE_FLAGS) $(DES_FLAGS) $(PASSWD_FLAGS) $(VTP_FLAGS)
  LIBS = $(LIBS1) $(LIBSM) $(DCE_LIBS) $(DES_LIB)
  
! PROGS1 = smbd smbclient nmbd testparm testprns smbrun smbstatus
! PROGS = $(PROGS1) nmblookup
  SCRIPTS = smbtar
  
  all : CHECK $(PROGS)
--- 425,432 ----
  CFLAGS  = $(CFLAGS5) $(DCE_FLAGS) $(DES_FLAGS) $(PASSWD_FLAGS) $(VTP_FLAGS)
  LIBS = $(LIBS1) $(LIBSM) $(DCE_LIBS) $(DES_LIB)
  
! PROGS1 = smbd smbclient nmbd testparm testprns smbrun smbstatus smbpasswd 
! PROGS = $(PROGS1) nmblookup addtosmbpass
  SCRIPTS = smbtar
  
  all : CHECK $(PROGS)
diff -c -r samba/source/installman.sh samba-1.9.15p4/source/installman.sh
*** samba/source/installman.sh	Thu Dec  7 09:34:19 1995
--- samba-1.9.15p4/source/installman.sh	Sat Nov 18 02:36:53 1995
***************
*** 1,22 ****
  #!/bin/sh
  MANDIR=$1
- TYPE=$2
- 
- #	BSDI	BSDI_CONTRIB,v 1.1.1.1 1995/12/07 16:54:29 polk Exp
  
  echo Installing man pages in $MANDIR
  
- 
- if [ X$TYPE = Xman ]; then
  for d in $MANDIR $MANDIR/man1 $MANDIR/man5 $MANDIR/man7 $MANDIR/man8; do
  if [ ! -d $d ]; then
  mkdir $d
  if [ ! -d $d ]; then
!  	echo Failed to make directory $d
!  	exit 1
  fi
  fi
  done
  cp ../docs/*.1 $MANDIR/man1
  cp ../docs/*.5 $MANDIR/man5
  cp ../docs/*.8 $MANDIR/man8
--- 1,18 ----
  #!/bin/sh
  MANDIR=$1
  
  echo Installing man pages in $MANDIR
  
  for d in $MANDIR $MANDIR/man1 $MANDIR/man5 $MANDIR/man7 $MANDIR/man8; do
  if [ ! -d $d ]; then
  mkdir $d
  if [ ! -d $d ]; then
!   echo Failed to make directory $d
!   exit 1
  fi
  fi
  done
+ 
  cp ../docs/*.1 $MANDIR/man1
  cp ../docs/*.5 $MANDIR/man5
  cp ../docs/*.8 $MANDIR/man8
***************
*** 31,44 ****
  chmod 0644 $MANDIR/man7/samba.7
  chmod 0644 $MANDIR/man8/smbd.8
  chmod 0644 $MANDIR/man8/nmbd.8
- else
- 	for i in 1 5 8 7; do
- 		for j in ../docs/*.$i; do
- 			echo Formatting $j
- 			nroff -mandoc $j > $MANDIR/cat$i/`basename $j $i`0
- 		done
- 	done
- fi
  
  exit 0
  
--- 27,32 ----
diff -c -r samba/source/smbtar samba-1.9.15p4/source/smbtar
*** samba/source/smbtar	Thu Dec  7 09:23:28 1995
--- samba-1.9.15p4/source/smbtar	Thu Jun 29 01:58:36 1995
***************
*** 2,8 ****
  # 
  
  # edit this to show where your smbclient is
! SMBCLIENT="/usr/contrib/bin/smbclient"
  
  server=""
  service=backup
--- 2,8 ----
  # 
  
  # edit this to show where your smbclient is
! SMBCLIENT="./smbclient"
  
  server=""
  service=backup
