lib: Move "iov_buf.[ch]" to lib/util
[obnox/samba/samba-obnox.git] / source3 / lib / substitute.c
index 80feee95790d4323d418d3d263837827fa8b6cf8..ce4fbbab73d4d915f5816eca4e8d815e7327289b 100644 (file)
@@ -3,25 +3,26 @@
    string substitution functions
    Copyright (C) Andrew Tridgell 1992-2000
    Copyright (C) Gerald Carter   2006
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
 #include "includes.h"
-
-extern struct current_user current_user;
+#include "system/passwd.h"
+#include "secrets.h"
+#include "auth.h"
 
 userdom_struct current_user_info;
 fstring remote_proto="UNKNOWN";
@@ -34,49 +35,42 @@ fstring remote_proto="UNKNOWN";
 
 static char *local_machine;
 
+void free_local_machine_name(void)
+{
+       TALLOC_FREE(local_machine);
+}
+
 bool set_local_machine_name(const char *local_name, bool perm)
 {
        static bool already_perm = false;
        char *tmp_local_machine = NULL;
-       char addr[INET6_ADDRSTRLEN];
        size_t len;
 
-       tmp_local_machine = SMB_STRDUP(local_name);
+       if (already_perm) {
+               return true;
+       }
+
+       tmp_local_machine = talloc_strdup(NULL, local_name);
        if (!tmp_local_machine) {
                return false;
        }
        trim_char(tmp_local_machine,' ',' ');
 
-       /*
-        * Windows NT/2k uses "*SMBSERVER" and XP uses "*SMBSERV"
-        * arrggg!!!
-        */
-
-       if (strequal(tmp_local_machine, "*SMBSERVER") ||
-                       strequal(tmp_local_machine, "*SMBSERV") )  {
-               SAFE_FREE(local_machine);
-               local_machine = SMB_STRDUP(client_socket_addr(get_client_fd(),
-                                       addr, sizeof(addr)) );
-               SAFE_FREE(tmp_local_machine);
-               return local_machine ? true : false;
-       }
-
-       if (already_perm) {
-               return true;
-       }
-
-       SAFE_FREE(local_machine);
+       TALLOC_FREE(local_machine);
        len = strlen(tmp_local_machine);
-       local_machine = SMB_CALLOC_ARRAY(char, len+1);
+       local_machine = (char *)TALLOC_ZERO(NULL, len+1);
        if (!local_machine) {
-               SAFE_FREE(tmp_local_machine);
+               TALLOC_FREE(tmp_local_machine);
                return false;
        }
        /* alpha_strcpy includes the space for the terminating nul. */
        alpha_strcpy(local_machine,tmp_local_machine,
                        SAFE_NETBIOS_CHARS,len+1);
-       strlower_m(local_machine);
-       SAFE_FREE(tmp_local_machine);
+       if (!strlower_m(local_machine)) {
+               TALLOC_FREE(tmp_local_machine);
+               return false;
+       }
+       TALLOC_FREE(tmp_local_machine);
 
        already_perm = perm;
 
@@ -86,7 +80,7 @@ bool set_local_machine_name(const char *local_name, bool perm)
 const char *get_local_machine_name(void)
 {
        if (!local_machine || !*local_machine) {
-               return global_myname();
+               return lp_netbios_name();
        }
 
        return local_machine;
@@ -110,25 +104,28 @@ bool set_remote_machine_name(const char *remote_name, bool perm)
                return true;
        }
 
-       tmp_remote_machine = SMB_STRDUP(remote_name);
+       tmp_remote_machine = talloc_strdup(NULL, remote_name);
        if (!tmp_remote_machine) {
                return false;
        }
        trim_char(tmp_remote_machine,' ',' ');
 
-       SAFE_FREE(remote_machine);
+       TALLOC_FREE(remote_machine);
        len = strlen(tmp_remote_machine);
-       remote_machine = SMB_CALLOC_ARRAY(char, len+1);
+       remote_machine = (char *)TALLOC_ZERO(NULL, len+1);
        if (!remote_machine) {
-               SAFE_FREE(tmp_remote_machine);
+               TALLOC_FREE(tmp_remote_machine);
                return false;
        }
 
        /* alpha_strcpy includes the space for the terminating nul. */
        alpha_strcpy(remote_machine,tmp_remote_machine,
                        SAFE_NETBIOS_CHARS,len+1);
-       strlower_m(remote_machine);
-       SAFE_FREE(tmp_remote_machine);
+       if (!strlower_m(remote_machine)) {
+               TALLOC_FREE(tmp_remote_machine);
+               return false;
+       }
+       TALLOC_FREE(tmp_remote_machine);
 
        already_perm = perm;
 
@@ -157,17 +154,20 @@ void sub_set_smb_name(const char *name)
                return;
        }
 
