From bfc828cabd4bda78e7ef5f8d3f34cf4e74bfa718 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Mon, 23 Jul 2001 10:17:32 +0000 Subject: [PATCH] add rename command git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10384 ec53bebd-3082-4978-b11e-865c3cabbd6b --- admin/Makefile.am | 18 +++--- admin/ktutil.c | 2 + admin/ktutil_locl.h | 1 + admin/rename.c | 133 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 146 insertions(+), 8 deletions(-) create mode 100644 admin/rename.c diff --git a/admin/Makefile.am b/admin/Makefile.am index 6bf85238a..b568c8605 100644 --- a/admin/Makefile.am +++ b/admin/Makefile.am @@ -8,14 +8,16 @@ man_MANS = ktutil.8 sbin_PROGRAMS = ktutil -ktutil_SOURCES = add.c \ - change.c \ - copy.c \ - get.c \ - ktutil.c \ - list.c \ - purge.c \ - remove.c +ktutil_SOURCES = \ + add.c \ + change.c \ + copy.c \ + get.c \ + ktutil.c \ + list.c \ + purge.c \ + remove.c \ + rename.c LDADD = \ $(top_builddir)/lib/kadm5/libkadm5clnt.la \ diff --git a/admin/ktutil.c b/admin/ktutil.c index dfcbe52d9..6313c5ad9 100644 --- a/admin/ktutil.c +++ b/admin/ktutil.c @@ -59,6 +59,8 @@ static SL_cmd cmds[] = { "remove old and superceeded entries" }, { "remove", kt_remove, "remove", "remove key from keytab" }, + { "rename", kt_rename, "rename from to", + "rename entry" }, { "srvconvert", srvconv, "srvconvert [flags]", "convert v4 srvtab to keytab" }, { "srv2keytab" }, diff --git a/admin/ktutil_locl.h b/admin/ktutil_locl.h index ca3d42c52..61e0dc5a1 100644 --- a/admin/ktutil_locl.h +++ b/admin/ktutil_locl.h @@ -81,6 +81,7 @@ int kt_get (int argc, char **argv); int kt_list(int argc, char **argv); int kt_purge(int argc, char **argv); int kt_remove(int argc, char **argv); +int kt_rename(int argc, char **argv); int srvconv(int argc, char **argv); int srvcreate(int argc, char **argv); diff --git a/admin/rename.c b/admin/rename.c new file mode 100644 index 000000000..b46835af3 --- /dev/null +++ b/admin/rename.c @@ -0,0 +1,133 @@ +/* + * Copyright (c) 2001 Kungliga Tekniska Högskolan + * (Royal Institute of Technology, Stockholm, Sweden). + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include "ktutil_locl.h" + +RCSID("$Id$"); + +int +kt_rename(int argc, char **argv) +{ + krb5_error_code ret = 0; + krb5_keytab_entry entry; + krb5_keytab keytab; + krb5_kt_cursor cursor; + krb5_principal from_princ, to_princ; + int help_flag = 0; + + struct getargs args[] = { + { "help", 'h', arg_flag, NULL } + }; + int num_args = sizeof(args) / sizeof(args[0]); + int optind = 0; + int i = 0; + + args[i++].value = &help_flag; + if(getarg(args, num_args, argc, argv, &optind)) { + arg_printusage(args, num_args, "ktutil rename", "from to"); + return 1; + } + if(help_flag) { + arg_printusage(args, num_args, "ktutil rename", "from to"); + return 0; + } + argv += optind; + argc -= optind; + if(argc != 2) { + arg_printusage(args, num_args, "ktutil rename", "from to"); + return 0; + } + + ret = krb5_parse_name(context, argv[0], &from_princ); + if(ret != 0) { + krb5_warn(context, ret, "%s", argv[0]); + return 0; + } + + ret = krb5_parse_name(context, argv[1], &to_princ); + if(ret != 0) { + krb5_free_principal(context, from_princ); + krb5_warn(context, ret, "%s", argv[1]); + return 0; + } + + if((keytab = ktutil_open_keytab()) == NULL) { + krb5_free_principal(context, from_princ); + krb5_free_principal(context, to_princ); + return 1; + } + + ret = krb5_kt_start_seq_get(context, keytab, &cursor); + if(ret) { + krb5_kt_close(context, keytab); + krb5_free_principal(context, from_princ); + krb5_free_principal(context, to_princ); + return 1; + } + while(1) { + ret = krb5_kt_next_entry(context, keytab, &entry, &cursor); + if(ret != 0) { + if(ret != KRB5_CC_END && ret != KRB5_KT_END) + krb5_warn(context, ret, "getting entry from keytab"); + break; + } + if(krb5_principal_compare(context, entry.principal, from_princ)) { + krb5_free_principal(context, entry.principal); + entry.principal = to_princ; + ret = krb5_kt_add_entry(context, keytab, &entry); + if(ret) { + entry.principal = NULL; + krb5_kt_free_entry(context, &entry); + krb5_warn(context, ret, "adding entry"); + break; + } + entry.principal = from_princ; + ret = krb5_kt_remove_entry(context, keytab, &entry); + if(ret) { + entry.principal = NULL; + krb5_kt_free_entry(context, &entry); + krb5_warn(context, ret, "removing entry"); + break; + } + entry.principal = NULL; + } + krb5_kt_free_entry(context, &entry); + } + krb5_kt_end_seq_get(context, keytab, &cursor); + + krb5_free_principal(context, from_princ); + krb5_free_principal(context, to_princ); + + return 0; +} +