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

merge srvcreate with copy

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9405 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2000-12-16 00:17:19 +00:00
parent 37bcf8ded8
commit 427d9d63a6
3 changed files with 39 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
admin/Makefile.am
View File

@@ -15,8 +15,7 @@ ktutil_SOURCES = add.c \
ktutil.c \
list.c \
purge.c \
remove.c \
srvcreate.c
remove.c
LDADD = \
$(top_builddir)/lib/kadm5/libkadm5clnt.la \

43
admin/copy.c
View File

@@ -123,20 +123,21 @@ kt_copy (int argc, char **argv)
return kt_copy_int(argv[0], argv[1]);
}
/* convert a version 4 srvtab to a version 5 keytab */
#ifndef KEYFILE
#define KEYFILE "/etc/srvtab"
#endif
int
srvconv(int argc, char **argv)
/* copy to from v4 srvtab, just short for copy */
static int
conv(int srvconv, int argc, char **argv)
{
int help_flag = 0;
char *srvtab = KEYFILE;
int optind = 0;
char kt4[1024], kt5[1024];
char *name;
struct getargs args[] = {
{ "srvtab", 's', arg_string, NULL},
{ "help", 'h', arg_flag, NULL}
@@ -148,12 +149,17 @@ srvconv(int argc, char **argv)
args[i++].value = &srvtab;
args[i++].value = &help_flag;
if(srvconv)
name = "ktutil srvconvert";
else
name = "ktutil srvcreate";
if(getarg(args, num_args, argc, argv, &optind)){
arg_printusage(args, num_args, "ktutil srvconvert", "");
arg_printusage(args, num_args, name, "");
return 1;
}
if(help_flag){
arg_printusage(args, num_args, "ktutil srvconvert", "");
arg_printusage(args, num_args, name, "");
return 0;
}
@@ -161,15 +167,36 @@ srvconv(int argc, char **argv)
argv += optind;
if (argc != 0) {
arg_printusage(args, num_args, "ktutil srvconvert", "");
arg_printusage(args, num_args, name, "");
return 1;
}
snprintf(kt4, sizeof(kt4), "krb4:%s", srvtab);
if(srvconv) {
if(keytab_string != NULL)
return kt_copy_int(kt4, keytab_string);
else {
krb5_kt_default_name(context, kt5, sizeof(kt5));
return kt_copy_int(kt4, kt5);
}
} else {
if(keytab_string != NULL)
return kt_copy_int(keytab_string, kt4);
krb5_kt_default_name(context, kt5, sizeof(kt5));
return kt_copy_int(kt5, kt4);
}
}
int
srvconv(int argc, char **argv)
{
return conv(1, argc, argv);
}
int
srvcreate(int argc, char **argv)
{
return conv(0, argc, argv);
}

124
admin/srvcreate.c
View File

@@ -1,124 +0,0 @@
/*
* Copyright (c) 1997 - 2000 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$");
/* convert a version 5 keytab to a version 4 srvtab */
#ifndef KEYFILE
#define KEYFILE "/etc/srvtab"
#endif
static char *srvtab = KEYFILE;
static int help_flag;
static int verbose;
static struct getargs args[] = {
{ "srvtab", 's', arg_string, &srvtab, "srvtab to create", "file" },
{ "help", 'h', arg_flag, &help_flag },
{ "verbose", 'v', arg_flag, &verbose },
};
static int num_args = sizeof(args) / sizeof(args[0]);
int
srvcreate(int argc, char **argv)
{
krb5_error_code ret;
int optind = 0;
int fd;
krb5_kt_cursor cursor;
krb5_keytab_entry entry;
char service[100], instance[100], realm[100];
int8_t kvno;
if(getarg(args, num_args, argc, argv, &optind)){
arg_printusage(args, num_args, "ktutil srvcreate", "");
return 1;
}
if(help_flag){
arg_printusage(args, num_args, "ktutil srvcreate", "");
return 0;
}
argc -= optind;
argv += optind;
if (argc != 0) {
arg_printusage(args, num_args, "ktutil srvcreate", "");
return 1;
}
ret = krb5_kt_start_seq_get(context, keytab, &cursor);
if(ret){
krb5_warn(context, ret, "krb5_kt_start_seq_get %s", keytab_string);
return 1;
}
fd = open(srvtab, O_WRONLY |O_APPEND |O_CREAT, 0600);
if(fd < 0){
krb5_warn(context, errno, "%s", srvtab);
return 1;
}
while((ret = krb5_kt_next_entry(context, keytab, &entry, &cursor)) == 0){
ret = krb5_524_conv_principal(context, entry.principal,
service, instance, realm);
if(ret) {
krb5_warn(context, ret, "krb5_524_conv_principal");
close(fd);
return 1;
}
if ( (entry.keyblock.keyvalue.length == 8) &&
(entry.keyblock.keytype == ETYPE_DES_CBC_MD5) ) {
if (verbose) {
printf ("%s.%s@%s vno %d\n", service, instance, realm,
entry.vno);
}
write(fd, service, strlen(service)+1);
write(fd, instance, strlen(instance)+1);
write(fd, realm, strlen(realm)+1);
kvno = entry.vno;
write(fd, &kvno, sizeof(kvno));
write(fd, entry.keyblock. keyvalue.data, 8);
}
krb5_kt_free_entry(context, &entry);
}
close(fd);
ret = krb5_kt_end_seq_get(context, keytab, &cursor);
return ret;
}