summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorWilco Baan Hofman <wilco@baanhofman.nl>2010-05-21 14:56:15 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-06-20 17:19:12 +0200
commit3895b8fbf84764ff603af91644198e518af97e74 (patch)
tree4707d3dba5ed1342b6c2e73522b9f988e31c93ce /source4
parent8f74ee01d9bb93872c5cd5471084c8bd2da0d17f (diff)
downloadsamba-3895b8fbf84764ff603af91644198e518af97e74.tar.gz
samba-3895b8fbf84764ff603af91644198e518af97e74.tar.bz2
samba-3895b8fbf84764ff603af91644198e518af97e74.zip
Revert "Add old functionality back which was removed in commit 589a42e2."
This reverts commit 94e3b4a0d8b714c101803886d60ae6c484740d2f. Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Diffstat (limited to 'source4')
-rw-r--r--source4/auth/session.c17
-rw-r--r--source4/auth/session.h6
-rw-r--r--source4/utils/net/net_gpo.c2
3 files changed, 3 insertions, 22 deletions
diff --git a/source4/auth/session.c b/source4/auth/session.c
index 75af3056a8..29ba13e536 100644
--- a/source4/auth/session.c
+++ b/source4/auth/session.c
@@ -46,19 +46,6 @@ _PUBLIC_ NTSTATUS auth_generate_session_info(TALLOC_CTX *mem_ctx,
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;
unsigned int i, num_groupSIDs = 0;
@@ -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 3e422d9790..8e22cc0576 100644
--- 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 f570d83a26..45f568c192 100644
--- 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);