summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2005-10-20 04:53:42 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:45:01 -0500
commit11b16c2580a95afcd7740328282be1e0bbf74dc9 (patch)
tree9de4c067665e0f675a7aecdd579d83f074023b43 /source4
parent642b42424a75102c83cd8d1fbd67186db0623e76 (diff)
downloadsamba-11b16c2580a95afcd7740328282be1e0bbf74dc9.tar.gz
samba-11b16c2580a95afcd7740328282be1e0bbf74dc9.tar.bz2
samba-11b16c2580a95afcd7740328282be1e0bbf74dc9.zip
r11204: Allow us to read credentials from secrets.ldb without a
secureChannelType (non machine join records). Andrew Bartlett (This used to be commit 3dddf497ccf246af435e6e2802d8f3745f2e4fd3)
Diffstat (limited to 'source4')
-rw-r--r--source4/auth/credentials/credentials_files.c8
1 files changed, 2 insertions, 6 deletions
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);