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

(help): use sl_slc_help().

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17949 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-08-28 14:20:18 +00:00
parent e6d68876f5
commit c993715525
3 changed files with 53 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
kadmin/kadmin.c
View File

@@ -100,34 +100,7 @@ void *kadm_handle;
int int
help(void *opt, int argc, char **argv) help(void *opt, int argc, char **argv)
{ {
if(argc == 0) { sl_slc_help(commands, argc, argv);
sl_help(commands, 1, argv - 1 /* XXX */);
} else {
SL_cmd *c = sl_match (commands, argv[0], 0);
if(c == NULL) {
fprintf (stderr, "No such command: %s. "
"Try \"help\" for a list of commands\n",
argv[0]);
} else {
if(c->func) {
char *fake[] = { NULL, "--help", NULL };
fake[0] = argv[0];
(*c->func)(2, fake);
fprintf(stderr, "\n");
}
if(c->help && *c->help)
fprintf (stderr, "%s\n", c->help);
if((++c)->name && c->func == NULL) {
int f = 0;
fprintf (stderr, "Synonyms:");
while (c->name && c->func == NULL) {
fprintf (stderr, "%s%s", f ? ", " : " ", (c++)->name);
f = 1;
}
fprintf (stderr, "\n");
}
}
}
return 0; return 0;
} }

29
kuser/kdigest.c
View File

@@ -216,34 +216,7 @@ client_request(struct client_request_options *opt, int argc, char **argv)
int int
help(void *opt, int argc, char **argv) help(void *opt, int argc, char **argv)
{ {
if(argc == 0) { sl_slc_help(commands, argc, argv);
sl_help(commands, 1, argv - 1 /* XXX */);
} else {
SL_cmd *c = sl_match (commands, argv[0], 0);
if(c == NULL) {
fprintf (stderr, "No such command: %s. "
"Try \"help\" for a list of commands\n",
argv[0]);
} else {
if(c->func) {
char *fake[] = { NULL, "--help", NULL };
fake[0] = argv[0];
(*c->func)(2, fake);
fprintf(stderr, "\n");
}
if(c->help && *c->help)
fprintf (stderr, "%s\n", c->help);
if((++c)->name && c->func == NULL) {
int f = 0;
fprintf (stderr, "Synonyms:");
while (c->name && c->func == NULL) {
fprintf (stderr, "%s%s", f ? ", " : " ", (c++)->name);
f = 1;
}
fprintf (stderr, "\n");
}
}
}
return 0; return 0;
} }

79
lib/gssapi/gss.c
View File

@@ -111,6 +111,56 @@ supported_mechanisms(void *argptr, int argc, char **argv)
return 0; return 0;
} }
/*
*
*/
#define DOVEDOT_MAJOR_VERSION 1
#define DOVEDOT_MINOR_VERSION 0
/*
S: MECH mech mech-parameters
S: MECH mech mech-parameters
S: VERSION major minor
S: CPID pid
S: CUID pid
S: ...
S: DONE
C: VERSION major minor
C: CPID pid
C: AUTH id method service= resp=
C: CONT id message
S: OK id user=
S: FAIL id reason=
S: CONTINUE id message
*/
int
dovecot_server(void *argptr, int argc, char **argv)
{
krb5_storage *sp;
int fd = 0;
sp = krb5_storage_from_fd(fd);
if (sp == NULL)
errx(1, "krb5_storage_from_fd");
krb5_store_stringnl(sp, "MECH\tGSSAPI");
krb5_store_stringnl(sp, "VERSION\t1\t0");
krb5_store_stringnl(sp, "DONE");
while (1) {
char *cmd;
if (krb5_ret_stringnl(sp, &cmd) != 0)
break;
printf("cmd: %s\n", cmd);
free(cmd);
}
return 0;
}
/* /*
* *
*/ */
@@ -118,34 +168,7 @@ supported_mechanisms(void *argptr, int argc, char **argv)
int int
help(void *opt, int argc, char **argv) help(void *opt, int argc, char **argv)
{ {
if(argc == 0) { sl_slc_help(commands, argc, argv);
sl_help(commands, 1, argv - 1 /* XXX */);
} else {
SL_cmd *c = sl_match (commands, argv[0], 0);
if(c == NULL) {
fprintf (stderr, "No such command: %s. "
"Try \"help\" for a list of commands\n",
argv[0]);
} else {
if(c->func) {
char *fake[] = { NULL, "--help", NULL };
fake[0] = argv[0];
(*c->func)(2, fake);
fprintf(stderr, "\n");
}
if(c->help && *c->help)
fprintf (stderr, "%s\n", c->help);
if((++c)->name && c->func == NULL) {
int f = 0;
fprintf (stderr, "Synonyms:");
while (c->name && c->func == NULL) {
fprintf (stderr, "%s%s", f ? ", " : " ", (c++)->name);
f = 1;
}
fprintf (stderr, "\n");
}
}
}
return 0; return 0;
} }