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

[lha at samba.org]

Author: lha
Date: 2006-10-09 11:25:53 +0000 (Mon, 09 Oct 2006)
New Revision: 583

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

Log:
merge build fixes from heimdal cvs 20061009
Modified:
   trunk/heimdal/lib/hdb/keytab.c


Changeset:
Modified: trunk/heimdal/lib/hdb/keytab.c
===================================================================
--- trunk/heimdal/lib/hdb/keytab.c	2006-10-09 06:44:00 UTC (rev 582)
+++ trunk/heimdal/lib/hdb/keytab.c	2006-10-09 11:25:53 UTC (rev 583)
@@ -35,7 +35,7 @@
 
 /* keytab backend for HDB databases */
 
-RCSID("$Id: keytab.c,v 1.13 2006/10/06 16:53:11 lha Exp $");
+RCSID("$Id: keytab.c,v 1.15 2006/10/09 11:22:59 lha Exp $");
 
 struct hdb_data {
     char *dbname;
@@ -44,7 +44,7 @@
 
 /*
  * the format for HDB keytabs is:
- * HDB:[database:mkey]
+ * HDB:[database:file:mkey]
  */
 
 static krb5_error_code
@@ -59,7 +59,7 @@
 	return ENOMEM;
     }
     db = name;
-    mkey = strrchr(name, ':');
+    mkey = strchr(name, ':');
     if(mkey == NULL || mkey[1] == '\0') {
 	if(*name == '\0')
 	    d->dbname = NULL;
@@ -220,7 +220,10 @@
 	(*db->hdb_destroy)(context, db);
 	return ret;
     }
-    ret = (*db->hdb_fetch)(context, db, principal, HDB_F_DECRYPT, &ent);
+    ret = (*db->hdb_fetch)(context, db, principal, 
+			   HDB_F_DECRYPT||
+			   HDB_F_GET_CLIENT|HDB_F_GET_SERVER|HDB_F_GET_KRBTGT,
+			   &ent);
 
     if(ret == HDB_ERR_NOENTRY) {
 	ret = KRB5_KT_NOTFOUND;