working on files for 3.0.0rc1

3 files changed, 12 insertions, 30 deletions

diff --git a/packaging/RedHat/samba.spec.tmpl b/packaging/RedHat/samba.spec.tmpl
index 4c5a480a27e..6c6bafe5faf 100644
--- a/packaging/RedHat/samba.spec.tmpl
+++ b/packaging/RedHat/samba.spec.tmpl
@@ -7,7 +7,7 @@ Group: Networking
 Source: http://download.samba.org/samba/ftp/samba-%{version}.tar.bz2
 Packager: Gerald Carter [Samba-Team] <jerry@samba.org>
 Requires: pam >= 0.72 kernel >= 2.2.1 glibc >= 2.1.2
-Prereq: chkconfig fileutils
+Prereq: chkconfig fileutils /sbin/ldconfig
 Provides: samba = %{version}
 Obsoletes: samba-common, samba-client, samba-swat
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -94,7 +94,7 @@ mkdir -p $RPM_BUILD_ROOT%{prefix}/{lib,include}
 # Install standard binary files
 for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \
 	rpcclient smbspool smbcacls smbcontrol wbinfo smbmnt net \
-	smbcacls pdbedit tdbbackup smbtree
+	smbcacls pdbedit tdbbackup smbtree ntlm_auth
 do
 	install -m755 source/bin/$i $RPM_BUILD_ROOT%{prefix}/bin
 done
@@ -123,7 +123,7 @@ make DESTDIR=$RPM_BUILD_ROOT \
 	LIBDIR=%{prefix}/lib/samba \
 	VARDIR=/var \
 	SBINDIR=%{prefix}/sbin \
-	BINDIR=$%{prefix}/bin \
+	BINDIR=%{prefix}/bin \
 	MANDIR=MANDIR_MACRO \
 	SWATDIR=%{prefix}/share/swat \
 	SAMBABOOK=%{prefix}/share/swat/using_samba \
@@ -147,20 +147,6 @@ install -m 755 source/bin/libsmbclient.so $RPM_BUILD_ROOT%{prefix}/lib/
 install -m 755 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{prefix}/lib/
 install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{prefix}/include/
 
-# Install SWAT helper files
-#for i in swat/help/*.html docs/htmldocs/*.html
-#do
-#	install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/help
-#done
-#for i in swat/images/*.gif
-#do
-#	install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/images
-#done
-#for i in swat/include/*.html
-#do
-#	install -m644 $i $RPM_BUILD_ROOT%{prefix}/share/swat/include
-#done
-
 # Install the miscellany
 install -m755 swat/README $RPM_BUILD_ROOT%{prefix}/share/swat/README
 install -m755 packaging/RedHat/smbprint $RPM_BUILD_ROOT%{prefix}/bin
@@ -287,15 +273,13 @@ else
 	rm -f /etc/samba/samba.stack
 fi
 
-# Create winbind nss client symlink
-
-if [ -e /lib/libnss_winbind.so ]; then
-	ln -sf /lib/libnss_winbind.so /lib/libnss_winbind.so.2
-fi
+## call ldconfig to create the version symlink for libsmbclient.so
+/sbin/ldconfig
 
 %preun
 if [ $1 = 0 ] ; then
 	/sbin/chkconfig --del smb
+	/sbin/chkconfig --del winbind
 
 	# We want to remove the browse.dat and wins.dat files so they can not interfer with a new version of samba!
 	if [ -e /var/cache/samba/browse.dat ]; then
@@ -366,6 +350,8 @@ if [ $1 = 0 ] ; then
 	fi
 fi
 
+/sbin/ldconfig
+
 %files
 %defattr(-,root,root)
 %doc README COPYING Manifest Read-Manifest-Now
@@ -399,6 +385,7 @@ fi
 %{prefix}/bin/smbcontrol
 %{prefix}/bin/wbinfo
 %{prefix}/bin/net
+%{prefix}/bin/ntlm_auth
 %{prefix}/bin/smbcacls
 %{prefix}/bin/pdbedit
 %{prefix}/bin/tdbbackup
diff --git a/packaging/RedHat/smb.conf b/packaging/RedHat/smb.conf
index 71ff9463884..5786ec5d04a 100644
--- a/packaging/RedHat/smb.conf
+++ b/packaging/RedHat/smb.conf
@@ -66,7 +66,7 @@
 ;  smb passwd file = /etc/samba/smbpasswd
 
 # The following are needed to allow password changing from Windows to
-# update the Linux sytsem password also.
+# update the Linux system password also.
 # NOTE: Use these with 'encrypt passwords' and 'smb passwd file' above.
 # NOTE2: You do NOT need these to allow workstations to change only
 #        the encrypted SMB passwords. They allow the Unix password
diff --git a/packaging/RedHat/winbind.init b/packaging/RedHat/winbind.init
index 17ddbd502b3..e5680726e78 100644
--- a/packaging/RedHat/winbind.init
+++ b/packaging/RedHat/winbind.init
@@ -19,16 +19,11 @@ fi
 # Check that networking is up.
 [ ${NETWORKING} = "no" ] && exit 0
 
+CONFIG=/etc/samba/smb.conf
+
 # Check that smb.conf exists.
 [ -f $CONFIG ] || exit 0
 
-RETVAL=0
-
-CONFIG=/usr/local/samba/lib/smb.conf
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/samba/sbin:/usr/local/samba/bin
-export PATH
-
-
 start() {
 	echo -n "Starting Winbind services: "
 	RETVAL=1