Changeset 77 for trunk/samba/source/lib/substitute.c

Timestamp:

Sep 30, 2007, 3:42:50 AM (18 years ago)

Author:

Paul Smedley

Message:

Update trunk to 3.2.0pre1

File:

• trunk/samba/source/lib/substitute.c (modified) (11 diffs)

trunk/samba/source/lib/substitute.c

@@ -7 +7 @@
    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 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
@@ -16 +16 @@
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
@@ -142 +141 @@
 }
 
-char* sub_get_smb_name( void )
-{
-        return smb_user_name;
-}
-
 /*******************************************************************
  Setup the strings used by substitutions. Called per packet. Ensure
@@ -156 +150 @@
         current_user_info = *pcui;
         /* The following is safe as current_user_info.smb_name
-         * has already been sanitised in register_vuid. */
+         * has already been sanitised in register_existing_vuid. */
         fstrcpy(smb_user_name, current_user_info.smb_name);
 }
@@ -265 +259 @@
 };
 
-struct api_longvar longvar_table[] = {
+static struct api_longvar longvar_table[] = {
         { "DomainSID",          longvar_domainsid },
         { NULL,                 NULL }
@@ -341 +335 @@
 static char *automount_path(const char *user_name)
 {
-        static pstring server_path;
+        pstring server_path;
 
         /* use the passwd entry as the default */
@@ -370 +364 @@
         DEBUG(4,("Home server path: %s\n", server_path));
 
-        return server_path;
+        return talloc_strdup(talloc_tos(), server_path);
 }
 
@@ -381 +375 @@
 static const char *automount_server(const char *user_name)
 {
-        static pstring server_name;
+        pstring server_name;
         const char *local_machine_name = get_local_machine_name(); 
 
@@ -407 +401 @@
         DEBUG(4,("Home server: %s\n", server_name));
 
-        return server_name;
+        return talloc_strdup(talloc_tos(), server_name);
 }
 
@@ -454 +448 @@
 {
         char *b, *p, *s, *r, *a_string;
-        fstring pidstr;
+        fstring pidstr, vnnstr;
         struct passwd *pass;
         const char *local_machine_name = get_local_machine_name();
@@ -552 +546 @@
                 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);
                         break;
                 default: