r9794: r11627@blu: tridge | 2005-08-30 22:55:27 +1000
[jra/samba/.git] / source4 / lib / credentials.c
index db796cde3543549100c3cb88fbcff4c4fe39006c..162b52e5d05139531532f4dd82bdf0f413f13ad4 100644 (file)
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "lib/cmdline/popt_common.h"
 #include "include/secrets.h"
 #include "lib/ldb/include/ldb.h"
+#include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
+#include "system/kerberos.h"
+#include "auth/kerberos/kerberos.h"
+
 
 /**
  * Create a new credentials structure
@@ -44,6 +47,8 @@ struct cli_credentials *cli_credentials_init(TALLOC_CTX *mem_ctx)
        cred->password_obtained = CRED_UNINITIALISED;
        cred->domain_obtained = CRED_UNINITIALISED;
        cred->realm_obtained = CRED_UNINITIALISED;
+       cred->ccache_obtained = CRED_UNINITIALISED;
+       cred->principal_obtained = CRED_UNINITIALISED;
        return cred;
 }
 
@@ -53,21 +58,27 @@ struct cli_credentials *cli_credentials_init(TALLOC_CTX *mem_ctx)
  * @retval The username set on this context.
  * @note Return value will never be NULL except by programmer error.
  */
-const char *cli_credentials_get_username(struct cli_credentials *cred)
+const char *cli_credentials_get_username(struct cli_credentials *cred, TALLOC_CTX *mem_ctx)
 {
        if (cred->machine_account_pending) {
                cli_credentials_set_machine_account(cred);
        }
 
+       /* If we have a principal set on this, we want to login with "" domain and user@realm */
+       if (cred->username_obtained < cred->principal_obtained) {
+               return cli_credentials_get_principal(cred, mem_ctx);
+       }
+
        if (cred->username_obtained == CRED_CALLBACK) {
                cred->username = cred->username_cb(cred);
                cred->username_obtained = CRED_SPECIFIED;
        }
 
-       return cred->username;
+       return talloc_reference(mem_ctx, cred->username);
 }
 
