r5177: more updates in preparation for 3.0.11

5 files changed, 62 insertions, 25 deletions

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 7915112f89c..bc16df439b0 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -70,11 +70,46 @@ Changes since 3.0.11rc1
 commits
 -------
 o   Jeremy Allison <jra@samba.org>
+
+
 o   Timur Bakeyev <timur@com.bat.ru>
+    * BUG 2263: Guard base64_encode_data_blob() against empty blobs.
+
 o   Gerald (Jerry) Carter <jerry@samba.org>
+    * BUG 2262: Add support in configure.in for *freebsd6*.
+    * BUG 2266: Portability fixes for queota code on FreeBSD4.
+    * BUG 2264: Remove shutdown and abortshutdown commands from 
+      rpcclient in favor of using the same functions in 'net'.
+    * BUG 2295: Prevent mbd from returning an emptry servername
+      in certain lanman api calls.
+    * BUG 2290: Fix autogen.sh script in examples (based on original
+      patch from Lars Mueller).
+    * Fix bug enumerating domain trusts in security = ads.
+    * Fix segv in rpcclient's dsenumdomtrusts.
+    * Fix bug in expansion of %U and %G in included filesnames.
+    
+
 o   Guenther Deschner <gd@samba.org>
+
+
 o   Volker Lendecke <vl@samba.org>
+
+
+o   Jason Mader <jason@ncac.gwu.edu>
+    * BUG 2113, 2289: Remove dead code.
+
+
 o   Tim Potter <tpot@samba.org>
+    * Compile fixes after new setsampwent() API.
+
+
+o   Richard Renard <rrenard@idealx.com>
+    * Update Netscape DS 5.2 LDAP schema.
+
+
+o   Simo Sorce <idra@samba.org>
+    * Log a warning in testparm if a print command is defined for
+      a print service using 'printing = cups'.
 
 
 Changes since 3.0.10
diff --git a/source/VERSION b/source/VERSION
index 3784ff146c2..f4c79d16ec7 100644
--- a/source/VERSION
+++ b/source/VERSION
@@ -39,7 +39,7 @@ SAMBA_VERSION_PRE_RELEASE=
 # e.g. SAMBA_VERSION_RC_RELEASE=1                      #
 #  ->  "3.0.0rc1"                                      #
 ########################################################
-SAMBA_VERSION_RC_RELEASE=1
+SAMBA_VERSION_RC_RELEASE=
 
 ########################################################
 # To mark SVN snapshots this should be set to 'yes'    #
