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

make merge/load work again

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14018 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2004-07-02 13:43:27 +00:00
parent 240a2fd230
commit 54e18d77a9
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
kadmin/load.c
View File

@@ -487,30 +487,29 @@ doit(const char *filename, int merge)
extern int local_flag; extern int local_flag;
static int static int
loadit(int merge, int argc, char **argv) loadit(int merge, const char *name, int argc, char **argv)
{ {
const char *myname = merge ? "merge" : "load";
if(!local_flag) { if(!local_flag) {
krb5_warnx(context, "%s is only available in local (-l) mode", myname); krb5_warnx(context, "%s is only available in local (-l) mode", name);
return 0; return 0;
} }
if(argc != 1) { if(argc != 1) {
printf("%s file", myname); printf("%s file", name);
return 0; return 0;
} }
doit(argv[optind], merge); doit(argv[0], merge);
return 0; return 0;
} }
int int
load(void *opt, int argc, char **argv) load(void *opt, int argc, char **argv)
{ {
return loadit(0, argc, argv); return loadit(0, "load", argc, argv);
} }
int int
merge(void *opt, int argc, char **argv) merge(void *opt, int argc, char **argv)
{ {
return loadit(1, argc, argv); return loadit(1, "merge", argc, argv);
} }