From ff681c40678cca8e5b2fa5400fc4f9319c5aa869 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 1 Jun 2001 12:27:05 +0000
Subject: more syncs with SAMBA_2_2 (This used to be commit
 a4bf39e3dd8a28faac54ddb4e16bea5adf745440)

---
 packaging/RedHat/makefile-path.patch | 12 ------
 packaging/RedHat/smbadduser          | 73 ------------------------------------
 packaging/RedHat/smbw.patch          | 10 -----
 3 files changed, 95 deletions(-)
 delete mode 100644 packaging/RedHat/makefile-path.patch
 delete mode 100755 packaging/RedHat/smbadduser
 delete mode 100644 packaging/RedHat/smbw.patch

(limited to 'packaging/RedHat')

diff --git a/packaging/RedHat/makefile-path.patch b/packaging/RedHat/makefile-path.patch
deleted file mode 100644
index 88d5222e09..0000000000
--- a/packaging/RedHat/makefile-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- samba-2.0.1/source/Makefile.in.orig	Tue Dec  1 22:32:20 1998
-+++ samba-2.0.1/source/Makefile.in	Wed Dec  2 17:11:33 1998
-@@ -25,9 +25,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 = /var/log/samba
- MANDIR = @mandir@
diff --git a/packaging/RedHat/smbadduser b/packaging/RedHat/smbadduser
deleted file mode 100755
index 2f38bf28f1..0000000000
--- a/packaging/RedHat/smbadduser
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/csh
-#
-# smbadduser - Written by Mike Zakharoff
-#
-unalias *
-set path = ($path)
-
-set smbpasswd = /etc/smbpasswd
-set user_map  = /etc/smbusers
-#
-# Set to site specific passwd command
-#
-set passwd    = "cat /etc/passwd"
-#set passwd    = "niscat passwd.org_dir"
-#set passwd    = "ypcat passwd"
-
-set line = "----------------------------------------------------------"
-if ($#argv == 0) then
-	echo $line
-	echo "Written: Mike Zakharoff email: michael.j.zakharoff@boeing.com"
-	echo ""
-	echo "   1) Updates $smbpasswd"
-	echo "   2) Updates $user_map"
-	echo "   3) Executes smbpasswd for each new user"
-	echo ""
-	echo "smbadduser unixid:ntid unixid:ntid ..."
-	echo ""
-	echo "Example: smbadduser zak:zakharoffm johns:smithj"
-	echo $line
-	exit 1
-endif
-
-touch $smbpasswd $user_map
-set new  = ()
-foreach one ($argv)
-	echo $one | grep ':' >& /dev/null
-	if ($status != 0) then
-		echo "ERROR: Must use unixid:ntid like -> zak:zakharoffm"
-		continue
-	endif
-	set unix = `echo $one | awk -F: '{print $1}'`
-	set ntid = `echo $one | awk -F: '{print $2}'`
-
-	set usr = `eval $passwd | awk -F: '$1==USR {print $1}' USR=$unix`
-	if ($#usr != 1) then
-		echo "ERROR: $unix Not in passwd database SKIPPING..."
-		continue
-	endif
-        set tmp = `cat $smbpasswd | awk -F: '$1==USR {print $1}' USR=$unix`
-	if ($#tmp != 0) then
-		echo "ERROR: $unix is already in $smbpasswd SKIPPING..."
-		continue
-	endif
-
-	echo "Adding: $unix to $smbpasswd"
-	eval $passwd | \
-	awk -F: '$1==USR { \
-	printf( "%s:%s:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:%s:%s:%s\n", $1, $3, $5, $6, $7) }' USR=$unix >> $smbpasswd
-	if ($unix != $ntid) then
-		echo "Adding: {$unix = $ntid} to $user_map"
-		echo "$unix = $ntid" >> $user_map
-	endif
-	set new = ($new $unix)
-end
-
-#
-# Enter password for new users
-#
-foreach one ($new)
-	echo $line
-	echo "ENTER password for $one"
-	smbpasswd $one
-end
diff --git a/packaging/RedHat/smbw.patch b/packaging/RedHat/smbw.patch
deleted file mode 100644
index 0abbfdf73f..0000000000
--- a/packaging/RedHat/smbw.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- samba-2.0.0/source/smbwrapper/smbsh.in.orig	Mon Oct  5 22:37:01 1998
-+++ samba-2.0.0/source/smbwrapper/smbsh.in	Mon Oct  5 22:37:51 1998
-@@ -1,6 +1,6 @@
- #! /bin/sh
- 
--SMBW_LIBDIR=${SMBW_LIBDIR-@builddir@/smbwrapper}
-+SMBW_LIBDIR=${SMBW_LIBDIR-/usr/bin}
- 
- if [ ! -f ${SMBW_LIBDIR}/smbwrapper.so ]; then
-     echo You need to set LIBDIR in smbsh
-- 
cgit