oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(kt_change): reorganize some. open the keytab (defaulting to the modify

Browse Source 
one)


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9885 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-05-10 15:40:07 +00:00
parent b341554465
commit b1b216683c
1 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
admin/change.c
View File

@@ -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.
* *
@@ -36,7 +36,8 @@
RCSID("$Id$"); RCSID("$Id$");
static void static void
change_entry (krb5_context context, krb5_keytab_entry *entry, change_entry (krb5_context context, krb5_keytab keytab,
krb5_keytab_entry *entry,
const char *realm, const char *admin_server, int server_port) const char *realm, const char *admin_server, int server_port)
{ {
krb5_error_code ret; krb5_error_code ret;
@@ -49,7 +50,7 @@ change_entry (krb5_context context, krb5_keytab_entry *entry,
ret = krb5_unparse_name (context, entry->principal, &client_name); ret = krb5_unparse_name (context, entry->principal, &client_name);
if (ret) { if (ret) {
krb5_warn (context, ret, "kadm5_c_init_with_skey_ctx"); krb5_warn (context, ret, "krb5_unparse_name");
return; return;
} }
@@ -113,6 +114,7 @@ int
kt_change (int argc, char **argv) kt_change (int argc, char **argv)
{ {
krb5_error_code ret; krb5_error_code ret;
krb5_keytab keytab;
krb5_kt_cursor cursor; krb5_kt_cursor cursor;
krb5_keytab_entry entry; krb5_keytab_entry entry;
char *realm = NULL; char *realm = NULL;
@@ -145,21 +147,39 @@ kt_change (int argc, char **argv)
|| help_flag) { || help_flag) {
arg_printusage(args, sizeof(args) / sizeof(args[0]), arg_printusage(args, sizeof(args) / sizeof(args[0]),
"ktutil change", "principal..."); "ktutil change", "principal...");
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);
j = 0; j = 0;
max = 10; max = 10;
princs = malloc (max * sizeof(*princs)); princs = malloc (max * sizeof(*princs));
if (princs == NULL) { if (princs == NULL) {
krb5_warnx (context, "malloc: out of memory"); krb5_warnx (context, "malloc: out of memory");
return 1; goto out;
} }
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) {
@@ -174,7 +194,8 @@ kt_change (int argc, char **argv)
continue; continue;
if (optind == argc) { if (optind == argc) {
change_entry (context, &entry, realm, admin_server, server_port); change_entry (context, keytab, &entry, realm, admin_server,
server_port);
done = 1; done = 1;
} else { } else {
for (i = optind; i < argc; ++i) { for (i = optind; i < argc; ++i) {
@@ -186,7 +207,7 @@ kt_change (int argc, char **argv)
continue; continue;
} }
if (krb5_principal_compare (context, princ, entry.principal)) { if (krb5_principal_compare (context, princ, entry.principal)) {
change_entry (context, &entry, change_entry (context, keytab, &entry,
realm, admin_server, server_port); realm, admin_server, server_port);
done = 1; done = 1;
} }
@@ -220,5 +241,7 @@ kt_change (int argc, char **argv)
krb5_free_principal (context, princs[j]); krb5_free_principal (context, princs[j]);
free (princs); free (princs);
ret = krb5_kt_end_seq_get(context, keytab, &cursor); ret = krb5_kt_end_seq_get(context, keytab, &cursor);
out:
krb5_kt_close(context, keytab);
return 0; return 0;
} }