-BOOL cli_credentials_set_username(struct cli_credentials *cred, const char *val, enum credentials_obtained obtained)
+BOOL cli_credentials_set_username(struct cli_credentials *cred, 
+                                 const char *val, enum credentials_obtained obtained)
 {
        if (obtained >= cred->username_obtained) {
                cred->username = talloc_strdup(cred, val);
@@ -78,6 +89,79 @@ BOOL cli_credentials_set_username(struct cli_credentials *cred, const char *val,
        return False;
 }
 
+BOOL cli_credentials_set_username_callback(struct cli_credentials *cred,
+                                 const char *(*username_cb) (struct cli_credentials *))
+{
+       if (cred->username_obtained < CRED_CALLBACK) {
+               cred->username_cb = username_cb;
+               cred->username_obtained = CRED_CALLBACK;
+               return True;
+       }
+
+       return False;
+}
+
+
+
+/**
+ * Obtain the client principal for this credentials context.
+ * @param cred credentials context
+ * @retval The username set on this context.
+ * @note Return value will never be NULL except by programmer error.
+ */
+const char *cli_credentials_get_principal(struct cli_credentials *cred, TALLOC_CTX *mem_ctx)
+{
+       if (cred->machine_account_pending) {
+               cli_credentials_set_machine_account(cred);
+       }
+
+       if (cred->principal_obtained == CRED_CALLBACK) {
+               cred->principal = cred->principal_cb(cred);
+               cred->principal_obtained = CRED_SPECIFIED;
+       }
+
+       if (cred->principal_obtained < cred->username_obtained) {
+               return talloc_asprintf(mem_ctx, "%s@%s", 
+                                      cli_credentials_get_username(cred, mem_ctx),
+                                      cli_credentials_get_realm(cred));
+       }
+       return talloc_reference(mem_ctx, cred->principal);
+}
+
+BOOL cli_credentials_set_principal(struct cli_credentials *cred, const char *val, enum credentials_obtained obtained)
+{
+       if (obtained >= cred->principal_obtained) {
+               cred->principal = talloc_strdup(cred, val);
+               cred->principal_obtained = obtained;
+               return True;
+       }
+
+       return False;
+}
+
+BOOL cli_credentials_set_principal_callback(struct cli_credentials *cred,
+                                 const char *(*principal_cb) (struct cli_credentials *))
+{
+       if (cred->principal_obtained < CRED_CALLBACK) {
+               cred->principal_cb = principal_cb;
+               cred->principal_obtained = CRED_CALLBACK;
+               return True;
+       }
+
+       return False;
+}
+
+BOOL cli_credentials_authentication_requested(struct cli_credentials *cred) 
+{
+       if (cred->principal_obtained >= CRED_SPECIFIED) {
+               return True;
+       }
+       if (cred->username_obtained >= CRED_SPECIFIED) {
+               return True;
+       }
+       return False;
+}
+
 /**
  * Obtain the password for this credentials context.
  * @param cred credentials context
@@ -97,17 +181,273 @@ const char *cli_credentials_get_password(struct cli_credentials *cred)
        return cred->password;
 }
 
-BOOL cli_credentials_set_password(struct cli_credentials *cred, const char *val, enum credentials_obtained obtained)
+BOOL cli_credentials_set_password(struct cli_credentials *cred, 
+                                 const char *val, 
+                                 enum credentials_obtained obtained)
 {
        if (obtained >= cred->password_obtained) {
                cred->password = talloc_strdup(cred, val);
                cred->password_obtained = obtained;
+
+               cred->nt_hash = NULL;
                return True;
        }
 
        return False;
 }
 
+BOOL cli_credentials_set_password_callback(struct cli_credentials *cred,
+                                          const char *(*password_cb) (struct cli_credentials *))
+{
+       if (cred->password_obtained < CRED_CALLBACK) {
+               cred->password_cb = password_cb;
+               cred->password_obtained = CRED_CALLBACK;
+               return True;
+       }
+
+       return False;
+}
+
+/**
+ * Obtain the password for this credentials context.
+ * @param cred credentials context
+ * @retval If set, the cleartext password, otherwise NULL
+ */
+const struct samr_Password *cli_credentials_get_nt_hash(struct cli_credentials *cred, 
+                                                       TALLOC_CTX *mem_ctx)
+{
+       const char *password = cli_credentials_get_password(cred);
+
+       if (password) {
+               struct samr_Password *nt_hash = talloc(mem_ctx, struct samr_Password);
+               if (!nt_hash) {
+                       return NULL;
+               }
+               
+               E_md4hash(password, nt_hash->hash);    
+
+               return nt_hash;
+       } else {
+               return cred->nt_hash;
+       }
+}
+
+BOOL cli_credentials_set_nt_hash(struct cli_credentials *cred,
+                                const struct samr_Password *nt_hash, 
+                                enum credentials_obtained obtained)
+{
+       if (obtained >= cred->password_obtained) {
+               cli_credentials_set_password(cred, NULL, obtained);
+               cred->nt_hash = talloc(cred, struct samr_Password);
+               *cred->nt_hash = *nt_hash;
+               return True;
+       }
+
+       return False;
+}
+
+int cli_credentials_set_from_ccache(struct cli_credentials *cred, 
+                                   enum credentials_obtained obtained)
+{
+       
+       krb5_principal princ;
+       krb5_error_code ret;
+       char *name;
+       char **realm;
+
+       ret = krb5_cc_get_principal(cred->ccache->smb_krb5_context->krb5_context, 
+                                   cred->ccache->ccache, &princ);
+
+       if (ret) {
+               char *err_mess = smb_get_krb5_error_message(cred->ccache->smb_krb5_context->krb5_context, ret, cred);
+               DEBUG(1,("failed to get principal from ccache: %s\n", 
+                        err_mess));
+               talloc_free(err_mess);
+               return ret;
+       }
+       
+       ret = krb5_unparse_name(cred->ccache->smb_krb5_context->krb5_context, princ, &name);
+       if (ret) {
+               char *err_mess = smb_get_krb5_error_message(cred->ccache->smb_krb5_context->krb5_context, ret, cred);
+               DEBUG(1,("failed to unparse principal from ccache: %s\n", 
+                        err_mess));
+               talloc_free(err_mess);
+               return ret;
+       }
+
+       realm = krb5_princ_realm(cred->ccache->smb_krb5_context->krb5_context, princ);
+
+       cli_credentials_set_realm(cred, *realm, obtained);
+       cli_credentials_set_principal(cred, name, obtained);
+
+       free(name);
+
+       krb5_free_principal(cred->ccache->smb_krb5_context->krb5_context, princ);
+
+       cred->ccache_obtained = obtained;
+
+       return 0;
+}
+
+
+static int free_mccache(void *ptr) {
+       struct ccache_container *ccc = ptr;
+       krb5_cc_destroy(ccc->smb_krb5_context->krb5_context, ccc->ccache);
+
+       return 0;
+}
+
+static int free_dccache(void *ptr) {
+       struct ccache_container *ccc = ptr;
+       krb5_cc_close(ccc->smb_krb5_context->krb5_context, ccc->ccache);
+
+       return 0;
+}
+
+static int cli_credentials_set_ccache(struct cli_credentials *cred, 
+                                     const char *name, 
+                                     enum credentials_obtained obtained)
+{
+       krb5_error_code ret;
+       krb5_principal princ;
+       struct ccache_container *ccc = talloc(cred, struct ccache_container);
+       if (!ccc) {
+               return ENOMEM;
+       }
+
+       ret = smb_krb5_init_context(ccc, &ccc->smb_krb5_context);
+       if (ret) {
+               talloc_free(ccc);
+               return ret;
+       }
+       if (name) {
+               ret = krb5_cc_resolve(ccc->smb_krb5_context->krb5_context, name, &ccc->ccache);
+               if (ret) {
+                       DEBUG(1,("failed to read krb5 ccache: %s: %s\n", 
+                                name, 
+                                smb_get_krb5_error_message(ccc->smb_krb5_context->krb5_context, ret, ccc)));
+                       talloc_free(ccc);
+                       return ret;
+               }
+       } else {
+               ret = krb5_cc_default(ccc->smb_krb5_context->krb5_context, &ccc->ccache);
+               if (ret) {
+                       DEBUG(1,("failed to read default krb5 ccache: %s\n", 
+                                smb_get_krb5_error_message(ccc->smb_krb5_context->krb5_context, ret, ccc)));
+                       talloc_free(ccc);
+                       return ret;
+               }
+       }
+
+       talloc_set_destructor(ccc, free_dccache);
+
+       ret = krb5_cc_get_principal(ccc->smb_krb5_context->krb5_context, ccc->ccache, &princ);
+
+       if (ret) {
+               DEBUG(1,("failed to get principal from default ccache: %s\n", 
+                        smb_get_krb5_error_message(ccc->smb_krb5_context->krb5_context, ret, ccc)));
+               talloc_free(ccc);               
+               return ret;
+       }
+
+       krb5_free_principal(ccc->smb_krb5_context->krb5_context, princ);
+
+       cred->ccache = ccc;
+       talloc_steal(cred, ccc);
+
+       ret = cli_credentials_set_from_ccache(cred, obtained);
+
+       if (ret) {
+               return ret;
+       }
+
+       return 0;
+}
+
+
+int cli_credentials_new_ccache(struct cli_credentials *cred)
+{
+       krb5_error_code ret;
+       char *rand_string;
+       struct ccache_container *ccc = talloc(cred, struct ccache_container);
+       char *ccache_name;
+       if (!ccc) {
+               return ENOMEM;
+       }
+
+       rand_string = generate_random_str(NULL, 16);
+       if (!rand_string) {
+               talloc_free(ccc);
+               return ENOMEM;
+       }
+
+       ccache_name = talloc_asprintf(ccc, "MEMORY:%s", 
+                             rand_string);
+       talloc_free(rand_string);
+
+       if (!ccache_name) {
+               talloc_free(ccc);
+               return ENOMEM;
+       }
+
+       ret = smb_krb5_init_context(ccc, &ccc->smb_krb5_context);
+       if (ret) {
+               talloc_free(ccache_name);
+               talloc_free(ccc);
+               return ret;
+       }
+
+       ret = krb5_cc_resolve(ccc->smb_krb5_context->krb5_context, ccache_name, &ccc->ccache);
+       if (ret) {
+               DEBUG(1,("failed to generate a new krb5 ccache (%s): %s\n", 
+                        ccache_name,
+                        smb_get_krb5_error_message(ccc->smb_krb5_context->krb5_context, ret, ccc)));
+               talloc_free(ccache_name);
+               talloc_free(ccc);
+               return ret;
+       }
+
+       talloc_set_destructor(ccc, free_mccache);
+
+       cred->ccache = ccc;
+       talloc_steal(cred, ccc);
+       talloc_free(ccache_name);
+
+       return ret;
+}
+
+int cli_credentials_get_ccache(struct cli_credentials *cred, 
+                              struct ccache_container **ccc)
+{
+       krb5_error_code ret;
+       
+       if (cred->ccache_obtained >= (MAX(cred->principal_obtained, 
+                                         cred->username_obtained))) {
+               *ccc = cred->ccache;
+               return 0;
+       }
+       if (cli_credentials_is_anonymous(cred)) {
+               return EINVAL;
+       }
+
+       ret = cli_credentials_new_ccache(cred);
+       if (ret) {
+               return ret;
+       }
+       ret = kinit_to_ccache(cred, cred, cred->ccache->smb_krb5_context, cred->ccache->ccache);
+       if (ret) {
+               return ret;
+       }
+       ret = cli_credentials_set_from_ccache(cred, cred->principal_obtained);
+
+       if (ret) {
+               return ret;
+       }
+       *ccc = cred->ccache;
+       return ret;
+}
+
+
 /**
  * Obtain the 'short' or 'NetBIOS' domain for this credentials context.
  * @param cred credentials context
@@ -120,6 +460,11 @@ const char *cli_credentials_get_domain(struct cli_credentials *cred)
                cli_credentials_set_machine_account(cred);
        }
 
+       /* If we have a principal set on this, we want to login with "" domain and user@realm */
+       if (cred->domain_obtained < cred->principal_obtained) {
+               return "";
+       }
+
        if (cred->domain_obtained == CRED_CALLBACK) {
                cred->domain = cred->domain_cb(cred);
                cred->domain_obtained = CRED_SPECIFIED;
@@ -129,7 +474,9 @@ const char *cli_credentials_get_domain(struct cli_credentials *cred)
 }
 
 
-BOOL cli_credentials_set_domain(struct cli_credentials *cred, const char *val, enum credentials_obtained obtained)
+BOOL cli_credentials_set_domain(struct cli_credentials *cred, 
+                               const char *val, 
+                               enum credentials_obtained obtained)
 {
        if (obtained >= cred->domain_obtained) {
                cred->domain = talloc_strdup(cred, val);
@@ -140,6 +487,18 @@ BOOL cli_credentials_set_domain(struct cli_credentials *cred, const char *val, e
        return False;
 }
 
+BOOL cli_credentials_set_domain_callback(struct cli_credentials *cred,
+                                        const char *(*domain_cb) (struct cli_credentials *))
+{
+       if (cred->domain_obtained < CRED_CALLBACK) {
+               cred->domain_cb = domain_cb;
+               cred->domain_obtained = CRED_CALLBACK;
+               return True;
+       }
+
+       return False;
+}
+
 /**
  * Obtain the Kerberos realm for this credentials context.
  * @param cred credentials context
@@ -161,25 +520,28 @@ const char *cli_credentials_get_realm(struct cli_credentials *cred)
 }
 
 /**
- * Obtain the user's Kerberos principal for this credentials context.
- * @param cred credentials context
- * @param mem_ctx A talloc context to return the prinipal name on.
- * @retval The user's Kerberos principal
- * @note Return value may be NULL due to out-of memeory or invalid mem_ctx
+ * Set the realm for this credentials context, and force it to
+ * uppercase for the sainity of our local kerberos libraries 
  */
-char *cli_credentials_get_principal(struct cli_credentials *cred,
-                                   TALLOC_CTX *mem_ctx)
+BOOL cli_credentials_set_realm(struct cli_credentials *cred, 
+                              const char *val, 
+                              enum credentials_obtained obtained)
 {
-       return talloc_asprintf(mem_ctx, "%s@%s", 
-                              cli_credentials_get_username(cred),
-                              cli_credentials_get_realm(cred));
+       if (obtained >= cred->realm_obtained) {
+               cred->realm = strupper_talloc(cred, val);
+               cred->realm_obtained = obtained;
+               return True;
+       }
+
+       return False;
 }
 
-BOOL cli_credentials_set_realm(struct cli_credentials *cred, const char *val, enum credentials_obtained obtained)
+BOOL cli_credentials_set_realm_callback(struct cli_credentials *cred,
+                                       const char *(*realm_cb) (struct cli_credentials *))
 {
-       if (obtained >= cred->realm_obtained) {
-               cred->realm = talloc_strdup(cred, val);
-               cred->realm_obtained = obtained;
+       if (cred->realm_obtained < CRED_CALLBACK) {
+               cred->realm_cb = realm_cb;
+               cred->realm_obtained = CRED_CALLBACK;
                return True;
        }
 
@@ -203,7 +565,9 @@ const char *cli_credentials_get_workstation(struct cli_credentials *cred)
        return cred->workstation;
 }
 
-BOOL cli_credentials_set_workstation(struct cli_credentials *cred, const char *val, enum credentials_obtained obtained)
+BOOL cli_credentials_set_workstation(struct cli_credentials *cred, 
+                                    const char *val, 
+                                    enum credentials_obtained obtained)
 {
        if (obtained >= cred->workstation_obtained) {
                cred->workstation = talloc_strdup(cred, val);
@@ -214,6 +578,18 @@ BOOL cli_credentials_set_workstation(struct cli_credentials *cred, const char *v
        return False;
 }
 
+BOOL cli_credentials_set_workstation_callback(struct cli_credentials *cred,
+                                             const char *(*workstation_cb) (struct cli_credentials *))
+{
+       if (cred->workstation_obtained < CRED_CALLBACK) {
+               cred->workstation_cb = workstation_cb;
+               cred->workstation_obtained = CRED_CALLBACK;
+               return True;
+       }
+
+       return False;
+}
+
 /**
  * Read a file descriptor, and parse it for a password (eg from a file or stdin)
  *
@@ -222,7 +598,8 @@ BOOL cli_credentials_set_workstation(struct cli_credentials *cred, const char *v
  * @param obtained This enum describes how 'specified' this password is
  */
 
-BOOL cli_credentials_parse_password_fd(struct cli_credentials *credentials, int fd, enum credentials_obtained obtained)
+BOOL cli_credentials_parse_password_fd(struct cli_credentials *credentials, 
+                                      int fd, enum credentials_obtained obtained)
 {
        char *p;
        char pass[128];
@@ -375,8 +752,10 @@ void cli_credentials_parse_string(struct cli_credentials *credentials, const cha
        }
 
        if ((p = strchr_m(uname,'@'))) {
+               cli_credentials_set_principal(credentials, uname, obtained);
                *p = 0;
                cli_credentials_set_realm(credentials, p+1, obtained);
+               return;
        } else if ((p = strchr_m(uname,'\\')) || (p = strchr_m(uname, '/'))) {
                *p = 0;
                cli_credentials_set_domain(credentials, uname, obtained);
@@ -393,9 +772,10 @@ void cli_credentials_parse_string(struct cli_credentials *credentials, const cha
  */
 void cli_credentials_set_conf(struct cli_credentials *cred)
 {
-       cli_credentials_set_domain(cred, lp_workgroup(), CRED_GUESSED);
-       cli_credentials_set_workstation(cred, lp_netbios_name(), CRED_GUESSED);
-       cli_credentials_set_realm(cred, lp_realm(), CRED_GUESSED);
+       cli_credentials_set_username(cred, "", CRED_UNINITIALISED);
+       cli_credentials_set_domain(cred, lp_workgroup(), CRED_UNINITIALISED);
+       cli_credentials_set_workstation(cred, lp_netbios_name(), CRED_UNINITIALISED);
+       cli_credentials_set_realm(cred, lp_realm(), CRED_UNINITIALISED);
 }
 
 /**
@@ -408,35 +788,36 @@ void cli_credentials_guess(struct cli_credentials *cred)
 {
        char *p;
 
-       cli_credentials_set_username(cred, "", CRED_GUESSED);
        cli_credentials_set_conf(cred);
        
        if (getenv("LOGNAME")) {
-               cli_credentials_set_username(cred, getenv("LOGNAME"), CRED_GUESSED);
+               cli_credentials_set_username(cred, getenv("LOGNAME"), CRED_GUESS_ENV);
        }
 
        if (getenv("USER")) {
-               cli_credentials_parse_string(cred, getenv("USER"), CRED_GUESSED);
+               cli_credentials_parse_string(cred, getenv("USER"), CRED_GUESS_ENV);
                if ((p = strchr_m(getenv("USER"),'%'))) {
                        memset(p,0,strlen(cred->password));
                }
        }
 
        if (getenv("DOMAIN")) {
-               cli_credentials_set_domain(cred, getenv("DOMAIN"), CRED_GUESSED);
+               cli_credentials_set_domain(cred, getenv("DOMAIN"), CRED_GUESS_ENV);
        }
 
        if (getenv("PASSWD")) {
-               cli_credentials_set_password(cred, getenv("PASSWD"), CRED_GUESSED);
+               cli_credentials_set_password(cred, getenv("PASSWD"), CRED_GUESS_ENV);
        }
 
        if (getenv("PASSWD_FD")) {
-               cli_credentials_parse_password_fd(cred, atoi(getenv("PASSWD_FD")), CRED_GUESSED);
+               cli_credentials_parse_password_fd(cred, atoi(getenv("PASSWD_FD")), CRED_GUESS_FILE);
        }
        
        if (getenv("PASSWD_FILE")) {
-               cli_credentials_parse_password_file(cred, getenv("PASSWD_FILE"), CRED_GUESSED);
+               cli_credentials_parse_password_file(cred, getenv("PASSWD_FILE"), CRED_GUESS_FILE);
        }
+
+       cli_credentials_set_ccache(cred, NULL, CRED_GUESS_FILE);
 }
 
 /**
@@ -452,12 +833,14 @@ NTSTATUS cli_credentials_set_machine_account(struct cli_credentials *cred)
        struct ldb_context *ldb;
        int ldb_ret;
        struct ldb_message **msgs;
-       const char *base_dn = SECRETS_PRIMARY_DOMAIN_DN;
        const char *attrs[] = {
                "secret",
                "samAccountName",
                "flatname",
                "realm",
+               "secureChannelType",
+               "ntPwdHash",
+               "msDS-KeyVersionNumber",
                NULL
        };
        
@@ -465,6 +848,7 @@ NTSTATUS cli_credentials_set_machine_account(struct cli_credentials *cred)
        const char *password;
        const char *domain;
        const char *realm;
+       enum netr_SchannelType sct;
        
        /* ok, we are going to get it now, don't recurse back here */
        cred->machine_account_pending = False;
@@ -479,7 +863,8 @@ NTSTATUS cli_credentials_set_machine_account(struct cli_credentials *cred)
 
        /* search for the secret record */
        ldb_ret = gendb_search(ldb,
-                              mem_ctx, base_dn, &msgs, attrs,
+                              mem_ctx, ldb_dn_explode(mem_ctx, SECRETS_PRIMARY_DOMAIN_DN), 
+                              &msgs, attrs,
                               SECRETS_PRIMARY_DOMAIN_FILTER, 
                               cli_credentials_get_domain(cred));
        if (ldb_ret == 0) {
@@ -495,14 +880,9 @@ NTSTATUS cli_credentials_set_machine_account(struct cli_credentials *cred)
        }
        
        password = ldb_msg_find_string(msgs[0], "secret", NULL);
-       if (!password) {
-               DEBUG(1, ("Could not find 'secret' in join record to domain: %s\n",
-                         cli_credentials_get_domain(cred)));
-               talloc_free(mem_ctx);
-               return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
-       }
-       
+
        machine_account = ldb_msg_find_string(msgs[0], "samAccountName", NULL);
+
        if (!machine_account) {
                DEBUG(1, ("Could not find 'samAccountName' in join record to domain: %s\n",
                          cli_credentials_get_domain(cred)));
@@ -510,6 +890,33 @@ NTSTATUS cli_credentials_set_machine_account(struct cli_credentials *cred)
                return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
        }
        
+       sct = ldb_msg_find_int(msgs[0], "secureChannelType", 0);
+       if (!sct) { 
+               DEBUG(1, ("Domain join for acocunt %s did not have a secureChannelType set!\n",
+                         machine_account));
+               return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
+       }
+       
+       if (!password) {
+               const struct ldb_val *nt_password_hash = ldb_msg_find_ldb_val(msgs[0], "ntPwdHash");
+               struct samr_Password hash;
+               ZERO_STRUCT(hash);
+               if (nt_password_hash) {
+                       memcpy(hash.hash, nt_password_hash->data, 
+                              MIN(nt_password_hash->length, sizeof(hash.hash)));
+               
+                       cli_credentials_set_nt_hash(cred, &hash, CRED_SPECIFIED);
+               } else {
+               
+                       DEBUG(1, ("Could not find 'secret' in join record to domain: %s\n",
+                                 cli_credentials_get_domain(cred)));
+                       talloc_free(mem_ctx);
+                       return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
+               }
+       }
+       
+       cli_credentials_set_secure_channel_type(cred, sct);
+
        domain = ldb_msg_find_string(msgs[0], "flatname", NULL);
        if (domain) {
                cli_credentials_set_domain(cred, domain, CRED_SPECIFIED);
@@ -519,9 +926,14 @@ NTSTATUS cli_credentials_set_machine_account(struct cli_credentials *cred)
        if (realm) {
                cli_credentials_set_realm(cred, realm, CRED_SPECIFIED);
        }
-       
+
        cli_credentials_set_username(cred, machine_account, CRED_SPECIFIED);
-       cli_credentials_set_password(cred, password, CRED_SPECIFIED);
+       if (password) {
+               cli_credentials_set_password(cred, password, CRED_SPECIFIED);
+       }
+
+       cli_credentials_set_kvno(cred, ldb_msg_find_int(msgs[0], "msDS-KeyVersionNumber", 0));
+       
        talloc_free(mem_ctx);
        
        return NT_STATUS_OK;
@@ -560,6 +972,44 @@ struct creds_CredentialState *cli_credentials_get_netlogon_creds(struct cli_cred
        return cred->netlogon_creds;
 }
 
+/** 
+ * Set NETLOGON secure channel type
+ */
+
+void cli_credentials_set_secure_channel_type(struct cli_credentials *cred,
+                                            enum netr_SchannelType secure_channel_type)
+{
+       cred->secure_channel_type = secure_channel_type;
+}
+
+/**
+ * Return NETLOGON secure chanel type
+ */
+
+enum netr_SchannelType cli_credentials_get_secure_channel_type(struct cli_credentials *cred)
+{
+       return cred->secure_channel_type;
+}
+
+/** 
+ * Set Kerberos KVNO
+ */
+
+void cli_credentials_set_kvno(struct cli_credentials *cred,
+                             int kvno)
+{
+       cred->kvno = kvno;
+}
+
+/**
+ * Return Kerberos KVNO
+ */
+
+int cli_credentials_get_kvno(struct cli_credentials *cred)
+{
+       return cred->kvno;
+}
+
 /**
  * Fill in a credentials structure as the anonymous user
  */
@@ -577,13 +1027,17 @@ void cli_credentials_set_anonymous(struct cli_credentials *cred)
 
 BOOL cli_credentials_is_anonymous(struct cli_credentials *cred)
 {
-       const char *username = cli_credentials_get_username(cred);
-
+       TALLOC_CTX *tmp_ctx = talloc_new(cred);
+       const char *username = cli_credentials_get_username(cred, tmp_ctx);
+       
        /* Yes, it is deliberate that we die if we have a NULL pointer
         * here - anonymous is "", not NULL, which is 'never specified,
         * never guessed', ie programmer bug */
-       if (!username[0]) 
+       if (!username[0]) {
+               talloc_free(tmp_ctx);
                return True;
-
+       }
+       
+       talloc_free(tmp_ctx);
        return False;
 }