svn commit: lorikeet r344 - in trunk/heimdal/lib: hdb kadm5

abartlet at samba.org abartlet at samba.org
Fri Jun 17 06:08:20 GMT 2005


Author: abartlet
Date: 2005-06-17 06:08:19 +0000 (Fri, 17 Jun 2005)
New Revision: 344

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

Log:
Remove HDB_ENT_TYPE_KRBTGT (it belongs in hdb-ldb only) and rename
HDB_ENT_TYPE_ENUM -> HDB_ENT_TYPE_ANY.

Andrew Bartlett

Modified:
   trunk/heimdal/lib/hdb/hdb.h
   trunk/heimdal/lib/hdb/keytab.c
   trunk/heimdal/lib/kadm5/chpass_s.c
   trunk/heimdal/lib/kadm5/delete_s.c
   trunk/heimdal/lib/kadm5/get_s.c
   trunk/heimdal/lib/kadm5/log.c
   trunk/heimdal/lib/kadm5/modify_s.c
   trunk/heimdal/lib/kadm5/randkey_s.c
   trunk/heimdal/lib/kadm5/rename_s.c


Changeset:
Modified: trunk/heimdal/lib/hdb/hdb.h
===================================================================
--- trunk/heimdal/lib/hdb/hdb.h	2005-06-17 06:05:46 UTC (rev 343)
+++ trunk/heimdal/lib/hdb/hdb.h	2005-06-17 06:08:19 UTC (rev 344)
@@ -49,7 +49,7 @@
 /* key usage for master key */
 #define HDB_KU_MKEY	0x484442
 
-enum hdb_ent_type{ HDB_ENT_TYPE_KRBTGT, HDB_ENT_TYPE_CLIENT, HDB_ENT_TYPE_SERVER, HDB_ENT_TYPE_ENUM };
+enum hdb_ent_type{ HDB_ENT_TYPE_CLIENT, HDB_ENT_TYPE_SERVER, HDB_ENT_TYPE_ANY };
 
 typedef struct hdb_master_key_data *hdb_master_key;
 

Modified: trunk/heimdal/lib/hdb/keytab.c
===================================================================
--- trunk/heimdal/lib/hdb/keytab.c	2005-06-17 06:05:46 UTC (rev 343)
+++ trunk/heimdal/lib/hdb/keytab.c	2005-06-17 06:08:19 UTC (rev 344)
@@ -220,7 +220,7 @@
     }
 
     /* Hmm, what type of entry should we return for an enum... */
-    ret = (*db->hdb_fetch)(context, db, HDB_F_DECRYPT, principal, HDB_ENT_TYPE_ENUM, &ent);
+    ret = (*db->hdb_fetch)(context, db, HDB_F_DECRYPT, principal, HDB_ENT_TYPE_ANY, &ent);
     (*db->hdb_close)(context, db);
     (*db->hdb_destroy)(context, db);
 

Modified: trunk/heimdal/lib/kadm5/chpass_s.c
===================================================================
--- trunk/heimdal/lib/kadm5/chpass_s.c	2005-06-17 06:05:46 UTC (rev 343)
+++ trunk/heimdal/lib/kadm5/chpass_s.c	2005-06-17 06:08:19 UTC (rev 344)
@@ -51,9 +51,12 @@
     ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
     if(ret)
 	return ret;
+
+    /* Where the backend knows the difference, it only makes sense to
+     * 'change password' on client style names */
     ret = context->db->hdb_fetch(context->context, context->db, 
 				 HDB_F_DECRYPT, 
-				 princ, HDB_ENT_TYPE_ENUM, 
+				 princ, HDB_ENT_TYPE_ANY, 
 				 &ent);
     if(ret == HDB_ERR_NOENTRY)
 	goto out;
@@ -150,7 +153,7 @@
     if(ret)
 	return ret;
     ret = context->db->hdb_fetch(context->context, context->db, 0, 
-				 princ, HDB_ENT_TYPE_ENUM, &ent);
+				 princ, HDB_ENT_TYPE_ANY, &ent);
     if(ret == HDB_ERR_NOENTRY)
 	goto out;
     ret = _kadm5_set_keys2(context, &ent, n_key_data, key_data);

