s3-lib Replace StrnCaseCmp() with strncasecmp_m()

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

diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index 399ef1daa3be603984b0aefaa602d72457b4d209..b246a17132fcfed74a58664f050e174b12ccbdb1 100644 (file)
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -20,7 +20,9 @@
 
 
 #include "includes.h"
+#include "system/passwd.h"
 #include "secrets.h"
+#include "auth.h"
 
 static char *alloc_sub_basic(const char *smb_name, const char *domain_name,
                             const char *str);
@@ -630,7 +632,7 @@ static char *alloc_sub_basic(const char *smb_name, const char *domain_name,
                                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) {
@@ -917,9 +919,9 @@ char *standard_sub_conn(TALLOC_CTX *ctx, connection_struct *conn, const char *st
 {
        return talloc_sub_advanced(ctx,
                                lp_servicename(SNUM(conn)),
-                               conn->server_info->unix_name,
+                               conn->session_info->unix_name,
                                conn->connectpath,
-                               conn->server_info->utok.gid,
+                               conn->session_info->utok.gid,
                                get_smb_user_name(),
                                "",
                                str);