removing unneeded files

(This used to be commit b2a36ae3967591296e755b3e7a85a851ba382608)

11 files changed, 0 insertions, 1333 deletions

diff --git a/packaging/SuSE/5.2/samba-1.9.18p5.dif b/packaging/SuSE/5.2/samba-1.9.18p5.dif
deleted file mode 100644
index 39b13f010d..0000000000
--- a/packaging/SuSE/5.2/samba-1.9.18p5.dif
+++ /dev/null
@@ -1,234 +0,0 @@
---- Makefile.Linux
-+++ Makefile.Linux	1998/05/06 15:58:42
-@@ -0,0 +1,35 @@
-+#
-+#
-+# Makefile.Linux to integrate package into source tree of S.u.S.E.-Linux
-+#
-+# Copyright (C) 1996 S.u.S.E. GmbH Fuerth, Germany.
-+#
-+# Please send bug-fixes or comments to feedback@suse.de.
-+#
-+# Author: Florian La Roche  <florian@suse.de>
-+#         Volker Lendecke   <vl@suse.de>
-+#
-+#
-+
-+doc=/usr/doc/packages/samba
-+
-+compile:
-+	make -C source
-+
-+install:
-+	make install -C source
-+	mkdir -p $(doc)
-+	cp -a docs/* $(doc)
-+	rm -rf $(doc)/*.[0-9] 
-+	cp -R examples $(doc)
-+	chmod 644 `find $(doc) -type f`
-+	chmod 755 `find $(doc) -type d`
-+	install -m 644 smb.conf /etc/smb.conf
-+	install rc /sbin/init.d/smb
-+	install -m 755 source/mksmbpasswd.sh /usr/bin/mksmbpasswd.sh
-+	ln -sf ../smb /sbin/init.d/rc2.d/S20smb
-+	ln -sf ../smb /sbin/init.d/rc2.d/K20smb
-+	ln -sf ../smb /sbin/init.d/rc3.d/S20smb
-+	ln -sf ../smb /sbin/init.d/rc3.d/K20smb
-+	mkdir -p /var/adm/fillup-templates
-+	cp rc.config.samba /var/adm/fillup-templates
---- doinst.sh
-+++ doinst.sh	1998/05/06 15:54:52
-@@ -0,0 +1,15 @@
-+#
-+# install/doinst.sh - to be done after extraction
-+#
-+# Copyright (c) 1997 S.u.S.E. GmbH Fuerth, Germany.
-+#
-+#
-+echo "Updating etc/rc.config..."
-+if [ -x bin/fillup ] ; then
-+  bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.samba
-+else
-+  echo "ERROR: fillup not found. This should not happen. Please compare"
-+  echo "etc/rc.config and var/adm/fillup-templates/rc.config.samba and"
-+  echo "update by hand."
-+fi
-+
---- rc
-+++ rc	1998/05/06 15:54:52
-@@ -0,0 +1,32 @@
-+#! /bin/sh
-+# Copyright (c) 1996 StarDivision GmbH. All rights reserved.
-+# Copyright (c) 1996 S.u.S.E. Gmbh Fuerth, Germany. All rights reserved.
-+#
-+# Author: Bastian Epting, StarDivision GmbH <be@stardivision.de>
-+#      Florian La Roche, <florian@suse.de>
-+#      Volker Lendecke, <vl@suse.de>
-+#
-+
-+. /etc/rc.config
-+
-+test "$START_SMB" = "yes" || exit 0
-+
-+case "$1" in
-+    start)
-+        echo -n "Starting SMB services."
-+        /usr/sbin/nmbd -D
-+        /usr/sbin/smbd -D
-+        echo
-+        ;;
-+    stop)
-+        echo -n "Shutting down SMB services."
-+        killproc -TERM /usr/sbin/nmbd
-+        killproc -TERM /usr/sbin/smbd
-+        echo
-+        ;;
-+    *)
-+        echo "Usage: $0 {start|stop}"
-+        exit 1
-+esac
-+
-+exit 0
---- rc.config.samba
-+++ rc.config.samba	1998/05/06 15:54:52
-@@ -0,0 +1,5 @@
-+#
-+# start samba? ("yes" or "no")
-+# Windows 95 / NT  -  File- and Printservices
-+#
-+START_SMB="no"
---- smb.conf
-+++ smb.conf	1998/05/06 15:54:52
-@@ -0,0 +1,48 @@
-+[global]
-+   workgroup = arbeitsgruppe
-+   guest account = nobody
-+   keep alive = 30
-+   os level = 2
-+   security = user
-+   printing = bsd
-+   printcap name = /etc/printcap
-+   load printers = yes
-+
-+; Please uncomment the following entry and replace the 
-+; ip number and netmask with the correct numbers for
-+; your ethernet interface.
-+;   interfaces = 192.168.1.1/255.255.255.0
-+   
-+; If you want Samba to act as a wins server, please set
-+; 'wins support = yes'
-+   wins support = no
-+
-+; If you want Samba to use an existing wins server,
-+; please uncomment the following line and replace
-+; the dummy with the wins server's ip number.
-+;   wins server = 192.168.1.1
-+
-+[homes]
-+   comment = Heimatverzeichnis
-+   browseable = no
-+   read only = no
-+   create mode = 0750
-+
-+; The following share gives all users access to the Server's CD drive,
-+; assuming it is mounted under /cd. To enable this share, please remove
-+; the semicolons before the lines
-+;
-+; [cdrom]
-+;   comment = Linux CD-ROM
-+;   path = /cd
-+;   read only = yes
-+;   locking = no
-+
-+[printers]
-+   comment = All Printers
-+   browseable = no
-+   printable = yes
-+   public = no
-+   read only = yes
-+   create mode = 0700
-+   directory = /tmp
---- source/Makefile
-+++ source/Makefile	1998/05/06 15:54:52
-@@ -5,11 +5,11 @@
- ###########################################################################
- 
- # The base directory for all samba files
--BASEDIR = /usr/local/samba
-+BASEDIR = /usr
- 
- # The base manpages directory to put the man pages in
- # Note: $(MANDIR)/man1, $(MANDIR)/man5 and $(MANDIR)/man8 must exist.
--MANDIR = /usr/local/man
-+MANDIR = /usr/man
- 
- # The directories to put things in. If you use multiple
- # architectures or share the samba binaries across NFS then
-@@ -18,16 +18,16 @@
- #       normally only applies to nmbd and smbd
- #       SBINDIR implies a secure binary directory
- BINDIR = $(BASEDIR)/bin
--SBINDIR = $(BASEDIR)/bin
--LIBDIR = $(BASEDIR)/lib
--VARDIR = $(BASEDIR)/var
-+SBINDIR = $(BASEDIR)/sbin
-+LIBDIR = $(BASEDIR)/lib/samba
-+VARDIR = /var/log
- 
- # The permissions to give the executables
- INSTALLPERMS = 0755
- 
- # Add any optimisation or debugging flags here
- # add -DSYSLOG for syslog support
--FLAGS1 = -O
-+FLAGS1 = -O2
- LIBS1 = 
- 
- # You will need to use a ANSI C compiler. This means under SunOS 4 you can't 
-@@ -47,15 +47,15 @@
- # or in smb.conf (see smb.conf(5))
- SMBLOGFILE = $(VARDIR)/log.smb
- NMBLOGFILE = $(VARDIR)/log.nmb
--CONFIGFILE = $(LIBDIR)/smb.conf
--LMHOSTSFILE = $(LIBDIR)/lmhosts
--DRIVERFILE = $(LIBDIR)/printers.def
-+CONFIGFILE = /etc/smb.conf
-+LMHOSTSFILE = /etc/lmhosts
-+DRIVERFILE = /etc/printers.def
- SMB_PASSWD = $(BINDIR)/smbpasswd
--SMB_PASSWD_FILE = $(BASEDIR)/private/smbpasswd
--WEB_ROOT = $(BASEDIR)
-+SMB_PASSWD_FILE = /etc/smbpasswd
-+WEB_ROOT = /etc
- 
- # the directory where lock files go
--LOCKDIR = $(VARDIR)/locks
-+LOCKDIR = /var/lock
- 
- # The directory where code page definition files go
- CODEPAGEDIR = $(LIBDIR)/codepages
-@@ -206,7 +206,7 @@
- # 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
-+FLAGSM = -DLINUX -DSHADOW_PWD -DFAST_SHARE_MODES
- # LIBSM = -lshadow
- 
- # Use this for Linux without shadow passwords or for any Linux
---- source/includes.h
-+++ source/includes.h	1998/05/06 15:54:52
-@@ -244,13 +244,6 @@
- #define USE_SETFS
- #endif
- #endif
--#ifdef SHADOW_PWD
--#if _LINUX_C_LIB_VERSION_MAJOR < 5
--#ifndef crypt
--#define crypt pw_encrypt
--#endif
--#endif
--#endif
- #endif
- 
- #ifdef SUNOS4
diff --git a/packaging/SuSE/5.2/samba.spec b/packaging/SuSE/5.2/samba.spec
deleted file mode 100644
index 5f20875c9e..0000000000
--- a/packaging/SuSE/5.2/samba.spec
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-# spec file for package samba (Version 1.9.18p1)
-# 
-# Copyright  (c)  1997  S.u.S.E. GmbH  Fuerth, Germany.
-#
-# please send bugfixes or comments to feedback@suse.de.
-#
-
-Vendor:       S.u.S.E. GmbH, Fuerth, Germany
-Distribution: S.u.S.E. Linux 5.1 (i386)
-Name:         samba
-Release:      1
-Copyright:    1992-98 Andrew Tridgell, Karl Auer, Jeremy Allison
-Group: 
-Provides:     samba smbfs 
-Requires: 
-Conflicts:    
-Autoreqprov:  on
-Packager:     feedback@suse.de
-
-Version:      1.9.18p5
-Summary:      Samba  is a file server for Unix, similar to LanManager.
-Source: samba-1.9.18p5.tar.gz
-Source1: smbfs-2.0.2.tar.gz
-Patch: samba-1.9.18p5.dif
-Patch1: smbfs-2.0.2.dif
-%prep
-%setup
-%patch
-%setup -T -n smbfs-2.0.2 -b1
-%patch -P 1
-%build
-cd ../samba-1.9.18p5
-make -f Makefile.Linux compile
-cd ../smbfs-2.0.2
-make -f Makefile.Linux compile
-%install
-cd ../samba-1.9.18p5
-make -f Makefile.Linux install
-cd ../smbfs-2.0.2
-make -f Makefile.Linux install
-Check
-%post
-echo "Updating etc/rc.config..."
-if [ -x bin/fillup ] ; then
-  bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.samba
-else
-  echo "ERROR: fillup not found. This should not happen. Please compare"
-  echo "etc/rc.config and var/adm/fillup-templates/rc.config.samba and"
-  echo "update by hand."
-fi
-%files
-%docdir /usr/doc/packages/samba
-/usr/doc/packages/samba
-%config /etc/smb.conf
-/usr/lib/samba/codepages
-/sbin/init.d/rc2.d/K20smb
-/sbin/init.d/rc2.d/S20smb
-/sbin/init.d/rc3.d/K20smb
-/sbin/init.d/rc3.d/S20smb
-%config /sbin/init.d/smb
-/usr/bin/addtosmbpass
-/usr/bin/mksmbpasswd.sh
-/usr/bin/make_printerdef
-/usr/bin/make_smbcodepage
-/usr/bin/nmblookup
-/usr/bin/smbclient
-/usr/bin/smbmount
-/usr/bin/smbpasswd
-/usr/bin/smbstatus
-/usr/bin/smbtar
-/usr/bin/smbumount
-/usr/bin/testparm
-/usr/bin/testprns
-%doc /usr/man/man1/smbclient.1.gz
-%doc /usr/man/man1/smbrun.1.gz
-%doc /usr/man/man1/smbstatus.1.gz
-%doc /usr/man/man1/smbtar.1.gz
-%doc /usr/man/man1/testparm.1.gz
-%doc /usr/man/man1/testprns.1.gz
-%doc /usr/man/man1/make_smbcodepage.1.gz
-%doc /usr/man/man5/smb.conf.5.gz
-%doc /usr/man/man7/samba.7.gz
-%doc /usr/man/man8/nmbd.8.gz
-%doc /usr/man/man8/smbd.8.gz
-%doc /usr/man/man8/smbmount.8.gz
-%doc /usr/man/man8/smbumount.8.gz
-%doc /usr/man/man8/smbmnt.8.gz
-%doc /usr/man/man8/smbpasswd.8.gz
-/usr/sbin/nmbd
-/usr/sbin/smbd
-/var/adm/fillup-templates/rc.config.samba
-%description
-Samba is a suite of programs which work together to allow clients to
-access Unix filespace and printers via the SMB protocol (Seerver Message
-Block). 
-CAUTION: The samba daemons are started by the init script
-/sbin/init.d/samba, not by inetd. The entries for /usr/sbin/smbd
-and /usr/sbin/nmbd must be commented out in /etc/inetd.conf.
-In practice, this means that you can redirect disks and printers to
-Unix disks and printers from LAN Manager clients, Windows for
-Workgroups 3.11 clients, Windows'95 clients, Windows NT clients
-and OS/2 clients. There is
-also a Unix client program supplied as part of the suite which allows
-Unix users to use an ftp-like interface to access filespace and
-printers on any other SMB server.
-Samba includes the following programs (in summary):
-* smbd, the SMB server. This handles actual connections from clients.
-* nmbd, the Netbios name server, which helps clients locate servers.
-* smbclient, the Unix-hosted client program.
-* testprns, a program to test server access to printers.
-* testparm, a program to test the Samba configuration file for correctness.
-* smb.conf, the Samba configuration file.
-* smbprint, a sample script to allow a Unix host to use smbclient
-to print to an SMB server.
-The suite is supplied with full source and is GPLed.
-This package expects its config file under /etc/smb.conf .
-Documentation: /usr/doc/packages/samba
-
diff --git a/packaging/SuSE/7.1/samba-2.2.0-alpha0.dif b/packaging/SuSE/7.1/samba-2.2.0-alpha0.dif
deleted file mode 100644
index 75bfdf18c6..0000000000
--- a/packaging/SuSE/7.1/samba-2.2.0-alpha0.dif
+++ /dev/null
@@ -1,224 +0,0 @@
---- lmhosts
-+++ lmhosts	2000/08/28 07:32:33
-@@ -0,0 +1,8 @@
-+# This file provides the same function that the 
-+# lmhosts file does for Windows.
-+# It provides another way to map netbios names to ip addresses.
-+# See the section on 'name resolve order' in the manual page to
-+# smb.conf for more information.
-+
-+# Sample entry:
-+# 192.168.1.1 samba
---- mount.smbfs
-+++ mount.smbfs	2000/08/28 07:32:55
-@@ -0,0 +1,14 @@
-+#!/bin/sh
-+#
-+# Copyright (c) 1999 SuSE GmbH Nuernberg, Germany.  All rights reserved.
-+#
-+# Author: Carsten Hoeger <choeger@suse.de>
-+#
-+# /sbin/mount.smbfs
-+#
-+# I'm called by the mount-command and smbmount want's to get
-+# called by me, so lets do it.
-+#
-+# P.S.: This is a very very raw solution and I don't know, if this
-+# is intentionally.
-+smbmount "$@"
---- rc
-+++ rc	2000/08/28 07:32:33
-@@ -0,0 +1,53 @@
-+#! /bin/sh
-+# Copyright (c) 1996 StarDivision GmbH. All rights reserved.
-+# Copyright (c) 1996 S.u.S.E. Gmbh Fuerth, Germany. All rights reserved.
-+#
-+# Author: Bastian Epting, StarDivision GmbH <be@stardivision.de>
-+#      Florian La Roche, <florian@suse.de>
-+#      Volker Lendecke, <vl@suse.de>
-+#
-+
-+. /etc/rc.config
-+
-+# Determine the base and follow a runlevel link name.
-+base=${0##*/}
-+link=${base#*[SK][0-9][0-9]}
-+
-+# Force execution if not called by a runlevel directory.
-+test $link = $base && START_SMB=yes
-+test "$START_SMB" = "yes" || exit 0
-+
-+# The echo return value for success (defined in /etc/rc.config).
-+return=$rc_done
-+case "$1" in
-+    start)
-+        echo -n "Starting SMB services:"
-+        startproc /usr/sbin/nmbd -D || return=$rc_failed
-+        startproc /usr/sbin/smbd -D || return=$rc_failed
-+        echo -e "$return"
-+        ;;
-+    stop)
-+        echo -n "Shutting down SMB services:"
-+        killproc -TERM /usr/sbin/nmbd || return=$rc_failed
-+        killproc -TERM /usr/sbin/smbd || return=$rc_failed
-+        echo -e "$return"
-+        ;;
-+    restart|reload)
-+	echo -n "Reloading SMB services:"
-+	killproc -HUP /usr/sbin/nmbd || return=$rc_failed
-+	killproc -HUP /usr/sbin/smbd || return=$rc_failed
-+	echo -e "$return"
-+	;;
-+    status)
-+	echo -n "Checking for service smb: "
-+	checkproc /usr/sbin/nmbd && echo -n "OK " || echo -n "No process "
-+	checkproc /usr/sbin/smbd && echo "OK " || echo "No process"
-+	;;
-+    *)
-+        echo "Usage: $0 {start|stop|restart|reload|status}"
-+        exit 1
-+esac
-+
-+# Inform the caller not only verbosely and set an exit status.
-+test "$return" = "$rc_done" || exit 1
-+exit 0
---- rc.config.samba
-+++ rc.config.samba	2000/08/28 07:32:33
-@@ -0,0 +1,5 @@
-+#
-+# start samba? ("yes" or "no")
-+# Windows 95 / NT  -  File- and Printservices
-+#
-+START_SMB="no"
---- smb.conf
-+++ smb.conf	2000/08/28 07:32:33
-@@ -0,0 +1,80 @@
-+;
-+; /etc/smb.conf
-+;
-+; Copyright (c) 1999 SuSE GmbH Nuernberg, Germany.
-+;
-+[global]
-+   workgroup = arbeitsgruppe
-+   guest account = nobody
-+   keep alive = 30
-+   os level = 2
-+   kernel oplocks = false
-+   security = user
-+
-+; Uncomment the following, if you want to use an existing
-+; NT-Server to authenticate users, but don't forget that
-+; you also have to create them locally!!!
-+;  security = server
-+;  password server = 192.168.1.10
-+;  encrypt passwords = yes
-+
-+   printing = bsd
-+   printcap name = /etc/printcap
-+   load printers = yes
-+
-+   socket options = TCP_NODELAY
-+
-+   map to guest = Bad User
-+
-+; Uncomment this, if you want to integrate your server
-+; into an existing net e.g. with NT-WS to prevent nettraffic
-+;  local master = no   
-+
-+; Please uncomment the following entry and replace the 
-+; ip number and netmask with the correct numbers for
-+; your ethernet interface.
-+;   interfaces = 192.168.1.1/255.255.255.0
-+   
-+; If you want Samba to act as a wins server, please set
-+; 'wins support = yes'
-+   wins support = no
-+
-+; If you want Samba to use an existing wins server,
-+; please uncomment the following line and replace
-+; the dummy with the wins server's ip number.
-+;   wins server = 192.168.1.1
-+
-+; Do you wan't samba to act as a logon-server for
-+; your windows 95/98 clients, so uncomment the
-+; following:
-+;   logon script =%U.bat
-+;   domain logons = yes
-+;   domain master = yes
-+; [netlogon]
-+;   path = /netlogon
-+
-+
-+[homes]
-+   comment = Heimatverzeichnis
-+   browseable = no
-+   read only = no
-+   create mode = 0750
-+
-+; The following share gives all users access to the Server's CD drive,
-+; assuming it is mounted under /cd. To enable this share, please remove
-+; the semicolons before the lines
-+;
-+; [cdrom]
-+;   comment = Linux CD-ROM
-+;   path = /cdrom
-+;   read only = yes
-+;   locking = no
-+
-+[printers]
-+   comment = All Printers
-+   browseable = no
-+   printable = yes
-+   public = no
-+   read only = yes
-+   create mode = 0700
-+   directory = /tmp
---- smbfs
-+++ smbfs	2000/08/28 07:32:33
-@@ -0,0 +1,40 @@
-+#! /bin/bash
-+# Copyright (c) 1996 SuSE GmbH Nuernberg, Germany.  All rights reserved.
-+#
-+# Author: Thomas Fehr <fehr@suse.de>, 1999
-+#
-+# /sbin/init.d/smbfs
-+#
-+
-+smbfs=no
-+if [ `cat /proc/mounts | grep " smbfs " | wc -l` -gt 0 ]
-+then
-+    smbfs=yes
-+fi
-+
-+return=$rc_done
-+case "$1" in
-+    start|reload)
-+	;;
-+    stop)
-+	if [ "$smbfs" = "yes" ]
-+	then
-+	    echo -n "Remove SMB File System"
-+	    #
-+	    # Unmount in background because during long timeouts
-+	    #
-+	    umount -at smbfs &
-+	    sleep 2
-+	    echo -e "$return"
-+	fi
-+	;;
-+    restart)
-+	$0 stop && $0 start || return=$rc_failed
-+	;;
-+    status)
-+	;;
-+    *)
-+	echo "Usage: $0 {start|stop|status|reload|restart}"
-+	exit 1
-+esac
-+exit 0
---- smbpasswd
-+++ smbpasswd	2000/08/28 07:32:33
-@@ -0,0 +1,3 @@
-+# Sample smbpasswd file.
-+# To use this, set 'encrypt passwords = yes' in the [global]-section
-+# of /etc/smb.conf
diff --git a/packaging/SuSE/7.1/samba.pamd b/packaging/SuSE/7.1/samba.pamd
deleted file mode 100644
index d9e7088bea..0000000000
--- a/packaging/SuSE/7.1/samba.pamd
+++ /dev/null
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth     required       /lib/security/pam_unix.so
-account  required       /lib/security/pam_unix.so
diff --git a/packaging/SuSE/7.1/samba.spec b/packaging/SuSE/7.1/samba.spec
deleted file mode 100644
index 60d8099edb..0000000000
--- a/packaging/SuSE/7.1/samba.spec
+++ /dev/null
@@ -1,381 +0,0 @@
-#
-# spec file for package samba (Version 2.0.7)
-# 
-# Copyright  (c)  2000  SuSE GmbH  Nuernberg, Germany.
-#
-# please send bugfixes or comments to feedback@suse.de.
-#
-
-# neededforbuild  automake openldap
-# usedforbuild    aaa_base aaa_dir autoconf automake base bash bindutil binutils bison bzip compress cpio cracklib devs diff ext2fs file fileutil find flex gawk gcc gdbm gettext gpm gppshare groff gzip kbd less libc libtool libz lx_suse make mktemp modules ncurses net_tool netcfg nkita nkitb nssv1 openldap pam patch perl pgp ps rcs rpm sendmail sh_utils shadow shlibs strace syslogd sysvinit texinfo textutil timezone unzip util vim xdevel xf86 xshared
-
-Vendor:       SuSE GmbH, Nuernberg, Germany
-Distribution: SuSE Linux 7.1a (i386)
-Name:         samba
-Release:      0
-Packager:     feedback@suse.de
-
-Copyright:    1992-95 Andrew Tridgell, Karl Auer, Jeremy Allison
-Group:        Networking/Daemons
-Url:          http://www.samba.org
-Provides:     samba smbfs 
-Requires:     smbclnt
-Autoreqprov:  on
-Version:      2.2
-Summary:      An SMB file server for Unix
-Source: samba-2.2.0-alpha0.tar.gz
-Source1: samba.pamd
-Patch: samba-2.2.0-alpha0.dif
-%package -n smbclnt
-Summary:      Samba client utilities
-Autoreqprov:  on
-Group:        Networking
-%prep
-%setup -n samba-2.2.0-alpha0
-%patch
-
-%build
-cd source
-%{?suse_update_config:%{suse_update_config -f}}
-LIBS=-lnsl \
-./configure --prefix=/usr --libdir=/etc \
-	--with-privatedir=/etc --localstatedir=/var/log \
-	--with-smbmount --with-pam \
-	--mandir=%{_mandir} \
-	--with-swatdir=/usr/lib/samba/swat \
-	--with-sambabook=/usr/lib/samba/swat/using_samba
-cd ..
-make LOCKDIR=/var/lock/samba SBINDIR=/usr/sbin \
-	CODEPAGEDIR=/usr/lib/samba/codepages -C source
-
-%install
-mkdir -p /usr/lib/samba
-make install LOCKDIR=/var/lock/samba SBINDIR=/usr/sbin \
-	CODEPAGEDIR=/usr/lib/samba/codepages -C source
-# cleanup docs
-rm -rf docs/*.[0-9]
-chmod 644 `find docs examples -type f`
-chmod 755 `find docs examples -type d`
-#utility scripts
-mkdir -p /usr/lib/samba/scripts
-cp -a source/script/* /usr/lib/samba/scripts
-# configuration files
-install -m 644 smb.conf /etc/smb.conf
-install -m 644 lmhosts /etc/lmhosts
-install -m 600 smbpasswd -o root -g root /etc/smbpasswd
-install -d 755 /etc/pam.d
-install -m 644 $RPM_SOURCE_DIR/samba.pamd /etc/pam.d/samba
-install -m 755 mount.smbfs /sbin/mount.smbfs
-# start script
-install rc /sbin/init.d/smb
-ln -sf ../smb /sbin/init.d/rc2.d/S20smb
-ln -sf ../smb /sbin/init.d/rc2.d/K20smb
-ln -sf ../smb /sbin/init.d/rc3.d/S20smb
-ln -sf ../smb /sbin/init.d/rc3.d/K20smb
-ln -sf ../../sbin/init.d/smb /usr/sbin/rcsmb
-install smbfs /sbin/init.d/smbfs
-ln -sf ../smbfs /sbin/init.d/rc2.d/S21smbfs
-ln -sf ../smbfs /sbin/init.d/rc2.d/K19smbfs
-ln -sf ../smbfs /sbin/init.d/rc3.d/S21smbfs
-ln -sf ../smbfs /sbin/init.d/rc3.d/K19smbfs
-ln -sf ../../sbin/init.d/smbfs /usr/sbin/rcsmbfs
-# rc.config fragment
-mkdir -p /var/adm/fillup-templates
-cp rc.config.samba /var/adm/fillup-templates
-%{?suse_check}
-
-%post
-echo "Updating etc/rc.config..."
-if [ -x bin/fillup ] ; then
-  bin/fillup -q -d = etc/rc.config var/adm/fillup-templates/rc.config.samba
-else
-  echo "ERROR: fillup not found. This should not happen. Please compare"
-  echo "etc/rc.config and var/adm/fillup-templates/rc.config.samba and"
-  echo "update by hand."
-fi
-if grep -q '^[#[:space:]]*swat' etc/inetd.conf ; then
-   echo /etc/inetd.conf is up to date
-else
-   echo updating inetd.conf
-   cat >> etc/inetd.conf << EOF
-# swat is the Samba Web Administration Tool
-swat    stream  tcp     nowait.400  root    /usr/sbin/swat swat
-EOF
-fi
-if grep -q '^swat' etc/services ; then
-   echo /etc/services is up to date
-else
-   echo updating services
-   cat >> etc/services << EOF
-swat            901/tcp		# swat is the Samba Web Administration Tool
-EOF
-fi
-mkdir -p var/adm/notify/messages
-cat << EOF > var/adm/notify/messages/samba-notify
-Achtung!
-========
-Die Syntax des smbmount Kommandos hat sich geaendert!
-smbmount kann nicht mehr direkt aufgerufen werden. Es wird von einem
-Shellscript /sbin/mount.smbfs aufgerufen, welches wiederum von mount
-aufgerufen wird.
-Hier ein Beispielaufruf:
-mount -t smbfs -o username=uname,password=passwd //smbserv/share /destination
-*****************************************************************************
-Attention!
-==========
-The syntax of smbmount has changed!
-smbmount can not be called direct anymore. It will be called by a shell
-script /sbin/mount.smbfs, which will be called by mount.
-A sample call to smbfs:
-mount -t smbfs -o username=uname,password=passwd //smbserv/share /destination
-EOF
-
-%files
-%config(noreplace) /etc/smb.conf
-%config(noreplace) /etc/lmhosts
-%config(noreplace) /etc/smbpasswd
-%config /etc/pam.d/samba
-/usr/lib/samba
-/sbin/init.d/rc2.d/K20smb
-/sbin/init.d/rc2.d/S20smb
-/sbin/init.d/rc3.d/K20smb
-/sbin/init.d/rc3.d/S20smb
-%config /sbin/init.d/smb
-/usr/bin/addtosmbpass
-/usr/bin/convert_smbpasswd
-/usr/bin/make_printerdef
-/usr/bin/make_smbcodepage
-/usr/bin/make_unicodemap
-/usr/bin/smbpasswd
-/usr/bin/smbstatus
-/usr/bin/testparm
-/usr/bin/testprns
-%doc docs/* examples
-%doc %{_mandir}/man1/make_smbcodepage.1.gz
-%doc %{_mandir}/man1/make_unicodemap.1.gz
-%doc %{_mandir}/man1/smbrun.1.gz
-%doc %{_mandir}/man1/smbsh.1.gz
-%doc %{_mandir}/man1/smbstatus.1.gz
-%doc %{_mandir}/man1/testparm.1.gz
-%doc %{_mandir}/man1/testprns.1.gz
-%doc %{_mandir}/man5/lmhosts.5.gz
-%doc %{_mandir}/man5/smb.conf.5.gz
-%doc %{_mandir}/man5/smbpasswd.5.gz
-%doc %{_mandir}/man7/samba.7.gz
-%doc %{_mandir}/man8/nmbd.8.gz
-%doc %{_mandir}/man8/smbd.8.gz
-%doc %{_mandir}/man8/smbpasswd.8.gz
-%doc %{_mandir}/man8/swat.8.gz
-/usr/sbin/nmbd
-/usr/sbin/rcsmb
-/usr/sbin/smbd
-/usr/sbin/swat
-/var/adm/fillup-templates/rc.config.samba
-
-%files -n smbclnt
-/sbin/init.d/rc2.d/K19smbfs
-/sbin/init.d/rc2.d/S21smbfs
-/sbin/init.d/rc3.d/K19smbfs
-/sbin/init.d/rc3.d/S21smbfs
-%config /sbin/init.d/smbfs
-/usr/sbin/rcsmbfs
-/sbin/mount.smbfs
-/usr/bin/nmblookup
-/usr/bin/rpcclient
-/usr/bin/smbclient
-/usr/bin/smbmnt
-/usr/bin/smbmount
-/usr/bin/smbumount
-/usr/bin/smbspool
-/usr/bin/smbtar
-%doc %{_mandir}/man1/nmblookup.1.gz
-%doc %{_mandir}/man1/smbclient.1.gz
-%doc %{_mandir}/man1/smbtar.1.gz
-%doc %{_mandir}/man8/smbmnt.8.gz
-%doc %{_mandir}/man8/smbmount.8.gz
-%doc %{_mandir}/man8/smbspool.8.gz
-%doc %{_mandir}/man8/smbumount.8.gz
-
-%description
-Samba is a suite of programs which work together to allow clients to
-access Unix filespace and printers via the SMB protocol (Server Message
-Block). 
-In practice, this means that you can redirect disks and printers to
-Unix disks and printers from LAN Manager clients, Windows for
-Workgroups 3.11 clients, Windows'95 clients, Windows NT clients
-and OS/2 clients. There is
-also a Unix client program supplied as part of the suite which allows
-Unix users to use an ftp-like interface to access filespace and
-printers on any other SMB server.
-Samba includes the following programs (in summary):
-* smbd, the SMB server. This handles actual connections from clients.
-* nmbd, the Netbios name server, which helps clients locate servers.
-* smbclient, the Unix-hosted client program.
-* smbrun, a little 'glue' program to help the server run external
-programs. 
-* testprns, a program to test server access to printers.
-* testparm, a program to test the Samba configuration file for correctness.
-* smb.conf, the Samba configuration file.
-* smbprint, a sample script to allow a Unix host to use smbclient
-to print to an SMB server.
-The suite is supplied with full source and is GPLed.
-This package expects its config file under /etc/smb.conf .
-
-Authors:
---------
-    Andrew Tridgell <Andrew.Tridgell@anu.edu.au>
-    Karl Auer <Karl.Auer@anu.edu.au>
-    Jeremy Allison <jeremy@netcom.com>
-
-SuSE series: n
-
-
-%description -n smbclnt
-This package contains all programs, that are needed to act as a samba
-client. This includes also smbmount, of course.
-
-Authors:
---------
-    Andrew Tridgell <Andrew.Tridgell@anu.edu.au>
-    Karl Auer <Karl.Auer@anu.edu.au>
-    Jeremy Allison <jeremy@netcom.com>
-
-SuSE series: n
-
-
-%changelog -n samba
-* Mon Aug 28 2000 - choeger@suse.de
-- changed $* to "$@" in mount.smbfs to make it also
-  possible to mount shares with spaces
-* Mon Jul 31 2000 - choeger@suse.de
-- improvement for rcsmb
-- fix for spec-file to compile with NIS netgroups
-* Thu Jul 20 2000 - choeger@suse.de
-- added smbfs initscript that has been removed
-  by an error
-* Tue Jul 11 2000 - choeger@suse.de
-- split package into client and server parts
-  client package name: smbclnt
-* Wed Apr 26 2000 - choeger@suse.de
-- new version, 2.0.7
-* Thu Apr 06 2000 - ro@suse.de
-- removed pam,cracklib from neededforbuild: build handles this
-* Wed Apr 05 2000 - bk@suse.de
-- s390 team added config.{sub,guess} update macro for s390
-* Mon Mar 27 2000 - choeger@suse.de
-- fixed bug in specfile
-  the multilined configure call missed a "" :-(
-* Thu Mar 09 2000 - choeger@suse.de
-- fixed typo in specfile
-* Wed Mar 01 2000 - choeger@suse.de
-- added %{_mandir}
-* Tue Feb 08 2000 - choeger@suse.de
-- removed /sbin/init.d/smbfs because it is no longer needed
-* Mon Jan 03 2000 - choeger@suse.de
-- bugfix for ipc.c
-  to make roaming profiles work again.
-* Tue Nov 30 1999 - choeger@suse.de
-- changed kernel oplocks = off to
-  kernel oplocks = false
-* Tue Nov 16 1999 - choeger@suse.de
-- added kernel oplocks = off in smb.conf
-* Fri Nov 12 1999 - choeger@suse.de
-- new version, 2.0.6
-* Fri Nov 05 1999 - choeger@suse.de
-- Fix for the smbmount lost-connection problem
-  _seems_ to work...
-* Fri Oct 29 1999 - choeger@suse.de
-- removed comment sign in /etc/inetd.conf for swat
-* Mon Sep 13 1999 - bs@suse.de
-- ran old prepare_spec on spec file to switch to new prepare_spec.
-* Tue Aug 10 1999 - fehr@suse.de
-- set execute permissions for mksmbpasswd.sh and changesmbpasswd.sh
-* Thu Jul 29 1999 - fehr@suse.de
-- fixed typo in /sbin/init.d/smbfs
-* Thu Jul 22 1999 - fehr@suse.de
-- changed to new version 2.0.5a
-* Wed Jul 21 1999 - fehr@suse.de
-- changed to new version 2.0.5
-* Tue Jul 20 1999 - fehr@suse.de
-- install /sbin/init.d/smbfs
-- changed to new version 2.0.5pre4
-* Mon Jul 19 1999 - fehr@suse.de
-- add /sbin/init.d/smbfs
-- changed to new version 2.0.5pre3
-* Fri Jul 02 1999 - fehr@suse.de
-- removed "umount -a -t smbfs" from start sscript
-* Tue Jun 22 1999 - kukuk@suse.de
-- 2.0.4b changed default values, enable PAM again
-* Fri Jun 18 1999 - kukuk@suse.de
-- changed to new version 2.0.4b
-* Mon Jun 14 1999 - kukuk@suse.de
-- Enable PAM, add samba.pamd
-* Mon May 03 1999 - fehr@suse.de
-- add umount -a -t smbfs to shutdown sequence of samba
-* Thu Mar 11 1999 - ro@suse.de
-- smbmount: define NR_OPEN to 1024 if undefined (GLIBC-2.1)
-* Wed Mar 10 1999 - choeger@suse.de
-- some enhancements for smb.conf
-* Wed Mar 10 1999 - choeger@suse.de
-- new version 2.0.3 and smbmount now seems to work
-* Tue Mar 09 1999 - ro@suse.de
-- use samba-2.0.2 for STABLE
-- use smbfs-2.1 with kernel 2.2.2
-* Sun Feb 28 1999 - ro@suse.de
-- for glibc-2.1 strncat uses strcat for one subcase, so don't
-  redefine strcat to "ERROR" for glibc-2.1
-* Mon Feb 15 1999 - fehr@suse.de
-- fix for umount problem from Volker
-* Tue Feb 09 1999 - fehr@suse.de
-- changed to version 2.0.2 of samba
-* Fri Jan 15 1999 - bs@suse.de
-- replaced /sbin/init.d/smb with newer style version (again)
-* Fri Jan 15 1999 - fehr@suse.de
-- switched to new version 2.0.0
-* Wed Jan 13 1999 - bs@suse.de
-- fixed entry in inetd.conf
-* Wed Jan 13 1999 - bs@suse.de
-- replaced /sbin/init.d/smb with newer style version
-* Mon Jan 11 1999 - vl@suse.de
-- make 2.0.0beta5 package of samba
-* Mon Aug 24 1998 - vl@suse.de
-- changed to version 1.9.18p10
-* Mon Jun 29 1998 - vl@suse.de
-- changed to version 1.9.18p8
-* Mon Apr 20 1998 - vl@suse.de
-- changed to version 1.9.18p4
-* Thu Feb 19 1998 - vl@suse.de
-- changed to version 1.9.18p3
-* Tue Feb 03 1998 - vl@suse.de
-- changed to version 1.9.18p2
-- fixed some problems in spec-file, some files were missing :-(
-- fixed smbfs-2.0.2/Makefile.Linux
-* Tue Jan 13 1998 - vl@suse.de
-- changed to version 1.9.18p1
-* Fri Jan 09 1998 - vl@suse.de
-- changed to version 1.9.18
-* Tue Dec 02 1997 - bs@suse.de
-- disable samba by default in /etc/rc.config
-* Mon Oct 06 1997 - fehr@suse.de
-- package prepared for automatic building
-* Mon Sep 29 1997 - fehr@suse.de
-- updated to version 1.9.17p2 due to security hole.
-* Wed Jul 16 1997 - fehr@suse.de
-- add fillup-template for rc.config and install it in doinst.sh
-* Fri Jun 27 1997 - bs@suse.de
-- update to smbfs-2.0.2, due to security hole.
-* Tue Jun 17 1997 - fehr@suse.de
-- changed init-skript to recognize entry START_SMB of rc.config
-* Mon Jun 02 1997 - vl@suse.de
-- update to version 1.9.16p11
-- Starting Samba from /sbin/init.d, not from inetd.conf
-* Sun Feb 02 1997 - vl@suse.de
-- update to version 1.9.16p10
-- Adapted /etc/smb.conf.sample to 4.4.1 manual
-* Thu Jan 02 1997 - florian@suse.de
-- update to version 1.9.16p9
-- configuration file is now /etc/smb.conf
-- smbd and nmbd are now in /usr/sbin
-- added start-script /sbin/init.d/smb and entry in /etc/rc.config
-* Thu Jan 02 1997 - florian@suse.de
-- Update auf neue Version 1.9.16p6.
diff --git a/packaging/SuSE/samba-3.0.0-msdfs.diff b/packaging/SuSE/samba-3.0.0-msdfs.diff
deleted file mode 100644
index 1e688e64c4..0000000000
--- a/packaging/SuSE/samba-3.0.0-msdfs.diff
+++ /dev/null
@@ -1,97 +0,0 @@
---- source/param/loadparm.c	Wed Oct  9 21:17:05 2002
-+++ source/param/loadparm.c	Mon Oct 14 16:33:08 2002
-@@ -386,6 +386,8 @@
- 	BOOL bInheritPerms;
- 	BOOL bInheritACLS;
- 	BOOL bMSDfsRoot;
-+	BOOL bMSDfsProxy;
-+	char *bMSDfsLinkName;
- 	BOOL bUseClientDriver;
- 	BOOL bDefaultDevmode;
- 	BOOL bNTAclSupport;
-@@ -508,6 +510,8 @@
- 	False,			/* bInheritPerms */
- 	False,			/* bInheritACLS */
- 	False,			/* bMSDfsRoot */
-+	False,                  /* bMSDfsProxy */
-+	NULL,                   /* bMSDfsLinkName */
- 	False,			/* bUseClientDriver */
- 	False,			/* bDefaultDevmode */
- 	True,			/* bNTAclSupport */
-@@ -1079,6 +1083,8 @@
- 
- 	
- 	{"msdfs root", P_BOOL, P_LOCAL, &sDefault.bMSDfsRoot, NULL, NULL, FLAG_SHARE},
-+	{"msdfs proxy", P_BOOL, P_LOCAL, &sDefault.bMSDfsProxy, NULL, NULL, FLAG_SHARE},
-+	{"msdfs link name", P_STRING, P_LOCAL, &sDefault.bMSDfsLinkName, NULL, NULL, FLAG_SHARE},
- 	{"host msdfs", P_BOOL, P_GLOBAL, &Globals.bHostMSDfs, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
- 
- 	{"Winbind options", P_SEP, P_SEPARATOR},
-@@ -1730,6 +1736,8 @@
- FN_LOCAL_STRING(lp_veto_oplocks, szVetoOplockFiles)
- FN_LOCAL_STRING(lp_driverlocation, szPrinterDriverLocation)
- FN_LOCAL_BOOL(lp_msdfs_root, bMSDfsRoot)
-+FN_LOCAL_BOOL(lp_msdfs_proxy, bMSDfsProxy)
-+FN_LOCAL_STRING(lp_msdfs_link_name, bMSDfsLinkName)
- FN_LOCAL_BOOL(lp_autoloaded, autoloaded)
- FN_LOCAL_BOOL(lp_preexec_close, bPreexecClose)
- FN_LOCAL_BOOL(lp_rootpreexec_close, bRootpreexecClose)
---- source/msdfs/msdfs.c	Tue Jul  2 08:34:24 2002
-+++ source/msdfs/msdfs.c	Mon Oct 14 16:49:57 2002
-@@ -600,12 +600,38 @@
- 	int reply_size = 0;
- 	char *pathnamep = pathname;
- 
-+	struct connection_struct conns;
-+	struct connection_struct* conn = &conns;
-+	int snum;
-+	pstring conn_path;
-+	struct dfs_path dpi;
-+
-+	struct junction_map junction2;
-+	parse_dfs_path(pathname, &dpi);
-+	pstrcpy(junction2.service_name, dpi.servicename);
-+	snum = lp_servicenumber(junction2.service_name);
-+	create_conn_struct(conn, snum, conn_path);
-+	
-+
- 	ZERO_STRUCT(junction);
- 
- 	/* get the junction entry */
- 	if (!pathnamep)
- 		return -1;
- 
-+        if (lp_msdfs_proxy(SNUM(conn))) {
-+		DEBUG(10,("running in proxy mode\n"));
-+		pstrcpy(pathnamep, "\\");
-+		pstrcat(pathnamep, dpi.hostname);
-+		pstrcat(pathnamep, "\\");
-+		pstrcat(pathnamep, dpi.servicename);
-+		pstrcat(pathnamep, "\\");
-+		pstrcat(pathnamep, (char *) lp_msdfs_link_name(SNUM(conn)));
-+	 } else {
-+	        DEBUG(10,("running in normal mode\n"));
-+	}
-+	
-+	
- 	/* Trim pathname sent by client so it begins with only one backslash.
- 	   Two backslashes confuse some dfs clients
- 	 */
-@@ -631,6 +657,17 @@
- 		}
- 	}
- 	
-+        if ( lp_msdfs_proxy(SNUM(conn)) ) {
-+		DEBUG(10,("running in proxy mode\n"));
-+		pstrcpy ( pathnamep, "\\" );
-+		pstrcat ( pathnamep, dpi.hostname);
-+		pstrcat ( pathnamep, "\\" );
-+		pstrcat ( pathnamep, dpi.servicename);
-+        } else {
-+	   	DEBUG(10,("running in normal mode\n"));
-+	}
-+		
-+	
- 	/* create the referral depeding on version */
- 	DEBUG(10,("max_referral_level :%d\n",max_referral_level));
- 	if(max_referral_level<2 || max_referral_level>3)
diff --git a/packaging/SuSE/samba-3.0.0-net_ads.diff b/packaging/SuSE/samba-3.0.0-net_ads.diff
deleted file mode 100644
index b1224c0cef..0000000000
--- a/packaging/SuSE/samba-3.0.0-net_ads.diff
+++ /dev/null
@@ -1,140 +0,0 @@
-diff -Nur source/utils/net.c source/utils/net.c
---- source/utils/net.c	Fri Sep 27 09:42:34 2002
-+++ source/utils/net.c	Tue Oct  1 12:22:00 2002
-@@ -68,6 +68,7 @@
- int opt_port = 0;
- int opt_maxusers = -1;
- char *opt_comment = "";
-+char *opt_container = "cn=Users";
- int opt_flags = -1;
- int opt_jobid = 0;
- int opt_timeout = 0;
-@@ -459,6 +460,7 @@
- 		{"myname",	'n', POPT_ARG_STRING, &opt_requester_name},
- 		{"conf",	's', POPT_ARG_STRING, &servicesf},
- 		{"server",	'S', POPT_ARG_STRING, &opt_host},
-+		{"container",	'c', POPT_ARG_STRING, &opt_container},
- 		{"comment",	'C', POPT_ARG_STRING, &opt_comment},
- 		{"maxusers",	'M', POPT_ARG_INT,    &opt_maxusers},
- 		{"flags",	'F', POPT_ARG_INT,    &opt_flags},
-diff -Nur source/utils/net.h source/utils/net.h
---- source/utils/net.h	Tue Jun 25 04:29:09 2002
-+++ source/utils/net.h	Tue Oct  1 12:19:51 2002
-@@ -38,10 +38,8 @@
- 
- extern int opt_maxusers;
- extern char *opt_comment;
-+extern char *opt_container;
- extern int opt_flags;
--
--extern char *opt_comment;
--
- extern char *opt_target_workgroup;
- extern int opt_long_list_entries;
- extern int opt_reboot;
-diff -Nur source/utils/net_ads.c source/utils/net_ads.c
---- source/utils/net_ads.c	Tue Sep 17 14:15:52 2002
-+++ source/utils/net_ads.c	Tue Oct  1 12:33:44 2002
-@@ -255,7 +255,7 @@
- 		goto done;
- 	}
- 
--	status = ads_add_user_acct(ads, argv[0], opt_comment);
-+	status = ads_add_user_acct(ads, argv[0], opt_container, opt_comment);
- 
- 	if (!ADS_ERR_OK(status)) {
- 		d_printf("Could not add user %s: %s\n", argv[0],
-@@ -431,7 +431,7 @@
- 		goto done;
- 	}
- 
--	status = ads_add_group_acct(ads, argv[0], opt_comment);
-+	status = ads_add_group_acct(ads, argv[0], opt_container, opt_comment);
- 
- 	if (ADS_ERR_OK(status)) {
- 		d_printf("Group %s added\n", argv[0]);
-diff -Nur source/utils/net_help.c source/utils/net_help.c
---- source/utils/net_help.c	Tue Sep 24 20:10:30 2002
-+++ source/utils/net_help.c	Tue Oct  1 13:01:50 2002
-@@ -69,14 +69,14 @@
- 		 "\n\tDelete specified user\n");
- 	d_printf("\nnet [<method>] user INFO <name> [misc. options] [targets]"\
- 		 "\n\tList the domain groups of the specified user\n");
--	d_printf("\nnet [<method>] user ADD <name> [password] "\
-+	d_printf("\nnet [<method>] user ADD <name> [password] [-c container] "\
- 		 "[-F user flags] [misc. options]"\
- 		 " [targets]\n\tAdd specified user\n");
- 
- 	net_common_methods_usage(argc, argv);
- 	net_common_flags_usage(argc, argv);
--	d_printf(
--	 "\t-C or --comment=<comment>\tdescriptive comment (for add only)\n");
-+	d_printf("\t-C or --comment=<comment>\tdescriptive comment (for add only)\n");
-+	d_printf("\t-c or --container=<container>\tLDAP container, defaults to cn=Users (for add in ADS only)\n");
- 	return -1;
- }
- 
-@@ -85,12 +85,12 @@
- 		 "\n\tList user groups\n\n");
- 	d_printf("net [<method>] group DELETE <name> [misc. options] [targets]"\
- 		 "\n\tDelete specified group\n");
--	d_printf("\nnet [<method>] group ADD <name> [-C comment]"\
-+	d_printf("\nnet [<method>] group ADD <name> [-C comment] [-c container]"\
- 		 " [misc. options] [targets]\n\tCreate specified group\n");
- 	net_common_methods_usage(argc, argv);
- 	net_common_flags_usage(argc, argv);
--	d_printf(
--	 "\t-C or --comment=<comment>\tdescriptive comment (for add only)\n");
-+	d_printf("\t-C or --comment=<comment>\tdescriptive comment (for add only)\n");
-+	d_printf("\t-c or --container=<container>\tLDAP container, defaults to cn=Users (for add in ADS only)\n");
- 	return -1;
- }
- 
-diff -Nur source/libads/ldap_user.c source/libads/ldap_user.c
---- source/libads/ldap_user.c	Wed Aug  7 12:33:22 2002
-+++ source/libads/ldap_user.c	Tue Oct  1 12:46:08 2002
-@@ -38,7 +38,7 @@
- }
- 
- ADS_STATUS ads_add_user_acct(ADS_STRUCT *ads, const char *user, 
--			     const char *fullname)
-+			     const char *container, const char *fullname)
- {
- 	TALLOC_CTX *ctx;
- 	ADS_MODLIST mods;
-@@ -57,7 +60,7 @@
- 
- 	if (!(upn = talloc_asprintf(ctx, "%s@%s", user, ads->config.realm)))
- 		goto done;
--	if (!(new_dn = talloc_asprintf(ctx, "cn=%s,cn=Users,%s", name, 
-+	if (!(new_dn = talloc_asprintf(ctx, "cn=%s,%s,%s", name, container,
- 				       ads->config.bind_path)))
- 		goto done;
- 	if (!(controlstr = talloc_asprintf(ctx, "%u", UF_NORMAL_ACCOUNT)))
-@@ -80,7 +83,7 @@
- }
- 
- ADS_STATUS ads_add_group_acct(ADS_STRUCT *ads, const char *group, 
--			      const char *comment)
-+			      const char *container, const char *comment)
- {
- 	TALLOC_CTX *ctx;
- 	ADS_MODLIST mods;
-@@ -93,7 +96,7 @@
- 
- 	status = ADS_ERROR(LDAP_NO_MEMORY);
- 
--	if (!(new_dn = talloc_asprintf(ctx, "cn=%s,cn=Users,%s", group, 
-+	if (!(new_dn = talloc_asprintf(ctx, "cn=%s,%s,%s", group, container,
- 				       ads->config.bind_path)))
- 		goto done;
- 	if (!(mods = ads_init_mods(ctx)))
-@@ -102,7 +105,7 @@
- 	ads_mod_str(ctx, &mods, "cn", group);
- 	ads_mod_strlist(ctx, &mods, "objectClass",objectClass);
- 	ads_mod_str(ctx, &mods, "name", group);
--	if (comment)
-+	if (comment && *comment) 
- 		ads_mod_str(ctx, &mods, "description", comment);
- 	ads_mod_str(ctx, &mods, "sAMAccountName", group);
- 	status = ads_gen_add(ads, new_dn, mods);
diff --git a/packaging/SuSE/samba-3.0.0-pdb.diff b/packaging/SuSE/samba-3.0.0-pdb.diff
deleted file mode 100644
index 4f767c4ac4..0000000000
--- a/packaging/SuSE/samba-3.0.0-pdb.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/pdb/Makefile	Thu Sep  5 02:11:41 2002
-+++ examples/pdb/Makefile	Thu Sep  5 02:11:59 2002
-@@ -8,7 +8,7 @@
- SAMBA_INCL = ../../source/include
- UBIQX_SRC = ../../source/ubiqx
- SMBWR_SRC = ../../source/smbwrapper
--CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g
-+CFLAGS = -I/usr/include/heimdal -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -Wall -g
- PDB_OBJS = pdb_test.so
- 
- # Default target
diff --git a/packaging/SuSE/samba-3.0.0-python.diff b/packaging/SuSE/samba-3.0.0-python.diff
deleted file mode 100644
index 8c5931e444..0000000000
--- a/packaging/SuSE/samba-3.0.0-python.diff
+++ /dev/null
@@ -1,44 +0,0 @@
---- source/python/py_common.c	2002-12-22 03:07:40.000000000 +0100
-+++ source/python/py_common.c	2002-11-29 11:50:22.000000000 +0100
-@@ -45,9 +45,6 @@
- 
- void py_samba_init(void)
- {
--	extern pstring global_myname;
--	char *p;
--
- 	if (initialised)
- 		return;
- 
-@@ -59,11 +56,7 @@
- 	/* Misc other stuff */
- 
- 	load_interfaces();
--	
--	fstrcpy(global_myname, myhostname());
--	p = strchr(global_myname, '.');
--	if (p)
--		*p = 0;
-+	init_names();
- 
- 	initialised = True;
- }
---- source/python/py_smb.c	2002-11-27 03:54:20.000000000 +0100
-+++ source/python/py_smb.c	2002-11-29 11:50:22.000000000 +0100
-@@ -61,7 +61,6 @@
- 	static char *kwlist[] = { "called", "calling", NULL };
- 	char *calling_name = NULL, *called_name;
- 	struct nmb_name calling, called;
--	extern pstring global_myname;
- 	BOOL result;
- 
- 	if (!PyArg_ParseTupleAndKeywords(args, kw, "s|s", kwlist, &called_name, 
-@@ -69,7 +68,7 @@
- 		return NULL;
- 
- 	if (!calling_name)
--		calling_name = global_myname;
-+		calling_name = global_myname();
- 
- 	make_nmb_name(&calling, calling_name, 0x00);
- 	make_nmb_name(&called, called_name, 0x20);
diff --git a/packaging/SuSE/samba-3.0.0-vscan.diff b/packaging/SuSE/samba-3.0.0-vscan.diff
deleted file mode 100644
index cb860e3ffb..0000000000
--- a/packaging/SuSE/samba-3.0.0-vscan.diff
+++ /dev/null
@@ -1,80 +0,0 @@
---- examples/VFS/samba-vscan-0.3.1/fprot/Makefile	2002-11-26 15:20:17.000000000 +0100
-+++ examples/VFS/samba-vscan-0.3.1/fprot/Makefile	2002-12-19 13:26:19.000000000 +0100
-@@ -14,7 +14,7 @@
- SMBWR_SRC = ../../../../source/smbwrapper
- SMBVS_INCL = ../include
- SMBVS_GLB = ../global
--CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  
-+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal 
- VFS_OBJS = vscan-fprotd.so
- SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-fprotd.c vscan-fprotd_core.c vscan-fprotd.h vscan-fprotd_core.h
- OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-fprotd.lo vscan-fprotd_core.lo
---- examples/VFS/samba-vscan-0.3.1/include/vscan-global.h	2002-11-25 16:48:10.000000000 +0100
-+++ examples/VFS/samba-vscan-0.3.1/include/vscan-global.h	2002-12-19 13:26:34.000000000 +0100
-@@ -93,7 +93,7 @@
- */
- 
- #ifndef SAMBA_VERSION_MAJOR
--# define SAMBA_VERSION_MAJOR 2 
-+# define SAMBA_VERSION_MAJOR 3 
- #endif
- 
- #ifndef SAMBA_VERSION_MINOR
---- examples/VFS/samba-vscan-0.3.1/kaspersky/Makefile	2002-11-28 17:40:35.000000000 +0100
-+++ examples/VFS/samba-vscan-0.3.1/kaspersky/Makefile	2002-12-19 13:27:23.000000000 +0100
-@@ -23,9 +23,9 @@
- VFS_OBJS = vscan-kavp.so
- 
- ifdef USE_DEBUG
--CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  
-+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal
- else
--CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 
-+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal 
- endif
- 
- ifndef USE_KAVPSHAREDLIB
---- examples/VFS/samba-vscan-0.3.1/mks/Makefile	2002-11-26 16:29:55.000000000 +0100
-+++ examples/VFS/samba-vscan-0.3.1/mks/Makefile	2002-12-19 13:27:53.000000000 +0100
-@@ -13,7 +13,7 @@
- SMBWR_SRC = ../../../../source/smbwrapper
- SMBVS_INCL = ../include
- SMBVS_GLB = ../global
--CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  
-+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal 
- VFS_OBJS = vscan-mksd.so
- SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c  vscan-mksd.c vscan-mksd_core.c vscan-mksd.h vscan-mksd_core.h mks.h mks_c.c
- OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-mksd.lo vscan-mksd_core.lo mks_c.lo
---- examples/VFS/samba-vscan-0.3.1/openantivirus/Makefile	2002-11-27 19:24:03.000000000 +0100
-+++ examples/VFS/samba-vscan-0.3.1/openantivirus/Makefile	2002-12-19 13:28:10.000000000 +0100
-@@ -15,7 +15,7 @@
- SMBWR_SRC = ../../../../source/smbwrapper
- SMBVS_INCL = ../include
- SMBVS_GLB = ../global
--CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  
-+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal 
- VFS_OBJS = vscan-oav.so
- SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c  vscan-oav.c vscan-oav_core.c vscan-oav.h vscan-oav_core.h
- OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-oav.lo vscan-oav_core.lo
---- examples/VFS/samba-vscan-0.3.1/sophos/Makefile	2002-11-27 19:24:03.000000000 +0100
-+++ examples/VFS/samba-vscan-0.3.1/sophos/Makefile	2002-12-19 13:29:20.000000000 +0100
-@@ -15,7 +15,7 @@
- SMBWR_SRC = ../../../../source/smbwrapper
- SMBVS_INCL = ../include
- SMBVS_GLB = ../global
--CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  
-+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal 
- VFS_OBJS = vscan-sophos.so
- SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-sophos.c vscan-sophos_core.c vscan-sophos.h vscan-sophos_core.h
- OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-sophos.lo vscan-sophos_core.lo
---- examples/VFS/samba-vscan-0.3.1/trend/Makefile	2002-11-27 19:24:03.000000000 +0100
-+++ examples/VFS/samba-vscan-0.3.1/trend/Makefile	2002-12-19 13:29:31.000000000 +0100
-@@ -15,7 +15,7 @@
- SMBWR_SRC = ../../../../source/smbwrapper
- SMBVS_INCL = ../include
- SMBVS_GLB = ../global
--CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  
-+CFLAGS = -I$(SAMBA_SRC) -I$(SAMBA_INCL) -I$(UBIQX_SRC) -I$(SMBWR_SRC) -I$(SMBVS_INCL) -Wall -g -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/heimdal 
- VFS_OBJS = vscan-trend.so
- SOURCES = $(SMBVS_GLB)/vscan-functions.c $(SMBVS_GLB)/vscan-message.c $(SMBVS_GLB)/vscan-quarantine.c vscan-trend.c vscan-trend_core.c vscan-trend.h vscan-trend_core.h
- OBJS = vscan-functions.lo vscan-message.lo vscan-quarantine.lo vscan-trend.lo vscan-trend_core.lo
diff --git a/packaging/SuSE/samba-vscan-0.3.1.tar.bz2 b/packaging/SuSE/samba-vscan-0.3.1.tar.bz2
deleted file mode 100644
index 5639279374..0000000000
--- a/packaging/SuSE/samba-vscan-0.3.1.tar.bz2
+++ /dev/null