s4-auth-krb: smb_rd_req_return_stuff is used only in gensec_krb5
[idra/samba.git] / source4 / auth / gensec / gensec_krb5.c
index 1ddf2d67eb7e9b4fb184616bc5dbfd42d067f0d8..e247d676653f93bf8af67bfcb752d13b4ed60657 100644 (file)
@@ -10,7 +10,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,
 
    
    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 "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
-#include "librpc/gen_ndr/krb5pac.h"
 #include "auth/auth.h"
-#include "lib/ldb/include/ldb.h"
-#include "auth/auth_sam.h"
-#include "system/network.h"
 #include "lib/socket/socket.h"
+#include "lib/tsocket/tsocket.h"
 #include "librpc/rpc/dcerpc.h"
+#include "auth/credentials/credentials.h"
+#include "auth/credentials/credentials_krb5.h"
+#include "auth/kerberos/kerberos_credentials.h"
+#include "auth/gensec/gensec.h"
+#include "auth/gensec/gensec_proto.h"
+#include "auth/gensec/gensec_toplevel_proto.h"
+#include "param/param.h"
+#include "auth/auth_sam_reply.h"
+#include "lib/util/util_net.h"
+#include "../lib/util/asn1.h"
+#include "auth/kerberos/pac_utils.h"
+
+_PUBLIC_ NTSTATUS gensec_krb5_init(void);
 
 enum GENSEC_KRB5_STATE {
        GENSEC_KRB5_SERVER_START,
@@ -43,21 +52,18 @@ enum GENSEC_KRB5_STATE {
 };
 
 struct gensec_krb5_state {
-       DATA_BLOB session_key;
-       DATA_BLOB pac;
        enum GENSEC_KRB5_STATE state_position;
        struct smb_krb5_context *smb_krb5_context;
        krb5_auth_context auth_context;
        krb5_data enc_ticket;
        krb5_keyblock *keyblock;
        krb5_ticket *ticket;
-       BOOL gssapi;
+       bool gssapi;
+       krb5_flags ap_req_options;
 };
 
-static int gensec_krb5_destroy(void *ptr) 
+static int gensec_krb5_destroy(struct gensec_krb5_state *gensec_krb5_state)
 {
-       struct gensec_krb5_state *gensec_krb5_state = ptr;
-
        if (!gensec_krb5_state->smb_krb5_context) {
                /* We can't clean anything else up unless we started up this far */
                return 0;
@@ -85,12 +91,12 @@ static int gensec_krb5_destroy(void *ptr)
        return 0;
 }
 
-static NTSTATUS gensec_krb5_start(struct gensec_security *gensec_security)
+static NTSTATUS gensec_krb5_start(struct gensec_security *gensec_security, bool gssapi)
 {
        krb5_error_code ret;
        struct gensec_krb5_state *gensec_krb5_state;
        struct cli_credentials *creds;
-       const struct socket_address *my_addr, *peer_addr;
+       const struct tsocket_address *tlocal_addr, *tremote_addr;
        krb5_address my_krb5_addr, peer_krb5_addr;
        
        creds = gensec_get_credentials(gensec_security);
@@ -109,13 +115,12 @@ static NTSTATUS gensec_krb5_start(struct gensec_security *gensec_security)
        gensec_krb5_state->ticket = NULL;
        ZERO_STRUCT(gensec_krb5_state->enc_ticket);
        gensec_krb5_state->keyblock = NULL;
-       gensec_krb5_state->session_key = data_blob(NULL, 0);
-       gensec_krb5_state->pac = data_blob(NULL, 0);
-       gensec_krb5_state->gssapi = False;
+       gensec_krb5_state->gssapi = gssapi;
 
        talloc_set_destructor(gensec_krb5_state, gensec_krb5_destroy); 
 
-       if (cli_credentials_get_krb5_context(creds, &gensec_krb5_state->smb_krb5_context)) {
+       if (cli_credentials_get_krb5_context(creds, 
+                                            gensec_security->settings->lp_ctx, &gensec_krb5_state->smb_krb5_context)) {
                talloc_free(gensec_krb5_state);
                return NT_STATUS_INTERNAL_ERROR;
        }
@@ -140,10 +145,20 @@ static NTSTATUS gensec_krb5_start(struct gensec_security *gensec_security)
                return NT_STATUS_INTERNAL_ERROR;
        }
 
-       my_addr = gensec_get_my_addr(gensec_security);
-       if (my_addr && my_addr->sockaddr) {
-               ret = krb5_sockaddr2address(gensec_krb5_state->smb_krb5_context->krb5_context, 
-                                           my_addr->sockaddr, &my_krb5_addr);
+       tlocal_addr = gensec_get_local_address(gensec_security);
+       if (tlocal_addr) {
+               ssize_t socklen;
+               struct sockaddr_storage ss;
+
+               socklen = tsocket_address_bsd_sockaddr(tlocal_addr,
+                               (struct sockaddr *) &ss,
+                               sizeof(struct sockaddr_storage));
+               if (socklen < 0) {
+                       talloc_free(gensec_krb5_state);
+                       return NT_STATUS_INTERNAL_ERROR;
+               }
+               ret = krb5_sockaddr2address(gensec_krb5_state->smb_krb5_context->krb5_context,
+                               (const struct sockaddr *) &ss, &my_krb5_addr);
                if (ret) {
                        DEBUG(1,("gensec_krb5_start: krb5_sockaddr2address (local) failed (%s)\n", 
                                 smb_get_krb5_error_message(gensec_krb5_state->smb_krb5_context->krb5_context, 
@@ -153,10 +168,20 @@ static NTSTATUS gensec_krb5_start(struct gensec_security *gensec_security)
                }
        }
 
-       peer_addr = gensec_get_my_addr(gensec_security);
-       if (peer_addr && peer_addr->sockaddr) {
-               ret = krb5_sockaddr2address(gensec_krb5_state->smb_krb5_context->krb5_context, 
-                                           peer_addr->sockaddr, &peer_krb5_addr);
+       tremote_addr = gensec_get_remote_address(gensec_security);
+       if (tremote_addr) {
+               ssize_t socklen;
+               struct sockaddr_storage ss;
+
+               socklen = tsocket_address_bsd_sockaddr(tremote_addr,
+                               (struct sockaddr *) &ss,
+                               sizeof(struct sockaddr_storage));
+               if (socklen < 0) {
+                       talloc_free(gensec_krb5_state);
+                       return NT_STATUS_INTERNAL_ERROR;
+               }
+               ret = krb5_sockaddr2address(gensec_krb5_state->smb_krb5_context->krb5_context,
+                               (const struct sockaddr *) &ss, &peer_krb5_addr);
                if (ret) {
                        DEBUG(1,("gensec_krb5_start: krb5_sockaddr2address (local) failed (%s)\n", 
                                 smb_get_krb5_error_message(gensec_krb5_state->smb_krb5_context->krb5_context, 
@@ -168,8 +193,8 @@ static NTSTATUS gensec_krb5_start(struct gensec_security *gensec_security)
 
        ret = krb5_auth_con_setaddrs(gensec_krb5_state->smb_krb5_context->krb5_context, 
                                     gensec_krb5_state->auth_context,
-                                    my_addr ? &my_krb5_addr : NULL, 
-                                    peer_addr ? &peer_krb5_addr : NULL);
+                                    tlocal_addr ? &my_krb5_addr : NULL,
+                                    tremote_addr ? &peer_krb5_addr : NULL);
        if (ret) {
                DEBUG(1,("gensec_krb5_start: krb5_auth_con_setaddrs failed (%s)\n", 
                         smb_get_krb5_error_message(gensec_krb5_state->smb_krb5_context->krb5_context, 
@@ -181,46 +206,37 @@ static NTSTATUS gensec_krb5_start(struct gensec_security *gensec_security)
        return NT_STATUS_OK;
 }
 
-static NTSTATUS gensec_krb5_server_start(struct gensec_security *gensec_security)
+static NTSTATUS gensec_krb5_common_server_start(struct gensec_security *gensec_security, bool gssapi)
 {
        NTSTATUS nt_status;
        struct gensec_krb5_state *gensec_krb5_state;
 
-       nt_status = gensec_krb5_start(gensec_security);
+       nt_status = gensec_krb5_start(gensec_security, gssapi);
        if (!NT_STATUS_IS_OK(nt_status)) {
                return nt_status;
        }
        
-       gensec_krb5_state = gensec_security->private_data;
+       gensec_krb5_state = (struct gensec_krb5_state *)gensec_security->private_data;
        gensec_krb5_state->state_position = GENSEC_KRB5_SERVER_START;
 
        return NT_STATUS_OK;
 }
 
-static NTSTATUS gensec_fake_gssapi_krb5_server_start(struct gensec_security *gensec_security)
+static NTSTATUS gensec_krb5_server_start(struct gensec_security *gensec_security)
 {
-       NTSTATUS nt_status = gensec_krb5_server_start(gensec_security);
+       return gensec_krb5_common_server_start(gensec_security, false);
+}
 
-       if (NT_STATUS_IS_OK(nt_status)) {
-               struct gensec_krb5_state *gensec_krb5_state;
-               gensec_krb5_state = gensec_security->private_data;
-               gensec_krb5_state->gssapi = True;
-       }
-       return nt_status;
+static NTSTATUS gensec_fake_gssapi_krb5_server_start(struct gensec_security *gensec_security)
+{
+       return gensec_krb5_common_server_start(gensec_security, true);
 }
 
-static NTSTATUS gensec_krb5_client_start(struct gensec_security *gensec_security)
+static NTSTATUS gensec_krb5_common_client_start(struct gensec_security *gensec_security, bool gssapi)
 {
+       const char *hostname;
        struct gensec_krb5_state *gensec_krb5_state;
-       krb5_error_code ret;
        NTSTATUS nt_status;
-       struct ccache_container *ccache_container;
-       const char *hostname;
-       krb5_flags ap_req_options = AP_OPTS_USE_SUBKEY | AP_OPTS_MUTUAL_REQUIRED;
-
-       const char *principal;
-       krb5_data in_data;
-
        hostname = gensec_get_target_hostname(gensec_security);
        if (!hostname) {
                DEBUG(1, ("Could not determine hostname for target computer, cannot use kerberos\n"));
@@ -235,32 +251,83 @@ static NTSTATUS gensec_krb5_client_start(struct gensec_security *gensec_security
                return NT_STATUS_INVALID_PARAMETER;
        }
                        
-       nt_status = gensec_krb5_start(gensec_security);
+       nt_status = gensec_krb5_start(gensec_security, gssapi);
        if (!NT_STATUS_IS_OK(nt_status)) {
                return nt_status;
        }
 
-       gensec_krb5_state = gensec_security->private_data;
+       gensec_krb5_state = (struct gensec_krb5_state *)gensec_security->private_data;
        gensec_krb5_state->state_position = GENSEC_KRB5_CLIENT_START;
+       gensec_krb5_state->ap_req_options = AP_OPTS_USE_SUBKEY;
 
-       ret = cli_credentials_get_ccache(gensec_get_credentials(gensec_security), &ccache_container);
-       if (ret) {
-               DEBUG(1,("gensec_krb5_start: cli_credentials_get_ccache failed: %s\n", 
-                        error_message(ret)));
-               return NT_STATUS_UNSUCCESSFUL;
+       if (gensec_krb5_state->gssapi) {
+               /* The Fake GSSAPI modal emulates Samba3, which does not do mutual authentication */
+               if (gensec_setting_bool(gensec_security->settings, "gensec_fake_gssapi_krb5", "mutual", false)) {
+                       gensec_krb5_state->ap_req_options |= AP_OPTS_MUTUAL_REQUIRED;
+               }
+       } else {
+               /* The wrapping for KPASSWD (a user of the raw KRB5 API) should be mutually authenticated */
+               if (gensec_setting_bool(gensec_security->settings, "gensec_krb5", "mutual", true)) {
+                       gensec_krb5_state->ap_req_options |= AP_OPTS_MUTUAL_REQUIRED;
+               }
        }
+       return NT_STATUS_OK;
+}
 
+static NTSTATUS gensec_krb5_common_client_creds(struct gensec_security *gensec_security,
+                                               struct tevent_context *ev,
+                                               bool gssapi)
+{
+       struct gensec_krb5_state *gensec_krb5_state;
+       krb5_error_code ret;
+       struct ccache_container *ccache_container;
+       const char *error_string;
+       const char *principal;
+       const char *hostname;
+       krb5_data in_data;
+       struct tevent_context *previous_ev;
+
+       gensec_krb5_state = (struct gensec_krb5_state *)gensec_security->private_data;
+
+       principal = gensec_get_target_principal(gensec_security);
+       hostname = gensec_get_target_hostname(gensec_security);
+
+       ret = cli_credentials_get_ccache(gensec_get_credentials(gensec_security), 
+                                        ev,
+                                        gensec_security->settings->lp_ctx, &ccache_container, &error_string);
+       switch (ret) {
+       case 0:
+               break;
+       case KRB5KDC_ERR_PREAUTH_FAILED:
+       case KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN:
+               return NT_STATUS_LOGON_FAILURE;
+       case KRB5_KDC_UNREACH:
+               DEBUG(3, ("Cannot reach a KDC we require to contact %s: %s\n", principal, error_string));
+               return NT_STATUS_INVALID_PARAMETER; /* Make SPNEGO ignore us, we can't go any further here */
+       case KRB5_CC_NOTFOUND:
+       case KRB5_CC_END:
+               DEBUG(3, ("Error preparing credentials we require to contact %s : %s\n", principal, error_string));
+               return NT_STATUS_INVALID_PARAMETER; /* Make SPNEGO ignore us, we can't go any further here */
+       default:
+               DEBUG(1, ("gensec_krb5_start: Aquiring initiator credentials failed: %s\n", error_string));
+               return NT_STATUS_UNSUCCESSFUL;
+       }
        in_data.length = 0;
        
-       principal = gensec_get_target_principal(gensec_security);
-       if (principal && lp_client_use_spnego_principal()) {
+       /* Do this every time, in case we have weird recursive issues here */
+       ret = smb_krb5_context_set_event_ctx(gensec_krb5_state->smb_krb5_context, ev, &previous_ev);
+       if (ret != 0) {
+               DEBUG(1, ("gensec_krb5_start: Setting event context failed\n"));
+               return NT_STATUS_NO_MEMORY;
+       }
+       if (principal) {
                krb5_principal target_principal;
                ret = krb5_parse_name(gensec_krb5_state->smb_krb5_context->krb5_context, principal,
                                      &target_principal);
                if (ret == 0) {
                        ret = krb5_mk_req_exact(gensec_krb5_state->smb_krb5_context->krb5_context, 
                                                &gensec_krb5_state->auth_context,
-                                               ap_req_options, 
+                                               gensec_krb5_state->ap_req_options, 
                                                target_principal,
                                                &in_data, ccache_container->ccache, 
                                                &gensec_krb5_state->enc_ticket);
@@ -270,12 +337,15 @@ static NTSTATUS gensec_krb5_client_start(struct gensec_security *gensec_security
        } else {
                ret = krb5_mk_req(gensec_krb5_state->smb_krb5_context->krb5_context, 
                                  &gensec_krb5_state->auth_context,
-                                 ap_req_options,
+                                 gensec_krb5_state->ap_req_options,
                                  gensec_get_target_service(gensec_security),
                                  hostname,
                                  &in_data, ccache_container->ccache, 
                                  &gensec_krb5_state->enc_ticket);
        }
+
+       smb_krb5_context_remove_event_ctx(gensec_krb5_state->smb_krb5_context, previous_ev, ev);
+
        switch (ret) {
        case 0:
                return NT_STATUS_OK;
@@ -314,38 +384,148 @@ static NTSTATUS gensec_krb5_client_start(struct gensec_security *gensec_security
        }
 }
 
+static NTSTATUS gensec_krb5_client_start(struct gensec_security *gensec_security)
+{
+       return gensec_krb5_common_client_start(gensec_security, false);
+}
+
 static NTSTATUS gensec_fake_gssapi_krb5_client_start(struct gensec_security *gensec_security)
 {
-       NTSTATUS nt_status = gensec_krb5_client_start(gensec_security);
+       return gensec_krb5_common_client_start(gensec_security, true);
+}
+
+
+/*
+  generate a krb5 GSS-API wrapper packet given a ticket
+*/
+static DATA_BLOB gensec_gssapi_gen_krb5_wrap(TALLOC_CTX *mem_ctx, const DATA_BLOB *ticket, const uint8_t tok_id[2])
+{
+       struct asn1_data *data;
+       DATA_BLOB ret;
 
-       if (NT_STATUS_IS_OK(nt_status)) {
-               struct gensec_krb5_state *gensec_krb5_state;
-               gensec_krb5_state = gensec_security->private_data;
-               gensec_krb5_state->gssapi = True;
+       data = asn1_init(mem_ctx);
+       if (!data || !ticket->data) {
+               return data_blob(NULL,0);
        }
-       return nt_status;
-}
 
-/**
- * Check if the packet is one for this mechansim
- * 
- * @param gensec_security GENSEC state
- * @param in The request, as a DATA_BLOB
- * @return Error, INVALID_PARAMETER if it's not a packet for us
- *                or NT_STATUS_OK if the packet is ok. 
- */
+       asn1_push_tag(data, ASN1_APPLICATION(0));
+       asn1_write_OID(data, GENSEC_OID_KERBEROS5);
 
-static NTSTATUS gensec_fake_gssapi_krb5_magic(struct gensec_security *gensec_security, 
-                                 const DATA_BLOB *in) 
+       asn1_write(data, tok_id, 2);
+       asn1_write(data, ticket->data, ticket->length);
+       asn1_pop_tag(data);
+
+       if (data->has_error) {
+               DEBUG(1,("Failed to build krb5 wrapper at offset %d\n", (int)data->ofs));
+               asn1_free(data);
+               return data_blob(NULL,0);
+       }
+
+       ret = data_blob_talloc(mem_ctx, data->data, data->length);
+       asn1_free(data);
+
+       return ret;
+}
+
+/*
+  parse a krb5 GSS-API wrapper packet giving a ticket
+*/
+static bool gensec_gssapi_parse_krb5_wrap(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, DATA_BLOB *ticket, uint8_t tok_id[2])
 {
-       if (gensec_gssapi_check_oid(in, GENSEC_OID_KERBEROS5)) {
-               return NT_STATUS_OK;
+       bool ret;
+       struct asn1_data *data = asn1_init(mem_ctx);
+       int data_remaining;
+
+       if (!data) {
+               return false;
+       }
+
+       asn1_load(data, *blob);
+       asn1_start_tag(data, ASN1_APPLICATION(0));
+       asn1_check_OID(data, GENSEC_OID_KERBEROS5);
+
+       data_remaining = asn1_tag_remaining(data);
+
+       if (data_remaining < 3) {
+               data->has_error = true;
        } else {
-               return NT_STATUS_INVALID_PARAMETER;
+               asn1_read(data, tok_id, 2);
+               data_remaining -= 2;
+               *ticket = data_blob_talloc(mem_ctx, NULL, data_remaining);
+               asn1_read(data, ticket->data, ticket->length);
        }
+
+       asn1_end_tag(data);
+
+       ret = !data->has_error;
+
+       asn1_free(data);
+
+       return ret;
 }
 
+/* Taken from  accept_sec_context.c,v 1.65 */
+static
+krb5_error_code smb_rd_req_return_stuff(krb5_context context, 
+                                       krb5_auth_context *auth_context,
+                                       const krb5_data *inbuf,
+                                       krb5_keytab keytab, 
+                                       krb5_principal acceptor_principal,
+                                       krb5_data *outbuf, 
+                                       krb5_ticket **ticket, 
+                                       krb5_keyblock **keyblock)
+{
+       krb5_rd_req_in_ctx in = NULL;
+       krb5_rd_req_out_ctx out = NULL;
+       krb5_error_code kret;
+
+       *keyblock = NULL;
+       *ticket = NULL;
+       outbuf->length = 0;
+       outbuf->data = NULL;
+
+       kret = krb5_rd_req_in_ctx_alloc(context, &in);
+       if (kret == 0)
+           kret = krb5_rd_req_in_set_keytab(context, in, keytab);
+       if (kret) {
+           if (in)
+               krb5_rd_req_in_ctx_free(context, in);
+           return kret;
+       }
+
+       kret = krb5_rd_req_ctx(context,
+                              auth_context,
+                              inbuf,
+                              acceptor_principal,
+                              in, &out);
+       krb5_rd_req_in_ctx_free(context, in);
+       if (kret) {
+           return kret;
+       }
+
+       /*
+        * We need to remember some data on the context_handle.
+        */
+       kret = krb5_rd_req_out_get_ticket(context, out, 
+                                         ticket);
+       if (kret == 0) {
+           kret = krb5_rd_req_out_get_keyblock(context, out,
+                                               keyblock);
+       }
+       krb5_rd_req_out_ctx_free(context, out);
+
+       if (kret == 0) {
+               kret = krb5_mk_rep(context, *auth_context, outbuf);
+       }
+
+       if (kret) {
+               krb5_free_ticket(context, *ticket);
+               krb5_free_keyblock(context, *keyblock);
+               krb5_data_free(outbuf);
+       }
 
+       return kret;
+}
 /**
  * Next state function for the Krb5 GENSEC mechanism
  * 
@@ -359,9 +539,10 @@ static NTSTATUS gensec_fake_gssapi_krb5_magic(struct gensec_security *gensec_sec
 
 static NTSTATUS gensec_krb5_update(struct gensec_security *gensec_security, 
                                   TALLOC_CTX *out_mem_ctx, 
+                                  struct tevent_context *ev,
                                   const DATA_BLOB in, DATA_BLOB *out) 
 {
-       struct gensec_krb5_state *gensec_krb5_state = gensec_security->private_data;
+       struct gensec_krb5_state *gensec_krb5_state = (struct gensec_krb5_state *)gensec_security->private_data;
        krb5_error_code ret = 0;
        NTSTATUS nt_status;
 
@@ -370,6 +551,11 @@ static NTSTATUS gensec_krb5_update(struct gensec_security *gensec_security,
        {
                DATA_BLOB unwrapped_out;
                
+               nt_status = gensec_krb5_common_client_creds(gensec_security, ev, gensec_krb5_state->gssapi);
+               if (!NT_STATUS_IS_OK(nt_status)) {
+                       return nt_status;
+               }
+
                if (gensec_krb5_state->gssapi) {
                        unwrapped_out = data_blob_talloc(out_mem_ctx, gensec_krb5_state->enc_ticket.data, gensec_krb5_state->enc_ticket.length);
                        
@@ -378,8 +564,13 @@ static NTSTATUS gensec_krb5_update(struct gensec_security *gensec_security,
                } else {
                        *out = data_blob_talloc(out_mem_ctx, gensec_krb5_state->enc_ticket.data, gensec_krb5_state->enc_ticket.length);
                }
-               gensec_krb5_state->state_position = GENSEC_KRB5_CLIENT_MUTUAL_AUTH;
-               nt_status = NT_STATUS_MORE_PROCESSING_REQUIRED;
+               if (gensec_krb5_state->ap_req_options & AP_OPTS_MUTUAL_REQUIRED) {
+                       gensec_krb5_state->state_position = GENSEC_KRB5_CLIENT_MUTUAL_AUTH;
+                       nt_status = NT_STATUS_MORE_PROCESSING_REQUIRED;
+               } else {
+                       gensec_krb5_state->state_position = GENSEC_KRB5_DONE;
+                       nt_status = NT_STATUS_OK;
+               }
                return nt_status;
        }
                
@@ -409,7 +600,7 @@ static NTSTATUS gensec_krb5_update(struct gensec_security *gensec_security,
                if (ret) {
                        DEBUG(1,("krb5_rd_rep (mutual authentication) failed (%s)\n",
                                 smb_get_krb5_error_message(gensec_krb5_state->smb_krb5_context->krb5_context, ret, out_mem_ctx)));
-                       dump_data_pw("Mutual authentication message:\n", inbuf.data, inbuf.length);
+                       dump_data_pw("Mutual authentication message:\n", (uint8_t *)inbuf.data, inbuf.length);
                        nt_status = NT_STATUS_ACCESS_DENIED;
                } else {
                        *out = data_blob(NULL, 0);
@@ -426,48 +617,68 @@ static NTSTATUS gensec_krb5_update(struct gensec_security *gensec_security,
        {
                DATA_BLOB unwrapped_in;
                DATA_BLOB unwrapped_out = data_blob(NULL, 0);
+               krb5_data inbuf, outbuf;
                uint8_t tok_id[2];
+               struct keytab_container *keytab;
+               krb5_principal server_in_keytab;
+               const char *error_string;
+               enum credentials_obtained obtained;
 
                if (!in.data) {
                        return NT_STATUS_INVALID_PARAMETER;
                }       
 
+               /* Grab the keytab, however generated */
+               ret = cli_credentials_get_keytab(gensec_get_credentials(gensec_security), 
+                                                gensec_security->settings->lp_ctx, &keytab);
+               if (ret) {
+                       return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
+               }
+               
+               /* This ensures we lookup the correct entry in that
+                * keytab.  A NULL principal is acceptable, and means
+                * that the krb5 libs should search the keytab at
+                * accept time for any matching key */
+               ret = principal_from_credentials(out_mem_ctx, gensec_get_credentials(gensec_security), 
+                                                gensec_krb5_state->smb_krb5_context, 
+                                                &server_in_keytab, &obtained, &error_string);
+
+               if (ret) {
+                       DEBUG(2,("Failed to make credentials from principal: %s\n", error_string));
+                       return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
+               }
+
                /* Parse the GSSAPI wrapping, if it's there... (win2k3 allows it to be omited) */
                if (gensec_krb5_state->gssapi
                    && gensec_gssapi_parse_krb5_wrap(out_mem_ctx, &in, &unwrapped_in, tok_id)) {
-                       nt_status = ads_verify_ticket(out_mem_ctx, 
-                                                     gensec_krb5_state->smb_krb5_context,
-                                                     &gensec_krb5_state->auth_context, 
-                                                     gensec_get_credentials(gensec_security),
-                                                     gensec_get_target_service(gensec_security), &unwrapped_in, 
-                                                     &gensec_krb5_state->ticket, &unwrapped_out,
-                                                     &gensec_krb5_state->keyblock);
+                       inbuf.data = unwrapped_in.data;
+                       inbuf.length = unwrapped_in.length;
                } else {
-                       /* TODO: check the tok_id */
-                       nt_status = ads_verify_ticket(out_mem_ctx, 
-                                                     gensec_krb5_state->smb_krb5_context,
-                                                     &gensec_krb5_state->auth_context, 
-                                                     gensec_get_credentials(gensec_security),
-                                                     gensec_get_target_service(gensec_security), 
-                                                     &in, 
-                                                     &gensec_krb5_state->ticket, &unwrapped_out,
-                                                     &gensec_krb5_state->keyblock);
+                       inbuf.data = in.data;
+                       inbuf.length = in.length;
                }
 
-               if (!NT_STATUS_IS_OK(nt_status)) {
-                       return nt_status;
-               }
+               ret = smb_rd_req_return_stuff(gensec_krb5_state->smb_krb5_context->krb5_context,
+                                             &gensec_krb5_state->auth_context, 
+                                             &inbuf, keytab->keytab, server_in_keytab,  
+                                             &outbuf, 
+                                             &gensec_krb5_state->ticket, 
+                                             &gensec_krb5_state->keyblock);
 
-               if (NT_STATUS_IS_OK(nt_status)) {
-                       gensec_krb5_state->state_position = GENSEC_KRB5_DONE;
-                       /* wrap that up in a nice GSS-API wrapping */
-                       if (gensec_krb5_state->gssapi) {
-                               *out = gensec_gssapi_gen_krb5_wrap(out_mem_ctx, &unwrapped_out, TOK_ID_KRB_AP_REP);
-                       } else {
-                               *out = unwrapped_out;
-                       }
+               if (ret) {
+                       return NT_STATUS_LOGON_FAILURE;
                }
-               return nt_status;
+               unwrapped_out.data = (uint8_t *)outbuf.data;
+               unwrapped_out.length = outbuf.length;
+               gensec_krb5_state->state_position = GENSEC_KRB5_DONE;
+               /* wrap that up in a nice GSS-API wrapping */
+               if (gensec_krb5_state->gssapi) {
+                       *out = gensec_gssapi_gen_krb5_wrap(out_mem_ctx, &unwrapped_out, TOK_ID_KRB_AP_REP);
+               } else {
+                       *out = data_blob_talloc(out_mem_ctx, outbuf.data, outbuf.length);
+               }
+               krb5_data_free(&outbuf);
+               return NT_STATUS_OK;
        }
 
        case GENSEC_KRB5_DONE:
@@ -478,17 +689,17 @@ static NTSTATUS gensec_krb5_update(struct gensec_security *gensec_security,
 }
 
 static NTSTATUS gensec_krb5_session_key(struct gensec_security *gensec_security, 
+                                       TALLOC_CTX *mem_ctx,
                                        DATA_BLOB *session_key) 
 {
-       struct gensec_krb5_state *gensec_krb5_state = gensec_security->private_data;
+       struct gensec_krb5_state *gensec_krb5_state = (struct gensec_krb5_state *)gensec_security->private_data;
        krb5_context context = gensec_krb5_state->smb_krb5_context->krb5_context;
        krb5_auth_context auth_context = gensec_krb5_state->auth_context;
        krb5_keyblock *skey;
        krb5_error_code err = -1;
 
-       if (gensec_krb5_state->session_key.data) {
-               *session_key = gensec_krb5_state->session_key;
-               return NT_STATUS_OK;
+       if (gensec_krb5_state->state_position != GENSEC_KRB5_DONE) {
+               return NT_STATUS_NO_USER_SESSION_KEY;
        }
 
        switch (gensec_security->gensec_role) {
@@ -502,9 +713,8 @@ static NTSTATUS gensec_krb5_session_key(struct gensec_security *gensec_security,
        if (err == 0 && skey != NULL) {
                DEBUG(10, ("Got KRB5 session key of length %d\n",  
                           (int)KRB5_KEY_LENGTH(skey)));
-               gensec_krb5_state->session_key = data_blob_talloc(gensec_krb5_state, 
-                                               KRB5_KEY_DATA(skey), KRB5_KEY_LENGTH(skey));
-               *session_key = gensec_krb5_state->session_key;
+               *session_key = data_blob_talloc(mem_ctx,
+                                              KRB5_KEY_DATA(skey), KRB5_KEY_LENGTH(skey));
                dump_data_pw("KRB5 Session Key:\n", session_key->data, session_key->length);
 
                krb5_free_keyblock(context, skey);
@@ -516,124 +726,109 @@ static NTSTATUS gensec_krb5_session_key(struct gensec_security *gensec_security,
 }
 
 static NTSTATUS gensec_krb5_session_info(struct gensec_security *gensec_security,
+                                        TALLOC_CTX *mem_ctx,
                                         struct auth_session_info **_session_info) 
 {
        NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
-       struct gensec_krb5_state *gensec_krb5_state = gensec_security->private_data;
+       struct gensec_krb5_state *gensec_krb5_state = (struct gensec_krb5_state *)gensec_security->private_data;
        krb5_context context = gensec_krb5_state->smb_krb5_context->krb5_context;
-       struct auth_serversupplied_info *server_info = NULL;
        struct auth_session_info *session_info = NULL;
-       struct PAC_LOGON_INFO *logon_info;
 
        krb5_principal client_principal;
+       char *principal_string;
        
-       DATA_BLOB pac;
+       DATA_BLOB pac_blob, *pac_blob_ptr = NULL;
        krb5_data pac_data;
 
        krb5_error_code ret;
 
-       TALLOC_CTX *mem_ctx = talloc_new(gensec_security);
-       if (!mem_ctx) {
+       TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
+       if (!tmp_ctx) {
                return NT_STATUS_NO_MEMORY;
        }
        
+       ret = krb5_ticket_get_client(context, gensec_krb5_state->ticket, &client_principal);
+       if (ret) {
+               DEBUG(5, ("krb5_ticket_get_client failed to get cleint principal: %s\n", 
+                         smb_get_krb5_error_message(context, 
+                                                    ret, tmp_ctx)));
+               talloc_free(tmp_ctx);
+               return NT_STATUS_NO_MEMORY;
+       }
+       
+       ret = krb5_unparse_name(gensec_krb5_state->smb_krb5_context->krb5_context, 
+                               client_principal, &principal_string);
+       if (ret) {
+               DEBUG(1, ("Unable to parse client principal: %s\n",
+                         smb_get_krb5_error_message(context, 
+                                                    ret, tmp_ctx)));
+               krb5_free_principal(context, client_principal);
+               talloc_free(tmp_ctx);
+               return NT_STATUS_NO_MEMORY;
+       }
+
        ret = krb5_ticket_get_authorization_data_type(context, gensec_krb5_state->ticket, 
                                                      KRB5_AUTHDATA_WIN2K_PAC, 
                                                      &pac_data);
        
        if (ret) {
+               /* NO pac */
                DEBUG(5, ("krb5_ticket_get_authorization_data_type failed to find PAC: %s\n", 
                          smb_get_krb5_error_message(context, 
-                                                    ret, mem_ctx)));
+                                                    ret, tmp_ctx)));
        } else {
-               pac = data_blob_talloc(mem_ctx, pac_data.data, pac_data.length);
-               if (!pac.data) {
-                       talloc_free(mem_ctx);
+               /* Found pac */
+               pac_blob = data_blob_talloc(tmp_ctx, pac_data.data, pac_data.length);
+               if (!pac_blob.data) {
+                       free(principal_string);
+                       krb5_free_principal(context, client_principal);
+                       talloc_free(tmp_ctx);
                        return NT_STATUS_NO_MEMORY;
                }
 
-               ret = krb5_ticket_get_client(context, gensec_krb5_state->ticket, &client_principal);
-               if (ret) {
-                       DEBUG(5, ("krb5_ticket_get_client failed to get cleint principal: %s\n", 
-                                 smb_get_krb5_error_message(context, 
-                                                            ret, mem_ctx)));
-                       talloc_free(mem_ctx);
-                       return NT_STATUS_NO_MEMORY;
-               }
-               
                /* decode and verify the pac */
-               nt_status = kerberos_pac_logon_info(gensec_krb5_state, &logon_info, pac,
-                                                   gensec_krb5_state->smb_krb5_context->krb5_context,
-                                                   NULL, gensec_krb5_state->keyblock,
-                                                   client_principal,
-                                                   gensec_krb5_state->ticket->ticket.authtime, NULL);
-               krb5_free_principal(context, client_principal);
+               nt_status = kerberos_decode_pac(gensec_krb5_state,
+                                               pac_blob,
+                                               gensec_krb5_state->smb_krb5_context->krb5_context,
+                                               NULL, gensec_krb5_state->keyblock,
+                                               client_principal,
+                                               gensec_krb5_state->ticket->ticket.authtime, NULL);
 
-               if (NT_STATUS_IS_OK(nt_status)) {
-                       union netr_Validation validation;
-                       validation.sam3 = &logon_info->info3;
-                       nt_status = make_server_info_netlogon_validation(mem_ctx, 
-                                                                        NULL,
-                                                                        3, &validation,
-                                                                        &server_info); 
-               }
-       }
-
-               
-               
-       /* IF we have the PAC - otherwise we need to get this
-        * data from elsewere - local ldb, or (TODO) lookup of some
-        * kind... 
-        */
-       if (!NT_STATUS_IS_OK(nt_status)) {
-               /* NO pac, or can't parse or verify it */
-               char *principal_string;
-               ret = krb5_ticket_get_client(context, gensec_krb5_state->ticket, &client_principal);
-               if (ret) {
-                       DEBUG(5, ("krb5_ticket_get_client failed to get cleint principal: %s\n", 
-                                 smb_get_krb5_error_message(context, 
-                                                            ret, mem_ctx)));
-                       talloc_free(mem_ctx);
-                       return NT_STATUS_NO_MEMORY;
-               }
-               
-               ret = krb5_unparse_name(gensec_krb5_state->smb_krb5_context->krb5_context, 
-                                       client_principal, &principal_string);
-               krb5_free_principal(context, client_principal);
-               if (ret) {
-                       talloc_free(mem_ctx);
-                       return NT_STATUS_NO_MEMORY;
-               }
-
-               nt_status = sam_get_server_info_principal(mem_ctx, principal_string,
-                                                         &server_info);
-               free(principal_string);
-               
                if (!NT_STATUS_IS_OK(nt_status)) {
-                       talloc_free(mem_ctx);
+                       free(principal_string);
+                       krb5_free_principal(context, client_principal);
+                       talloc_free(tmp_ctx);
                        return nt_status;
                }
+
+               pac_blob_ptr = &pac_blob;
        }
 
-       /* references the server_info into the session_info */
-       nt_status = auth_generate_session_info(mem_ctx, server_info, &session_info);
+       nt_status = gensec_generate_session_info_pac(tmp_ctx,
+                                                    gensec_security,
+                                                    gensec_krb5_state->smb_krb5_context,
+                                                    pac_blob_ptr, principal_string,
+                                                    gensec_get_remote_address(gensec_security),
+                                                    &session_info);
+
+       free(principal_string);
+       krb5_free_principal(context, client_principal);
 
        if (!NT_STATUS_IS_OK(nt_status)) {
-               talloc_free(mem_ctx);
+               talloc_free(tmp_ctx);
                return nt_status;
        }
 
-       nt_status = gensec_krb5_session_key(gensec_security, &session_info->session_key);
+       nt_status = gensec_krb5_session_key(gensec_security, session_info, &session_info->session_key);
 
        if (!NT_STATUS_IS_OK(nt_status)) {
-               talloc_free(mem_ctx);
+               talloc_free(tmp_ctx);
                return nt_status;
        }
 
-       *_session_info = session_info;
+       *_session_info = talloc_steal(mem_ctx, session_info);
 
-       talloc_steal(gensec_krb5_state, session_info);
-       talloc_free(mem_ctx);
+       talloc_free(tmp_ctx);
        return NT_STATUS_OK;
 }
 
@@ -642,7 +837,7 @@ static NTSTATUS gensec_krb5_wrap(struct gensec_security *gensec_security,
                                   const DATA_BLOB *in, 
                                   DATA_BLOB *out)
 {
-       struct gensec_krb5_state *gensec_krb5_state = gensec_security->private_data;
+       struct gensec_krb5_state *gensec_krb5_state = (struct gensec_krb5_state *)gensec_security->private_data;
        krb5_context context = gensec_krb5_state->smb_krb5_context->krb5_context;
        krb5_auth_context auth_context = gensec_krb5_state->auth_context;
        krb5_error_code ret;
@@ -672,7 +867,7 @@ static NTSTATUS gensec_krb5_unwrap(struct gensec_security *gensec_security,
                                     const DATA_BLOB *in, 
                                     DATA_BLOB *out)
 {
-       struct gensec_krb5_state *gensec_krb5_state = gensec_security->private_data;
+       struct gensec_krb5_state *gensec_krb5_state = (struct gensec_krb5_state *)gensec_security->private_data;
        krb5_context context = gensec_krb5_state->smb_krb5_context->krb5_context;
        krb5_auth_context auth_context = gensec_krb5_state->auth_context;
        krb5_error_code ret;
@@ -698,19 +893,19 @@ static NTSTATUS gensec_krb5_unwrap(struct gensec_security *gensec_security,
        return NT_STATUS_OK;
 }
 
-static BOOL gensec_krb5_have_feature(struct gensec_security *gensec_security,
+static bool gensec_krb5_have_feature(struct gensec_security *gensec_security,
                                     uint32_t feature)
 {
-       struct gensec_krb5_state *gensec_krb5_state = gensec_security->private_data;
+       struct gensec_krb5_state *gensec_krb5_state = (struct gensec_krb5_state *)gensec_security->private_data;
        if (feature & GENSEC_FEATURE_SESSION_KEY) {
-               return True;
+               return true;
        } 
        if (!gensec_krb5_state->gssapi && 
            (feature & GENSEC_FEATURE_SEAL)) {
-               return True;
+               return true;
        } 
        
-       return False;
+       return false;
 }
 
 static const char *gensec_krb5_oids[] = { 
@@ -721,18 +916,18 @@ static const char *gensec_krb5_oids[] = {
 
 static const struct gensec_security_ops gensec_fake_gssapi_krb5_security_ops = {
        .name           = "fake_gssapi_krb5",
-       .sasl_name      = "GSSAPI",
        .auth_type      = DCERPC_AUTH_TYPE_KRB5,
        .oid            = gensec_krb5_oids,
        .client_start   = gensec_fake_gssapi_krb5_client_start,
        .server_start   = gensec_fake_gssapi_krb5_server_start,
        .update         = gensec_krb5_update,
-       .magic          = gensec_fake_gssapi_krb5_magic,
+       .magic          = gensec_magic_check_krb5_oid,
        .session_key    = gensec_krb5_session_key,
        .session_info   = gensec_krb5_session_info,
        .have_feature   = gensec_krb5_have_feature,
-       .enabled        = False,
-       .kerberos       = True
+       .enabled        = false,
+       .kerberos       = true,
+       .priority       = GENSEC_KRB5
 };
 
 static const struct gensec_security_ops gensec_krb5_security_ops = {
@@ -745,16 +940,15 @@ static const struct gensec_security_ops gensec_krb5_security_ops = {
        .have_feature   = gensec_krb5_have_feature,
        .wrap           = gensec_krb5_wrap,
        .unwrap         = gensec_krb5_unwrap,
-       .enabled        = True,
-       .kerberos       = True
+       .enabled        = true,
+       .kerberos       = true,
+       .priority       = GENSEC_KRB5
 };
 
-NTSTATUS gensec_krb5_init(void)
+_PUBLIC_ NTSTATUS gensec_krb5_init(void)
 {
        NTSTATUS ret;
 
-       auth_init();
-
        ret = gensec_register(&gensec_krb5_security_ops);
        if (!NT_STATUS_IS_OK(ret)) {
                DEBUG(0,("Failed to register '%s' gensec backend!\n",