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

make get' and list' aliases to each other, but with different

Browse Source 
defaults


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9043 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2000-09-10 19:18:37 +00:00
parent 3e24852f6d
commit 47b95f3233
1 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
kadmin/get.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997, 1998, 1999 Kungliga Tekniska H<>gskolan * Copyright (c) 1997-2000 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -190,37 +190,49 @@ do_get_entry(krb5_principal principal, void *data)
return 0; return 0;
} }
int static int
get_entry(int argc, char **argv) getit(const char *name, int terse_flag, int argc, char **argv)
{ {
int i; int i;
krb5_error_code ret; krb5_error_code ret;
struct get_entry_data data; struct get_entry_data data;
struct getargs args[] = { struct getargs args[] = {
{ "long", 'l', arg_flag, NULL, "long format" }, { "long", 'l', arg_flag, NULL, "long format" },
{ "short", 's', arg_flag, NULL, "short format" },
{ "terse", 't', arg_flag, NULL, "terse format" }, { "terse", 't', arg_flag, NULL, "terse format" },
}; };
int num_args = sizeof(args) / sizeof(args[0]); int num_args = sizeof(args) / sizeof(args[0]);
int optind = 0; int optind = 0;
int long_flag = 0; int long_flag = -1;
int terse_flag = 0; int short_flag = -1;
args[0].value = &long_flag; args[0].value = &long_flag;
args[1].value = &terse_flag; args[1].value = &short_flag;
args[2].value = &terse_flag;
if(getarg(args, num_args, argc, argv, &optind)) if(getarg(args, num_args, argc, argv, &optind))
goto usage; goto usage;
if(optind == argc) if(optind == argc)
goto usage; goto usage;
if(long_flag == -1 && (short_flag == 1 || terse_flag == 1))
long_flag = 0;
if(short_flag == -1 && (long_flag == 1 || terse_flag == 1))
short_flag = 0;
if(terse_flag == -1 && (long_flag == 1 || short_flag == 1))
terse_flag = 0;
if(long_flag == 0 && short_flag == 0 && terse_flag == 0)
short_flag = 1;
if(long_flag) { if(long_flag) {
data.format = print_entry_long; data.format = print_entry_long;
data.header = NULL; data.header = NULL;
} else if(short_flag){
data.format = print_entry_short;
data.header = print_header_short;
} else if(terse_flag) { } else if(terse_flag) {
data.format = print_entry_terse; data.format = print_entry_terse;
data.header = NULL; data.header = NULL;
} else {
data.format = print_entry_short;
data.header = print_header_short;
} }
argc -= optind; argc -= optind;
@@ -230,21 +242,18 @@ get_entry(int argc, char **argv)
ret = foreach_principal(argv[i], do_get_entry, &data); ret = foreach_principal(argv[i], do_get_entry, &data);
return 0; return 0;
usage: usage:
arg_printusage (args, num_args, "get", "principal..."); arg_printusage (args, num_args, name, "principal...");
return 0; return 0;
} }
int
get_entry(int argc, char **argv)
{
return getit("get", 0, argc, argv);
}
int int
list_princs(int argc, char **argv) list_princs(int argc, char **argv)
{ {
int i; return getit("list", 1, argc, argv);
krb5_error_code ret;
struct get_entry_data data;
data.format = print_entry_terse;
data.header = NULL;
for(i = 1; i < argc; i++)
ret = foreach_principal(argv[i], do_get_entry, &data);
return 0;
} }