1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00

r11204: Allow us to read credentials from secrets.ldb without a

secureChannelType (non machine join records).

Andrew Bartlett
(This used to be commit 3dddf497cc)
This commit is contained in:
Andrew Bartlett 2005-10-20 04:53:42 +00:00 committed by Gerald (Jerry) Carter
parent 642b42424a
commit 11b16c2580

View File

@ -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);