From 609b831462d95bcb24b93453d62481d11e0ff53b Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 28 Oct 2009 16:49:30 +1100 Subject: s4:credentials Put the 'secrets.keytab' in the same directory as secrets.ldb This avoids trouble when the secrets.ldb is updated with ldbedit but an smb.conf is not specified. Andrew Bartlett --- source4/auth/credentials/credentials_files.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source4/auth/credentials/credentials_files.c') diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c index 42e8ea082a..8036e48193 100644 --- a/source4/auth/credentials/credentials_files.c +++ b/source4/auth/credentials/credentials_files.c @@ -33,6 +33,8 @@ #include "auth/credentials/credentials_proto.h" #include "param/param.h" #include "lib/events/events.h" +#include "dsdb/samdb/samdb.h" + /** * Read a file descriptor, and parse it for a password (eg from a file or stdin) @@ -323,7 +325,7 @@ _PUBLIC_ 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, lp_ctx, keytab)); + keytab = talloc_asprintf(mem_ctx, "FILE:%s", samdb_relative_path(ldb, mem_ctx, keytab)); if (keytab) { cli_credentials_set_keytab_name(cred, event_ctx, lp_ctx, keytab, CRED_SPECIFIED); } -- cgit