From f17c4a6c5c0182ac7fdfd9b79b05e5286c398f1a Mon Sep 17 00:00:00 2001
From: Love Hornquist Astrand <lha@h5l.org>
Date: Wed, 24 Apr 2013 16:42:30 -0700
Subject: [PATCH] only check for keytab content where its needed

---
 appl/test/common.c        | 5 -----
 appl/test/gssapi_server.c | 7 ++++++-
 appl/test/tcp_server.c    | 6 ++++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/appl/test/common.c b/appl/test/common.c
index 1e00ad16a..3f0fc23f0 100644
--- a/appl/test/common.c
+++ b/appl/test/common.c
@@ -33,8 +33,6 @@
 
 #include "test_locl.h"
 
-RCSID("$Id$");
-
 static int help_flag;
 static int version_flag;
 static char *port_str;
@@ -124,9 +122,6 @@ server_setup(krb5_context *context, int argc, char **argv)
         if (ret)
             krb5_err (*context, 1, ret, "krb5_kt_default");
     }
-    ret = krb5_kt_have_content(*context, keytab);
-    if (ret)
-        krb5_err (*context, 1, ret, "krb5_kt_have_content");
     return port;
 }
 
diff --git a/appl/test/gssapi_server.c b/appl/test/gssapi_server.c
index 44790730f..5d2a39dd7 100644
--- a/appl/test/gssapi_server.c
+++ b/appl/test/gssapi_server.c
@@ -40,7 +40,6 @@
 #include <gssapi/gssapi_krb5.h>
 #include <gssapi/gssapi_spnego.h>
 #include "gss_common.h"
-RCSID("$Id$");
 
 static int
 process_it(int sock,
@@ -380,7 +379,13 @@ int
 main(int argc, char **argv)
 {
     krb5_context context = NULL; /* XXX */
+    krb5_error_code ret;
     int port = server_setup(&context, argc, argv);
+
+    ret = krb5_kt_have_content(context, keytab);
+    if (ret)
+        krb5_err (context, 1, ret, "krb5_kt_have_content");
+
     loop (port, service);
     return 0;
 }
diff --git a/appl/test/tcp_server.c b/appl/test/tcp_server.c
index 265ab691a..50d1bf4d6 100644
--- a/appl/test/tcp_server.c
+++ b/appl/test/tcp_server.c
@@ -195,5 +195,11 @@ int
 main(int argc, char **argv)
 {
     int port = server_setup(&context, argc, argv);
+    krb5_error_code ret;
+
+    ret = krb5_kt_have_content(context, keytab);
+    if (ret)
+        krb5_err (context, 1, ret, "krb5_kt_have_content");
+
     return doit (port, service);
 }