no need to use the "modify" keytab anymore
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10829 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
17
kadmin/ext.c
17
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).
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
@@ -87,7 +87,6 @@ ext_keytab(int argc, char **argv)
|
|||||||
int i;
|
int i;
|
||||||
int optind = 0;
|
int optind = 0;
|
||||||
char *keytab = NULL;
|
char *keytab = NULL;
|
||||||
char keytab_buf[256];
|
|
||||||
struct ext_keytab_data data;
|
struct ext_keytab_data data;
|
||||||
|
|
||||||
args[0].value = &keytab;
|
args[0].value = &keytab;
|
||||||
@@ -95,17 +94,11 @@ ext_keytab(int argc, char **argv)
|
|||||||
usage();
|
usage();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (keytab == NULL) {
|
if (keytab == NULL)
|
||||||
ret = krb5_kt_default_modify_name (context, keytab_buf,
|
ret = krb5_kt_default(context, &data.keytab);
|
||||||
sizeof(keytab_buf));
|
else
|
||||||
if (ret) {
|
ret = krb5_kt_resolve(context, keytab, &data.keytab);
|
||||||
krb5_warn(context, ret, "krb5_kt_default_modify_name");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
keytab = keytab_buf;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = krb5_kt_resolve(context, keytab, &data.keytab);
|
|
||||||
if(ret){
|
if(ret){
|
||||||
krb5_warn(context, ret, "krb5_kt_resolve");
|
krb5_warn(context, ret, "krb5_kt_resolve");
|
||||||
return 0;
|
return 0;
|
||||||
|
Reference in New Issue
Block a user