sync compiler warning fixes from 3.0; packaging updates; and start on WHATSNEW for 3.0.1 final

5 files changed, 19 insertions, 27 deletions

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 1383c3b2078..53d1bb6a4c1 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,28 +1,28 @@
-                    WHATS NEW IN Samba 3.0.1rc2
-                         December 10, 2003
+                      WHATS NEW IN Samba 3.0.1
+                         December XX, 2003
                   ===============================
 
-This is a release candidate snapshot of the Samba 3.0.1 code base 
-and is provided for testing only.  A release candidate (RC) means 
-that we are close to the the final, stable version and is provided
-for Quality Assurance (QA) purposes. This release is *not* intended 
-for production servers.  Use at your own risk.
-
-There have been several bug fixes since the 3.0.0 release that
-we feel are important to make available to the Samba community
-for wider testings.  See the "Changes" section for details on
-exact updates.
+This is the latest stable release of Samba. This is the 
+version that all production Samba servers should be running 
+for all current bug-fixes.
 
 
 ######################################################################
 Changes
 #######
-Changes since 3.0.1rc1
------------------------
+Changes since 3.0.1rc2
+----------------------
 
 Please refer to the CVS log for the SAMBA_3_0 branch for complete
 details:
 
+1)  Fix uninitialized variable in passdb.c.
+2)  Fix formal parameter type in get_static() in nsswitch/wins.c.
+
+
+Changes since 3.0.1rc1
+-----------------------
+
 1)  Update version string in smbldap-tools Makefile to 0.8.2.
 2)  Correct a problem with "net rpc vampire" mis-parsing the 
     alias member info reply.
diff --git a/packaging/Fedora/samba.spec.tmpl b/packaging/Fedora/samba.spec.tmpl
index c5956889f0a..ec50cc705b4 100644
--- a/packaging/Fedora/samba.spec.tmpl
+++ b/packaging/Fedora/samba.spec.tmpl
@@ -348,7 +348,6 @@ fi
 %{_bindir}/smbcquotas
 #%{_bindir}/vfstest
 %{_sbindir}/winbindd
-%dir /var/cache/samba
 %config(noreplace) %{_sysconfdir}/samba/smb.conf
 %config(noreplace) %{_sysconfdir}/samba/lmhosts
 %dir %{_datadir}/samba
diff --git a/packaging/RedHat/samba.spec.tmpl b/packaging/RedHat/samba.spec.tmpl
index 034c909fb7f..550ab9304b3 100644
--- a/packaging/RedHat/samba.spec.tmpl
+++ b/packaging/RedHat/samba.spec.tmpl
@@ -185,9 +185,6 @@ install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT%{prefix}/sbin/samba
 install -m644 packaging/RedHat/samba.log $RPM_BUILD_ROOT/etc/logrotate.d/samba
 install -m644 packaging/RedHat/smb.conf $RPM_BUILD_ROOT/etc/samba/smb.conf
 install -m644 packaging/RedHat/smbusers $RPM_BUILD_ROOT/etc/samba/smbusers
-install -m644 packaging/RedHat/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba
-install -m644 packaging/RedHat/samba.pamd.stack $RPM_BUILD_ROOT/etc/samba/samba.stack
-install -m644 packaging/RedHat/samba.xinetd $RPM_BUILD_ROOT/etc/samba/samba.xinetd
 echo 127.0.0.1 localhost > $RPM_BUILD_ROOT/etc/samba/lmhosts
 
 # Remove "*.old" files
@@ -293,9 +290,7 @@ fi
 
 # Add swat entry to xinetd.d if needed.
 if [ -d /etc/xinetd.d -a ! -f /etc/xinetd.d/swat ]; then
-	mv /etc/samba/samba.xinetd /etc/xinetd.d/swat
-else
-	rm -f /etc/samba/samba.xinetd
+	install -m644 packaging/RedHat/samba.xinetd $RPM_BUILD_ROOT/etc/xinetd.d/swat
 fi
 
 # Install the correct version of the samba pam file, depending on pam version.
@@ -303,10 +298,10 @@ fi
 if [ ! -f /etc/pam.d/samba ]; then 
 	if [ -f /lib/security/pam_stack.so ]; then
 		echo "Installing stack version of /etc/pam.d/samba..."
-		mv /etc/samba/samba.stack /etc/pam.d/samba
+		install -m644 packaging/RedHat/samba.pamd.stack $RPM_BUILD_ROOT/etc/pam.d/samba
 	else
 		echo "Installing non-stack version of /etc/pam.d/samba..."
-		rm -f /etc/samba/samba.stack
+		install -m644 packaging/RedHat/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba
 	fi
 fi
 
@@ -444,8 +439,6 @@ fi
 %config(noreplace) /etc/samba/lmhosts
 %config(noreplace) /etc/samba/smb.conf
 %config(noreplace) /etc/samba/smbusers
-/etc/samba/samba.stack
-/etc/samba/samba.xinetd
 /etc/rc.d/init.d/smb
 /etc/rc.d/init.d/winbind
 /etc/logrotate.d/samba
diff --git a/source/nsswitch/wins.c b/source/nsswitch/wins.c
index 0fc4e46cdb7..779d1b2c6ce 100644
--- a/source/nsswitch/wins.c
+++ b/source/nsswitch/wins.c
@@ -265,7 +265,7 @@ int lookup(nsd_file_t *rq)
    are the pointers passed in by the C library to the _nss_*_*
    functions. */
 
-static char *get_static(char **buffer, int *buflen, int len)
+static char *get_static(char **buffer, size_t *buflen, int len)
 {
 	char *result;
 
diff --git a/source/passdb/passdb.c b/source/passdb/passdb.c
index cfa39685e39..616ebf2252b 100644
--- a/source/passdb/passdb.c
+++ b/source/passdb/passdb.c
@@ -1249,7 +1249,7 @@ BOOL local_sid_to_gid(gid_t *pgid, const DOM_SID *psid, enum SID_NAME_USE *name_
 	   the GROUP_MAP object */
 	   
 	become_root();
-	pdb_getgrsid(&group, *psid);
+	ret = pdb_getgrsid(&group, *psid);
 	unbecome_root();
 	
 	if ( !ret ) {