summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-07-19 15:58:20 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-07-20 09:17:15 +1000
commit15123d96ffcac2243f69be41143bf78d92228d7f (patch)
tree5143cbef729705d7c4a547e83ca07efcf2d1f4f7
parent42e40140ae4f6031987d00aaad8a08066d0abd5c (diff)
downloadsamba-15123d96ffcac2243f69be41143bf78d92228d7f.tar.gz
samba-15123d96ffcac2243f69be41143bf78d92228d7f.tar.bz2
samba-15123d96ffcac2243f69be41143bf78d92228d7f.zip
s3-auth inline make_auth_session_info into only caller
-rw-r--r--source3/auth/auth_util.c2
-rw-r--r--source3/auth/proto.h1
-rw-r--r--source3/auth/server_info.c23
3 files changed, 1 insertions, 25 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index b0deb2c8ab..c774065464 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -472,7 +472,7 @@ NTSTATUS create_local_token(TALLOC_CTX *mem_ctx,
return NT_STATUS_LOGON_FAILURE;
}
- session_info = make_auth_session_info(mem_ctx);
+ session_info = talloc_zero(mem_ctx, struct auth_session_info);
if (!session_info) {
return NT_STATUS_NO_MEMORY;
}
diff --git a/source3/auth/proto.h b/source3/auth/proto.h
index 4c69a32c11..d51a3e6444 100644
--- a/source3/auth/proto.h
+++ b/source3/auth/proto.h
@@ -225,7 +225,6 @@ struct netr_SamInfo3;
struct netr_SamInfo6;
struct auth_serversupplied_info *make_server_info(TALLOC_CTX *mem_ctx);
-struct auth_session_info *make_auth_session_info(TALLOC_CTX *mem_ctx);
NTSTATUS serverinfo_to_SamInfo2(struct auth_serversupplied_info *server_info,
uint8_t *pipe_session_key,
size_t pipe_session_key_len,
diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c
index c78b3f67df..a53e556d28 100644
--- a/source3/auth/server_info.c
+++ b/source3/auth/server_info.c
@@ -63,29 +63,6 @@ struct auth_serversupplied_info *make_server_info(TALLOC_CTX *mem_ctx)
return result;
}
-/***************************************************************************
- Make a server_info struct. Free with TALLOC_FREE().
-***************************************************************************/
-
-struct auth_session_info *make_auth_session_info(TALLOC_CTX *mem_ctx)
-{
- struct auth_session_info *result;
-
- result = talloc_zero(mem_ctx, struct auth_session_info);
- if (result == NULL) {
- DEBUG(0, ("talloc failed\n"));
- return NULL;
- }
-
- /* Initialise the unix_token to NULL which may save us from
- giving away root access if there is a bug in allocating
- these fields. */
-
- result->unix_token = NULL;
-
- return result;
-}
-
/****************************************************************************
inits a netr_SamInfo2 structure from an auth_serversupplied_info. sam2 must
already be initialized and is used as the talloc parent for its members.