s3-rpc_server rename NTLMSSP functions to auth_generic..()

[mat/samba.git] / source3 / rpc_server / dcesrv_spnego.c

diff --git a/source3/rpc_server/dcesrv_spnego.c b/source3/rpc_server/dcesrv_spnego.c
index 4686534a2ee8e541cd3adb97a40f8debfe791b6e..94c282cdfc282c8305a3f6f94efbff327ee33a85 100644 (file)
--- a/source3/rpc_server/dcesrv_spnego.c
+++ b/source3/rpc_server/dcesrv_spnego.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "../libcli/auth/spnego.h"
+#include "../lib/tsocket/tsocket.h"
 #include "dcesrv_ntlmssp.h"
 #include "dcesrv_gssapi.h"
 #include "dcesrv_spnego.h"
@@ -26,6 +27,7 @@
 static NTSTATUS spnego_init_server(TALLOC_CTX *mem_ctx,
                                   bool do_sign, bool do_seal,
                                   bool is_dcerpc,
+                                  const struct tsocket_address *remote_address,
                                   struct spnego_context **spnego_ctx)
 {
        struct spnego_context *sp_ctx = NULL;
@@ -35,6 +37,11 @@ static NTSTATUS spnego_init_server(TALLOC_CTX *mem_ctx,
                return NT_STATUS_NO_MEMORY;
        }
 
+       sp_ctx->remote_address = tsocket_address_copy(remote_address, sp_ctx);
+       if (sp_ctx->remote_address == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
        sp_ctx->do_sign = do_sign;
        sp_ctx->do_seal = do_seal;
        sp_ctx->is_dcerpc = is_dcerpc;
@@ -47,7 +54,7 @@ static NTSTATUS spnego_server_mech_init(struct spnego_context *sp_ctx,
                                        DATA_BLOB *token_in,
                                        DATA_BLOB *token_out)
 {
-       struct auth_ntlmssp_state *ntlmssp_ctx;
+       struct gensec_security *gensec_security;
        struct gse_context *gse_ctx;
        NTSTATUS status;
 
@@ -70,20 +77,22 @@ 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,
                                                   token_in,
                                                   token_out,
-                                                  &ntlmssp_ctx);
+                                                  sp_ctx->remote_address,
+                                                  &gensec_security);
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(0, ("Failed to init ntlmssp server "
                                  "(%s)\n", nt_errstr(status)));
                        return status;
                }
 
-               sp_ctx->mech_ctx.ntlmssp_state = ntlmssp_ctx;
+               sp_ctx->mech_ctx.gensec_security = gensec_security;
                break;
 
        default:
@@ -146,8 +155,8 @@ NTSTATUS spnego_server_step(struct spnego_context *sp_ctx,
                                        mem_ctx, &token_in, &token_out);
                        break;
                case SPNEGO_NTLMSSP:
-                       status = ntlmssp_server_step(
-                                       sp_ctx->mech_ctx.ntlmssp_state,
+                       status = auth_generic_server_step(
+                                       sp_ctx->mech_ctx.gensec_security,
                                        mem_ctx, &token_in, &token_out);
                        break;
                default:
@@ -210,6 +219,7 @@ NTSTATUS spnego_server_auth_start(TALLOC_CTX *mem_ctx,
                                  bool is_dcerpc,
                                  DATA_BLOB *spnego_in,
                                  DATA_BLOB *spnego_out,
+                                 const struct tsocket_address *remote_address,
                                  struct spnego_context **spnego_ctx)
 {
        struct spnego_context *sp_ctx;
@@ -223,14 +233,19 @@ NTSTATUS spnego_server_auth_start(TALLOC_CTX *mem_ctx,
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       status = spnego_init_server(mem_ctx, do_sign, do_seal, is_dcerpc, &sp_ctx);
+       status = spnego_init_server(mem_ctx,
+                                   do_sign,
+                                   do_seal,
+                                   is_dcerpc,
+                                   remote_address,
+                                   &sp_ctx);
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
 
        ret = spnego_parse_negTokenInit(sp_ctx, *spnego_in,
                                        sp_ctx->oid_list, NULL, &token_in);
-       if (!ret) {
+       if (!ret || sp_ctx->oid_list[0] == NULL) {
                DEBUG(3, ("Invalid SPNEGO message\n"));
                status = NT_STATUS_INVALID_PARAMETER;
                goto done;