r25446: Merge some changes I made on the way home from SFO:

[jelmer/samba4-debian.git] / source / auth / credentials / credentials_files.c

diff --git a/source/auth/credentials/credentials_files.c b/source/auth/credentials/credentials_files.c
index 5770dbf05706809a13a3b075fd496edbab144562..2aefb7c52fad4c62192aa6883f369d096d6cc04d 100644 (file)
--- a/source/auth/credentials/credentials_files.c
+++ b/source/auth/credentials/credentials_files.c
@@ -308,7 +308,7 @@ NTSTATUS cli_credentials_set_secrets(struct cli_credentials *cred,
        } else {
                keytab = ldb_msg_find_attr_as_string(msgs[0], "privateKeytab", NULL);
                if (keytab) {
-                       keytab = talloc_asprintf(mem_ctx, "FILE:%s", private_path(mem_ctx, keytab));
+                       keytab = talloc_asprintf(mem_ctx, "FILE:%s", private_path(mem_ctx, global_loadparm, keytab));
                        if (keytab) {
                                cli_credentials_set_keytab_name(cred, keytab, CRED_SPECIFIED);
                        }