svn commit: lorikeet r282 - in trunk/heimdal/lib/hdb: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-05-11 13:31:40 +0000 (Wed, 11 May 2005)
New Revision: 282

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

Log:
Merge from tmp branch - allow kadmin ext_keytab to work by returning
the user-specified prinicpal if available.

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	2005-05-11 13:01:16 UTC (rev 281)
+++ trunk/heimdal/lib/hdb/hdb-ldb.c	2005-05-11 13:31:40 UTC (rev 282)
@@ -235,7 +235,7 @@
 	userAccountControl = ldb_msg_find_int(msg, "userAccountControl", 0);
 	
 	ent->principal = malloc(sizeof(*(ent->principal)));
-	if (ent_type == HDB_ENT_TYPE_ENUM) {
+	if (ent_type == HDB_ENT_TYPE_ENUM && principal == NULL) {
 		const char *samAccountName = ldb_msg_find_string(msg, "samAccountName", NULL);
 		if (!samAccountName) {
 			krb5_set_error_string(context, "LDB_message2entry: no samAccountName present");