From f1db719a8aad3deaf716b2def62553d571133bd4 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Sat, 8 Mar 1997 10:46:03 +0000 Subject: [PATCH] Use kuser_locl.h git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1311 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kuser/kinit.c | 43 ++++++++++++++++++++++++++----------------- kuser/klist.c | 8 +------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/kuser/kinit.c b/kuser/kinit.c index 4e84d2d7b..330235af0 100644 --- a/kuser/kinit.c +++ b/kuser/kinit.c @@ -1,7 +1,4 @@ -#include -#include -#include -#include +#include "kuser_locl.h" int @@ -15,18 +12,24 @@ main (int argc, char **argv) krb5_creds cred; err = krb5_init_context (&context); - if (err) - abort (); - + if (err){ + fprintf(stderr, "%s\n", krb5_get_err_text(context, err));; + abort(); + } + err = krb5_cc_default (context, &ccache); - if (err) - abort (); + if (err){ + fprintf(stderr, "%s\n", krb5_get_err_text(context, err));; + abort(); + } if(argv[1]){ err = krb5_parse_name (context, argv[1], &principal); - if (err) - abort (); + if (err){ + fprintf(stderr, "%s\n", krb5_get_err_text(context, err));; + abort(); + } }else{ char *realm; @@ -40,8 +43,10 @@ main (int argc, char **argv) } err = krb5_cc_initialize (context, ccache, principal); - if (err) - abort (); + if (err){ + fprintf(stderr, "%s\n", krb5_get_err_text(context, err));; + abort(); + } cred.client = principal; cred.times.endtime = time (NULL) + 4711; @@ -55,8 +60,10 @@ main (int argc, char **argv) principal->realm.length, principal->realm.data, NULL); - if (err) - abort (); + if (err){ + fprintf(stderr, "%s\n", krb5_get_err_text(context, err));; + abort(); + } cred.server->type = KRB5_NT_SRV_INST; err = krb5_get_in_tkt_with_password (context, @@ -68,8 +75,10 @@ main (int argc, char **argv) ccache, &cred, NULL); - if (err) - abort (); + if (err){ + fprintf(stderr, "%s\n", krb5_get_err_text(context, err));; + abort(); + } krb5_free_context (context); return 0; diff --git a/kuser/klist.c b/kuser/klist.c index 0e601c438..5383b68b6 100644 --- a/kuser/klist.c +++ b/kuser/klist.c @@ -1,10 +1,4 @@ -#include -#include -#include -#include -#include -#include - +#include "kuser_locl.h" char* stime(time_t t)