From 11b16c2580a95afcd7740328282be1e0bbf74dc9 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 20 Oct 2005 04:53:42 +0000 Subject: r11204: Allow us to read credentials from secrets.ldb without a secureChannelType (non machine join records). Andrew Bartlett (This used to be commit 3dddf497ccf246af435e6e2802d8f3745f2e4fd3) --- source4/auth/credentials/credentials_files.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'source4/auth/credentials') diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c index aa0a7f3213..f23aecb0a0 100644 --- a/source4/auth/credentials/credentials_files.c +++ b/source4/auth/credentials/credentials_files.c @@ -232,10 +232,8 @@ static NTSTATUS cli_credentials_set_secrets(struct cli_credentials *cred, } 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 (sct) { + cli_credentials_set_secure_channel_type(cred, sct); } if (!password) { @@ -256,8 +254,6 @@ static NTSTATUS cli_credentials_set_secrets(struct cli_credentials *cred, } } - 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); -- cgit