oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

only check for keytab content where its needed

Browse Source
This commit is contained in:
Love Hornquist Astrand
2013-04-24 16:42:30 -07:00
parent 6e5bfce2de
commit f17c4a6c5c
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
appl/test/common.c
View File

@@ -33,8 +33,6 @@
#include "test_locl.h" #include "test_locl.h"
RCSID("$Id$");
static int help_flag; static int help_flag;
static int version_flag; static int version_flag;
static char *port_str; static char *port_str;
@@ -124,9 +122,6 @@ server_setup(krb5_context *context, int argc, char **argv)
if (ret) if (ret)
krb5_err (*context, 1, ret, "krb5_kt_default"); 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; return port;
} }

7
appl/test/gssapi_server.c
View File

@@ -40,7 +40,6 @@
#include <gssapi/gssapi_krb5.h> #include <gssapi/gssapi_krb5.h>
#include <gssapi/gssapi_spnego.h> #include <gssapi/gssapi_spnego.h>
#include "gss_common.h" #include "gss_common.h"
RCSID("$Id$");
static int static int
process_it(int sock, process_it(int sock,
@@ -380,7 +379,13 @@ int
main(int argc, char **argv) main(int argc, char **argv)
{ {
krb5_context context = NULL; /* XXX */ krb5_context context = NULL; /* XXX */
krb5_error_code ret;
int port = server_setup(&context, argc, argv); 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); loop (port, service);
return 0; return 0;
} }

6
appl/test/tcp_server.c
View File

@@ -195,5 +195,11 @@ int
main(int argc, char **argv) main(int argc, char **argv)
{ {
int port = server_setup(&context, argc, 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); return doit (port, service);
} }