svn commit: lorikeet r98 - in trunk/heimdal/lib/hdb: .
abartlet at samba.org
abartlet at samba.org
Thu Oct 21 15:24:00 GMT 2004
Author: abartlet
Date: 2004-10-21 15:23:59 +0000 (Thu, 21 Oct 2004)
New Revision: 98
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=lorikeet&path=/trunk/heimdal/lib/hdb&rev=98&nolog=1
Log:
Fix the order for the prinipal name search - I'm trying to get the
salting right.
Andrew Bartlett
Modified:
trunk/heimdal/lib/hdb/hdb-ldb.c
Changeset:
Modified: trunk/heimdal/lib/hdb/hdb-ldb.c
===================================================================
--- trunk/heimdal/lib/hdb/hdb-ldb.c 2004-10-21 08:47:52 UTC (rev 97)
+++ trunk/heimdal/lib/hdb/hdb-ldb.c 2004-10-21 15:23:59 UTC (rev 98)
@@ -217,15 +217,15 @@
userAccountControl = ldb_msg_find_int(msg, "userAccountControl", 0);
- unparsed_name = ldb_msg_find_string(msg, "samAccountName", NULL);
+ unparsed_name = ldb_msg_find_string(msg, "servicePrincipalName", NULL);
if (unparsed_name == NULL) {
krb5_warnx(context, "LDB_message2entry: no userPrincipalName\n");
unparsed_name = ldb_msg_find_string(msg, "userPrincipalName", NULL);
if (unparsed_name == NULL) {
- krb5_warnx(context, "LDB_message2entry: no userPrincipalName\n");
- unparsed_name = ldb_msg_find_string(msg, "userPrincipalName", NULL);
+ krb5_warnx(context, "LDB_message2entry: no servicePrincipalName\n");
+ unparsed_name = ldb_msg_find_string(msg, "samAccountName", NULL);
if (unparsed_name == NULL) {
- krb5_warnx(context, "LDB_message2entry: no servicePrincipalName\n");
+ krb5_warnx(context, "LDB_message2entry: no userPrincipalName\n");
return HDB_ERR_NOENTRY;
}
}
More information about the samba-cvs
mailing list