Author: jerry Date: 2005-02-02 16:35:57 +0000 (Wed, 02 Feb 2005) New Revision: 5177
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5177 Log: more updates in preparation for 3.0.11 Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt branches/SAMBA_3_0_RELEASE/source/VERSION branches/SAMBA_3_0_RELEASE/source/lib/substitute.c branches/SAMBA_3_0_RELEASE/source/param/loadparm.c branches/SAMBA_3_0_RELEASE/source/utils/testparm.c Changeset: Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt =================================================================== --- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2005-02-02 16:22:59 UTC (rev 5176) +++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2005-02-02 16:35:57 UTC (rev 5177) @@ -70,13 +70,48 @@ commits ------- o Jeremy Allison <[EMAIL PROTECTED]> + + o Timur Bakeyev <[EMAIL PROTECTED]> + * BUG 2263: Guard base64_encode_data_blob() against empty blobs. + o Gerald (Jerry) Carter <[EMAIL PROTECTED]> + * 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 <[EMAIL PROTECTED]> + + o Volker Lendecke <[EMAIL PROTECTED]> + + +o Jason Mader <[EMAIL PROTECTED]> + * BUG 2113, 2289: Remove dead code. + + o Tim Potter <[EMAIL PROTECTED]> + * Compile fixes after new setsampwent() API. +o Richard Renard <[EMAIL PROTECTED]> + * Update Netscape DS 5.2 LDAP schema. + + +o Simo Sorce <[EMAIL PROTECTED]> + * Log a warning in testparm if a print command is defined for + a print service using 'printing = cups'. + + Changes since 3.0.10 -------------------- Modified: branches/SAMBA_3_0_RELEASE/source/VERSION =================================================================== --- branches/SAMBA_3_0_RELEASE/source/VERSION 2005-02-02 16:22:59 UTC (rev 5176) +++ branches/SAMBA_3_0_RELEASE/source/VERSION 2005-02-02 16:35:57 UTC (rev 5177) @@ -39,7 +39,7 @@ # 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' # Modified: branches/SAMBA_3_0_RELEASE/source/lib/substitute.c =================================================================== --- branches/SAMBA_3_0_RELEASE/source/lib/substitute.c 2005-02-02 16:22:59 UTC (rev 5176) +++ branches/SAMBA_3_0_RELEASE/source/lib/substitute.c 2005-02-02 16:35:57 UTC (rev 5177) @@ -135,6 +135,18 @@ } /******************************************************************* + 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 <[EMAIL PROTECTED]> Modified: branches/SAMBA_3_0_RELEASE/source/param/loadparm.c =================================================================== --- branches/SAMBA_3_0_RELEASE/source/param/loadparm.c 2005-02-02 16:22:59 UTC (rev 5176) +++ branches/SAMBA_3_0_RELEASE/source/param/loadparm.c 2005-02-02 16:35:57 UTC (rev 5177) @@ -1584,11 +1584,11 @@ 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 @@ 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 @@ 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 @@ 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,20 +3886,11 @@ 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( get_current_username(), n2,sizeof(n2) ); - standard_sub_basic( username, n2,sizeof(n2) ); - add_to_file_list(pszFname, n2); bRetval = False; @@ -4046,7 +4029,7 @@ * 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; } Modified: branches/SAMBA_3_0_RELEASE/source/utils/testparm.c =================================================================== --- branches/SAMBA_3_0_RELEASE/source/utils/testparm.c 2005-02-02 16:22:59 UTC (rev 5176) +++ branches/SAMBA_3_0_RELEASE/source/utils/testparm.c 2005-02-02 16:35:57 UTC (rev 5177) @@ -320,6 +320,13 @@ 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 } }