diff --git a/source/lib/substitute.c b/source/lib/substitute.c
index 6ec3bb4a76e..615a8d73b0a 100644
--- a/source/lib/substitute.c
+++ b/source/lib/substitute.c
@@ -135,6 +135,18 @@ void set_current_user_info(const userdom_struct *pcui)
 }
 
 /*******************************************************************
+ return the current active user name
+*******************************************************************/
+
+const char* get_current_username( void )
+{
+	if ( current_user_info.smb_name[0] == '\0' )
+		return smb_user_name;
+
+	return current_user_info.smb_name; 
+}
+
+/*******************************************************************
  Given a pointer to a %$(NAME) expand it as an environment variable.
  Return the number of characters by which the pointer should be advanced.
  Based on code by Branko Cibej <branko.cibej@hermes.si>
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 97d9389aa6c..01213a8fb39 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -1584,11 +1584,11 @@ static char *lp_string(const char *s)
 	if (!lp_talloc)
 		lp_talloc = talloc_init("lp_talloc");
 
-	tmpstr = alloc_sub_basic(current_user_info.smb_name, s);
+	tmpstr = alloc_sub_basic(get_current_username(), s);
 	if (trim_char(tmpstr, '\"', '\"')) {
 		if (strchr(tmpstr,'\"') != NULL) {
 			SAFE_FREE(tmpstr);
-			tmpstr = alloc_sub_basic(current_user_info.smb_name,s);
+			tmpstr = alloc_sub_basic(get_current_username(),s);
 		}
 	}
 	ret = talloc_strdup(lp_talloc, tmpstr);
@@ -2694,23 +2694,15 @@ static void add_to_file_list(const char *fname, const char *subfname)
 BOOL lp_file_list_changed(void)
 {
 	struct file_lists *f = file_lists;
-	char *username;
 
  	DEBUG(6, ("lp_file_list_changed()\n"));
 
-	/* get the username for substituion -- preference to the current_user_info */
-	if ( strlen( current_user_info.smb_name ) != 0 )
-		username = current_user_info.smb_name;
-	else
-		username = sub_get_smb_name();
-		
-
 	while (f) {
 		pstring n2;
 		time_t mod_time;
 
 		pstrcpy(n2, f->name);
-		standard_sub_basic( username, n2, sizeof(n2) );
+		standard_sub_basic( get_current_username(), n2, sizeof(n2) );
 
 		DEBUGADD(6, ("file %s -> %s  last mod_time: %s\n",
 			     f->name, n2, ctime(&f->modtime)));
@@ -2744,7 +2736,7 @@ static BOOL handle_netbios_name(int snum, const char *pszParmValue, char **ptr)
 
 	pstrcpy(netbios_name, pszParmValue);
 
-	standard_sub_basic(current_user_info.smb_name, netbios_name,sizeof(netbios_name));
+	standard_sub_basic(get_current_username(), netbios_name,sizeof(netbios_name));
 
 	ret = set_global_myname(netbios_name);
 	string_set(&Globals.szNetbiosName,global_myname());
@@ -2800,7 +2792,7 @@ static BOOL handle_include(int snum, const char *pszParmValue, char **ptr)
 	pstring fname;
 	pstrcpy(fname, pszParmValue);
 
-	standard_sub_basic(current_user_info.smb_name, fname,sizeof(fname));
+	standard_sub_basic(get_current_username(), fname,sizeof(fname));
 
 	add_to_file_list(pszParmValue, fname);
 
@@ -3894,19 +3886,10 @@ BOOL lp_load(const char *pszFname, BOOL global_only, BOOL save_defaults,
 	pstring n2;
 	BOOL bRetval;
 	param_opt_struct *data, *pdata;
-	char *username;
 
 	pstrcpy(n2, pszFname);
 	
-	/* get the username for substituion -- preference to the current_user_info */
-	
-	if ( strlen( current_user_info.smb_name ) != 0 ) {
-		username = current_user_info.smb_name;
-	} else {
-		username = sub_get_smb_name();
-	}
-
-	standard_sub_basic( username, n2,sizeof(n2) );
+	standard_sub_basic( get_current_username(), n2,sizeof(n2) );
 
 	add_to_file_list(pszFname, n2);
 
@@ -4046,7 +4029,7 @@ int lp_servicenumber(const char *pszServiceName)
 			 * service names
 			 */
 			fstrcpy(serviceName, ServicePtrs[iService]->szService);
-			standard_sub_basic(current_user_info.smb_name, serviceName,sizeof(serviceName));
+			standard_sub_basic(get_current_username(), serviceName,sizeof(serviceName));
 			if (strequal(serviceName, pszServiceName))
 				break;
 		}
diff --git a/source/utils/testparm.c b/source/utils/testparm.c
index e1314078311..dfd12c7a58e 100644
--- a/source/utils/testparm.c
+++ b/source/utils/testparm.c
@@ -320,6 +320,13 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_
 					   Map system can only work if force create mode excludes octal 010 (S_IXGRP).\n",
 					   lp_servicename(s) );
 			}
+#ifdef HAVE_CUPS
+			if (lp_printing(s) == PRINT_CUPS && *(lp_printcommand(s)) != '\0') {
+				 fprintf(stderr,"Warning: Service %s defines a print command, but \
+print command parameter is ignored when using CUPS libraries.\n",
+					   lp_servicename(s) );
+			}
+#endif
 		}
 	}