final changes for 3.0.1

4 files changed, 49 insertions, 13 deletions

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 2a299ecc265..94e19fac27c 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,10 +1,24 @@
                       WHATS NEW IN Samba 3.0.1
-                         December XX, 2003
+                         December 15, 2003
                   ===============================
 
 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.
+for all current bug-fixes.  Some of the more common bugs in
+3.0.0 addressed  in the release include:
+
+  * Substitution problems with smb.conf variables.
+  * Errors in return codes which caused some applications
+    to fail to open files.
+  * General Protection Faults on Windows 2000/XP clients
+    using Samba point-n-print features.
+  * Several miscellaneous crash bugs.
+  * Access problems when enumerating group mappings are 
+    stored in an LDAP Directory.
+  * Several common SWAT bugs when writing changes to 
+    smb.conf.
+  * Internal inconsistencies when 'winbind use default 
+    domain = yes'
 
 
 ######################################################################
@@ -19,9 +33,11 @@ details:
 1)  Fix uninitialized variable in passdb.c.
 2)  Fix formal parameter type in get_static() in nsswitch/wins.c.
 3)  Fix problem mounting directories when mount.cifs is installed 
-    with the setuid on.
+    with the setuid bit on.
 4)  Fix bug that prevent --mandir from overriding the defaults
     given in the --with-fhs macro.
+5)  Fix bug in in-memory Kerberos keytab detection routines 
+    in configure.in
 
 
 Changes since 3.0.1rc1
@@ -34,7 +50,7 @@ Changes since 3.0.1rc1
 4)  Fix detection of Windows 2003 client architecture in the smb.conf
     %a variable.
 5)  Ensure that smbd calls the add user script for a missing UNIX 
-    user on kerberos auth call  (bug 445).
+    user on kerberos auth call (bug 445).
 6)  Fix bugs in hosts allow/deny when using a mismatched 
     network/netmask pair.
 7)  Protect alloc_sub_basic() from crashing when the source string 
@@ -132,7 +148,7 @@ Added Parameters
 
     
 
-Changes since 3.0.1pre4
+Changes since 3.0.1pre2
 -----------------------
 
 Please refer to the CVS log for the SAMBA_3_0 branch for complete
@@ -226,7 +242,7 @@ Changes since 3.0.1pre1
     keyblock in the krb5 structs.
 41) Remove #include <compat.h> in hopes to avoid problems with 
     apache header files.
-42) COrrect winbindd build problems on HP-UX 11
+42) Correct winbindd build problems on HP-UX 11.
 43) Lowercase netgroups lookups (bug 703).
 44) Use the actual size of the buffer in strftime instead of a made
     up value which just happens to be less than sizeof(fstring).  
@@ -324,7 +340,6 @@ Removed Parameters
     files.
 33) Ensure canceling a blocking lock returns the correct error 
     message.
-34) Match Samba 2.2, and make ACB_NORMAL the default ACB value.
 
 
 
diff --git a/examples/misc/modify_samba_config.pl b/examples/misc/modify_samba_config.pl
index eb997f9b0c8..ad958625d66 100755
--- a/examples/misc/modify_samba_config.pl
+++ b/examples/misc/modify_samba_config.pl
@@ -66,7 +66,7 @@ while (<CONFIGFILE>) {
 	
 	## check for a param = value
 	if ($_ =~ /=/) {
-		($param, $value) = split (/=/, $_);
+		($param, $value) = split (/=/, $_,2);
 		$param =~ s/./\l$&/g;
 		$param =~ s/\s+//g;
 		$value =~ s/^\s+//;
diff --git a/packaging/RedHat/samba.spec.tmpl b/packaging/RedHat/samba.spec.tmpl
index 550ab9304b3..eb51d8b1a4e 100644
--- a/packaging/RedHat/samba.spec.tmpl
+++ b/packaging/RedHat/samba.spec.tmpl
@@ -185,6 +185,9 @@ 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
@@ -290,21 +293,37 @@ fi
 
 # Add swat entry to xinetd.d if needed.
 if [ -d /etc/xinetd.d -a ! -f /etc/xinetd.d/swat ]; then
-	install -m644 packaging/RedHat/samba.xinetd $RPM_BUILD_ROOT/etc/xinetd.d/swat
+	mv /etc/samba/samba.xinetd /etc/xinetd.d/swat
+else
+	rm -f /etc/samba/samba.xinetd
 fi
 
 # Install the correct version of the samba pam file, depending on pam version.
 # (always keep an existing PAM config file)
-if [ ! -f /etc/pam.d/samba ]; then 
+if [ ! -f /lib/security/pam_stack.so ]; then 
 	if [ -f /lib/security/pam_stack.so ]; then
 		echo "Installing stack version of /etc/pam.d/samba..."
-		install -m644 packaging/RedHat/samba.pamd.stack $RPM_BUILD_ROOT/etc/pam.d/samba
+		mv /etc/samba/samba.stack /etc/pam.d/samba
 	else
 		echo "Installing non-stack version of /etc/pam.d/samba..."
-		install -m644 packaging/RedHat/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba
+		rm -f /etc/samba/samba.stack
 	fi
 fi
 
+#
+# For 3.0.1 we move the tdb files from /var/cache/samba to /var/lib/samba
+#
+echo "Moving tdb files in /var/cache/samba/*.tdb to /var/lib/samba/*.tdb"
+for i in /var/cache/samba/*.tdb
+do
+if [ -f $i ]; then
+        newname=`echo $i | sed -e's|var\/lock\/samba|var\/lib\/samba|'`
+        echo "Moving $i to $newname"
+        mv $i $newname
+fi
+done
+
+
 ## call ldconfig to create the version symlink for libsmbclient.so
 /sbin/ldconfig
 
@@ -439,6 +458,8 @@ 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/configure.in b/source/configure.in
index d70060af3aa..edb6576db1f 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -2713,7 +2713,7 @@ if test x"$with_ads_support" != x"no"; then
   AC_CACHE_CHECK([for key in krb5_keytab_entry],
                  samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY,[
     AC_TRY_COMPILE([#include <krb5.h>],
-      [krb5_keytab_entry entry; entry.key = NULL;],
+      [krb5_keytab_entry entry; krb5_keyblock e; entry.key = e;],
       samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY=yes,
       samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY=no)])