Revert "Add old functionality back which was removed in commit 589a42e2."

This reverts commit 94e3b4a0d8b714c101803886d60ae6c484740d2f.

Signed-off-by: Jelmer Vernooij <jelmer@samba.org>

diff --git a/source4/auth/session.c b/source4/auth/session.c
index 75af3056a856b1e4f4413b95b673d10020221839..29ba13e536befa0727f399a4bb2d65966ea78201 100644 (file)
--- a/source4/auth/session.c
+++ b/source4/auth/session.c
@@ -45,19 +45,6 @@ _PUBLIC_ NTSTATUS auth_generate_session_info(TALLOC_CTX *mem_ctx,
                                             struct auth_serversupplied_info *server_info,
                                             uint32_t session_info_flags,
                                             struct auth_session_info **_session_info)
-{
-       return auth_generate_session_info2(mem_ctx,
-                       auth_context->event_ctx,
-                       auth_context->lp_ctx,
-                       server_info,
-                       _session_info);
-}
-
-_PUBLIC_ NTSTATUS auth_generate_session_info2(TALLOC_CTX *mem_ctx,
-                                            struct tevent_context *event_ctx,
-                                            struct loadparm_context *lp_ctx,
-                                            struct auth_serversupplied_info *server_info,
-                                            struct auth_session_info **_session_info)
 {
        struct auth_session_info *session_info;
        NTSTATUS nt_status;
@@ -206,8 +193,8 @@ _PUBLIC_ NTSTATUS auth_generate_session_info2(TALLOC_CTX *mem_ctx,
        }
 
        nt_status = security_token_create(session_info,
-                                         event_ctx,
-                                         lp_ctx,
+                                         auth_context->event_ctx,
+                                         auth_context->lp_ctx,
                                          server_info->account_sid,
                                          server_info->primary_group_sid,
                                          num_groupSIDs,

diff --git a/source4/auth/session.h b/source4/auth/session.h
index 3e422d97904679249d0e5bcec64ee226851de9d8..8e22cc05766ae3bd062c89a91e381780b6bb6085 100644 (file)
--- a/source4/auth/session.h
+++ b/source4/auth/session.h
@@ -53,12 +53,6 @@ NTSTATUS auth_generate_session_info(TALLOC_CTX *mem_ctx,
                                    uint32_t session_info_flags,
                                    struct auth_session_info **_session_info);
 
-NTSTATUS auth_generate_session_info2(TALLOC_CTX *mem_ctx,
-                                   struct tevent_context *event_ctx,
-                                   struct loadparm_context *lp_ctx,
-                                   struct auth_serversupplied_info *server_info,
-                                   struct auth_session_info **_session_info);
-
 NTSTATUS auth_anonymous_session_info(TALLOC_CTX *parent_ctx, 
                                     struct loadparm_context *lp_ctx,
                                     struct auth_session_info **_session_info);

diff --git a/source4/utils/net/net_gpo.c b/source4/utils/net/net_gpo.c
index f570d83a2602af53f9d0362a7f53b158a4688eed..45f568c192fcdc39f0e6227c30538331117c6177 100644 (file)
--- a/source4/utils/net/net_gpo.c
+++ b/source4/utils/net/net_gpo.c
@@ -256,7 +256,7 @@ static int net_gpo_list(struct net_context *ctx, int argc, const char **argv)
                return 1;
        }
 
-       status = auth_generate_session_info2(gp_ctx, gp_ctx->ev_ctx, gp_ctx->lp_ctx, server_info, &session_info);
+       status = auth_generate_session_info(gp_ctx, gp_ctx->ev_ctx, gp_ctx->lp_ctx, server_info, &session_info);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, ("Failed to generate session information: %s\n", get_friendly_nt_error_msg(status)));
                talloc_free(gp_ctx);