credentials: Rename library to samba-credentials to avoid name clashes.
[idra/samba.git] / source4 / auth / ntlmssp / ntlmssp.c
index 9bb0ed99faf45fc0eacdb2e84933e468e3240efe..d90c908d8d63ba893f76f838daa1da7b080eefc1 100644 (file)
@@ -9,7 +9,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-#include "auth/auth.h"
-#include "lib/crypto/crypto.h"
 #include "auth/ntlmssp/ntlmssp.h"
+#include "../libcli/auth/libcli_auth.h"
+#include "librpc/gen_ndr/ndr_dcerpc.h"
+#include "auth/gensec/gensec.h"
+#include "auth/gensec/gensec_proto.h"
 
 /**
  * Callbacks for NTLMSSP - for both client and server operating modes
 
 static const struct ntlmssp_callbacks {
        enum ntlmssp_role role;
-       enum ntlmssp_message_type ntlmssp_command;
-       NTSTATUS (*fn)(struct gensec_security *gensec_security, 
-                      TALLOC_CTX *out_mem_ctx, 
-                      DATA_BLOB in, DATA_BLOB *out);
+       enum ntlmssp_message_type command;
+       NTSTATUS (*sync_fn)(struct gensec_security *gensec_security,
+                           TALLOC_CTX *out_mem_ctx,
+                           DATA_BLOB in, DATA_BLOB *out);
 } ntlmssp_callbacks[] = {
-       {NTLMSSP_CLIENT, NTLMSSP_INITIAL, ntlmssp_client_initial},
-       {NTLMSSP_SERVER, NTLMSSP_NEGOTIATE, ntlmssp_server_negotiate},
-       {NTLMSSP_CLIENT, NTLMSSP_CHALLENGE, ntlmssp_client_challenge},
-       {NTLMSSP_SERVER, NTLMSSP_AUTH, ntlmssp_server_auth},
+       {
+               .role           = NTLMSSP_CLIENT,
+               .command        = NTLMSSP_INITIAL,
+               .sync_fn        = ntlmssp_client_initial,
+       },{
+               .role           = NTLMSSP_SERVER,
+               .command        = NTLMSSP_NEGOTIATE,
+               .sync_fn        = gensec_ntlmssp_server_negotiate,
+       },{
+               .role           = NTLMSSP_CLIENT,
+               .command        = NTLMSSP_CHALLENGE,
+               .sync_fn        = ntlmssp_client_challenge,
+       },{
+               .role           = NTLMSSP_SERVER,
+               .command        = NTLMSSP_AUTH,
+               .sync_fn        = gensec_ntlmssp_server_auth,
+       }
 };
 
 
-/**
- * Print out the NTLMSSP flags for debugging 
- * @param neg_flags The flags from the packet
- */
-
-void debug_ntlmssp_flags(uint32_t neg_flags)
+static NTSTATUS gensec_ntlmssp_magic(struct gensec_security *gensec_security, 
+                                    const DATA_BLOB *first_packet) 
 {
-       DEBUG(3,("Got NTLMSSP neg_flags=0x%08x\n", neg_flags));
-       
-       if (neg_flags & NTLMSSP_NEGOTIATE_UNICODE) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_UNICODE\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_OEM) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_OEM\n"));
-       if (neg_flags & NTLMSSP_REQUEST_TARGET) 
-               DEBUGADD(4, ("  NTLMSSP_REQUEST_TARGET\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_SIGN) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_SIGN\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_SEAL) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_SEAL\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_LM_KEY) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_LM_KEY\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_NETWARE) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_NETWARE\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_NTLM) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_NTLM\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_DOMAIN_SUPPLIED) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_DOMAIN_SUPPLIED\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_WORKSTATION_SUPPLIED) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_WORKSTATION_SUPPLIED\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_THIS_IS_LOCAL_CALL) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_THIS_IS_LOCAL_CALL\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_ALWAYS_SIGN\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_NTLM2) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_NTLM2\n"));
-       if (neg_flags & NTLMSSP_CHAL_TARGET_INFO) 
-               DEBUGADD(4, ("  NTLMSSP_CHAL_TARGET_INFO\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_128) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_128\n"));
-       if (neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH) 
-               DEBUGADD(4, ("  NTLMSSP_NEGOTIATE_KEY_EXCH\n"));
+       if (ntlmssp_blob_matches_magic(first_packet)) {
+               return NT_STATUS_OK;
+       } else {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
 }
 
