From d05f66dbff10b525d37f60ee01d5b9f94bf5192e Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@stanford.edu>
Date: Tue, 9 Feb 2010 16:00:04 -0800
Subject: Update util code and import Kerberos portability glue

Use the Kerberos portability layer from rra-c-util 3.0 and avoid
Kerberos API calls deprecated on Heimdal.  Break util/util.h into
separate header files and update all source files accordingly.

The test suite is not yet updated.  That will come in subsequent
commits.
---
 client/keytab.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'client/keytab.c')

diff --git a/client/keytab.c b/client/keytab.c
index 393ce3c..5f2076f 100644
--- a/client/keytab.c
+++ b/client/keytab.c
@@ -8,12 +8,15 @@
  */
 
 #include <config.h>
+#include <portable/krb5.h>
 #include <portable/system.h>
 
 #include <remctl.h>
 
 #include <client/internal.h>
-#include <util/util.h>
+#include <util/concat.h>
+#include <util/messages-krb5.h>
+#include <util/messages.h>
 
 
 /*
@@ -47,11 +50,7 @@ merge_keytab(krb5_context ctx, const char *newfile, const char *file)
         status = krb5_kt_add_entry(ctx, old, &entry);
         if (status != 0)
             die_krb5(ctx, status, "cannot write to keytab %s", file);
-#ifdef HAVE_KRB5_KT_FREE_ENTRY
         krb5_kt_free_entry(ctx, &entry);
-#else
-        krb5_free_keytab_entry_contents(ctx, &entry);
-#endif
     }
     if (status != KRB5_KT_END)
         die_krb5(ctx, status, "error reading temporary keytab %s", newfile);
-- 
cgit v1.2.3