s3:dom_sid Global replace of DOM_SID with struct dom_sid

[samba.git] / source3 / lib / substitute.c

diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index 55acdd95e381d8faffc1b22a7d02eba0531ad732..b81f0a1ec8084830105403ce87ca6a5867d95118 100644 (file)
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -21,6 +21,9 @@
 
 #include "includes.h"
 
+static char *alloc_sub_basic(const char *smb_name, const char *domain_name,
+                            const char *str);
+
 userdom_struct current_user_info;
 fstring remote_proto="UNKNOWN";
 
@@ -310,7 +313,7 @@ static char * realloc_expand_env_var(char *str, char *p)
 
 static char *longvar_domainsid( void )
 {
-       DOM_SID sid;
+       struct dom_sid sid;
        fstring tmp;
        char *sid_string;
 
@@ -544,8 +547,8 @@ char *talloc_sub_basic(TALLOC_CTX *mem_ctx, const char *smb_name,
 /****************************************************************************
 ****************************************************************************/
 
-char *alloc_sub_basic(const char *smb_name, const char *domain_name,
-                     const char *str)
+static char *alloc_sub_basic(const char *smb_name, const char *domain_name,
+                            const char *str)
 {
        char *b, *p, *s, *r, *a_string;
        fstring pidstr, vnnstr;