From eea5f3485585167c16a46f4312f59afca13e016f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Thu, 27 Apr 2006 11:18:52 +0000
Subject: [PATCH] Pass in HDB_F_GET_ANY to all ->hdb fetch to hint what entries
 we are looking for

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17313 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/kadm5/chpass_s.c  | 7 ++++---
 lib/kadm5/delete_s.c  | 4 ++--
 lib/kadm5/get_s.c     | 2 +-
 lib/kadm5/log.c       | 4 ++--
 lib/kadm5/modify_s.c  | 4 ++--
 lib/kadm5/randkey_s.c | 5 +++--
 lib/kadm5/rename_s.c  | 4 ++--
 7 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/lib/kadm5/chpass_s.c b/lib/kadm5/chpass_s.c
index d067f1cd3..85a90faca 100644
--- a/lib/kadm5/chpass_s.c
+++ b/lib/kadm5/chpass_s.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2005 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2006 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -53,7 +53,7 @@ change(void *server_handle,
     if(ret)
 	return ret;
     ret = context->db->hdb_fetch(context->context, context->db, princ,
-				 HDB_F_DECRYPT, &ent);
+				 HDB_F_DECRYPT|HDB_F_GET_ANY, &ent);
     if(ret == HDB_ERR_NOENTRY)
 	goto out;
 
@@ -151,7 +151,8 @@ kadm5_s_chpass_principal_with_key(void *server_handle,
     ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
     if(ret)
 	return ret;
-    ret = context->db->hdb_fetch(context->context, context->db, princ, 0, &ent);
+    ret = context->db->hdb_fetch(context->context, context->db, princ, 
+				 HDB_F_GET_ANY, &ent);
     if(ret == HDB_ERR_NOENTRY)
 	goto out;
     ret = _kadm5_set_keys2(context, &ent.entry, n_key_data, key_data);
diff --git a/lib/kadm5/delete_s.c b/lib/kadm5/delete_s.c
index 66953a7fb..4933470eb 100644
--- a/lib/kadm5/delete_s.c
+++ b/lib/kadm5/delete_s.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2001, 2003, 2005 - 2006 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -49,7 +49,7 @@ kadm5_s_delete_principal(void *server_handle, krb5_principal princ)
 	return ret;
     }
     ret = context->db->hdb_fetch(context->context, context->db, princ,
-				 HDB_F_DECRYPT, &ent);
+				 HDB_F_DECRYPT|HDB_F_GET_ANY, &ent);
     if(ret == HDB_ERR_NOENTRY)
 	goto out2;
     if(ent.entry.flags.immutable) {
diff --git a/lib/kadm5/get_s.c b/lib/kadm5/get_s.c
index 2f1dd2ee8..cfc5a317c 100644
--- a/lib/kadm5/get_s.c
+++ b/lib/kadm5/get_s.c
@@ -79,7 +79,7 @@ kadm5_s_get_principal(void *server_handle,
     if(ret)
 	return ret;
     ret = context->db->hdb_fetch(context->context, context->db, princ,
-				 HDB_F_DECRYPT, &ent);
+				 HDB_F_DECRYPT|HDB_F_GET_ANY, &ent);
     context->db->hdb_close(context->context, context->db);
     if(ret)
 	return _kadm5_error_code(ret);
diff --git a/lib/kadm5/log.c b/lib/kadm5/log.c
index ee921bf4d..6a069e8f0 100644
--- a/lib/kadm5/log.c
+++ b/lib/kadm5/log.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2005 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2006 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -554,7 +554,7 @@ kadm5_log_replay_modify (kadm5_server_context *context,
     memset(&ent, 0, sizeof(ent));
     ret = context->db->hdb_fetch(context->context, context->db,
 				 log_ent.entry.principal,
-				 HDB_F_DECRYPT, &ent);
+				 HDB_F_DECRYPT|HDB_F_GET_ANY, &ent);
     if (ret)
 	goto out;
     if (mask & KADM5_PRINC_EXPIRE_TIME) {
diff --git a/lib/kadm5/modify_s.c b/lib/kadm5/modify_s.c
index 33d766577..17b38fa66 100644
--- a/lib/kadm5/modify_s.c
+++ b/lib/kadm5/modify_s.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2001 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2001, 2003, 2005-2006 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -54,7 +54,7 @@ modify_principal(void *server_handle,
     if(ret)
 	return ret;
     ret = context->db->hdb_fetch(context->context, context->db, 
-				 princ->principal, 0, &ent);
+				 princ->principal, HDB_F_GET_ANY, &ent);
     if(ret)
 	goto out;
     ret = _kadm5_setup_entry(context, &ent, mask, princ, mask, NULL, 0);
diff --git a/lib/kadm5/randkey_s.c b/lib/kadm5/randkey_s.c
index 13ffb4732..18146e864 100644
--- a/lib/kadm5/randkey_s.c
+++ b/lib/kadm5/randkey_s.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2001 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2001, 2003-2006 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -54,7 +54,8 @@ kadm5_s_randkey_principal(void *server_handle,
     ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0);
     if(ret)
 	return ret;
-    ret = context->db->hdb_fetch(context->context, context->db, princ, 0, &ent);
+    ret = context->db->hdb_fetch(context->context, context->db, princ, 
+				 HDB_F_GET_ANY, &ent);
     if(ret)
 	goto out;
 
diff --git a/lib/kadm5/rename_s.c b/lib/kadm5/rename_s.c
index 73cb8ff88..5b1e285b0 100644
--- a/lib/kadm5/rename_s.c
+++ b/lib/kadm5/rename_s.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2001, 2003, 2005 - 2005 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -52,7 +52,7 @@ kadm5_s_rename_principal(void *server_handle,
     if(ret)
 	return ret;
     ret = context->db->hdb_fetch(context->context, context->db, 
-				 source, 0, &ent);
+				 source, HDB_F_GET_ANY, &ent);
     if(ret){
 	context->db->hdb_close(context->context, context->db);
 	goto out;