diff options
| author | nectar <nectar@FreeBSD.org> | 2002-02-19 15:46:56 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2002-02-19 15:46:56 +0000 |
| commit | 69a91bec14ec3ad49d1c8a82c40a796755f9e4a3 (patch) | |
| tree | 85ecf91fd00875cec4b93111d3a8ed9eec9cddfe /crypto/heimdal/kadmin/ext.c | |
| parent | 8db4cdb3da4228a5d93635e43825e2e8a2f66db7 (diff) | |
| download | FreeBSD-src-69a91bec14ec3ad49d1c8a82c40a796755f9e4a3.zip FreeBSD-src-69a91bec14ec3ad49d1c8a82c40a796755f9e4a3.tar.gz | |
Import of Heimdal Kerberos from KTH repository circa 2002/02/17.
Diffstat (limited to 'crypto/heimdal/kadmin/ext.c')
| -rw-r--r-- | crypto/heimdal/kadmin/ext.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/crypto/heimdal/kadmin/ext.c b/crypto/heimdal/kadmin/ext.c index 6b3f3af..c945fea 100644 --- a/crypto/heimdal/kadmin/ext.c +++ b/crypto/heimdal/kadmin/ext.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -33,7 +33,7 @@ #include "kadmin_locl.h" -RCSID("$Id: ext.c,v 1.6 2001/05/07 05:31:12 assar Exp $"); +RCSID("$Id: ext.c,v 1.8 2002/02/11 14:29:52 joda Exp $"); struct ext_keytab_data { krb5_keytab keytab; @@ -94,10 +94,11 @@ ext_keytab(int argc, char **argv) usage(); return 0; } - if(keytab) - ret = krb5_kt_resolve(context, keytab, &data.keytab); - else + if (keytab == NULL) ret = krb5_kt_default(context, &data.keytab); + else + ret = krb5_kt_resolve(context, keytab, &data.keytab); + if(ret){ krb5_warn(context, ret, "krb5_kt_resolve"); return 0; |
