s3-rpc_server rename ntlmssp_server_auth_start() -> auth_generic_server_start()

By adding an OID parameter we can make this routine generic to any
gensec module that may be made available.

Andrew Bartlett

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

diff --git a/source3/rpc_server/dcesrv_ntlmssp.c b/source3/rpc_server/dcesrv_ntlmssp.c
index c1ea388b89d2db751bec20e92ffaa762b38531fc..832837458190fb5203370518a63d7b33976de615 100644 (file)
--- a/source3/rpc_server/dcesrv_ntlmssp.c
+++ b/source3/rpc_server/dcesrv_ntlmssp.c
@@ -25,7 +25,8 @@
 #include "auth.h"
 #include "auth/gensec/gensec.h"
 
-NTSTATUS ntlmssp_server_auth_start(TALLOC_CTX *mem_ctx,
+NTSTATUS auth_generic_server_start(TALLOC_CTX *mem_ctx,
+                                  const char *oid,
                                   bool do_sign,
                                   bool do_seal,
                                   bool is_dcerpc,
@@ -56,7 +57,7 @@ NTSTATUS ntlmssp_server_auth_start(TALLOC_CTX *mem_ctx,
                gensec_want_feature(a->gensec_security, GENSEC_FEATURE_DCE_STYLE);
        }
 
-       status = auth_generic_start(a, GENSEC_OID_NTLMSSP);
+       status = auth_generic_start(a, oid);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, (__location__ ": auth_generic_start failed: %s\n",
                          nt_errstr(status)));

diff --git a/source3/rpc_server/dcesrv_ntlmssp.h b/source3/rpc_server/dcesrv_ntlmssp.h
index 6efc68d78ce41bff16a4ef1c2a74c011bd3940fd..d31b6f7ee651b7394fbea62a4b8c44ddc21d2ad0 100644 (file)
--- a/source3/rpc_server/dcesrv_ntlmssp.h
+++ b/source3/rpc_server/dcesrv_ntlmssp.h
@@ -22,7 +22,8 @@
 
 struct gensec_security;
 
-NTSTATUS ntlmssp_server_auth_start(TALLOC_CTX *mem_ctx,
+NTSTATUS auth_generic_server_start(TALLOC_CTX *mem_ctx,
+                                  const char *oid,
                                   bool do_sign,
                                   bool do_seal,
                                   bool is_dcerpc,

diff --git a/source3/rpc_server/dcesrv_spnego.c b/source3/rpc_server/dcesrv_spnego.c
index 88ffdf7b5ff3c7f79633a0da5422ed6d44c8157a..9f61bba990bd39e541d9e49c9a1fb2715083c403 100644 (file)
--- a/source3/rpc_server/dcesrv_spnego.c
+++ b/source3/rpc_server/dcesrv_spnego.c
@@ -77,7 +77,8 @@ static NTSTATUS spnego_server_mech_init(struct spnego_context *sp_ctx,
                break;
 
        case SPNEGO_NTLMSSP:
-               status = ntlmssp_server_auth_start(sp_ctx,
+               status = auth_generic_server_start(sp_ctx,
+                                                  OID_NTLMSSP,
                                                   sp_ctx->do_sign,
                                                   sp_ctx->do_seal,
                                                   sp_ctx->is_dcerpc,

diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index b32e1e1d485c17ca64f025016d398d8d43b462c4..68c099e74a50c2604da8d9943622893c46784217 100644 (file)
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -598,7 +598,8 @@ static bool pipe_ntlmssp_auth_bind(struct pipes_struct *p,
         }
 
        /* We have an NTLMSSP blob. */
-       status = ntlmssp_server_auth_start(p,
+       status = auth_generic_server_start(p,
+                                          OID_NTLMSSP,
                                           (auth_info->auth_level ==
                                                DCERPC_AUTH_LEVEL_INTEGRITY),
                                           (auth_info->auth_level ==