diff options
| author | assar <assar@FreeBSD.org> | 2001-02-13 16:46:19 +0000 |
|---|---|---|
| committer | assar <assar@FreeBSD.org> | 2001-02-13 16:46:19 +0000 |
| commit | 3a971fe69aad52dfd248901ae796e64a96ae3e37 (patch) | |
| tree | ac7b5c62510ffa9f0316643bcb19a3fed3d5bef7 /crypto/heimdal/admin/ktutil.c | |
| parent | 2934fc23653f64b32f4db32233d7eda11ca274f0 (diff) | |
| parent | ebfe6dc471c206300fd82c7c0fd145f683aa52f6 (diff) | |
| download | FreeBSD-src-3a971fe69aad52dfd248901ae796e64a96ae3e37.zip FreeBSD-src-3a971fe69aad52dfd248901ae796e64a96ae3e37.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r72445,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'crypto/heimdal/admin/ktutil.c')
| -rw-r--r-- | crypto/heimdal/admin/ktutil.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/crypto/heimdal/admin/ktutil.c b/crypto/heimdal/admin/ktutil.c index 205bd89..35ca1c9 100644 --- a/crypto/heimdal/admin/ktutil.c +++ b/crypto/heimdal/admin/ktutil.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -32,14 +32,17 @@ */ #include "ktutil_locl.h" +#include <err.h> -RCSID("$Id: ktutil.c,v 1.26 2000/02/07 04:29:25 assar Exp $"); +RCSID("$Id: ktutil.c,v 1.30 2001/01/25 12:44:37 assar Exp $"); static int help_flag; static int version_flag; int verbose_flag; char *keytab_string; +static char keytab_buf[256]; + static int help(int argc, char **argv); static SL_cmd cmds[] = { @@ -127,7 +130,9 @@ main(int argc, char **argv) int optind = 0; krb5_error_code ret; set_progname(argv[0]); - krb5_init_context(&context); + ret = krb5_init_context(&context); + if (ret) + errx (1, "krb5_init_context failed: %d", ret); if(getarg(args, num_args, argc, argv, &optind)) usage(1); if(help_flag) @@ -143,6 +148,10 @@ main(int argc, char **argv) if(keytab_string) { ret = krb5_kt_resolve(context, keytab_string, &keytab); } else { + if(krb5_kt_default_name (context, keytab_buf, sizeof(keytab_buf))) + strlcpy (keytab_buf, "unknown", sizeof(keytab_buf)); + keytab_string = keytab_buf; + ret = krb5_kt_default(context, &keytab); } if(ret) |
