Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test

[tprouty/samba.git] / source / auth / session.c

diff --git a/source/auth/session.c b/source/auth/session.c
index 0557187199a27a9ab398e686545cdec4d5499ea7..d75f1793e199c29405ffe8e7f2fdd4a15b1ac901 100644 (file)
--- a/source/auth/session.c
+++ b/source/auth/session.c
@@ -28,19 +28,23 @@
 #include "dsdb/samdb/samdb.h"
 #include "auth/credentials/credentials.h"
 #include "param/param.h"
+#include "auth/session_proto.h"
 
-struct auth_session_info *anonymous_session(TALLOC_CTX *mem_ctx) 
+_PUBLIC_ struct auth_session_info *anonymous_session(TALLOC_CTX *mem_ctx, 
+                                           struct event_context *event_ctx, 
+                                           struct loadparm_context *lp_ctx) 
 {
        NTSTATUS nt_status;
        struct auth_session_info *session_info = NULL;
-       nt_status = auth_anonymous_session_info(mem_ctx, global_loadparm, &session_info);
+       nt_status = auth_anonymous_session_info(mem_ctx, event_ctx, lp_ctx, &session_info);
        if (!NT_STATUS_IS_OK(nt_status)) {
                return NULL;
        }
        return session_info;
 }
 
-NTSTATUS auth_anonymous_session_info(TALLOC_CTX *parent_ctx, 
+_PUBLIC_ NTSTATUS auth_anonymous_session_info(TALLOC_CTX *parent_ctx, 
+                                    struct event_context *event_ctx, 
                                     struct loadparm_context *lp_ctx,
                                     struct auth_session_info **_session_info) 
 {
@@ -58,7 +62,7 @@ NTSTATUS auth_anonymous_session_info(TALLOC_CTX *parent_ctx,
        }
 
        /* references the server_info into the session_info */
-       nt_status = auth_generate_session_info(parent_ctx, server_info, &session_info);
+       nt_status = auth_generate_session_info(parent_ctx, event_ctx, lp_ctx, server_info, &session_info);
        talloc_free(mem_ctx);
 
        NT_STATUS_NOT_OK_RETURN(nt_status);
@@ -76,7 +80,7 @@ NTSTATUS auth_anonymous_session_info(TALLOC_CTX *parent_ctx,
        return NT_STATUS_OK;
 }
 
-NTSTATUS auth_anonymous_server_info(TALLOC_CTX *mem_ctx, 
+_PUBLIC_ NTSTATUS auth_anonymous_server_info(TALLOC_CTX *mem_ctx, 
                                    const char *netbios_name,
                                    struct auth_serversupplied_info **_server_info) 
 {
@@ -94,14 +98,14 @@ NTSTATUS auth_anonymous_server_info(TALLOC_CTX *mem_ctx,
        server_info->n_domain_groups = 0;
        server_info->domain_groups = NULL;
 
-       /* annoying, but the Anonymous really does have a session key, 
-          and it is all zeros! */
+       /* annoying, but the Anonymous really does have a session key... */
        server_info->user_session_key = data_blob_talloc(server_info, NULL, 16);
        NT_STATUS_HAVE_NO_MEMORY(server_info->user_session_key.data);
 
        server_info->lm_session_key = data_blob_talloc(server_info, NULL, 16);
        NT_STATUS_HAVE_NO_MEMORY(server_info->lm_session_key.data);
 
+       /*  and it is all zeros! */
        data_blob_clear(&server_info->user_session_key);
        data_blob_clear(&server_info->lm_session_key);
 
@@ -148,7 +152,9 @@ NTSTATUS auth_anonymous_server_info(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
-NTSTATUS auth_generate_session_info(TALLOC_CTX *mem_ctx, 
+_PUBLIC_ NTSTATUS auth_generate_session_info(TALLOC_CTX *mem_ctx, 
+                                   struct event_context *event_ctx, 
+                                   struct loadparm_context *lp_ctx,
                                    struct auth_serversupplied_info *server_info, 
                                    struct auth_session_info **_session_info) 
 {
@@ -165,7 +171,8 @@ NTSTATUS auth_generate_session_info(TALLOC_CTX *mem_ctx,
        session_info->session_key = server_info->user_session_key;
 
        nt_status = security_token_create(session_info,
-                                         global_loadparm,
+                                         event_ctx,
+                                         lp_ctx,
                                          server_info->account_sid,
                                          server_info->primary_group_sid,
                                          server_info->n_domain_groups,
@@ -197,7 +204,7 @@ void auth_session_info_debug(int dbg_lev,
 /**
  * Make a server_info struct from the info3 returned by a domain logon 
  */
-NTSTATUS make_server_info_netlogon_validation(TALLOC_CTX *mem_ctx,
+_PUBLIC_ NTSTATUS make_server_info_netlogon_validation(TALLOC_CTX *mem_ctx,
                                              const char *account_name,
                                              uint16_t validation_level,
                                              union netr_Validation *validation,
@@ -326,6 +333,9 @@ NTSTATUS make_server_info_netlogon_validation(TALLOC_CTX *mem_ctx,
                NT_STATUS_HAVE_NO_MEMORY(server_info->lm_session_key.data);
        }
 
+       ZERO_STRUCT(server_info->pac_srv_sig);
+       ZERO_STRUCT(server_info->pac_kdc_sig);
+
        *_server_info = server_info;
        return NT_STATUS_OK;
 }