(kt_purge): reorganize some. open the keytab (defaulting to the modify
one). correct usage strings git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9890 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -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).
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
@@ -97,8 +97,9 @@ delete_list (struct e *head)
|
|||||||
int
|
int
|
||||||
kt_purge(int argc, char **argv)
|
kt_purge(int argc, char **argv)
|
||||||
{
|
{
|
||||||
krb5_error_code ret;
|
krb5_error_code ret = 0;
|
||||||
krb5_kt_cursor cursor;
|
krb5_kt_cursor cursor;
|
||||||
|
krb5_keytab keytab;
|
||||||
krb5_keytab_entry entry;
|
krb5_keytab_entry entry;
|
||||||
int help_flag = 0;
|
int help_flag = 0;
|
||||||
char *age_str = "1 week";
|
char *age_str = "1 week";
|
||||||
@@ -117,24 +118,42 @@ kt_purge(int argc, char **argv)
|
|||||||
args[i++].value = &help_flag;
|
args[i++].value = &help_flag;
|
||||||
|
|
||||||
if(getarg(args, num_args, argc, argv, &optind)) {
|
if(getarg(args, num_args, argc, argv, &optind)) {
|
||||||
arg_printusage(args, num_args, "ktutil remove", "");
|
arg_printusage(args, num_args, "ktutil purge", "");
|
||||||
return 0;
|
return 1;
|
||||||
}
|
}
|
||||||
if(help_flag) {
|
if(help_flag) {
|
||||||
arg_printusage(args, num_args, "ktutil remove", "");
|
arg_printusage(args, num_args, "ktutil purge", "");
|
||||||
return 0;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
age = parse_time(age_str, "s");
|
age = parse_time(age_str, "s");
|
||||||
if(age < 0) {
|
if(age < 0) {
|
||||||
krb5_warnx(context, "unparasable time `%s'", age_str);
|
krb5_warnx(context, "unparasable time `%s'", age_str);
|
||||||
return 0;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (keytab_string == NULL) {
|
||||||
|
ret = krb5_kt_default_modify_name (context, keytab_buf,
|
||||||
|
sizeof(keytab_buf));
|
||||||
|
if (ret) {
|
||||||
|
krb5_warn(context, ret, "krb5_kt_default_modify_name");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
keytab_string = keytab_buf;
|
||||||
|
}
|
||||||
|
ret = krb5_kt_resolve(context, keytab_string, &keytab);
|
||||||
|
if (ret) {
|
||||||
|
krb5_warn(context, ret, "resolving keytab %s", keytab_string);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (verbose_flag)
|
||||||
|
fprintf (stderr, "Using keytab %s\n", keytab_string);
|
||||||
|
|
||||||
ret = krb5_kt_start_seq_get(context, keytab, &cursor);
|
ret = krb5_kt_start_seq_get(context, keytab, &cursor);
|
||||||
if(ret){
|
if(ret){
|
||||||
krb5_warn(context, ret, "krb5_kt_start_seq_get %s", keytab_string);
|
krb5_warn(context, ret, "krb5_kt_start_seq_get %s", keytab_string);
|
||||||
return 1;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
while((ret = krb5_kt_next_entry(context, keytab, &entry, &cursor)) == 0) {
|
while((ret = krb5_kt_next_entry(context, keytab, &entry, &cursor)) == 0) {
|
||||||
@@ -148,7 +167,7 @@ kt_purge(int argc, char **argv)
|
|||||||
ret = krb5_kt_start_seq_get(context, keytab, &cursor);
|
ret = krb5_kt_start_seq_get(context, keytab, &cursor);
|
||||||
if(ret){
|
if(ret){
|
||||||
krb5_warn(context, ret, "krb5_kt_start_seq_get, %s", keytab_string);
|
krb5_warn(context, ret, "krb5_kt_start_seq_get, %s", keytab_string);
|
||||||
return 1;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
while((ret = krb5_kt_next_entry(context, keytab, &entry, &cursor)) == 0) {
|
while((ret = krb5_kt_next_entry(context, keytab, &entry, &cursor)) == 0) {
|
||||||
@@ -178,5 +197,7 @@ kt_purge(int argc, char **argv)
|
|||||||
|
|
||||||
delete_list (head);
|
delete_list (head);
|
||||||
|
|
||||||
return 0;
|
out:
|
||||||
|
krb5_kt_close (context, keytab);
|
||||||
|
return ret != 0;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user