auth/gensec: Remove unneeded cli_credentials_set_conf() call
[nivanova/samba-autobuild/.git] / source4 / auth / gensec / gensec_gssapi.c
index c384914f922ae3ddbccff0f8b05eb1234ad35550..3ec1cd495d4895f4875eba9772a52fe17e94fe4e 100644 (file)
@@ -30,7 +30,7 @@
 #include "auth/auth.h"
 #include <ldb.h>
 #include "auth/auth_sam.h"
-#include "librpc/rpc/dcerpc.h"
+#include "librpc/gen_ndr/dcerpc.h"
 #include "auth/credentials/credentials.h"
 #include "auth/credentials/credentials_krb5.h"
 #include "auth/gensec/gensec.h"
@@ -42,6 +42,7 @@
 #include "gensec_gssapi.h"
 #include "lib/util/util_net.h"
 #include "auth/kerberos/pac_utils.h"
+#include "auth/kerberos/gssapi_helper.h"
 
 #ifndef gss_mech_spnego
 gss_OID_desc spnego_mech_oid_desc =
@@ -53,72 +54,42 @@ _PUBLIC_ NTSTATUS gensec_gssapi_init(void);
 
 static size_t gensec_gssapi_max_input_size(struct gensec_security *gensec_security);
 static size_t gensec_gssapi_max_wrapped_size(struct gensec_security *gensec_security);
+static size_t gensec_gssapi_sig_size(struct gensec_security *gensec_security, size_t data_size);
 
 static int gensec_gssapi_destructor(struct gensec_gssapi_state *gensec_gssapi_state)
 {
-       OM_uint32 maj_stat, min_stat;
-       
+       OM_uint32 min_stat;
+
        if (gensec_gssapi_state->delegated_cred_handle != GSS_C_NO_CREDENTIAL) {
-               maj_stat = gss_release_cred(&min_stat, 
-                                           &gensec_gssapi_state->delegated_cred_handle);
+               gss_release_cred(&min_stat,
+                                &gensec_gssapi_state->delegated_cred_handle);
        }
 
        if (gensec_gssapi_state->gssapi_context != GSS_C_NO_CONTEXT) {
-               maj_stat = gss_delete_sec_context (&min_stat,
-                                                  &gensec_gssapi_state->gssapi_context,
-                                                  GSS_C_NO_BUFFER);
+               gss_delete_sec_context(&min_stat,
+                                      &gensec_gssapi_state->gssapi_context,
+                                      GSS_C_NO_BUFFER);
        }
 
        if (gensec_gssapi_state->server_name != GSS_C_NO_NAME) {
-               maj_stat = gss_release_name(&min_stat, &gensec_gssapi_state->server_name);
+               gss_release_name(&min_stat,
+                                &gensec_gssapi_state->server_name);
        }
        if (gensec_gssapi_state->client_name != GSS_C_NO_NAME) {
-               maj_stat = gss_release_name(&min_stat, &gensec_gssapi_state->client_name);
-       }
-
-       if (gensec_gssapi_state->lucid) {
-               gss_krb5_free_lucid_sec_context(&min_stat, gensec_gssapi_state->lucid);
+               gss_release_name(&min_stat,
+                                &gensec_gssapi_state->client_name);
        }
 
        return 0;
 }
 
