summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-08-02 08:53:10 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-08-03 18:48:05 +1000
commit8fca9741fe7fca3a899fdff7ab667de1364f0ea9 (patch)
tree77eeffd551e12a3386d854f10a5426fb2dbdaf5e
parent4379738e8516f54d7599e87fd9e6a9ec80680dd0 (diff)
downloadsamba-8fca9741fe7fca3a899fdff7ab667de1364f0ea9.tar.gz
samba-8fca9741fe7fca3a899fdff7ab667de1364f0ea9.tar.bz2
samba-8fca9741fe7fca3a899fdff7ab667de1364f0ea9.zip
s3-auth rename auth_ntlmssp_steal_session_info()
There is no longer any theft of memory as the underlying routines now produce a new auth_session_info for this caller, allocating it on the supplied memory context. Andrew Bartlett
-rw-r--r--source3/auth/auth_ntlmssp.c6
-rw-r--r--source3/auth/proto.h6
-rw-r--r--source3/rpc_server/dcesrv_ntlmssp.c2
-rw-r--r--source3/smbd/sesssetup.c2
-rw-r--r--source3/smbd/smb2_sesssetup.c12
5 files changed, 14 insertions, 14 deletions
diff --git a/source3/auth/auth_ntlmssp.c b/source3/auth/auth_ntlmssp.c
index fc197ce605..5845969631 100644
--- a/source3/auth/auth_ntlmssp.c
+++ b/source3/auth/auth_ntlmssp.c
@@ -28,9 +28,9 @@
#include "../lib/tsocket/tsocket.h"
#include "auth/gensec/gensec.h"
-NTSTATUS auth_ntlmssp_steal_session_info(TALLOC_CTX *mem_ctx,
- struct auth_ntlmssp_state *auth_ntlmssp_state,
- struct auth_session_info **session_info)
+NTSTATUS auth_ntlmssp_session_info(TALLOC_CTX *mem_ctx,
+ struct auth_ntlmssp_state *auth_ntlmssp_state,
+ struct auth_session_info **session_info)
{
NTSTATUS nt_status;
if (auth_ntlmssp_state->gensec_security) {
diff --git a/source3/auth/proto.h b/source3/auth/proto.h
index 82bf203b57..239e8ff454 100644
--- a/source3/auth/proto.h
+++ b/source3/auth/proto.h
@@ -69,9 +69,9 @@ NTSTATUS auth_netlogond_init(void);
/* The following definitions come from auth/auth_ntlmssp.c */
-NTSTATUS auth_ntlmssp_steal_session_info(TALLOC_CTX *mem_ctx,
- struct auth_ntlmssp_state *auth_ntlmssp_state,
- struct auth_session_info **session_info);
+NTSTATUS auth_ntlmssp_session_info(TALLOC_CTX *mem_ctx,
+ struct auth_ntlmssp_state *auth_ntlmssp_state,
+ struct auth_session_info **session_info);
NTSTATUS auth_ntlmssp_prepare(const struct tsocket_address *remote_address,
struct auth_ntlmssp_state **auth_ntlmssp_state);
NTSTATUS auth_ntlmssp_start(struct auth_ntlmssp_state *auth_ntlmssp_state);
diff --git a/source3/rpc_server/dcesrv_ntlmssp.c b/source3/rpc_server/dcesrv_ntlmssp.c
index f9fbc060c5..a31bb36284 100644
--- a/source3/rpc_server/dcesrv_ntlmssp.c
+++ b/source3/rpc_server/dcesrv_ntlmssp.c
@@ -117,7 +117,7 @@ NTSTATUS ntlmssp_server_get_user_info(struct auth_ntlmssp_state *ctx,
{
NTSTATUS status;
- status = auth_ntlmssp_steal_session_info(mem_ctx, ctx, session_info);
+ status = auth_ntlmssp_session_info(mem_ctx, ctx, session_info);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(1, (__location__ ": Failed to get authenticated user "
"info: %s\n", nt_errstr(status)));
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index a3440a62f6..8b133b4a54 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -431,7 +431,7 @@ static void reply_spnego_ntlmssp(struct smb_request *req,
struct smbd_server_connection *sconn = req->sconn;
if (NT_STATUS_IS_OK(nt_status)) {
- nt_status = auth_ntlmssp_steal_session_info(talloc_tos(),
+ nt_status = auth_ntlmssp_session_info(talloc_tos(),
(*auth_ntlmssp_state), &session_info);
}
diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index d1022cd2cf..6517fb6d00 100644
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -591,9 +591,9 @@ static NTSTATUS smbd_smb2_spnego_auth(struct smbd_smb2_session *session,
/* If status is NT_STATUS_OK then we need to get the token.
* Map to guest is now internal to auth_ntlmssp */
if (NT_STATUS_IS_OK(status)) {
- status = auth_ntlmssp_steal_session_info(session,
- session->auth_ntlmssp_state,
- &session->session_info);
+ status = auth_ntlmssp_session_info(session,
+ session->auth_ntlmssp_state,
+ &session->session_info);
}
if (!NT_STATUS_IS_OK(status) &&
@@ -672,9 +672,9 @@ static NTSTATUS smbd_smb2_raw_ntlmssp_auth(struct smbd_smb2_session *session,
return status;
}
- status = auth_ntlmssp_steal_session_info(session,
- session->auth_ntlmssp_state,
- &session->session_info);
+ status = auth_ntlmssp_session_info(session,
+ session->auth_ntlmssp_state,
+ &session->session_info);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(session->auth_ntlmssp_state);