-       tmp = SMB_STRDUP(name);
+       tmp = talloc_strdup(NULL, name);
        if (!tmp) {
                return;
        }
        trim_char(tmp, ' ', ' ');
-       strlower_m(tmp);
+       if (!strlower_m(tmp)) {
+               TALLOC_FREE(tmp);
+               return;
+       }
 
        len = strlen(tmp);
 
        if (len == 0) {
-               SAFE_FREE(tmp);
+               TALLOC_FREE(tmp);
                return;
        }
 
@@ -180,10 +180,10 @@ void sub_set_smb_name(const char *name)
                is_machine_account = True;
        }
 
-       SAFE_FREE(smb_user_name);
-       smb_user_name = SMB_CALLOC_ARRAY(char, len+1);
+       TALLOC_FREE(smb_user_name);
+       smb_user_name = (char *)TALLOC_ZERO(NULL, len+1);
        if (!smb_user_name) {
-               SAFE_FREE(tmp);
+               TALLOC_FREE(tmp);
                return;
        }
 
@@ -192,7 +192,7 @@ void sub_set_smb_name(const char *name)
                        SAFE_NETBIOS_CHARS,
                        len+1);
 
-       SAFE_FREE(tmp);
+       TALLOC_FREE(tmp);
 
        if (is_machine_account) {
                len = strlen(smb_user_name);
@@ -200,6 +200,38 @@ void sub_set_smb_name(const char *name)
        }
 }
 
