s4-kerberos Don't segfault if the password isn't specified in keytab generation
[samba.git] / source4 / auth / kerberos / kerberos_util.c
index 3d7084aa0de78a1a3389fa79955129d49577ac53..76edf0d05aa8fed28e3e91f87c9eb4ad01f121a2 100644 (file)
@@ -7,7 +7,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 "system/time.h"
-#include "system/network.h"
 #include "auth/kerberos/kerberos.h"
-#include "auth/auth.h"
+#include "auth/credentials/credentials.h"
+#include "auth/credentials/credentials_proto.h"
+#include "auth/credentials/credentials_krb5.h"
+#include "auth/kerberos/kerberos_credentials.h"
+#include "ldb.h"
+#include "param/secrets.h"
 
 struct principal_container {
        struct smb_krb5_context *smb_krb5_context;
        krb5_principal principal;
+       const char *string_form; /* Optional */
 };
 
-static int free_principal(void *ptr) {
-       struct principal_container *pc = ptr;
+static krb5_error_code free_principal(struct principal_container *pc)
+{
        /* current heimdal - 0.6.3, which we need anyway, fixes segfaults here */
        krb5_free_principal(pc->smb_krb5_context->krb5_context, pc->principal);
 
        return 0;
 }
 
-krb5_error_code salt_principal_from_credentials(TALLOC_CTX *parent_ctx, 
-                                               struct cli_credentials *machine_account, 
-                                               struct smb_krb5_context *smb_krb5_context,
-                                               krb5_principal *salt_princ)
+
+static krb5_error_code parse_principal(TALLOC_CTX *parent_ctx,
+                                      const char *princ_string,
+                                      struct smb_krb5_context *smb_krb5_context,
+                                      krb5_principal *princ,
+                                      const char **error_string)
 {
-       krb5_error_code ret;
-       char *machine_username;
-       char *salt_body;
-       char *lower_realm;
-       struct principal_container *mem_ctx = talloc(parent_ctx, struct principal_container);
+       int ret;
+       struct principal_container *mem_ctx;
+       if (princ_string == NULL) {
+                *princ = NULL;
+                return 0;
+       }
+
+       ret = krb5_parse_name(smb_krb5_context->krb5_context,
+                             princ_string, princ);
+
+       if (ret) {
+               (*error_string) = smb_get_krb5_error_message(smb_krb5_context->krb5_context, ret, parent_ctx);
+               return ret;
+       }
+
+       mem_ctx = talloc(parent_ctx, struct principal_container);
        if (!mem_ctx) {
+               (*error_string) = error_message(ENOMEM);
                return ENOMEM;
        }
-       
-       machine_username = talloc_strdup(mem_ctx, cli_credentials_get_username(machine_account));
 
-       if (!machine_username) {
-               talloc_free(mem_ctx);
+       /* This song-and-dance effectivly puts the principal
+        * into talloc, so we can't loose it. */
+       mem_ctx->smb_krb5_context = talloc_reference(mem_ctx, smb_krb5_context);
+       mem_ctx->principal = *princ;
+       talloc_set_destructor(mem_ctx, free_principal);
+       return 0;
+}
+
+static krb5_error_code principals_from_msg(TALLOC_CTX *parent_ctx,
+                                          struct ldb_message *msg,
+                                          struct smb_krb5_context *smb_krb5_context,
+                                          struct principal_container ***principals_out,
+                                          const char **error_string)
+{
+       unsigned int i;
+       krb5_error_code ret;
+       char *upper_realm;
+       const char *realm = ldb_msg_find_attr_as_string(msg, "realm", NULL);
+       const char *samAccountName = ldb_msg_find_attr_as_string(msg, "samAccountName", NULL);
+       struct ldb_message_element *spn_el = ldb_msg_find_element(msg, "servicePrincipalName");
+       TALLOC_CTX *tmp_ctx;
+       struct principal_container **principals;
+       tmp_ctx = talloc_new(parent_ctx);
+       if (!tmp_ctx) {
+               *error_string = "Cannot allocate tmp_ctx";
                return ENOMEM;
        }
 
-       if (machine_username[strlen(machine_username)-1] == '$') {
-               machine_username[strlen(machine_username)-1] = '\0';
+       if (!realm) {
+               *error_string = "Cannot have a kerberos secret in secrets.ldb without a realm";
+               return EINVAL;
        }
-       lower_realm = strlower_talloc(mem_ctx, cli_credentials_get_realm(machine_account));
-       if (!lower_realm) {
-               talloc_free(mem_ctx);
+
+       upper_realm = strupper_talloc(tmp_ctx, realm);
+       if (!upper_realm) {
+               talloc_free(tmp_ctx);
+               *error_string = "Cannot allocate full upper case realm";
                return ENOMEM;
        }
 
-       salt_body = talloc_asprintf(mem_ctx, "%s.%s", machine_username, 
-                                   lower_realm);
-       if (!salt_body) {
-               talloc_free(mem_ctx);
-               return ENOMEM;
+       principals = talloc_array(tmp_ctx, struct principal_container *, spn_el ? (spn_el->num_values + 2) : 2);
+
+       spn_el = ldb_msg_find_element(msg, "servicePrincipalName");
+       for (i=0; spn_el && i < spn_el->num_values; i++) {
+               principals[i] = talloc(principals, struct principal_container);
+               if (!principals[i]) {
+                       talloc_free(tmp_ctx);
+                       *error_string = "Cannot allocate mem_ctx";
+                       return ENOMEM;
+               }
+
+               principals[i]->smb_krb5_context = talloc_reference(principals[i], smb_krb5_context);
+               principals[i]->string_form = talloc_asprintf(principals[i], "%*.*s@%s",
+                                                            (int)spn_el->values[i].length,
+                                                            (int)spn_el->values[i].length,
+                                                            (const char *)spn_el->values[i].data, upper_realm);
+               if (!principals[i]->string_form) {
+                       talloc_free(tmp_ctx);
+                       *error_string = "Cannot allocate full samAccountName";
+                       return ENOMEM;
+               }
+
+               ret = krb5_parse_name(smb_krb5_context->krb5_context,
+                                     principals[i]->string_form, &principals[i]->principal);
+               
+               if (ret) {
+                       talloc_free(tmp_ctx);
+                       (*error_string) = smb_get_krb5_error_message(smb_krb5_context->krb5_context, ret, parent_ctx);
+                       return ret;
+               }
+
+               /* This song-and-dance effectivly puts the principal
+                * into talloc, so we can't loose it. */
+               talloc_set_destructor(principals[i], free_principal);
        }
-       
-       ret = krb5_make_principal(smb_krb5_context->krb5_context, salt_princ, 
-                                 cli_credentials_get_realm(machine_account), 
-                                 "host", salt_body, NULL);
 
-       if (ret == 0) {
-               mem_ctx->smb_krb5_context = talloc_reference(mem_ctx, smb_krb5_context);
-               mem_ctx->principal = *salt_princ;
-               talloc_set_destructor(mem_ctx, free_principal);
+       if (samAccountName) {
+               principals[i] = talloc(principals, struct principal_container);
+               if (!principals[i]) {
+                       talloc_free(tmp_ctx);
+                       *error_string = "Cannot allocate mem_ctx";
+                       return ENOMEM;
+               }
+
+               principals[i]->smb_krb5_context = talloc_reference(principals[i], smb_krb5_context);
+               principals[i]->string_form = talloc_asprintf(parent_ctx, "%s@%s", samAccountName, upper_realm);
+               if (!principals[i]->string_form) {
+                       talloc_free(tmp_ctx);
+                       *error_string = "Cannot allocate full samAccountName";
+                       return ENOMEM;
+               }
+               
+               ret = krb5_make_principal(smb_krb5_context->krb5_context, &principals[i]->principal, upper_realm, samAccountName,
+                                         NULL);
+               if (ret) {
+                       talloc_free(tmp_ctx);
+                       (*error_string) = smb_get_krb5_error_message(smb_krb5_context->krb5_context, ret, parent_ctx);
+                       return ret;
+               }
+               
+               /* This song-and-dance effectivly puts the principal
+                * into talloc, so we can't loose it. */
+               talloc_set_destructor(principals[i], free_principal);
+               i++;
        }
+
+       principals[i] = NULL;
+       *principals_out = talloc_steal(parent_ctx, principals);
+
+       talloc_free(tmp_ctx);
        return ret;
 }
 
+static krb5_error_code salt_principal_from_msg(TALLOC_CTX *parent_ctx, 
+                                              struct ldb_message *msg, 
+                                              struct smb_krb5_context *smb_krb5_context,
+                                              krb5_principal *salt_princ,
+                                              const char **error_string)
+{
+       const char *salt_principal = ldb_msg_find_attr_as_string(msg, "saltPrincipal", NULL);
+       const char *samAccountName = ldb_msg_find_attr_as_string(msg, "samAccountName", NULL);
+       const char *realm = ldb_msg_find_attr_as_string(msg, "realm", NULL);
+       if (salt_principal) {
+               return parse_principal(parent_ctx, salt_principal, smb_krb5_context, salt_princ, error_string);
+       } else if (samAccountName) {
+               krb5_error_code ret;
+               char *machine_username;
+               char *salt_body;
+               char *lower_realm;
+               char *upper_realm;
+
+               TALLOC_CTX *tmp_ctx;
+               struct principal_container *mem_ctx = talloc(parent_ctx, struct principal_container);
+               if (!mem_ctx) {
+                       *error_string = "Cannot allocate mem_ctx";
+                       return ENOMEM;
+               }
+
+               tmp_ctx = talloc_new(mem_ctx);
+               if (!tmp_ctx) {
+                       talloc_free(mem_ctx);
+                       *error_string = "Cannot allocate tmp_ctx";
+                       return ENOMEM;
+               }
+
+               if (!realm) {
+                       *error_string = "Cannot have a kerberos secret in secrets.ldb without a realm";
+                       return EINVAL;
+               }
+               
+               machine_username = talloc_strdup(tmp_ctx, samAccountName);
+               if (!machine_username) {
+                       talloc_free(mem_ctx);
+                       *error_string = "Cannot duplicate samAccountName";
+                       return ENOMEM;
+               }
+               
+               if (machine_username[strlen(machine_username)-1] == '$') {
+                       machine_username[strlen(machine_username)-1] = '\0';
+               }
+
+               lower_realm = strlower_talloc(tmp_ctx, realm);
+               if (!lower_realm) {
+                       talloc_free(mem_ctx);
+                       *error_string = "Cannot allocate to lower case realm";
+                       return ENOMEM;
+               }
+               
+               upper_realm = strupper_talloc(tmp_ctx, realm);
+               if (!upper_realm) {
+                       talloc_free(mem_ctx);
+                       *error_string = "Cannot allocate to upper case realm";
+                       return ENOMEM;
+               }
+               
+               salt_body = talloc_asprintf(tmp_ctx, "%s.%s", machine_username, 
+                                           lower_realm);
+               talloc_free(lower_realm);
+               talloc_free(machine_username);
+               if (!salt_body) {
+                       talloc_free(mem_ctx);
+                       *error_string = "Cannot form salt principal body";
+                       return ENOMEM;
+               }
+               
+               ret = krb5_make_principal(smb_krb5_context->krb5_context, salt_princ, 
+                                         upper_realm,
+                                         "host", salt_body, NULL);
+               if (ret == 0) {
+                       /* This song-and-dance effectivly puts the principal
+                        * into talloc, so we can't loose it. */
+                       mem_ctx->smb_krb5_context = talloc_reference(mem_ctx, smb_krb5_context);
+                       mem_ctx->principal = *salt_princ;
+                       talloc_set_destructor(mem_ctx, free_principal);
+               } else {
+                       (*error_string) = smb_get_krb5_error_message(smb_krb5_context->krb5_context, ret, parent_ctx);
+               }
+               talloc_free(tmp_ctx);
+               return ret;
+       } else {
+               (*error_string) = "Cannot determine salt principal, no saltPrincipal or samAccountName specified";
+               return EINVAL;
+       }
+}
+
+/* Obtain the principal set on this context.  Requires a
+ * smb_krb5_context because we are doing krb5 principal parsing with
+ * the library routines.  The returned princ is placed in the talloc
+ * system by means of a destructor (do *not* free). */
+
 krb5_error_code principal_from_credentials(TALLOC_CTX *parent_ctx, 
-                                          struct cli_credentials *credentials, 
-                                          struct smb_krb5_context *smb_krb5_context,
-                                          krb5_principal *princ)
+                                           struct cli_credentials *credentials, 
+                                           struct smb_krb5_context *smb_krb5_context,
+                                           krb5_principal *princ,
+                                           enum credentials_obtained *obtained,
+                                           const char **error_string)
 {
        krb5_error_code ret;
        const char *princ_string;
-       struct principal_container *mem_ctx = talloc(parent_ctx, struct principal_container);
+       TALLOC_CTX *mem_ctx = talloc_new(parent_ctx);
        if (!mem_ctx) {
+               (*error_string) = error_message(ENOMEM);
                return ENOMEM;
        }
-       
-       princ_string = cli_credentials_get_principal(credentials, mem_ctx);
-
+       princ_string = cli_credentials_get_principal_and_obtained(credentials, mem_ctx, obtained);
        if (!princ_string) {
-               talloc_free(mem_ctx);
-               princ = NULL;
-               return 0;
+               (*error_string) = error_message(ENOMEM);
+               return ENOMEM;
        }
 
-       ret = krb5_parse_name(smb_krb5_context->krb5_context,
-                             princ_string, princ);
-
-       if (ret == 0) {
-               mem_ctx->smb_krb5_context = talloc_reference(mem_ctx, smb_krb5_context);
-               mem_ctx->principal = *princ;
-               talloc_set_destructor(mem_ctx, free_principal);
-       }
+       ret = parse_principal(parent_ctx, princ_string,
+                             smb_krb5_context, princ, error_string);
+       talloc_free(mem_ctx);
        return ret;
 }
 
+/* Obtain the principal set on this context.  Requires a
+ * smb_krb5_context because we are doing krb5 principal parsing with
+ * the library routines.  The returned princ is placed in the talloc
+ * system by means of a destructor (do *not* free). */
+
+ krb5_error_code impersonate_principal_from_credentials(TALLOC_CTX *parent_ctx,
+                                                       struct cli_credentials *credentials,
+                                                       struct smb_krb5_context *smb_krb5_context,
+                                                       krb5_principal *princ,
+                                                       const char **error_string)
+{
+       return parse_principal(parent_ctx, cli_credentials_get_impersonate_principal(credentials),
+                              smb_krb5_context, princ, error_string);
+}
+
 /**
  * Return a freshly allocated ccache (destroyed by destructor on child
  * of parent_ctx), for a given set of client credentials 
@@ -129,55 +331,122 @@ krb5_error_code principal_from_credentials(TALLOC_CTX *parent_ctx,
  krb5_error_code kinit_to_ccache(TALLOC_CTX *parent_ctx,
                                 struct cli_credentials *credentials,
                                 struct smb_krb5_context *smb_krb5_context,
-                                krb5_ccache ccache) 
+                                krb5_ccache ccache,
+                                enum credentials_obtained *obtained,
+                                const char **error_string)
 {
        krb5_error_code ret;
-       const char *password;
+       const char *password, *target_service;
        time_t kdc_time = 0;
        krb5_principal princ;
-
+       krb5_principal impersonate_principal;
+       int tries;
        TALLOC_CTX *mem_ctx = talloc_new(parent_ctx);
+       krb5_get_init_creds_opt *krb_options;
 
        if (!mem_ctx) {
+               (*error_string) = strerror(ENOMEM);
                return ENOMEM;
        }
 
-       ret = principal_from_credentials(mem_ctx, credentials, smb_krb5_context, &princ);
+       ret = principal_from_credentials(mem_ctx, credentials, smb_krb5_context, &princ, obtained, error_string);
+       if (ret) {
+               talloc_free(mem_ctx);
+               return ret;
+       }
+
+       ret = impersonate_principal_from_credentials(mem_ctx, credentials, smb_krb5_context, &impersonate_principal, error_string);
        if (ret) {
                talloc_free(mem_ctx);
                return ret;
        }
 
+       target_service = cli_credentials_get_target_service(credentials);
+
        password = cli_credentials_get_password(credentials);
-       
-       if (password) {
-               ret = kerberos_kinit_password_cc(smb_krb5_context->krb5_context, ccache, 
-                                                princ, 
-                                                password, NULL, &kdc_time);
-       } else {
-               /* No password available, try to use a keyblock instead */
 
-               krb5_keyblock keyblock;
-               const struct samr_Password *mach_pwd;
-               mach_pwd = cli_credentials_get_nt_hash(credentials, mem_ctx);
-               if (!mach_pwd) {
-                       talloc_free(mem_ctx);
-                       DEBUG(1, ("kinit_to_ccache: No password available for kinit\n"));
+       /* setup the krb5 options we want */
+       if ((ret = krb5_get_init_creds_opt_alloc(smb_krb5_context->krb5_context, &krb_options))) {
+               (*error_string) = talloc_asprintf(credentials, "krb5_get_init_creds_opt_alloc failed (%s)\n",
+                                                 smb_get_krb5_error_message(smb_krb5_context->krb5_context,
+                                                                            ret, mem_ctx));
+               talloc_free(mem_ctx);
+               return ret;
+       }
+
+       /* get the defaults */
+       krb5_get_init_creds_opt_set_default_flags(smb_krb5_context->krb5_context, NULL, NULL, krb_options);
+
+       /* set if we want a forwardable ticket */
+       switch (cli_credentials_get_krb_forwardable(credentials)) {
+       case CRED_AUTO_KRB_FORWARDABLE:
+               break;
+       case CRED_NO_KRB_FORWARDABLE:
+               krb5_get_init_creds_opt_set_forwardable(krb_options, FALSE);
+               break;
+       case CRED_FORCE_KRB_FORWARDABLE:
+               krb5_get_init_creds_opt_set_forwardable(krb_options, TRUE);
+               break;
+       }
+
+       tries = 2;
+       while (tries--) {
+               if (password) {
+                       ret = kerberos_kinit_password_cc(smb_krb5_context->krb5_context, ccache, 
+                                                        princ, password,
+                                                        impersonate_principal, target_service,
+                                                        krb_options,
+                                                        NULL, &kdc_time);
+               } else if (impersonate_principal) {
+                       (*error_string) = "INTERNAL error: Cannot impersonate principal with just a keyblock.  A password must be specified in the credentials";
                        return EINVAL;
+               } else {
+                       /* No password available, try to use a keyblock instead */
+                       
+                       krb5_keyblock keyblock;
+                       const struct samr_Password *mach_pwd;
+                       mach_pwd = cli_credentials_get_nt_hash(credentials, mem_ctx);
+                       if (!mach_pwd) {
+                               talloc_free(mem_ctx);
+                               (*error_string) = "kinit_to_ccache: No password available for kinit\n";
+                               krb5_get_init_creds_opt_free(smb_krb5_context->krb5_context, krb_options);
+                               return EINVAL;
+                       }
+                       ret = krb5_keyblock_init(smb_krb5_context->krb5_context,
+                                                ENCTYPE_ARCFOUR_HMAC,
+                                                mach_pwd->hash, sizeof(mach_pwd->hash), 
+                                                &keyblock);
+                       
+                       if (ret == 0) {
+                               ret = kerberos_kinit_keyblock_cc(smb_krb5_context->krb5_context, ccache, 
+                                                                princ, &keyblock,
+                                                                target_service, krb_options,
+                                                                NULL, &kdc_time);
+                               krb5_free_keyblock_contents(smb_krb5_context->krb5_context, &keyblock);
+                       }
                }
-               ret = krb5_keyblock_init(smb_krb5_context->krb5_context,
-                                        ENCTYPE_ARCFOUR_HMAC,
-                                        mach_pwd->hash, sizeof(mach_pwd->hash), 
-                                        &keyblock);
-               
-               if (ret == 0) {
-                       ret = kerberos_kinit_keyblock_cc(smb_krb5_context->krb5_context, ccache, 
-                                                        princ,
-                                                        &keyblock, NULL, &kdc_time);
-                       krb5_free_keyblock_contents(smb_krb5_context->krb5_context, &keyblock);
+
+               if (ret == KRB5KRB_AP_ERR_SKEW || ret == KRB5_KDCREP_SKEW) {
+                       /* Perhaps we have been given an invalid skew, so try again without it */
+                       time_t t = time(NULL);
+                       krb5_set_real_time(smb_krb5_context->krb5_context, t, 0);
+               } else {
+                       /* not a skew problem */
+                       break;
                }
        }
 
+       krb5_get_init_creds_opt_free(smb_krb5_context->krb5_context, krb_options);
+
+       if (ret == KRB5KRB_AP_ERR_SKEW || ret == KRB5_KDCREP_SKEW) {
+               (*error_string) = talloc_asprintf(credentials, "kinit for %s failed (%s)\n",
+                                                 cli_credentials_get_principal(credentials, mem_ctx),
+                                                 smb_get_krb5_error_message(smb_krb5_context->krb5_context,
+                                                                            ret, mem_ctx));
+               talloc_free(mem_ctx);
+               return ret;
+       }
+
        /* cope with ticket being in the future due to clock skew */
        if ((unsigned)kdc_time > time(NULL)) {
                time_t t = time(NULL);
@@ -186,208 +455,503 @@ krb5_error_code principal_from_credentials(TALLOC_CTX *parent_ctx,
                krb5_set_real_time(smb_krb5_context->krb5_context, t + time_offset + 1, 0);
        }
        
-       if (ret == KRB5KRB_AP_ERR_SKEW || ret == KRB5_KDCREP_SKEW) {
-               DEBUG(1,("kinit for %s failed (%s)\n", 
-                        cli_credentials_get_principal(credentials, mem_ctx), 
-                        smb_get_krb5_error_message(smb_krb5_context->krb5_context, 
-                                                   ret, mem_ctx)));
+       if (ret == KRB5KDC_ERR_PREAUTH_FAILED && cli_credentials_wrong_password(credentials)) {
+               ret = kinit_to_ccache(parent_ctx,
+                                     credentials,
+                                     smb_krb5_context,
+                                     ccache, obtained,
+                                     error_string);
+       }
+
+       if (ret) {
+               (*error_string) = talloc_asprintf(credentials, "kinit for %s failed (%s)\n",
+                                                 cli_credentials_get_principal(credentials, mem_ctx),
+                                                 smb_get_krb5_error_message(smb_krb5_context->krb5_context,
+                                                                            ret, mem_ctx));
                talloc_free(mem_ctx);
                return ret;
-       }
+       } 
+       talloc_free(mem_ctx);
+       return 0;
+}
+
+static krb5_error_code free_keytab(struct keytab_container *ktc)
+{
+       return krb5_kt_close(ktc->smb_krb5_context->krb5_context, ktc->keytab);
+}
+
+krb5_error_code smb_krb5_open_keytab(TALLOC_CTX *mem_ctx,
+                        struct smb_krb5_context *smb_krb5_context, 
+                        const char *keytab_name, struct keytab_container **ktc) 
+{
+       krb5_keytab keytab;
+       krb5_error_code ret;
+       ret = krb5_kt_resolve(smb_krb5_context->krb5_context, keytab_name, &keytab);
        if (ret) {
-               DEBUG(1,("kinit for %s failed (%s)\n", 
-                        cli_credentials_get_principal(credentials, mem_ctx), 
+               DEBUG(1,("failed to open krb5 keytab: %s\n", 
                         smb_get_krb5_error_message(smb_krb5_context->krb5_context, 
                                                    ret, mem_ctx)));
-               talloc_free(mem_ctx);
                return ret;
-       } 
+       }
+
+       *ktc = talloc(mem_ctx, struct keytab_container);
+       if (!*ktc) {
+               return ENOMEM;
+       }
+
+       (*ktc)->smb_krb5_context = talloc_reference(*ktc, smb_krb5_context);
+       (*ktc)->keytab = keytab;
+       talloc_set_destructor(*ktc, free_keytab);
+
        return 0;
 }
 
-static int free_keytab(void *ptr) {
-       struct keytab_container *ktc = ptr;
-       krb5_kt_close(ktc->smb_krb5_context->krb5_context, ktc->keytab);
+static krb5_error_code keytab_add_keys(TALLOC_CTX *parent_ctx,
+                                      const char *princ_string,
+                                      krb5_principal princ,
+                                      krb5_principal salt_princ,
+                                      int kvno,
+                                      const char *password_s,
+                                      struct smb_krb5_context *smb_krb5_context,
+                                      krb5_enctype *enctypes,
+                                      krb5_keytab keytab,
+                                      const char **error_string)
+{
+       int i;
+       krb5_error_code ret;
+       krb5_data password;
+       TALLOC_CTX *mem_ctx = talloc_new(parent_ctx);
+       if (!mem_ctx) {
+               return ENOMEM;
+       }
+
+       password.data = discard_const_p(char *, password_s);
+       password.length = strlen(password_s);
+
+       for (i=0; enctypes[i]; i++) {
+               krb5_keytab_entry entry;
+               ret = create_kerberos_key_from_string(smb_krb5_context->krb5_context, 
+                                                     salt_princ, &password, &entry.keyblock, enctypes[i]);
+               if (ret != 0) {
+                       talloc_free(mem_ctx);
+                       return ret;
+               }
+
+                entry.principal = princ;
+                entry.vno       = kvno;
+               ret = krb5_kt_add_entry(smb_krb5_context->krb5_context, keytab, &entry);
+               if (ret != 0) {
+                       *error_string = talloc_asprintf(parent_ctx, "Failed to add enctype %d entry for %s(kvno %d) to keytab: %s\n",
+                                                       (int)enctypes[i],
+                                                       princ_string,
+                                                       kvno,
+                                                       smb_get_krb5_error_message(smb_krb5_context->krb5_context,
+                                                                                  ret, mem_ctx));
+                       talloc_free(mem_ctx);
+                       krb5_free_keyblock_contents(smb_krb5_context->krb5_context, &entry.keyblock);
+                       return ret;
+               }
 
+               DEBUG(5, ("Added %s(kvno %d) to keytab (enctype %d)\n", 
+                         princ_string, kvno,
+                         (int)enctypes[i]));
+               
+               krb5_free_keyblock_contents(smb_krb5_context->krb5_context, &entry.keyblock);
+       }
+       talloc_free(mem_ctx);
        return 0;
 }
 
- int create_memory_keytab(TALLOC_CTX *parent_ctx,
-                         struct cli_credentials *machine_account,
-                         struct smb_krb5_context *smb_krb5_context,
-                         struct keytab_container **keytab_container) 
+static krb5_error_code create_keytab(TALLOC_CTX *parent_ctx,
+                                    struct ldb_message *msg,
+                                    struct principal_container **principals,
+                                    struct smb_krb5_context *smb_krb5_context,
+                                    krb5_keytab keytab,
+                                    bool add_old,
+                                    const char **error_string)
 {
+       unsigned int i;
        krb5_error_code ret;
        const char *password_s;
-       char *old_secret;
-       krb5_data password;
-       int i, kvno;
-       krb5_enctype *enctypes;
+       const char *old_secret;
+       int kvno;
+       uint32_t enctype_bitmap;
        krb5_principal salt_princ;
-       krb5_principal princ;
-       krb5_keytab keytab;
-
+       krb5_enctype *enctypes;
        TALLOC_CTX *mem_ctx = talloc_new(parent_ctx);
        if (!mem_ctx) {
+               *error_string = "unable to allocate tmp_ctx for create_keytab";
                return ENOMEM;
        }
-       
-       *keytab_container = talloc(mem_ctx, struct keytab_container);
 
-       ret = krb5_kt_resolve(smb_krb5_context->krb5_context, "MEMORY:", &keytab);
+       /* The salt used to generate these entries may be different however, fetch that */
+       ret = salt_principal_from_msg(mem_ctx, msg,
+                                     smb_krb5_context, 
+                                     &salt_princ, error_string);
        if (ret) {
-               DEBUG(1,("failed to generate a new krb5 keytab: %s\n", 
-                        error_message(ret)));
                talloc_free(mem_ctx);
                return ret;
        }
 
-       (*keytab_container)->smb_krb5_context = talloc_reference(*keytab_container, smb_krb5_context);
-       (*keytab_container)->keytab = keytab;
+       kvno = ldb_msg_find_attr_as_int(msg, "msDS-KeyVersionNumber", 0);
 
-       talloc_set_destructor(*keytab_container, free_keytab);
+       /* Finally, do the dance to get the password to put in the entry */
+       password_s =  ldb_msg_find_attr_as_string(msg, "secret", NULL);
 
-       ret = salt_principal_from_credentials(mem_ctx, machine_account, 
-                                             smb_krb5_context, 
-                                             &salt_princ);
-       if (ret) {
-               DEBUG(1,("create_memory_keytab: maksing salt principal failed (%s)\n",
-                        smb_get_krb5_error_message(smb_krb5_context->krb5_context, 
-                                                   ret, mem_ctx)));
+       if (!password_s) {
+               /* There is no password here, so nothing to do */
                talloc_free(mem_ctx);
-               return ret;
+               return 0;
+       }
+
+       if (add_old && kvno != 0) {
+               old_secret = ldb_msg_find_attr_as_string(msg, "priorSecret", NULL);
+       } else {
+               old_secret = NULL;
        }
 
-       ret = principal_from_credentials(mem_ctx, machine_account, smb_krb5_context, &princ);
+       enctype_bitmap = (uint32_t)ldb_msg_find_attr_as_int(msg, "msDS-SupportedEncryptionTypes", ENC_ALL_TYPES);
+       
+       ret = kerberos_enctype_bitmap_to_enctypes(mem_ctx, enctype_bitmap, &enctypes);
        if (ret) {
-               DEBUG(1,("create_memory_keytab: maksing krb5 principal failed (%s)\n",
-                        smb_get_krb5_error_message(smb_krb5_context->krb5_context, 
-                                                   ret, mem_ctx)));
+               *error_string = talloc_asprintf(parent_ctx, "create_keytab: generating list of encryption types failed (%s)\n",
+                                               smb_get_krb5_error_message(smb_krb5_context->krb5_context,
+                                                                          ret, mem_ctx));
                talloc_free(mem_ctx);
                return ret;
        }
 
-       password_s = cli_credentials_get_password(machine_account);
-       if (!password_s) {
-               /* If we don't have the plaintext password, try for
-                * the MD4 password hash */
-
-               krb5_keytab_entry entry;
-               const struct samr_Password *mach_pwd;
-               mach_pwd = cli_credentials_get_nt_hash(machine_account, mem_ctx);
-               if (!mach_pwd) {
-                       talloc_free(mem_ctx);
-                       DEBUG(1, ("create_memory_keytab: Domain trust informaton for account %s not available\n",
-                                 cli_credentials_get_principal(machine_account, mem_ctx)));
-                       return EINVAL;
-               }
-               ret = krb5_keyblock_init(smb_krb5_context->krb5_context,
-                                        ENCTYPE_ARCFOUR_HMAC,
-                                        mach_pwd->hash, sizeof(mach_pwd->hash), 
-                                        &entry.keyblock);
+       /* Walk over the principals */
+       for (i=0; principals[i]; i++) {
+               ret = keytab_add_keys(mem_ctx, principals[i]->string_form, principals[i]->principal,
+                                     salt_princ,
+                                     kvno, password_s, smb_krb5_context,
+                                     enctypes, keytab, error_string);
                if (ret) {
-                       DEBUG(1, ("create_memory_keytab: krb5_keyblock_init failed: %s\n",
-                                 smb_get_krb5_error_message(smb_krb5_context->krb5_context, 
-                                                            ret, mem_ctx)));
+                       talloc_free(mem_ctx);
                        return ret;
                }
 
-               entry.principal = princ;
-               entry.vno       = cli_credentials_get_kvno(machine_account);
-               ret = krb5_kt_add_entry(smb_krb5_context->krb5_context, keytab, &entry);
-               if (ret) {
-                       DEBUG(1, ("Failed to add ARCFOUR_HMAC (only) entry for %s to keytab: %s",
-                                 cli_credentials_get_principal(machine_account, mem_ctx), 
-                                 smb_get_krb5_error_message(smb_krb5_context->krb5_context, 
-                                                            ret, mem_ctx)));
-                       talloc_free(mem_ctx);
-                       krb5_free_keyblock_contents(smb_krb5_context->krb5_context, &entry.keyblock);
-                       return ret;
+               if (old_secret) {
+                       ret = keytab_add_keys(mem_ctx, principals[i]->string_form, principals[i]->principal,
+                                             salt_princ,
+                                             kvno - 1, old_secret, smb_krb5_context,
+                                             enctypes, keytab, error_string);
+                       if (ret) {
+                               talloc_free(mem_ctx);
+                               return ret;
+                       }
                }
-               
-               krb5_free_keyblock_contents(smb_krb5_context->krb5_context, &entry.keyblock);
+       }
 
-               talloc_steal(parent_ctx, *keytab_container);
-               talloc_free(mem_ctx);
-               return 0;
+       talloc_free(mem_ctx);
+       return ret;
+}
+
+/*
+ * Walk the keytab, looking for entries of this principal name, with KVNO other than current kvno -1.
+ *
+ * These entries are now stale, we only keep the current, and previous entries around.
+ *
+ * Inspired by the code in Samba3 for 'use kerberos keytab'.
+ *
+ */
+
+static krb5_error_code remove_old_entries(TALLOC_CTX *parent_ctx,
+                                         struct ldb_message *msg,
+                                         struct principal_container **principals,
+                                         bool delete_all_kvno,
+                                         struct smb_krb5_context *smb_krb5_context,
+                                         krb5_keytab keytab, bool *found_previous,
+                                         const char **error_string)
+{
+       krb5_error_code ret, ret2;
+       krb5_kt_cursor cursor;
+       int kvno;
+       TALLOC_CTX *mem_ctx = talloc_new(parent_ctx);
+
+       if (!mem_ctx) {
+               return ENOMEM;
        }
-               
-       /* good, we actually have the real plaintext */
 
-       ret = get_kerberos_allowed_etypes(smb_krb5_context->krb5_context, 
-                                         &enctypes);
-       if (ret) {
-               DEBUG(1,("create_memory_keytab: getting encrption types failed (%s)\n",
-                        error_message(ret)));
+       *found_previous = false;
+
+       kvno = ldb_msg_find_attr_as_int(msg, "msDS-KeyVersionNumber", 0);
+
+       /* for each entry in the keytab */
+       ret = krb5_kt_start_seq_get(smb_krb5_context->krb5_context, keytab, &cursor);
+       switch (ret) {
+       case 0:
+               break;
+       case HEIM_ERR_OPNOTSUPP:
+       case ENOENT:
+       case KRB5_KT_END:
+               /* no point enumerating if there isn't anything here */
+               talloc_free(mem_ctx);
+               return 0;
+       default:
+               *error_string = talloc_asprintf(parent_ctx, "failed to open keytab for read of old entries: %s\n",
+                                               smb_get_krb5_error_message(smb_krb5_context->krb5_context,
+                                                                          ret, mem_ctx));
                talloc_free(mem_ctx);
                return ret;
        }
 
-       password.data = discard_const_p(char *, password_s);
-       password.length = strlen(password_s);
-       kvno = cli_credentials_get_kvno(machine_account);
-
-       for (i=0; enctypes[i]; i++) {
+       while (!ret) {
+               unsigned int i;
+               bool matched = false;
                krb5_keytab_entry entry;
-               ret = create_kerberos_key_from_string(smb_krb5_context->krb5_context, 
-                                                     salt_princ, &password, &entry.keyblock, enctypes[i]);
+               ret = krb5_kt_next_entry(smb_krb5_context->krb5_context, keytab, &entry, &cursor);
                if (ret) {
-                       talloc_free(mem_ctx);
-                       return ret;
+                       break;
+               }
+               for (i = 0; principals[i]; i++) {
+                       /* if it matches our principal */
+                       if (krb5_kt_compare(smb_krb5_context->krb5_context, &entry, principals[i]->principal, 0, 0)) {
+                               matched = true;
+                               break;
+                       }
                }
 
-                entry.principal = princ;
-                entry.vno       = kvno;
-               ret = krb5_kt_add_entry(smb_krb5_context->krb5_context, keytab, &entry);
-               if (ret) {
-                       DEBUG(1, ("Failed to add entry for %s to keytab: %s",
-                                 cli_credentials_get_principal(machine_account, mem_ctx), 
-                                 smb_get_krb5_error_message(smb_krb5_context->krb5_context, 
-                                                            ret, mem_ctx)));
-                       talloc_free(mem_ctx);
-                       krb5_free_keyblock_contents(smb_krb5_context->krb5_context, &entry.keyblock);
-                       return ret;
+               if (!matched) {
+                       /* Free the entry, it wasn't the one we were looking for anyway */
+                       krb5_kt_free_entry(smb_krb5_context->krb5_context, &entry);
+                       continue;
                }
-               
-               krb5_free_keyblock_contents(smb_krb5_context->krb5_context, &entry.keyblock);
-       }
 
-       old_secret = cli_credentials_get_old_password(machine_account);
-       if (kvno != 0 && old_secret) {
-               password.data = discard_const_p(char *, old_secret);
-               password.length = strlen(old_secret);
+               /* delete it, if it is not kvno -1 */
+               if (entry.vno != (kvno - 1 )) {
+                       /* Release the enumeration.  We are going to
+                        * have to start this from the top again,
+                        * because deletes during enumeration may not
+                        * always be consistant.
+                        *
+                        * Also, the enumeration locks a FILE: keytab
+                        */
                
-               for (i=0; enctypes[i]; i++) {
-                       krb5_keytab_entry entry;
-                       ret = create_kerberos_key_from_string(smb_krb5_context->krb5_context, 
-                                                             salt_princ, &password, &entry.keyblock, enctypes[i]);
-                       if (ret) {
+                       krb5_kt_end_seq_get(smb_krb5_context->krb5_context, keytab, &cursor);
+
+                       ret = krb5_kt_remove_entry(smb_krb5_context->krb5_context, keytab, &entry);
+                       krb5_kt_free_entry(smb_krb5_context->krb5_context, &entry);
+
+                       /* Deleted: Restart from the top */
+                       ret2 = krb5_kt_start_seq_get(smb_krb5_context->krb5_context, keytab, &cursor);
+                       if (ret2) {
+                               krb5_kt_free_entry(smb_krb5_context->krb5_context, &entry);
+                               DEBUG(1,("failed to restart enumeration of keytab: %s\n",
+                                        smb_get_krb5_error_message(smb_krb5_context->krb5_context, 
+                                                                   ret, mem_ctx)));
+                               
                                talloc_free(mem_ctx);
-                               return ret;
+                               return ret2;
                        }
-                       
-                       entry.principal = princ;
-                       entry.vno       = kvno - 1;
-                       ret = krb5_kt_add_entry(smb_krb5_context->krb5_context, keytab, &entry);
+
                        if (ret) {
-                               DEBUG(1, ("Failed to add 'old password' entry for %s to keytab: %s",
-                                         cli_credentials_get_principal(machine_account, mem_ctx), 
-                                         smb_get_krb5_error_message(smb_krb5_context->krb5_context, 
-                                                                    ret, mem_ctx)));
-                               talloc_free(mem_ctx);
-                               krb5_free_keyblock_contents(smb_krb5_context->krb5_context, &entry.keyblock);
-                               return ret;
+                               break;
                        }
                        
-                       krb5_free_keyblock_contents(smb_krb5_context->krb5_context, &entry.keyblock);
+               } else {
+                       *found_previous = true;
                }
+               
+               /* Free the entry, we don't need it any more */
+               krb5_kt_free_entry(smb_krb5_context->krb5_context, &entry);
+               
+               
+       }
+       krb5_kt_end_seq_get(smb_krb5_context->krb5_context, keytab, &cursor);
+
+       switch (ret) {
+       case 0:
+               break;
+       case ENOENT:
+       case KRB5_KT_END:
+               ret = 0;
+               break;
+       default:
+               *error_string = talloc_asprintf(parent_ctx, "failed in deleting old entries for principal: %s\n",
+                                               smb_get_krb5_error_message(smb_krb5_context->krb5_context,
+                                                                          ret, mem_ctx));
+       }
+       talloc_free(mem_ctx);
+       return ret;
+}
+
+krb5_error_code smb_krb5_update_keytab(TALLOC_CTX *parent_ctx,
+                                      struct smb_krb5_context *smb_krb5_context,
+                                      struct ldb_context *ldb, 
+                                      struct ldb_message *msg,
+                                      bool delete_all_kvno,
+                                      const char **error_string)
+{
+       krb5_error_code ret;
+       bool found_previous;
+       TALLOC_CTX *mem_ctx = talloc_new(NULL);
+       struct keytab_container *keytab_container;
+       struct principal_container **principals;
+       const char *keytab_name;
+
+       if (!mem_ctx) {
+               return ENOMEM;
+       }
+
+       keytab_name = keytab_name_from_msg(mem_ctx, ldb, msg);
+       if (!keytab_name) {
+               return ENOENT;
+       }
+
+       ret = smb_krb5_open_keytab(mem_ctx, smb_krb5_context, keytab_name, &keytab_container);
+
+       if (ret != 0) {
+               talloc_free(mem_ctx);
+               return ret;
        }
 
-       free_kerberos_etypes(smb_krb5_context->krb5_context, enctypes);
+       DEBUG(5, ("Opened keytab %s\n", keytab_name));
+
+       /* Get the principal we will store the new keytab entries under */
+       ret = principals_from_msg(mem_ctx, msg, smb_krb5_context, &principals, error_string);
 
-       talloc_steal(parent_ctx, *keytab_container);
+       if (ret != 0) {
+               *error_string = talloc_asprintf(parent_ctx, "Failed to load principals from ldb message: %s\n", *error_string);
+               talloc_free(mem_ctx);
+               return ret;
+       }
+
+       ret = remove_old_entries(mem_ctx, msg, principals, delete_all_kvno,
+                                smb_krb5_context, keytab_container->keytab, &found_previous, error_string);
+       if (ret != 0) {
+               *error_string = talloc_asprintf(parent_ctx, "Failed to remove old principals from keytab: %s\n", *error_string);
+               talloc_free(mem_ctx);
+               return ret;
+       }
+       
+       if (!delete_all_kvno) {
+               /* Create a new keytab.  If during the cleanout we found
+                * entires for kvno -1, then don't try and duplicate them.
+                * Otherwise, add kvno, and kvno -1 */
+               
+               ret = create_keytab(mem_ctx, msg, principals,
+                                   smb_krb5_context,
+                                   keytab_container->keytab, 
+                                   found_previous ? false : true, error_string);
+       }
        talloc_free(mem_ctx);
-       return 0;
+       return ret;
 }
 
+krb5_error_code smb_krb5_create_memory_keytab(TALLOC_CTX *parent_ctx,
+                                          struct cli_credentials *machine_account,
+                                          struct smb_krb5_context *smb_krb5_context,
+                                          struct keytab_container **keytab_container) 
+{
+       krb5_error_code ret;
+       TALLOC_CTX *mem_ctx = talloc_new(parent_ctx);
+       const char *rand_string;
+       const char *keytab_name;
+       struct ldb_message *msg;
+       const char *error_string;
+       if (!mem_ctx) {
+               return ENOMEM;
+       }
+       
+       *keytab_container = talloc(mem_ctx, struct keytab_container);
+
+       rand_string = generate_random_str(mem_ctx, 16);
+       if (!rand_string) {
+               talloc_free(mem_ctx);
+               return ENOMEM;
+       }
+
+       keytab_name = talloc_asprintf(mem_ctx, "MEMORY:%s", 
+                                     rand_string);
+       if (!keytab_name) {
+               talloc_free(mem_ctx);
+               return ENOMEM;
+       }
+
+       ret = smb_krb5_open_keytab(mem_ctx, smb_krb5_context, keytab_name, keytab_container);
+       if (ret) {
+               return ret;
+       }
 
+       msg = ldb_msg_new(mem_ctx);
+       if (!msg) {
+               talloc_free(mem_ctx);
+               return ENOMEM;
+       }
+       ldb_msg_add_string(msg, "krb5Keytab", keytab_name);
+       ldb_msg_add_string(msg, "secret", cli_credentials_get_password(machine_account));
+       ldb_msg_add_string(msg, "samAccountName", cli_credentials_get_username(machine_account));
+       ldb_msg_add_string(msg, "realm", cli_credentials_get_realm(machine_account));
+       ldb_msg_add_fmt(msg, "msDS-KeyVersionNumber", "%d", (int)cli_credentials_get_kvno(machine_account));
+
+       ret = smb_krb5_update_keytab(mem_ctx, smb_krb5_context, NULL, msg, false, &error_string);
+       if (ret == 0) {
+               talloc_steal(parent_ctx, *keytab_container);
+       } else {
+               DEBUG(0, ("Failed to create in-memory keytab: %s\n", error_string));
+               *keytab_container = NULL;
+       }
+       talloc_free(mem_ctx);
+       return ret;
+}
+/* Translate between the IETF encryption type values and the Microsoft msDS-SupportedEncryptionTypes values */
+uint32_t kerberos_enctype_to_bitmap(krb5_enctype enc_type_enum)
+{
+       switch (enc_type_enum) {
+       case ENCTYPE_DES_CBC_CRC:
+               return ENC_CRC32;
+       case ENCTYPE_DES_CBC_MD5:
+               return ENC_RSA_MD5;
+       case ENCTYPE_ARCFOUR_HMAC_MD5:
+               return ENC_RC4_HMAC_MD5;
+       case ENCTYPE_AES128_CTS_HMAC_SHA1_96:
+               return ENC_HMAC_SHA1_96_AES128;
+       case ENCTYPE_AES256_CTS_HMAC_SHA1_96:
+               return ENC_HMAC_SHA1_96_AES256;
+       default:
+               return 0;
+       }
+}
+
+/* Translate between the Microsoft msDS-SupportedEncryptionTypes values and the IETF encryption type values */
+krb5_enctype kerberos_enctype_bitmap_to_enctype(uint32_t enctype_bitmap)
+{
+       switch (enctype_bitmap) {
+       case ENC_CRC32:
+               return ENCTYPE_DES_CBC_CRC;
+       case ENC_RSA_MD5:
+               return ENCTYPE_DES_CBC_MD5;
+       case ENC_RC4_HMAC_MD5:
+               return ENCTYPE_ARCFOUR_HMAC_MD5;
+       case ENC_HMAC_SHA1_96_AES128:
+               return ENCTYPE_AES128_CTS_HMAC_SHA1_96;
+       case ENC_HMAC_SHA1_96_AES256:
+               return ENCTYPE_AES256_CTS_HMAC_SHA1_96;
+       default:
+               return 0;
+       }
+}
+
+/* Return an array of krb5_enctype values */
+krb5_error_code kerberos_enctype_bitmap_to_enctypes(TALLOC_CTX *mem_ctx, uint32_t enctype_bitmap, krb5_enctype **enctypes)
+{
+       unsigned int i, j = 0;
+       *enctypes = talloc_zero_array(mem_ctx, krb5_enctype, (8*sizeof(enctype_bitmap))+1);
+       if (!*enctypes) {
+               return ENOMEM;
+       }
+       for (i=0; i<(8*sizeof(enctype_bitmap)); i++) {
+               uint32_t bit_value = (1 << i) & enctype_bitmap;
+               if (bit_value & enctype_bitmap) {
+                       (*enctypes)[j] = kerberos_enctype_bitmap_to_enctype(bit_value);
+                       if (!(*enctypes)[j]) {
+                               continue;
+                       }
+                       j++;
+               }
+       }
+       (*enctypes)[j] = 0;
+       return 0;
+}