svn commit: lorikeet r277 - in branches/tmp/heimdal-gssapi/lib/hdb: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-05-11 10:54:07 +0000 (Wed, 11 May 2005)
New Revision: 277

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

Log:
Make kamdin ext_keytab more useful, we need to pass back the principal
name specified by the caller here.

Andrew Bartlett

Modified:
   branches/tmp/heimdal-gssapi/lib/hdb/hdb-ldb.c


Changeset:
Modified: branches/tmp/heimdal-gssapi/lib/hdb/hdb-ldb.c
===================================================================
--- branches/tmp/heimdal-gssapi/lib/hdb/hdb-ldb.c	2005-05-11 10:52:32 UTC (rev 276)
+++ branches/tmp/heimdal-gssapi/lib/hdb/hdb-ldb.c	2005-05-11 10:54:07 UTC (rev 277)
@@ -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");