+static char sub_peeraddr[INET6_ADDRSTRLEN];
+static const char *sub_peername = NULL;
+static char sub_sockaddr[INET6_ADDRSTRLEN];
+
+void sub_set_socket_ids(const char *peeraddr, const char *peername,
+                       const char *sockaddr)
+{
+       const char *addr = peeraddr;
+
+       if (strnequal(addr, "::ffff:", 7)) {
+               addr += 7;
+       }
+       strlcpy(sub_peeraddr, addr, sizeof(sub_peeraddr));
+
+       if (sub_peername != NULL &&
+                       sub_peername != sub_peeraddr) {
+               talloc_free(discard_const_p(char,sub_peername));
+               sub_peername = NULL;
+       }
+       sub_peername = talloc_strdup(NULL, peername);
+       if (sub_peername == NULL) {
+               sub_peername = sub_peeraddr;
+       }
+
+       /*
+        * Shouldn't we do the ::ffff: cancellation here as well? The
+        * original code in talloc_sub_basic() did not do it, so I'm
+        * leaving it out here as well for compatibility.
+        */
+       strlcpy(sub_sockaddr, sockaddr, sizeof(sub_sockaddr));
+}
+
 static const char *get_smb_user_name(void)
 {
        return smb_user_name ? smb_user_name : "";
@@ -208,11 +240,17 @@ static const char *get_smb_user_name(void)
 /*******************************************************************
  Setup the strings used by substitutions. Called per packet. Ensure
  %U name is set correctly also.
+
+ smb_name must be sanitized by alpha_strcpy
 ********************************************************************/
 
-void set_current_user_info(const userdom_struct *pcui)
+void set_current_user_info(const char *smb_name, const char *unix_name,
+                          const char *domain)
 {
-       current_user_info = *pcui;
+       fstrcpy(current_user_info.smb_name, smb_name);
+       fstrcpy(current_user_info.unix_name, unix_name);
+       fstrcpy(current_user_info.domain, domain);
+
        /* The following is safe as current_user_info.smb_name
         * has already been sanitised in register_existing_vuid. */
 
@@ -235,13 +273,14 @@ const char *get_current_username(void)
 /*******************************************************************
  Given a pointer to a %$(NAME) in p and the whole string in str
  expand it as an environment variable.
+ str must be a talloced string.
  Return a new allocated and expanded string.
  Based on code by Branko Cibej <branko.cibej@hermes.si>
  When this is called p points at the '%' character.
  May substitute multiple occurrencies of the same env var.
 ********************************************************************/
 
-static char * realloc_expand_env_var(char *str, char *p)
+static char *realloc_expand_env_var(char *str, char *p)
 {
        char *envname;
        char *envval;
@@ -267,18 +306,18 @@ static char * realloc_expand_env_var(char *str, char *p)
 
        r = p + 3;
        copylen = q - r;
-       
+
        /* reserve space for use later add %$() chars */
-       if ( (envname = (char *)SMB_MALLOC(copylen + 1 + 4)) == NULL ) {
+       if ( (envname = talloc_array(talloc_tos(), char, copylen + 1 + 4)) == NULL ) {
                return NULL;
        }
-       
+
        strncpy(envname,r,copylen);
        envname[copylen] = '\0';
 
        if ((envval = getenv(envname)) == NULL) {
                DEBUG(0,("expand_env_var: Environment variable [%s] not set\n", envname));
-               SAFE_FREE(envname);
+               TALLOC_FREE(envname);
                return str;
        }
 
@@ -291,106 +330,7 @@ static char * realloc_expand_env_var(char *str, char *p)
        strncpy(envname,p,copylen);
        envname[copylen] = '\0';
        r = realloc_string_sub(str, envname, envval);
-       SAFE_FREE(envname);
-               
-       return r;
-}
-
-/*******************************************************************
-*******************************************************************/
-
-static char *longvar_domainsid( void )
-{
-       DOM_SID sid;
-       fstring tmp;
-       char *sid_string;
-       
-       if ( !secrets_fetch_domain_sid( lp_workgroup(), &sid ) ) {
-               return NULL;
-       }
-       
-       sid_string = SMB_STRDUP( sid_to_fstring( tmp, &sid ) );
-       
-       if ( !sid_string ) {
-               DEBUG(0,("longvar_domainsid: failed to dup SID string!\n"));
-       }
-       
-       return sid_string;
-}
-
-/*******************************************************************
-*******************************************************************/
-
-struct api_longvar {
-       const char *name;
-       char* (*fn)( void );
-};
-
-static struct api_longvar longvar_table[] = {
-       { "DomainSID",          longvar_domainsid },
-       { NULL,                 NULL }
-};
-
-static char *get_longvar_val( const char *varname )
-{
-       int i;
-       
-       DEBUG(7,("get_longvar_val: expanding variable [%s]\n", varname));
-       
-       for ( i=0; longvar_table[i].name; i++ ) {
-               if ( strequal( longvar_table[i].name, varname ) ) {
-                       return longvar_table[i].fn();
-               }
-       }
-       
-       return NULL;
-}
-
-/*******************************************************************
- Expand the long smb.conf variable names given a pointer to a %(NAME).
- Return the number of characters by which the pointer should be advanced.
- When this is called p points at the '%' character.
-********************************************************************/
-
-static char *realloc_expand_longvar(char *str, char *p)
-{
-       fstring varname;
-       char *value;
-       char *q, *r;
-       int copylen;
-
-       if ( p[0] != '%' || p[1] != '(' ) {
-               return str;
-       }
-
-       /* Look for the terminating ')'.*/
-
-       if ((q = strchr_m(p,')')) == NULL) {
-               DEBUG(0,("realloc_expand_longvar: Unterminated environment variable [%s]\n", p));
-               return str;
-       }
-
-       /* Extract the name from within the %(NAME) string.*/
-
-       r = p+2;
-       copylen = MIN( (q-r), (sizeof(varname)-1) );
-       strncpy(varname, r, copylen);
-       varname[copylen] = '\0';
-
-       if ((value = get_longvar_val(varname)) == NULL) {
-               DEBUG(0,("realloc_expand_longvar: Variable [%s] not set.  Skipping\n", varname));
-               return str;
-       }
-
-       /* Copy the full %(NAME) into envname so it can be replaced.*/
-
-       copylen = MIN( (q+1-p),(sizeof(varname)-1) );
-       strncpy( varname, p, copylen );
-       varname[copylen] = '\0';
-       r = realloc_string_sub(str, varname, value);
-       SAFE_FREE( value );
-
-       /* skip over the %(varname) */
+       TALLOC_FREE(envname);
 
        return r;
 }
@@ -415,7 +355,7 @@ static const char *automount_path(const char *user_name)
 
 #if (defined(HAVE_NETGROUP) && defined (WITH_AUTOMOUNT))
 
-       if (lp_nis_home_map()) {
+       if (lp_nis_homedir()) {
                const char *home_path_start;
                char *automount_value = automount_lookup(ctx, user_name);
 
@@ -428,6 +368,9 @@ static const char *automount_path(const char *user_name)
                                                (home_path_start+1):""));
                                server_path = talloc_strdup(ctx,
                                                        home_path_start+1);
+                               if (!server_path) {
+                                       server_path = "";
+                               }
                        }
                } else {
                        /* NIS key lookup failed: default to
@@ -438,9 +381,6 @@ static const char *automount_path(const char *user_name)
        }
 #endif
 
-       if (!server_path) {
-               server_path = "";
-       }
        DEBUG(4,("Home server path: %s\n", server_path));
        return server_path;
 }
@@ -462,7 +402,7 @@ static const char *automount_server(const char *user_name)
        if (local_machine_name && *local_machine_name) {
                server_name = talloc_strdup(ctx, local_machine_name);
        } else {
-               server_name = talloc_strdup(ctx, global_myname());
+               server_name = talloc_strdup(ctx, lp_netbios_name());
        }
 
        if (!server_name) {
@@ -470,7 +410,7 @@ static const char *automount_server(const char *user_name)
        }
 
 #if (defined(HAVE_NETGROUP) && defined (WITH_AUTOMOUNT))
-       if (lp_nis_home_map()) {
+       if (lp_nis_homedir()) {
                char *p;
                char *srv;
                char *automount_value = automount_lookup(ctx, user_name);
@@ -478,6 +418,9 @@ static const char *automount_server(const char *user_name)
                        return "";
                }
                srv = talloc_strdup(ctx, automount_value);
+               if (!srv) {
+                       return "";
+               }
                p = strchr_m(srv, ':');
                if (!p) {
                        return "";
@@ -489,9 +432,6 @@ static const char *automount_server(const char *user_name)
        }
 #endif
 
-       if (!server_name) {
-               server_name = "";
-       }
        DEBUG(4,("Home server: %s\n", server_name));
        return server_name;
 }
@@ -506,65 +446,52 @@ void standard_sub_basic(const char *smb_name, const char *domain_name,
                        char *str, size_t len)
 {
        char *s;
-       
-       if ( (s = alloc_sub_basic( smb_name, domain_name, str )) != NULL ) {
+
+       if ( (s = talloc_sub_basic(talloc_tos(), smb_name, domain_name, str )) != NULL ) {
                strncpy( str, s, len );
        }
-       
-       SAFE_FREE( s );
-       
-}
 
-/****************************************************************************
- Do some standard substitutions in a string.
- This function will return an allocated string that have to be freed.
-****************************************************************************/
-
-char *talloc_sub_basic(TALLOC_CTX *mem_ctx, const char *smb_name,
-                      const char *domain_name, const char *str)
-{
-       char *a, *t;
-       
-       if ( (a = alloc_sub_basic(smb_name, domain_name, str)) == NULL ) {
-               return NULL;
-       }
-       t = talloc_strdup(mem_ctx, a);
-       SAFE_FREE(a);
-       return t;
+       TALLOC_FREE( s );
 }
 
 /****************************************************************************
+ Do some standard substitutions in a string.
+ This function will return an talloced string that has to be freed.
 ****************************************************************************/
 
-char *alloc_sub_basic(const char *smb_name, const char *domain_name,
-                     const char *str)
+char *talloc_sub_basic(TALLOC_CTX *mem_ctx,
+                       const char *smb_name,
+                       const char *domain_name,
+                       const char *str)
 {
        char *b, *p, *s, *r, *a_string;
        fstring pidstr, vnnstr;
-       char addr[INET6_ADDRSTRLEN];
        const char *local_machine_name = get_local_machine_name();
+       TALLOC_CTX *tmp_ctx = NULL;
 
        /* workaround to prevent a crash while looking at bug #687 */
-       
+
        if (!str) {
-               DEBUG(0,("alloc_sub_basic: NULL source string!  This should not happen\n"));
+               DEBUG(0,("talloc_sub_basic: NULL source string!  This should not happen\n"));
                return NULL;
        }
-       
-       a_string = SMB_STRDUP(str);
+
+       a_string = talloc_strdup(mem_ctx, str);
        if (a_string == NULL) {
-               DEBUG(0, ("alloc_sub_basic: Out of memory!\n"));
+               DEBUG(0, ("talloc_sub_basic: Out of memory!\n"));
                return NULL;
        }
-       
+
+       tmp_ctx = talloc_stackframe();
+
        for (b = s = a_string; (p = strchr_m(s, '%')); s = a_string + (p - b)) {
 
                r = NULL;
                b = a_string;
-               
+
                switch (*(p+1)) {
                case 'U' : 
-                       r = strdup_lower(smb_name);
+                       r = strlower_talloc(tmp_ctx, smb_name);
                        if (r == NULL) {
                                goto error;
                        }
@@ -572,11 +499,21 @@ char *alloc_sub_basic(const char *smb_name, const char *domain_name,
                        break;
                case 'G' : {
                        struct passwd *pass;
-                       r = SMB_STRDUP(smb_name);
+
+                       if (domain_name != NULL && domain_name[0] != '\0') {
+                               r = talloc_asprintf(tmp_ctx,
+                                                   "%s%c%s",
+                                                   domain_name,
+                                                   *lp_winbind_separator(),
+                                                   smb_name);
+                       } else {
+                               r = talloc_strdup(tmp_ctx, smb_name);
+                       }
                        if (r == NULL) {
                                goto error;
                        }
-                       pass = Get_Pwnam_alloc(talloc_tos(), r);
+
+                       pass = Get_Pwnam_alloc(tmp_ctx, r);
                        if (pass != NULL) {
                                a_string = realloc_string_sub(
                                        a_string, "%G",
@@ -586,58 +523,65 @@ char *alloc_sub_basic(const char *smb_name, const char *domain_name,
                        break;
                }
                case 'D' :
-                       r = strdup_upper(domain_name);
+                       r = strupper_talloc(tmp_ctx, domain_name);
                        if (r == NULL) {
                                goto error;
                        }
                        a_string = realloc_string_sub(a_string, "%D", r);
                        break;
-               case 'I' :
-                       a_string = realloc_string_sub(a_string, "%I",
-                                       client_addr(get_client_fd(),addr, sizeof(addr)));
+               case 'I' : {
+                       a_string = realloc_string_sub(
+                               a_string, "%I",
+                               sub_peeraddr[0] ? sub_peeraddr : "0.0.0.0");
                        break;
+               }
                case 'i': 
-                       a_string = realloc_string_sub( a_string, "%i",
-                                       client_socket_addr(get_client_fd(), addr, sizeof(addr)) );
+                       a_string = realloc_string_sub(
+                               a_string, "%i",
+                               sub_sockaddr[0] ? sub_sockaddr : "0.0.0.0");
                        break;
                case 'L' : 
-                       if ( StrnCaseCmp(p, "%LOGONSERVER%", strlen("%LOGONSERVER%")) == 0 ) {
+                       if ( strncasecmp_m(p, "%LOGONSERVER%", strlen("%LOGONSERVER%")) == 0 ) {
                                break;
                        }
                        if (local_machine_name && *local_machine_name) {
                                a_string = realloc_string_sub(a_string, "%L", local_machine_name); 
                        } else {
-                               a_string = realloc_string_sub(a_string, "%L", global_myname()); 
+                               a_string = realloc_string_sub(a_string, "%L", lp_netbios_name());
                        }
                        break;
                case 'N':
                        a_string = realloc_string_sub(a_string, "%N", automount_server(smb_name));
                        break;
                case 'M' :
-                       a_string = realloc_string_sub(a_string, "%M", client_name(get_client_fd()));
+                       a_string = realloc_string_sub(a_string, "%M",
+                                                     sub_peername ? sub_peername : "");
                        break;
                case 'R' :
                        a_string = realloc_string_sub(a_string, "%R", remote_proto);
                        break;
                case 'T' :
-                       a_string = realloc_string_sub(a_string, "%T", current_timestring(False));
+                       a_string = realloc_string_sub(a_string, "%T", current_timestring(tmp_ctx, False));
                        break;
                case 'a' :
                        a_string = realloc_string_sub(a_string, "%a",
                                        get_remote_arch_str());
                        break;
                case 'd' :
-                       slprintf(pidstr,sizeof(pidstr)-1, "%d",(int)sys_getpid());
+                       slprintf(pidstr,sizeof(pidstr)-1, "%d",(int)getpid());
                        a_string = realloc_string_sub(a_string, "%d", pidstr);
                        break;
                case 'h' :
                        a_string = realloc_string_sub(a_string, "%h", myhostname());
                        break;
                case 'm' :
-                       a_string = realloc_string_sub(a_string, "%m", remote_machine);
+                       a_string = realloc_string_sub(a_string, "%m",
+                                                     remote_machine
+                                                     ? remote_machine
+                                                     : "");
                        break;
                case 'v' :
-                       a_string = realloc_string_sub(a_string, "%v", SAMBA_VERSION_STRING);
+                       a_string = realloc_string_sub(a_string, "%v", samba_version_string());
                        break;
                case 'w' :
                        a_string = realloc_string_sub(a_string, "%w", lp_winbind_separator());
@@ -645,9 +589,6 @@ char *alloc_sub_basic(const char *smb_name, const char *domain_name,
                case '$' :
                        a_string = realloc_expand_env_var(a_string, p); /* Expand environment variables */
                        break;
-               case '(':
-                       a_string = realloc_expand_longvar( a_string, p );
-                       break;
                case 'V' :
                        slprintf(vnnstr,sizeof(vnnstr)-1, "%u", get_my_vnn());
                        a_string = realloc_string_sub(a_string, "%V", vnnstr);
@@ -657,18 +598,21 @@ char *alloc_sub_basic(const char *smb_name, const char *domain_name,
                }
 
                p++;
-               SAFE_FREE(r);
-               
-               if ( !a_string ) {
-                       return NULL;
+               TALLOC_FREE(r);
+
+               if (a_string == NULL) {
+                       goto done;
                }
        }
 
-       return a_string;
+       goto done;
 
 error:
-       SAFE_FREE(a_string);
-       return NULL;
+       TALLOC_FREE(a_string);
+
+done:
+       TALLOC_FREE(tmp_ctx);
+       return a_string;
 }
 
 /****************************************************************************
@@ -679,6 +623,7 @@ error:
 char *talloc_sub_specified(TALLOC_CTX *mem_ctx,
                        const char *input_string,
                        const char *username,
+                       const char *grpname,
                        const char *domain,
                        uid_t uid,
                        gid_t gid)
@@ -698,11 +643,11 @@ char *talloc_sub_specified(TALLOC_CTX *mem_ctx,
                DEBUG(0, ("talloc_sub_specified: Out of memory!\n"));
                goto done;
        }
-       
+
        for (b = s = a_string; (p = strchr_m(s, '%')); s = a_string + (p - b)) {
-               
+
                b = a_string;
-               
+
                switch (*(p+1)) {
                case 'U' : 
                        a_string = talloc_string_sub(
@@ -714,9 +659,18 @@ char *talloc_sub_specified(TALLOC_CTX *mem_ctx,
                        break;
                case 'G' :
                        if (gid != -1) {
-                               a_string = talloc_string_sub(
-                                       tmp_ctx, a_string, "%G",
-                                       gidtoname(gid));
+                               const char *name;
+
+                               if (grpname != NULL) {
+                                       name = grpname;
+                               } else {
+                                       name = gidtoname(gid);
+                               }
+
+                               a_string = talloc_string_sub(tmp_ctx,
+                                                            a_string,
+                                                            "%G",
+                                                            name);
                        } else {
                                a_string = talloc_string_sub(
                                        tmp_ctx, a_string,
@@ -725,9 +679,18 @@ char *talloc_sub_specified(TALLOC_CTX *mem_ctx,
                        break;
                case 'g' :
                        if (gid != -1) {
-                               a_string = talloc_string_sub(
-                                       tmp_ctx, a_string, "%g",
-                                       gidtoname(gid));
+                               const char *name;
+
+                               if (grpname != NULL) {
+                                       name = grpname;
+                               } else {
+                                       name = gidtoname(gid);
+                               }
+
+                               a_string = talloc_string_sub(tmp_ctx,
+                                                            a_string,
+                                                            "%g",
+                                                            name);
                        } else {
                                a_string = talloc_string_sub(
                                        tmp_ctx, a_string, "%g", "NO_GROUP");
@@ -765,24 +728,28 @@ char *talloc_sub_specified(TALLOC_CTX *mem_ctx,
 /****************************************************************************
 ****************************************************************************/
 
-static char *alloc_sub_advanced(const char *servicename, const char *user, 
-                        const char *connectpath, gid_t gid, 
-                        const char *smb_name, const char *domain_name,
-                        const char *str)
+char *talloc_sub_advanced(TALLOC_CTX *ctx,
+                       const char *servicename,
+                       const char *user,
+                       const char *connectpath,
+                       gid_t gid,
+                       const char *smb_name,
+                       const char *domain_name,
+                       const char *str)
 {
        char *a_string, *ret_string;
        char *b, *p, *s;
 
-       a_string = SMB_STRDUP(str);
+       a_string = talloc_strdup(talloc_tos(), str);
        if (a_string == NULL) {
-               DEBUG(0, ("alloc_sub_advanced: Out of memory!\n"));
+               DEBUG(0, ("talloc_sub_advanced: Out of memory!\n"));
                return NULL;
        }
-       
+
        for (b = s = a_string; (p = strchr_m(s, '%')); s = a_string + (p - b)) {
-               
+
                b = a_string;
-               
+
                switch (*(p+1)) {
                case 'N' :
                        a_string = realloc_string_sub(a_string, "%N", automount_server(user));
@@ -806,7 +773,7 @@ static char *alloc_sub_advanced(const char *servicename, const char *user,
                case 'u': 
                        a_string = realloc_string_sub(a_string, "%u", user); 
                        break;
-                       
+
                        /* Patch from jkf@soton.ac.uk Left the %N (NIS
                         * server name) in standard_sub_basic as it is
                         * a feature for logon servers, hence uses the
@@ -818,7 +785,7 @@ static char *alloc_sub_advanced(const char *servicename, const char *user,
                        a_string = realloc_string_sub(a_string, "%p",
                                                      automount_path(servicename)); 
                        break;
-                       
+
                default: 
                        break;
                }
@@ -829,62 +796,52 @@ static char *alloc_sub_advanced(const char *servicename, const char *user,
                }
        }
 
-       ret_string = alloc_sub_basic(smb_name, domain_name, a_string);
-       SAFE_FREE(a_string);
+       ret_string = talloc_sub_basic(ctx, smb_name, domain_name, a_string);
+       TALLOC_FREE(a_string);
        return ret_string;
 }
 
-/*
- * This obviously is inefficient and needs to be merged into
- * alloc_sub_advanced...
- */
-
-char *talloc_sub_advanced(TALLOC_CTX *mem_ctx,
-                         const char *servicename, const char *user,
-                         const char *connectpath, gid_t gid,
-                         const char *smb_name, const char *domain_name,
-                         const char *str)
-{
-       char *a, *t;
-
-       if (!(a = alloc_sub_advanced(servicename, user, connectpath, gid,
-                                    smb_name, domain_name, str))) {
-               return NULL;
-       }
-       t = talloc_strdup(mem_ctx, a);
-       SAFE_FREE(a);
-       return t;
-}
-
-
 void standard_sub_advanced(const char *servicename, const char *user,
                           const char *connectpath, gid_t gid,
                           const char *smb_name, const char *domain_name,
                           char *str, size_t len)
 {
-       char *s;
-
-       s = alloc_sub_advanced(servicename, user, connectpath,
-                              gid, smb_name, domain_name, str);
+       char *s = talloc_sub_advanced(talloc_tos(),
+                               servicename, user, connectpath,
+                               gid, smb_name, domain_name, str);
 
-       if ( s ) {
-               strncpy( str, s, len );
-               SAFE_FREE( s );
+       if (!s) {
+               return;
        }
+       strlcpy( str, s, len );
+       TALLOC_FREE( s );
 }
 
-/****************************************************************************
- Do some standard substitutions in a string.
-****************************************************************************/
+/******************************************************************************
+ version of standard_sub_basic() for string lists; uses talloc_sub_basic()
+ for the work
+ *****************************************************************************/
 
-char *standard_sub_conn(TALLOC_CTX *ctx, connection_struct *conn, const char *str)
+bool str_list_sub_basic( char **list, const char *smb_name,
+                        const char *domain_name )
 {
-       return talloc_sub_advanced(ctx,
-                               lp_servicename(SNUM(conn)),
-                               conn->user,
-                               conn->connectpath,
-                               conn->gid,
-                               get_smb_user_name(),
-                               "",
-                               str);
+       TALLOC_CTX *ctx = list;
+       char *s, *tmpstr;
+
+       while ( *list ) {
+               s = *list;
+               tmpstr = talloc_sub_basic(ctx, smb_name, domain_name, s);
+               if ( !tmpstr ) {
+                       DEBUG(0,("str_list_sub_basic: "
+                               "talloc_sub_basic() return NULL!\n"));
+                       return false;
+               }
+
+               TALLOC_FREE(*list);
+               *list = tmpstr;
+
+               list++;
+       }
+
+       return true;
 }