From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 2 Jan 2012 02:11:38 +0000 (+1100)
Subject: s3-librpc: rename get_ntlmssp_auth_footer to be more generic
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=e8cd9721776d3ffc574dcf93c8eb668d4dce36d0;p=metze%2Fsamba%2Fwip.git

s3-librpc: rename get_ntlmssp_auth_footer to be more generic

This can handle any gensec auth type now.

Andrew Bartlett

Signed-off-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c
index 30c05a3626c8..026b1fa32fb0 100644
--- a/source3/librpc/rpc/dcerpc_helpers.c
+++ b/source3/librpc/rpc/dcerpc_helpers.c
@@ -382,7 +382,7 @@ NTSTATUS dcerpc_guess_sizes(struct pipe_auth_data *auth,
  Create and add the NTLMSSP sign/seal auth data.
  ********************************************************************/
 
-static NTSTATUS add_ntlmssp_auth_footer(struct gensec_security *gensec_security,
+static NTSTATUS add_generic_auth_footer(struct gensec_security *gensec_security,
 					enum dcerpc_AuthLevel auth_level,
 					DATA_BLOB *rpc_out)
 {
@@ -450,7 +450,7 @@ static NTSTATUS add_ntlmssp_auth_footer(struct gensec_security *gensec_security,
  Check/unseal the NTLMSSP auth data. (Unseal in place).
  ********************************************************************/
 
-static NTSTATUS get_ntlmssp_auth_footer(struct gensec_security *gensec_security,
+static NTSTATUS get_generic_auth_footer(struct gensec_security *gensec_security,
 					enum dcerpc_AuthLevel auth_level,
 					DATA_BLOB *data, DATA_BLOB *full_pkt,
 					DATA_BLOB *auth_token)
@@ -809,7 +809,7 @@ NTSTATUS dcerpc_add_auth_footer(struct pipe_auth_data *auth,
 	case DCERPC_AUTH_TYPE_NTLMSSP:
 		gensec_security = talloc_get_type_abort(auth->auth_ctx,
 						struct gensec_security);
-		status = add_ntlmssp_auth_footer(gensec_security,
+		status = add_generic_auth_footer(gensec_security,
 						 auth->auth_level,
 						 rpc_out);
 		break;
@@ -937,11 +937,11 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth,
 
 	case DCERPC_AUTH_TYPE_NTLMSSP:
 
-		DEBUG(10, ("NTLMSSP auth\n"));
+		DEBUG(10, ("GENSEC auth\n"));
 
 		gensec_security = talloc_get_type_abort(auth->auth_ctx,
 						struct gensec_security);
-		status = get_ntlmssp_auth_footer(gensec_security,
+		status = get_generic_auth_footer(gensec_security,
 						 auth->auth_level,
 						 &data, &full_pkt,
 						 &auth_info.credentials);