-/**
- *  Store a DATA_BLOB containing an NTLMSSP response, for use later.
- *  This copies the data blob
- */
-
-NTSTATUS ntlmssp_store_response(struct ntlmssp_state *ntlmssp_state,
-                               DATA_BLOB response) 
+static NTSTATUS gensec_ntlmssp_update_find(struct ntlmssp_state *ntlmssp_state,
+                                          const DATA_BLOB input, uint32_t *idx)
 {
-       ntlmssp_state->stored_response = data_blob_talloc(ntlmssp_state, 
-                                                         response.data, response.length);
-       return NT_STATUS_OK;
-}
-
-/**
- * Next state function for the wrapped NTLMSSP state machine
- * 
- * @param gensec_security GENSEC state, initialised to NTLMSSP
- * @param out_mem_ctx The TALLOC_CTX for *out to be allocated on
- * @param in The request, as a DATA_BLOB
- * @param out The reply, as an talloc()ed DATA_BLOB, on *out_mem_ctx
- * @return Error, MORE_PROCESSING_REQUIRED if a reply is sent, 
- *                or NT_STATUS_OK if the user is authenticated. 
- */
-
-static NTSTATUS gensec_ntlmssp_update(struct gensec_security *gensec_security, 
-                                     TALLOC_CTX *out_mem_ctx, 
-                                     const DATA_BLOB in, DATA_BLOB *out) 
-{
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data;
-       struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp_state->ntlmssp_state;
-       NTSTATUS status;
-
-       DATA_BLOB input;
+       struct gensec_ntlmssp_context *gensec_ntlmssp =
+               talloc_get_type_abort(ntlmssp_state->callback_private,
+                                     struct gensec_ntlmssp_context);
+       struct gensec_security *gensec_security = gensec_ntlmssp->gensec_security;
        uint32_t ntlmssp_command;
-       int i;
-
-       *out = data_blob(NULL, 0);
+       uint32_t i;
 
        if (ntlmssp_state->expected_state == NTLMSSP_DONE) {
-               return NT_STATUS_OK;
-       }
+               /* We are strict here because other modules, which we
+                * don't fully control (such as GSSAPI) are also
+                * strict, but are tested less often */
 
-       if (!out_mem_ctx) {
-               /* if the caller doesn't want to manage/own the memory, 
-                  we can put it on our context */
-               out_mem_ctx = ntlmssp_state;
-       }
-
-       if (!in.length && ntlmssp_state->stored_response.length) {
-               input = ntlmssp_state->stored_response;
-               
-               /* we only want to read the stored response once - overwrite it */
-               ntlmssp_state->stored_response = data_blob(NULL, 0);
-       } else {
-               input = in;
+               DEBUG(1, ("Called NTLMSSP after state machine was 'done'\n"));
+               return NT_STATUS_INVALID_PARAMETER;
        }
 
        if (!input.length) {
@@ -152,12 +95,18 @@ static NTSTATUS gensec_ntlmssp_update(struct gensec_security *gensec_security,
                        ntlmssp_command = NTLMSSP_INITIAL;
                        break;
                case NTLMSSP_SERVER:
-                       /* 'datagram' mode - no neg packet */
-                       ntlmssp_command = NTLMSSP_NEGOTIATE;
+                       if (gensec_security->want_features & GENSEC_FEATURE_DATAGRAM_MODE) {
+                               /* 'datagram' mode - no neg packet */
+                               ntlmssp_command = NTLMSSP_NEGOTIATE;
+                       } else {
+                               /* This is normal in SPNEGO mech negotiation fallback */
+                               DEBUG(2, ("Failed to parse NTLMSSP packet: zero length\n"));
+                               return NT_STATUS_INVALID_PARAMETER;
+                       }
                        break;
                }
        } else {
-               if (!msrpc_parse(ntlmssp_state, 
+               if (!msrpc_parse(ntlmssp_state,
                                 &input, "Cd",
                                 "NTLMSSP",
                                 &ntlmssp_command)) {
@@ -168,45 +117,61 @@ static NTSTATUS gensec_ntlmssp_update(struct gensec_security *gensec_security,
        }
 
        if (ntlmssp_command != ntlmssp_state->expected_state) {
-               DEBUG(1, ("got NTLMSSP command %u, expected %u\n", ntlmssp_command, ntlmssp_state->expected_state));
+               DEBUG(2, ("got NTLMSSP command %u, expected %u\n", ntlmssp_command, ntlmssp_state->expected_state));
                return NT_STATUS_INVALID_PARAMETER;
        }
 
        for (i=0; i < ARRAY_SIZE(ntlmssp_callbacks); i++) {
-               if (ntlmssp_callbacks[i].role == ntlmssp_state->role 
-                   && ntlmssp_callbacks[i].ntlmssp_command == ntlmssp_command) {
-                       status = ntlmssp_callbacks[i].fn(gensec_security, out_mem_ctx, input, out);
-                       break;
+               if (ntlmssp_callbacks[i].role == ntlmssp_state->role &&
+                   ntlmssp_callbacks[i].command == ntlmssp_command) {
+                       *idx = i;
+                       return NT_STATUS_OK;
                }
        }
 
-       if (i == ARRAY_SIZE(ntlmssp_callbacks)) {
-               
-               DEBUG(1, ("failed to find NTLMSSP callback for NTLMSSP mode %u, command %u\n", 
-                         ntlmssp_state->role, ntlmssp_command)); 
+       DEBUG(1, ("failed to find NTLMSSP callback for NTLMSSP mode %u, command %u\n", 
+                 ntlmssp_state->role, ntlmssp_command));
                
-               return NT_STATUS_INVALID_PARAMETER;
-       }
+       return NT_STATUS_INVALID_PARAMETER;
+}
 
-       if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED) && !NT_STATUS_IS_OK(status)) {
-               return status;
-       }
-       
-       gensec_ntlmssp_state->have_features = 0;
+/**
+ * Next state function for the wrapped NTLMSSP state machine
+ * 
+ * @param gensec_security GENSEC state, initialised to NTLMSSP
+ * @param out_mem_ctx The TALLOC_CTX for *out to be allocated on
+ * @param in The request, as a DATA_BLOB
+ * @param out The reply, as an talloc()ed DATA_BLOB, on *out_mem_ctx
+ * @return Error, MORE_PROCESSING_REQUIRED if a reply is sent, 
+ *                or NT_STATUS_OK if the user is authenticated. 
+ */
 
-       if (gensec_ntlmssp_state->ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SIGN) {
-               gensec_ntlmssp_state->have_features |= GENSEC_FEATURE_SIGN;
-       }
+static NTSTATUS gensec_ntlmssp_update(struct gensec_security *gensec_security, 
+                                     TALLOC_CTX *out_mem_ctx, 
+                                     const DATA_BLOB input, DATA_BLOB *out)
+{
+       struct gensec_ntlmssp_context *gensec_ntlmssp =
+               talloc_get_type_abort(gensec_security->private_data,
+                                     struct gensec_ntlmssp_context);
+       struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
+       NTSTATUS status;
+       uint32_t i;
 
-       if (gensec_ntlmssp_state->ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SEAL) {
-               gensec_ntlmssp_state->have_features |= GENSEC_FEATURE_SEAL;
-       }
+       *out = data_blob(NULL, 0);
 
-       if (gensec_ntlmssp_state->ntlmssp_state->session_key.data) {
-               gensec_ntlmssp_state->have_features |= GENSEC_FEATURE_SESSION_KEY;
+       if (!out_mem_ctx) {
+               /* if the caller doesn't want to manage/own the memory, 
+                  we can put it on our context */
+               out_mem_ctx = ntlmssp_state;
        }
 
-       return status;
+       status = gensec_ntlmssp_update_find(ntlmssp_state, input, &i);
+       NT_STATUS_NOT_OK_RETURN(status);
+
+       status = ntlmssp_callbacks[i].sync_fn(gensec_security, out_mem_ctx, input, out);
+       NT_STATUS_NOT_OK_RETURN(status);
+       
+       return NT_STATUS_OK;
 }
 
 /**
@@ -216,142 +181,109 @@ static NTSTATUS gensec_ntlmssp_update(struct gensec_security *gensec_security,
  */
 
 NTSTATUS gensec_ntlmssp_session_key(struct gensec_security *gensec_security, 
+                                   TALLOC_CTX *mem_ctx,
                                    DATA_BLOB *session_key)
 {
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data;
-       struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp_state->ntlmssp_state;
+       struct gensec_ntlmssp_context *gensec_ntlmssp =
+               talloc_get_type_abort(gensec_security->private_data,
+                                     struct gensec_ntlmssp_context);
+       struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
+
+       if (ntlmssp_state->expected_state != NTLMSSP_DONE) {
+               return NT_STATUS_NO_USER_SESSION_KEY;
+       }
 
        if (!ntlmssp_state->session_key.data) {
                return NT_STATUS_NO_USER_SESSION_KEY;
        }
-       *session_key = ntlmssp_state->session_key;
+       *session_key = data_blob_talloc(mem_ctx, ntlmssp_state->session_key.data, ntlmssp_state->session_key.length);
+       if (!session_key->data) {
+               return NT_STATUS_NO_MEMORY;
+       }
 
        return NT_STATUS_OK;
 }
 
-void ntlmssp_handle_neg_flags(struct ntlmssp_state *ntlmssp_state,
-                             uint32_t neg_flags, BOOL allow_lm)
+static bool gensec_ntlmssp_have_feature(struct gensec_security *gensec_security,
+                                       uint32_t feature)
 {
-       if (neg_flags & NTLMSSP_NEGOTIATE_UNICODE) {
-               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_UNICODE;
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_OEM;
-               ntlmssp_state->unicode = True;
-       } else {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_UNICODE;
-               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_OEM;
-               ntlmssp_state->unicode = False;
-       }
-
-       if ((neg_flags & NTLMSSP_NEGOTIATE_LM_KEY) && allow_lm && !ntlmssp_state->use_ntlmv2) {
-               /* other end forcing us to use LM */
-               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_LM_KEY;
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_NTLM2;
-       } else {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_LM_KEY;
-       }
-
-       if (neg_flags & NTLMSSP_NEGOTIATE_ALWAYS_SIGN) {
-               ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_ALWAYS_SIGN;
-       }
-
-       if (!(neg_flags & NTLMSSP_NEGOTIATE_SIGN)) {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_SIGN;
-       }
-
-       if (!(neg_flags & NTLMSSP_NEGOTIATE_SEAL)) {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_SEAL;
-       }
-
-       if (!(neg_flags & NTLMSSP_NEGOTIATE_NTLM2)) {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_NTLM2;
-       }
-
-       if (!(neg_flags & NTLMSSP_NEGOTIATE_128)) {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_128;
-               if (neg_flags & NTLMSSP_NEGOTIATE_56) {
-                       ntlmssp_state->neg_flags |= NTLMSSP_NEGOTIATE_56;
+       struct gensec_ntlmssp_context *gensec_ntlmssp =
+               talloc_get_type_abort(gensec_security->private_data,
+                                     struct gensec_ntlmssp_context);
+       struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
+
+       if (feature & GENSEC_FEATURE_SIGN) {
+               if (!ntlmssp_state->session_key.length) {
+                       return false;
+               }
+               if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SIGN) {
+                       return true;
                }
        }
-
-       if (!(neg_flags & NTLMSSP_NEGOTIATE_56)) {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_56;
+       if (feature & GENSEC_FEATURE_SEAL) {
+               if (!ntlmssp_state->session_key.length) {
+                       return false;
+               }
+               if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_SEAL) {
+                       return true;
+               }
        }
-
-       if (!(neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH)) {
-               ntlmssp_state->neg_flags &= ~NTLMSSP_NEGOTIATE_KEY_EXCH;
+       if (feature & GENSEC_FEATURE_SESSION_KEY) {
+               if (ntlmssp_state->session_key.length) {
+                       return true;
+               }
        }
-
-       if ((neg_flags & NTLMSSP_REQUEST_TARGET)) {
-               ntlmssp_state->neg_flags |= NTLMSSP_REQUEST_TARGET;
+       if (feature & GENSEC_FEATURE_DCE_STYLE) {
+               return true;
        }
-       
-}
-
-/**
-   Weaken NTLMSSP keys to cope with down-level clients and servers.
-
-   We probably should have some parameters to control this, but as
-   it only occours for LM_KEY connections, and this is controlled
-   by the client lanman auth/lanman auth parameters, it isn't too bad.
-*/
-
-void ntlmssp_weaken_keys(struct ntlmssp_state *ntlmssp_state) 
-{
-       /* Key weakening not performed on the master key for NTLM2
-          and does not occour for NTLM1.  Therefore we only need
-          to do this for the LM_KEY.  
-       */
-
-       if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_LM_KEY) {
-               if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_128) {
-                       
-               } else if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_56) {
-                       ntlmssp_state->session_key.data[7] = 0xa0;
-               } else { /* forty bits */
-                       ntlmssp_state->session_key.data[5] = 0xe5;
-                       ntlmssp_state->session_key.data[6] = 0x38;
-                       ntlmssp_state->session_key.data[7] = 0xb0;
+       if (feature & GENSEC_FEATURE_ASYNC_REPLIES) {
+               if (ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
+                       return true;
                }
-               ntlmssp_state->session_key.length = 8;
        }
+       return false;
 }
 
-static BOOL gensec_ntlmssp_have_feature(struct gensec_security *gensec_security,
-                                       uint32_t feature)
+NTSTATUS gensec_ntlmssp_start(struct gensec_security *gensec_security)
 {
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data;
-       if (gensec_ntlmssp_state->have_features & feature) {
-               return True;
+       struct gensec_ntlmssp_context *gensec_ntlmssp;
+       struct ntlmssp_state *ntlmssp_state;
+
+       gensec_ntlmssp = talloc_zero(gensec_security,
+                                    struct gensec_ntlmssp_context);
+       if (!gensec_ntlmssp) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-       return False;
-}
+       gensec_ntlmssp->gensec_security = gensec_security;
 
-NTSTATUS gensec_ntlmssp_start(struct gensec_security *gensec_security)
-{
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state;
-       
-       gensec_ntlmssp_state = talloc(gensec_security, struct gensec_ntlmssp_state);
-       if (!gensec_ntlmssp_state) {
+       ntlmssp_state = talloc_zero(gensec_ntlmssp,
+                                   struct ntlmssp_state);
+       if (!ntlmssp_state) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       gensec_ntlmssp_state->ntlmssp_state = NULL;
-       gensec_ntlmssp_state->auth_context = NULL;
-       gensec_ntlmssp_state->server_info = NULL;
-       gensec_ntlmssp_state->have_features = 0;
+       ntlmssp_state->callback_private = gensec_ntlmssp;
+
+       gensec_ntlmssp->ntlmssp_state = ntlmssp_state;
 
-       gensec_security->private_data = gensec_ntlmssp_state;
+       gensec_security->private_data = gensec_ntlmssp;
        return NT_STATUS_OK;
 }
 
+static const char *gensec_ntlmssp_oids[] = { 
+       GENSEC_OID_NTLMSSP, 
+       NULL
+};
+
 static const struct gensec_security_ops gensec_ntlmssp_security_ops = {
        .name           = "ntlmssp",
-       .sasl_name      = "NTLM",
+       .sasl_name      = GENSEC_SASL_NAME_NTLMSSP, /* "NTLM" */
        .auth_type      = DCERPC_AUTH_TYPE_NTLMSSP,
-       .oid            = GENSEC_OID_NTLMSSP,
+       .oid            = gensec_ntlmssp_oids,
        .client_start   = gensec_ntlmssp_client_start,
        .server_start   = gensec_ntlmssp_server_start,
+       .magic          = gensec_ntlmssp_magic,
        .update         = gensec_ntlmssp_update,
        .sig_size       = gensec_ntlmssp_sig_size,
        .sign_packet    = gensec_ntlmssp_sign_packet,
@@ -363,13 +295,15 @@ static const struct gensec_security_ops gensec_ntlmssp_security_ops = {
        .session_key    = gensec_ntlmssp_session_key,
        .session_info   = gensec_ntlmssp_session_info,
        .have_feature   = gensec_ntlmssp_have_feature,
-       .enabled        = True
+       .enabled        = true,
+       .priority       = GENSEC_NTLMSSP
 };
 
 
-NTSTATUS gensec_ntlmssp_init(void)
+_PUBLIC_ NTSTATUS gensec_ntlmssp_init(void)
 {
        NTSTATUS ret;
+
        ret = gensec_register(&gensec_ntlmssp_security_ops);
        if (!NT_STATUS_IS_OK(ret)) {
                DEBUG(0,("Failed to register '%s' gensec backend!\n",