svn commit: samba r11204 - in branches/SAMBA_4_0/source/auth/credentials: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-10-20 04:53:42 +0000 (Thu, 20 Oct 2005)
New Revision: 11204

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11204

Log:
Allow us to read credentials from secrets.ldb without a
secureChannelType (non machine join records).

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/auth/credentials/credentials_files.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
===================================================================
--- branches/SAMBA_4_0/source/auth/credentials/credentials_files.c	2005-10-20 04:35:30 UTC (rev 11203)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials_files.c	2005-10-20 04:53:42 UTC (rev 11204)
@@ -232,10 +232,8 @@
 	}
 	
 	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 @@
 		}
 	}
 	
-	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);