trying to get HEAD building again. If you want the code

[ira/wip.git] / source3 / lib / substitute.c

diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index 7ba86481560e35af8cb0659d8e73634cbc13a28b..ac2cf687c498f2fa3b79b8847d47a23194be6cfc 100644 (file)
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -58,7 +58,7 @@ void set_local_machine_name(const char* local_name, BOOL perm)
 
        fstrcpy(tmp_local_machine,local_name);
        trim_string(tmp_local_machine," "," ");
-       strlower(tmp_local_machine);
+       strlower_m(tmp_local_machine);
        alpha_strcpy(local_machine,tmp_local_machine,SAFE_NETBIOS_CHARS,sizeof(local_machine)-1);
 }
 
@@ -80,7 +80,7 @@ void set_remote_machine_name(const char* remote_name, BOOL perm)
 
        fstrcpy(tmp_remote_machine,remote_name);
        trim_string(tmp_remote_machine," "," ");
-       strlower(tmp_remote_machine);
+       strlower_m(tmp_remote_machine);
        alpha_strcpy(remote_machine,tmp_remote_machine,SAFE_NETBIOS_CHARS,sizeof(remote_machine)-1);
 }
 
@@ -111,7 +111,7 @@ void sub_set_smb_name(const char *name)
 
        fstrcpy(tmp,name);
        trim_string(tmp," "," ");
-       strlower(tmp);
+       strlower_m(tmp);
        alpha_strcpy(smb_user_name,tmp,SAFE_NETBIOS_CHARS,sizeof(smb_user_name)-1);
 }
 
@@ -331,7 +331,7 @@ void standard_sub_basic(const char *smb_name, char *str,size_t len)
                switch (*(p+1)) {
                case 'U' : 
                        fstrcpy(tmp_str, smb_name);
-                       strlower(tmp_str);
+                       strlower_m(tmp_str);
                        string_sub(p,"%U",tmp_str,l);
                        break;
                case 'G' :
@@ -344,7 +344,7 @@ void standard_sub_basic(const char *smb_name, char *str,size_t len)
                        break;
                case 'D' :
                        fstrcpy(tmp_str, current_user_info.domain);
-                       strupper(tmp_str);
+                       strupper_m(tmp_str);
                        string_sub(p,"%D", tmp_str,l);
                        break;
                case 'I' :
@@ -357,7 +357,7 @@ void standard_sub_basic(const char *smb_name, char *str,size_t len)
                                pstring temp_name;
 
                                pstrcpy(temp_name, global_myname());
-                               strlower(temp_name);
+                               strlower_m(temp_name);
                                string_sub(p,"%L", temp_name,l); 
                        }
                        break;
@@ -650,7 +650,7 @@ char *talloc_sub_advanced(TALLOC_CTX *mem_ctx,
                        const char *connectpath,
                        gid_t gid,
                        const char *smb_name,
-                       char *str)
+                       const char *str)
 {
        char *a, *t;
                a = alloc_sub_advanced(snum, user, connectpath, gid, smb_name, str);
@@ -662,7 +662,7 @@ char *talloc_sub_advanced(TALLOC_CTX *mem_ctx,
 
 char *alloc_sub_advanced(int snum, const char *user, 
                                  const char *connectpath, gid_t gid, 
-                                 const char *smb_name, char *str)
+                                 const char *smb_name, const char *str)
 {
        char *a_string, *ret_string;
        char *b, *p, *s, *t, *h;
@@ -736,14 +736,14 @@ void standard_sub_conn(connection_struct *conn, char *str, size_t len)
                        conn->gid, smb_user_name, str, len);
 }
 
-char *talloc_sub_conn(TALLOC_CTX *mem_ctx, connection_struct *conn, char *str)
+char *talloc_sub_conn(TALLOC_CTX *mem_ctx, connection_struct *conn, const char *str)
 {
        return talloc_sub_advanced(mem_ctx, SNUM(conn), conn->user,
                        conn->connectpath, conn->gid,
                        smb_user_name, str);
 }
 
-char *alloc_sub_conn(connection_struct *conn, char *str)
+char *alloc_sub_conn(connection_struct *conn, const char *str)
 {
        return alloc_sub_advanced(SNUM(conn), conn->user, conn->connectpath,
                        conn->gid, smb_user_name, str);