-static NTSTATUS gensec_gssapi_init_lucid(struct gensec_gssapi_state *gensec_gssapi_state)
-{
-       OM_uint32 maj_stat, min_stat;
-
-       if (gensec_gssapi_state->lucid) {
-               return NT_STATUS_OK;
-       }
-
-       maj_stat = gss_krb5_export_lucid_sec_context(&min_stat,
-                                                    &gensec_gssapi_state->gssapi_context,
-                                                    1,
-                                                    (void **)&gensec_gssapi_state->lucid);
-       if (maj_stat != GSS_S_COMPLETE) {
-               DEBUG(0,("gensec_gssapi_init_lucid: %s\n",
-                       gssapi_error_string(gensec_gssapi_state,
-                                           maj_stat, min_stat,
-                                           gensec_gssapi_state->gss_oid)));
-               return NT_STATUS_INTERNAL_ERROR;
-       }
-
-       if (gensec_gssapi_state->lucid->version != 1) {
-               DEBUG(0,("gensec_gssapi_init_lucid: lucid version[%d] != 1\n",
-                       gensec_gssapi_state->lucid->version));
-               gss_krb5_free_lucid_sec_context(&min_stat, gensec_gssapi_state->lucid);
-               gensec_gssapi_state->lucid = NULL;
-               return NT_STATUS_INTERNAL_ERROR;
-       }
-
-       return NT_STATUS_OK;
-}
-
 static NTSTATUS gensec_gssapi_start(struct gensec_security *gensec_security)
 {
        struct gensec_gssapi_state *gensec_gssapi_state;
        krb5_error_code ret;
+#ifdef SAMBA4_USES_HEIMDAL
        const char *realm;
+#endif
 
        gensec_gssapi_state = talloc_zero(gensec_security, struct gensec_gssapi_state);
        if (!gensec_gssapi_state) {
@@ -144,7 +115,7 @@ static NTSTATUS gensec_gssapi_start(struct gensec_security *gensec_security)
        if (gensec_setting_bool(gensec_security->settings, "gensec_gssapi", "mutual", true)) {
                gensec_gssapi_state->gss_want_flags |= GSS_C_MUTUAL_FLAG;
        }
-       if (gensec_setting_bool(gensec_security->settings, "gensec_gssapi", "delegation", true)) {
+       if (gensec_setting_bool(gensec_security->settings, "gensec_gssapi", "delegation", false)) {
                gensec_gssapi_state->gss_want_flags |= GSS_C_DELEG_FLAG;
        }
        if (gensec_setting_bool(gensec_security->settings, "gensec_gssapi", "replay", true)) {
@@ -179,7 +150,6 @@ static NTSTATUS gensec_gssapi_start(struct gensec_security *gensec_security)
        }
 
        ret = smb_krb5_init_context(gensec_gssapi_state,
-                                   NULL,
                                    gensec_security->settings->lp_ctx,
                                    &gensec_gssapi_state->smb_krb5_context);
        if (ret) {
@@ -192,8 +162,6 @@ static NTSTATUS gensec_gssapi_start(struct gensec_security *gensec_security)
        gensec_gssapi_state->client_cred = NULL;
        gensec_gssapi_state->server_cred = NULL;
 
-       gensec_gssapi_state->lucid = NULL;
-
        gensec_gssapi_state->delegated_cred_handle = GSS_C_NO_CREDENTIAL;
 
        gensec_gssapi_state->sasl = false;
@@ -304,8 +272,13 @@ static NTSTATUS gensec_gssapi_client_creds(struct gensec_security *gensec_securi
                return NT_STATUS_INVALID_PARAMETER;
        case KRB5KDC_ERR_PREAUTH_FAILED:
        case KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN:
+       case KRB5KRB_AP_ERR_BAD_INTEGRITY:
                DEBUG(1, ("Wrong username or password: %s\n", error_string));
                return NT_STATUS_LOGON_FAILURE;
+       case KRB5KDC_ERR_CLIENT_REVOKED:
+               DEBUG(1, ("Account locked out: %s\n", error_string));
+               return NT_STATUS_ACCOUNT_LOCKED_OUT;
+       case KRB5_REALM_UNKNOWN:
        case KRB5_KDC_UNREACH:
                DEBUG(3, ("Cannot reach a KDC we require to contact %s : %s\n", gensec_gssapi_state->target_principal, error_string));
                return NT_STATUS_NO_LOGON_SERVERS;
@@ -366,7 +339,7 @@ static NTSTATUS gensec_gssapi_client_start(struct gensec_security *gensec_securi
        } else {
                gensec_gssapi_state->target_principal = talloc_asprintf(gensec_gssapi_state, "%s/%s@%s",
                                            gensec_get_target_service(gensec_security), 
-                                           hostname, lpcfg_realm(gensec_security->settings->lp_ctx));
+                                           hostname, cli_credentials_get_realm(creds));
 
                name_type = GSS_C_NT_USER_NAME;
        }
@@ -423,7 +396,9 @@ static NTSTATUS gensec_gssapi_update(struct gensec_security *gensec_security,
        NTSTATUS nt_status = NT_STATUS_LOGON_FAILURE;
        OM_uint32 maj_stat, min_stat;
        OM_uint32 min_stat2;
-       gss_buffer_desc input_token, output_token;
+       gss_buffer_desc input_token = { 0, NULL };
+       gss_buffer_desc output_token = { 0, NULL };
+
        gss_OID gss_oid_p = NULL;
        OM_uint32 time_req = 0;
        OM_uint32 time_rec = 0;
@@ -444,8 +419,8 @@ static NTSTATUS gensec_gssapi_update(struct gensec_security *gensec_security,
                {
 #ifdef SAMBA4_USES_HEIMDAL
                        struct gsskrb5_send_to_kdc send_to_kdc;
-#endif
                        krb5_error_code ret;
+#endif
 
                        nt_status = gensec_gssapi_client_creds(gensec_security, ev);
                        if (!NT_STATUS_IS_OK(nt_status)) {
@@ -520,7 +495,8 @@ static NTSTATUS gensec_gssapi_update(struct gensec_security *gensec_security,
                        *out = data_blob_talloc(out_mem_ctx, output_token.value, output_token.length);
                        gss_release_buffer(&min_stat2, &output_token);
                        
-                       if (gensec_gssapi_state->gss_got_flags & GSS_C_DELEG_FLAG) {
+                       if (gensec_gssapi_state->gss_got_flags & GSS_C_DELEG_FLAG &&
+                           gensec_gssapi_state->delegated_cred_handle != GSS_C_NO_CREDENTIAL) {
                                DEBUG(5, ("gensec_gssapi: credentials were delegated\n"));
                        } else {
                                DEBUG(5, ("gensec_gssapi: NO credentials were delegated\n"));
@@ -553,7 +529,7 @@ static NTSTATUS gensec_gssapi_update(struct gensec_security *gensec_security,
                        
                        return NT_STATUS_MORE_PROCESSING_REQUIRED;
                } else if (maj_stat == GSS_S_CONTEXT_EXPIRED) {
-                       gss_cred_id_t creds;
+                       gss_cred_id_t creds = NULL;
                        gss_name_t name;
                        gss_buffer_desc buffer;
                        OM_uint32 lifetime = 0;
@@ -580,7 +556,7 @@ static NTSTATUS gensec_gssapi_update(struct gensec_security *gensec_security,
                                                    &name, &lifetime, &usage, NULL);
 
                        if (maj_stat == GSS_S_COMPLETE) {
-                               const char *usage_string;
+                               const char *usage_string = NULL;
                                switch (usage) {
                                case GSS_C_BOTH:
                                        usage_string = "GSS_C_BOTH";
@@ -627,7 +603,7 @@ static NTSTATUS gensec_gssapi_update(struct gensec_security *gensec_security,
                                          gssapi_error_string(out_mem_ctx, maj_stat, min_stat, gensec_gssapi_state->gss_oid)));
                                return NT_STATUS_INVALID_PARAMETER; /* Make SPNEGO ignore us, we can't go any further here */
                        case KRB5_KDC_UNREACH:
-                               DEBUG(3, ("Cannot reach a KDC we require in order to obtain a ticetk to %s: %s\n",
+                               DEBUG(3, ("Cannot reach a KDC we require in order to obtain a ticket to %s: %s\n",
                                          gensec_gssapi_state->target_principal,
                                          gssapi_error_string(out_mem_ctx, maj_stat, min_stat, gensec_gssapi_state->gss_oid)));
                                return NT_STATUS_NO_LOGON_SERVERS; /* Make SPNEGO ignore us, we can't go any further here */
@@ -644,14 +620,14 @@ static NTSTATUS gensec_gssapi_update(struct gensec_security *gensec_security,
                                          gensec_security->gensec_role == GENSEC_CLIENT ? "client" : "server",
                                          gensec_gssapi_state->gss_exchange_count,
                                          gssapi_error_string(out_mem_ctx, maj_stat, min_stat, gensec_gssapi_state->gss_oid)));
-                               return nt_status;
+                               return NT_STATUS_LOGON_FAILURE;
                        }
                } else {
                        DEBUG(1, ("GSS %s Update(%d) failed: %s\n",
                                  gensec_security->gensec_role == GENSEC_CLIENT ? "client" : "server",
                                  gensec_gssapi_state->gss_exchange_count,
                                  gssapi_error_string(out_mem_ctx, maj_stat, min_stat, gensec_gssapi_state->gss_oid)));
-                       return nt_status;
+                       return NT_STATUS_LOGON_FAILURE;
                }
                break;
        }
@@ -1024,47 +1000,30 @@ static NTSTATUS gensec_gssapi_seal_packet(struct gensec_security *gensec_securit
 {
        struct gensec_gssapi_state *gensec_gssapi_state
                = talloc_get_type(gensec_security->private_data, struct gensec_gssapi_state);
-       OM_uint32 maj_stat, min_stat;
-       gss_buffer_desc input_token, output_token;
-       int conf_state;
-       ssize_t sig_length;
-
-       input_token.length = length;
-       input_token.value = data;
-       
-       maj_stat = gss_wrap(&min_stat, 
-                           gensec_gssapi_state->gssapi_context,
-                           gensec_have_feature(gensec_security, GENSEC_FEATURE_SEAL),
-                           GSS_C_QOP_DEFAULT,
-                           &input_token,
-                           &conf_state,
-                           &output_token);
-       if (GSS_ERROR(maj_stat)) {
-               DEBUG(1, ("gensec_gssapi_seal_packet: GSS Wrap failed: %s\n", 
-                         gssapi_error_string(mem_ctx, maj_stat, min_stat, gensec_gssapi_state->gss_oid)));
-               return NT_STATUS_ACCESS_DENIED;
-       }
+       bool hdr_signing = false;
+       size_t sig_size = 0;
+       NTSTATUS status;
 
-       if (output_token.length < input_token.length) {
-               DEBUG(1, ("gensec_gssapi_seal_packet: GSS Wrap length [%ld] *less* than caller length [%ld]\n", 
-                         (long)output_token.length, (long)length));
-               return NT_STATUS_INTERNAL_ERROR;
+       if (gensec_security->want_features & GENSEC_FEATURE_SIGN_PKT_HEADER) {
+               hdr_signing = true;
        }
-       sig_length = output_token.length - input_token.length;
 
-       memcpy(data, ((uint8_t *)output_token.value) + sig_length, length);
-       *sig = data_blob_talloc(mem_ctx, (uint8_t *)output_token.value, sig_length);
+       sig_size = gensec_gssapi_sig_size(gensec_security, length);
 
-       dump_data_pw("gensec_gssapi_seal_packet: sig\n", sig->data, sig->length);
-       dump_data_pw("gensec_gssapi_seal_packet: clear\n", data, length);
-       dump_data_pw("gensec_gssapi_seal_packet: sealed\n", ((uint8_t *)output_token.value) + sig_length, output_token.length - sig_length);
-
-       gss_release_buffer(&min_stat, &output_token);
-
-       if (gensec_have_feature(gensec_security, GENSEC_FEATURE_SEAL)
-           && !conf_state) {
-               return NT_STATUS_ACCESS_DENIED;
+       status = gssapi_seal_packet(gensec_gssapi_state->gssapi_context,
+                                   gensec_gssapi_state->gss_oid,
+                                   hdr_signing, sig_size,
+                                   data, length,
+                                   whole_pdu, pdu_length,
+                                   mem_ctx, sig);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("gssapi_seal_packet(hdr_signing=%u,sig_size=%zu,"
+                         "data=%zu,pdu=%zu) failed: %s\n",
+                         hdr_signing, sig_size, length, pdu_length,
+                         nt_errstr(status)));
+               return status;
        }
+
        return NT_STATUS_OK;
 }
 
@@ -1075,49 +1034,27 @@ static NTSTATUS gensec_gssapi_unseal_packet(struct gensec_security *gensec_secur
 {
        struct gensec_gssapi_state *gensec_gssapi_state
                = talloc_get_type(gensec_security->private_data, struct gensec_gssapi_state);
-       OM_uint32 maj_stat, min_stat;
-       gss_buffer_desc input_token, output_token;
-       int conf_state;
-       gss_qop_t qop_state;
-       DATA_BLOB in;
-
-       dump_data_pw("gensec_gssapi_unseal_packet: sig\n", sig->data, sig->length);
-
-       in = data_blob_talloc(gensec_security, NULL, sig->length + length);
-
-       memcpy(in.data, sig->data, sig->length);
-       memcpy(in.data + sig->length, data, length);
+       bool hdr_signing = false;
+       NTSTATUS status;
 
-       input_token.length = in.length;
-       input_token.value = in.data;
-       
-       maj_stat = gss_unwrap(&min_stat, 
-                             gensec_gssapi_state->gssapi_context, 
-                             &input_token,
-                             &output_token, 
-                             &conf_state,
-                             &qop_state);
-       talloc_free(in.data);
-       if (GSS_ERROR(maj_stat)) {
-               char *error_string = gssapi_error_string(NULL, maj_stat, min_stat, gensec_gssapi_state->gss_oid);
-               DEBUG(1, ("gensec_gssapi_unseal_packet: GSS UnWrap failed: %s\n", 
-                         error_string));
-               talloc_free(error_string);
-               return NT_STATUS_ACCESS_DENIED;
+       if (gensec_security->want_features & GENSEC_FEATURE_SIGN_PKT_HEADER) {
+               hdr_signing = true;
        }
 
-       if (output_token.length != length) {
-               return NT_STATUS_INTERNAL_ERROR;
+       status = gssapi_unseal_packet(gensec_gssapi_state->gssapi_context,
+                                     gensec_gssapi_state->gss_oid,
+                                     hdr_signing,
+                                     data, length,
+                                     whole_pdu, pdu_length,
+                                     sig);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("gssapi_unseal_packet(hdr_signing=%u,sig_size=%zu,"
+                         "data=%zu,pdu=%zu) failed: %s\n",
+                         hdr_signing, sig->length, length, pdu_length,
+                         nt_errstr(status)));
+               return status;
        }
 
-       memcpy(data, output_token.value, length);
-
-       gss_release_buffer(&min_stat, &output_token);
-       
-       if (gensec_have_feature(gensec_security, GENSEC_FEATURE_SEAL)
-           && !conf_state) {
-               return NT_STATUS_ACCESS_DENIED;
-       }
        return NT_STATUS_OK;
 }
 
@@ -1129,34 +1066,27 @@ static NTSTATUS gensec_gssapi_sign_packet(struct gensec_security *gensec_securit
 {
        struct gensec_gssapi_state *gensec_gssapi_state
                = talloc_get_type(gensec_security->private_data, struct gensec_gssapi_state);
-       OM_uint32 maj_stat, min_stat;
-       gss_buffer_desc input_token, output_token;
+       bool hdr_signing = false;
+       NTSTATUS status;
 
        if (gensec_security->want_features & GENSEC_FEATURE_SIGN_PKT_HEADER) {
-               input_token.length = pdu_length;
-               input_token.value = discard_const_p(uint8_t *, whole_pdu);
-       } else {
-               input_token.length = length;
-               input_token.value = discard_const_p(uint8_t *, data);
+               hdr_signing = true;
        }
 
-       maj_stat = gss_get_mic(&min_stat,
-                           gensec_gssapi_state->gssapi_context,
-                           GSS_C_QOP_DEFAULT,
-                           &input_token,
-                           &output_token);
-       if (GSS_ERROR(maj_stat)) {
-               DEBUG(1, ("GSS GetMic failed: %s\n",
-                         gssapi_error_string(mem_ctx, maj_stat, min_stat, gensec_gssapi_state->gss_oid)));
-               return NT_STATUS_ACCESS_DENIED;
+       status = gssapi_sign_packet(gensec_gssapi_state->gssapi_context,
+                                   gensec_gssapi_state->gss_oid,
+                                   hdr_signing,
+                                   data, length,
+                                   whole_pdu, pdu_length,
+                                   mem_ctx, sig);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("gssapi_sign_packet(hdr_signing=%u,"
+                         "data=%zu,pdu=%zu) failed: %s\n",
+                         hdr_signing, length, pdu_length,
+                         nt_errstr(status)));
+               return status;
        }
 
-       *sig = data_blob_talloc(mem_ctx, (uint8_t *)output_token.value, output_token.length);
-
-       dump_data_pw("gensec_gssapi_sign_packet: sig\n", sig->data, sig->length);
-
-       gss_release_buffer(&min_stat, &output_token);
-
        return NT_STATUS_OK;
 }
 
@@ -1167,35 +1097,25 @@ static NTSTATUS gensec_gssapi_check_packet(struct gensec_security *gensec_securi
 {
        struct gensec_gssapi_state *gensec_gssapi_state
                = talloc_get_type(gensec_security->private_data, struct gensec_gssapi_state);
-       OM_uint32 maj_stat, min_stat;
-       gss_buffer_desc input_token;
-       gss_buffer_desc input_message;
-       gss_qop_t qop_state;
-
-       dump_data_pw("gensec_gssapi_check_packet: sig\n", sig->data, sig->length);
+       bool hdr_signing = false;
+       NTSTATUS status;
 
        if (gensec_security->want_features & GENSEC_FEATURE_SIGN_PKT_HEADER) {
-               input_message.length = pdu_length;
-               input_message.value = discard_const(whole_pdu);
-       } else {
-               input_message.length = length;
-               input_message.value = discard_const(data);
+               hdr_signing = true;
        }
 
-       input_token.length = sig->length;
-       input_token.value = sig->data;
-
-       maj_stat = gss_verify_mic(&min_stat,
-                             gensec_gssapi_state->gssapi_context, 
-                             &input_message,
-                             &input_token,
-                             &qop_state);
-       if (GSS_ERROR(maj_stat)) {
-               char *error_string = gssapi_error_string(NULL, maj_stat, min_stat, gensec_gssapi_state->gss_oid);
-               DEBUG(1, ("GSS VerifyMic failed: %s\n", error_string));
-               talloc_free(error_string);
-
-               return NT_STATUS_ACCESS_DENIED;
+       status = gssapi_check_packet(gensec_gssapi_state->gssapi_context,
+                                    gensec_gssapi_state->gss_oid,
+                                    hdr_signing,
+                                    data, length,
+                                    whole_pdu, pdu_length,
+                                    sig);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0, ("gssapi_check_packet(hdr_signing=%u,sig_size=%zu,"
+                         "data=%zu,pdu=%zu) failed: %s\n",
+                         hdr_signing, sig->length, length, pdu_length,
+                         nt_errstr(status)));
+               return status;
        }
 
        return NT_STATUS_OK;
@@ -1276,6 +1196,17 @@ static bool gensec_gssapi_have_feature(struct gensec_security *gensec_security,
        if (feature & GENSEC_FEATURE_ASYNC_REPLIES) {
                return true;
        }
+       if (feature & GENSEC_FEATURE_SIGN_PKT_HEADER) {
+               if (gensec_security->want_features & GENSEC_FEATURE_SEAL) {
+                       return true;
+               }
+
+               if (gensec_security->want_features & GENSEC_FEATURE_SIGN) {
+                       return true;
+               }
+
+               return false;
+       }
        return false;
 }
 
@@ -1374,23 +1305,24 @@ static NTSTATUS gensec_gssapi_session_info(struct gensec_security *gensec_securi
                return nt_status;
        }
 
-       if (!(gensec_gssapi_state->gss_got_flags & GSS_C_DELEG_FLAG)) {
-               DEBUG(10, ("gensec_gssapi: NO delegated credentials supplied by client\n"));
-       } else {
+       if (gensec_gssapi_state->gss_got_flags & GSS_C_DELEG_FLAG &&
+           gensec_gssapi_state->delegated_cred_handle != GSS_C_NO_CREDENTIAL) {
                krb5_error_code ret;
                const char *error_string;
 
                DEBUG(10, ("gensec_gssapi: delegated credentials supplied by client\n"));
-               session_info->credentials = cli_credentials_init(session_info);
-               if (!session_info->credentials) {
+
+               /*
+                * Create anonymous credentials for now.
+                *
+                * We will update them with the provided client gss creds.
+                */
+               session_info->credentials = cli_credentials_init_anon(session_info);
+               if (session_info->credentials == NULL) {
                        talloc_free(tmp_ctx);
                        return NT_STATUS_NO_MEMORY;
                }
 
-               cli_credentials_set_conf(session_info->credentials, gensec_security->settings->lp_ctx);
-               /* Just so we don't segfault trying to get at a username */
-               cli_credentials_set_anonymous(session_info->credentials);
-               
                ret = cli_credentials_set_client_gss_creds(session_info->credentials, 
                                                           gensec_security->settings->lp_ctx,
                                                           gensec_gssapi_state->delegated_cred_handle,
@@ -1406,7 +1338,10 @@ static NTSTATUS gensec_gssapi_session_info(struct gensec_security *gensec_securi
 
                /* It has been taken from this place... */
                gensec_gssapi_state->delegated_cred_handle = GSS_C_NO_CREDENTIAL;
+       } else {
+               DEBUG(10, ("gensec_gssapi: NO delegated credentials supplied by client\n"));
        }
+
        *_session_info = talloc_steal(mem_ctx, session_info);
        talloc_free(tmp_ctx);
 
@@ -1417,56 +1352,18 @@ static size_t gensec_gssapi_sig_size(struct gensec_security *gensec_security, si
 {
        struct gensec_gssapi_state *gensec_gssapi_state
                = talloc_get_type(gensec_security->private_data, struct gensec_gssapi_state);
-       NTSTATUS status;
+       size_t sig_size;
 
-       if (gensec_gssapi_state->sig_size) {
+       if (gensec_gssapi_state->sig_size > 0) {
                return gensec_gssapi_state->sig_size;
        }
 
-       if (gensec_gssapi_state->gss_got_flags & GSS_C_CONF_FLAG) {
-               gensec_gssapi_state->sig_size = 45;
-       } else {
-               gensec_gssapi_state->sig_size = 37;
-       }
-
-       status = gensec_gssapi_init_lucid(gensec_gssapi_state);
-       if (!NT_STATUS_IS_OK(status)) {
-               return gensec_gssapi_state->sig_size;
-       }
-
-       if (gensec_gssapi_state->lucid->protocol == 1) {
-               if (gensec_gssapi_state->gss_got_flags & GSS_C_CONF_FLAG) {
-                       /*
-                        * TODO: windows uses 76 here, but we don't know
-                        *       gss_wrap works with aes keys yet
-                        */
-                       gensec_gssapi_state->sig_size = 76;
-               } else {
-                       gensec_gssapi_state->sig_size = 28;
-               }
-       } else if (gensec_gssapi_state->lucid->protocol == 0) {
-               switch (gensec_gssapi_state->lucid->rfc1964_kd.ctx_key.type) {
-               case ENCTYPE_DES_CBC_CRC:
-               case ENCTYPE_ARCFOUR_HMAC:
-               case ENCTYPE_ARCFOUR_HMAC_EXP:
-                       if (gensec_gssapi_state->gss_got_flags & GSS_C_CONF_FLAG) {
-                               gensec_gssapi_state->sig_size = 45;
-                       } else {
-                               gensec_gssapi_state->sig_size = 37;
-                       }
-                       break;
-#ifdef SAMBA4_USES_HEIMDAL
-               case ENCTYPE_OLD_DES3_CBC_SHA1:
-                       if (gensec_gssapi_state->gss_got_flags & GSS_C_CONF_FLAG) {
-                               gensec_gssapi_state->sig_size = 57;
-                       } else {
-                               gensec_gssapi_state->sig_size = 49;
-                       }
-                       break;
-#endif
-               }
-       }
+       sig_size = gssapi_get_sig_size(gensec_gssapi_state->gssapi_context,
+                                      gensec_gssapi_state->gss_oid,
+                                      gensec_gssapi_state->gss_got_flags,
+                                      data_size);
 
+       gensec_gssapi_state->sig_size = sig_size;
        return gensec_gssapi_state->sig_size;
 }
 
@@ -1497,6 +1394,8 @@ static const struct gensec_security_ops gensec_gssapi_spnego_security_ops = {
        .check_packet   = gensec_gssapi_check_packet,
        .seal_packet    = gensec_gssapi_seal_packet,
        .unseal_packet  = gensec_gssapi_unseal_packet,
+       .max_input_size   = gensec_gssapi_max_input_size,
+       .max_wrapped_size = gensec_gssapi_max_wrapped_size,
        .wrap           = gensec_gssapi_wrap,
        .unwrap         = gensec_gssapi_unwrap,
        .have_feature   = gensec_gssapi_have_feature,
@@ -1522,6 +1421,8 @@ static const struct gensec_security_ops gensec_gssapi_krb5_security_ops = {
        .check_packet   = gensec_gssapi_check_packet,
        .seal_packet    = gensec_gssapi_seal_packet,
        .unseal_packet  = gensec_gssapi_unseal_packet,
+       .max_input_size   = gensec_gssapi_max_input_size,
+       .max_wrapped_size = gensec_gssapi_max_wrapped_size,
        .wrap           = gensec_gssapi_wrap,
        .unwrap         = gensec_gssapi_unwrap,
        .have_feature   = gensec_gssapi_have_feature,