Modified: trunk/heimdal/lib/kadm5/delete_s.c
===================================================================
--- trunk/heimdal/lib/kadm5/delete_s.c	2005-06-17 06:05:46 UTC (rev 343)
+++ trunk/heimdal/lib/kadm5/delete_s.c	2005-06-17 06:08:19 UTC (rev 344)
@@ -49,7 +49,7 @@
     }
     ret = context->db->hdb_fetch(context->context, context->db, 
 				 HDB_F_DECRYPT, 
-				 princ, HDB_ENT_TYPE_ENUM, &ent);
+				 princ, HDB_ENT_TYPE_ANY, &ent);
     if(ret == HDB_ERR_NOENTRY)
 	goto out2;
     if(ent.flags.immutable) {

Modified: trunk/heimdal/lib/kadm5/get_s.c
===================================================================
--- trunk/heimdal/lib/kadm5/get_s.c	2005-06-17 06:05:46 UTC (rev 343)
+++ trunk/heimdal/lib/kadm5/get_s.c	2005-06-17 06:08:19 UTC (rev 344)
@@ -49,7 +49,7 @@
     if(ret)
 	return ret;
     ret = context->db->hdb_fetch(context->context, context->db, 
-				 HDB_F_DECRYPT, princ, HDB_ENT_TYPE_ENUM, &ent);
+				 HDB_F_DECRYPT, princ, HDB_ENT_TYPE_ANY, &ent);
     context->db->hdb_close(context->context, context->db);
     if(ret)
 	return _kadm5_error_code(ret);

Modified: trunk/heimdal/lib/kadm5/log.c
===================================================================
--- trunk/heimdal/lib/kadm5/log.c	2005-06-17 06:05:46 UTC (rev 343)
+++ trunk/heimdal/lib/kadm5/log.c	2005-06-17 06:08:19 UTC (rev 344)
@@ -527,7 +527,7 @@
     ret = context->db->hdb_fetch(context->context, context->db, 
 				 HDB_F_DECRYPT, 
 				 log_ent.principal, 
-				 HDB_ENT_TYPE_ENUM,
+				 HDB_ENT_TYPE_ANY,
 				 &ent);
     if (ret)
 	return ret;

Modified: trunk/heimdal/lib/kadm5/modify_s.c
===================================================================
--- trunk/heimdal/lib/kadm5/modify_s.c	2005-06-17 06:05:46 UTC (rev 343)
+++ trunk/heimdal/lib/kadm5/modify_s.c	2005-06-17 06:08:19 UTC (rev 344)
@@ -53,7 +53,7 @@
     if(ret)
 	return ret;
     ret = context->db->hdb_fetch(context->context, context->db, 0, 
-				 princ->principal, HDB_ENT_TYPE_ENUM, &ent);
+				 princ->principal, HDB_ENT_TYPE_ANY, &ent);
     if(ret)
 	goto out;
     ret = _kadm5_setup_entry(context, &ent, mask, princ, mask, NULL, 0);

Modified: trunk/heimdal/lib/kadm5/randkey_s.c
===================================================================
--- trunk/heimdal/lib/kadm5/randkey_s.c	2005-06-17 06:05:46 UTC (rev 343)
+++ trunk/heimdal/lib/kadm5/randkey_s.c	2005-06-17 06:08:19 UTC (rev 344)
@@ -54,7 +54,7 @@
     if(ret)
 	return ret;
     ret = context->db->hdb_fetch(context->context, context->db, 0, 
-				 princ, HDB_ENT_TYPE_ENUM, &ent);
+				 princ, HDB_ENT_TYPE_ANY, &ent);
     if(ret)
 	goto out;
 

Modified: trunk/heimdal/lib/kadm5/rename_s.c
===================================================================
--- trunk/heimdal/lib/kadm5/rename_s.c	2005-06-17 06:05:46 UTC (rev 343)
+++ trunk/heimdal/lib/kadm5/rename_s.c	2005-06-17 06:08:19 UTC (rev 344)
@@ -49,7 +49,7 @@
     if(ret)
 	return ret;
     ret = context->db->hdb_fetch(context->context, context->db, 0, 
-				 source, HDB_ENT_TYPE_ENUM, &ent);
+				 source, HDB_ENT_TYPE_ANY, &ent);
     if(ret){
 	context->db->hdb_close(context->context, context->db);
 	goto out;



More information about the samba-cvs mailing list