Changeset 745 for trunk/server/source4/heimdal/kdc/misc.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/heimdal/kdc/misc.c (modified) (4 diffs)

trunk/server/source4/heimdal/kdc/misc.c

@@ -34 +34 @@
 #include "kdc_locl.h"
 
-RCSID("$Id$");
-
 struct timeval _kdc_now;
 
@@ -43 +41 @@
               krb5_const_principal principal,
               unsigned flags,
+              krb5int32 *kvno_ptr,
               HDB **db,
               hdb_entry_ex **h)
 {
     hdb_entry_ex *ent;
-    krb5_error_code ret;
+    krb5_error_code ret = HDB_ERR_NOENTRY;
     int i;
+    unsigned kvno = 0;
+
+    if (kvno_ptr) {
+            kvno = *kvno_ptr;
+            flags |= HDB_F_KVNO_SPECIFIED;
+    }
 
     ent = calloc (1, sizeof (*ent));
@@ -81 +86 @@
         ret = config->db[i]->hdb_open(context, config->db[i], O_RDONLY, 0);
         if (ret) {
-            kdc_log(context, config, 0, "Failed to open database: %s",
-                    krb5_get_err_text(context, ret));
+            const char *msg = krb5_get_error_message(context, ret);
+            kdc_log(context, config, 0, "Failed to open database: %s", msg);
+            krb5_free_error_message(context, msg);
             continue;
         }
 
-        ret = config->db[i]->hdb_fetch(context,
-                                       config->db[i],
-                                       principal,
-                                       flags | HDB_F_DECRYPT,
-                                       ent);
+        ret = config->db[i]->hdb_fetch_kvno(context,
+                                            config->db[i],
+                                            principal,
+                                            flags | HDB_F_DECRYPT,
+                                            kvno,
+                                            ent);
+
         krb5_free_principal(context, enterprise_principal);
 
@@ -102 +110 @@
     }
     free(ent);
-    krb5_set_error_message(context, HDB_ERR_NOENTRY,
+    krb5_set_error_message(context, ret,
                            "no such entry found in hdb");
-    return HDB_ERR_NOENTRY;
+    return ret;
 }