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/srvtab.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'client/srvtab.c')

diff --git a/client/srvtab.c b/client/srvtab.c
index 5b52955..b26e6fc 100644
--- a/client/srvtab.c
+++ b/client/srvtab.c
@@ -8,12 +8,12 @@
  */
 
 #include <config.h>
+#include <portable/krb5.h>
 #include <portable/system.h>
 
-#include <krb5.h>
-
 #include <client/internal.h>
-#include <util/util.h>
+#include <util/messages-krb5.h>
+#include <util/messages.h>
 
 #ifndef KRB5_KRB4_COMPAT
 # define ANAME_SZ 40
@@ -87,11 +87,7 @@ write_srvtab(krb5_context ctx, const char *srvtab, const char *principal,
     memcpy(data + length, entry.key.contents, 8);
 #endif
     length += 8;
-#ifdef HAVE_KRB5_KT_FREE_ENTRY
     krb5_kt_free_entry(ctx, &entry);
-#else
-    krb5_free_keytab_entry_contents(ctx, &entry);
-#endif
 
     /* Write out the srvtab file. */
     write_file(srvtab, data, length);
-- 
cgit v1.2.3