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

convert to use slc; also add stash subcommand

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13970 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2004-06-21 19:19:45 +00:00
parent 3cc8ea1b60
commit d7f9fac88e
18 changed files with 646 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
kadmin/cpw.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997 - 2001 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997 - 2004 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -42,21 +42,6 @@ struct cpw_entry_data {
krb5_key_data *key_data;
};
static struct getargs args[] = {
{ "random-key", 'r', arg_flag, NULL, "set random key" },
{ "random-password", 0, arg_flag, NULL, "set random password" },
{ "password", 'p', arg_string, NULL, "princial's password" },
{ "key", 0, arg_string, NULL, "DES key in hex" }
};
static int num_args = sizeof(args) / sizeof(args[0]);
static void
usage(void)
{
arg_printusage(args, num_args, "passwd", "principal...");
}
static int
set_random_key (krb5_principal principal)
{
@@ -146,32 +131,19 @@ do_cpw_entry(krb5_principal principal, void *data)
}
int
cpw_entry(int argc, char **argv)
cpw_entry(struct passwd_options *opt, int argc, char **argv)
{
krb5_error_code ret;
int i;
int optind = 0;
struct cpw_entry_data data;
int num;
char *key_string;
krb5_key_data key_data[3];
data.random_key = 0;
data.random_password = 0;
data.password = NULL;
data.random_key = opt->random_key_flag;
data.random_password = opt->random_password_flag;
data.password = opt->password_string;
data.key_data = NULL;
key_string = NULL;
args[0].value = &data.random_key;
args[1].value = &data.random_password;
args[2].value = &data.password;
args[3].value = &key_string;
if(getarg(args, num_args, argc, argv, &optind)){
usage();
return 0;
}
num = 0;
if (data.random_key)
++num;
@@ -179,7 +151,7 @@ cpw_entry(int argc, char **argv)
++num;
if (data.password)
++num;
if (key_string)
if (opt->key_string)
++num;
if (num > 1) {
@@ -188,19 +160,16 @@ cpw_entry(int argc, char **argv)
return 0;
}
if (key_string) {
if (opt->key_string) {
const char *error;
if (parse_des_key (key_string, key_data, &error)) {
printf ("failed parsing key `%s': %s\n", key_string, error);
if (parse_des_key (opt->key_string, key_data, &error)) {
printf ("failed parsing key `%s': %s\n", opt->key_string, error);
return 0;
}
data.key_data = key_data;
}
argc -= optind;
argv += optind;
for(i = 0; i < argc; i++)
ret = foreach_principal(argv[i], do_cpw_entry, "cpw", &data);