Warning fixes from Christos Zoulas
- shadowed variables - signed/unsigned confusion - const lossage - incomplete structure initializations - unused code
This commit is contained in:
13
kdc/hpropd.c
13
kdc/hpropd.c
@@ -44,19 +44,20 @@ static char *ktname = NULL;
|
||||
|
||||
struct getargs args[] = {
|
||||
{ "database", 'd', arg_string, rk_UNCONST(&database), "database", "file" },
|
||||
{ "stdin", 'n', arg_flag, &from_stdin, "read from stdin" },
|
||||
{ "print", 0, arg_flag, &print_dump, "print dump to stdout" },
|
||||
{ "stdin", 'n', arg_flag, &from_stdin, "read from stdin", NULL },
|
||||
{ "print", 0, arg_flag, &print_dump, "print dump to stdout", NULL },
|
||||
#ifdef SUPPORT_INETD
|
||||
{ "inetd", 'i', arg_negative_flag, &inetd_flag,
|
||||
"Not started from inetd" },
|
||||
"Not started from inetd", NULL },
|
||||
#endif
|
||||
{ "keytab", 'k', arg_string, &ktname, "keytab to use for authentication", "keytab" },
|
||||
{ "realm", 'r', arg_string, &local_realm, "realm to use" },
|
||||
{ "realm", 'r', arg_string, &local_realm, "realm to use", NULL },
|
||||
{ "version", 0, arg_flag, &version_flag, NULL, NULL },
|
||||
{ "help", 'h', arg_flag, &help_flag, NULL, NULL}
|
||||
};
|
||||
|
||||
static int num_args = sizeof(args) / sizeof(args[0]);
|
||||
static char unparseable_name[] = "unparseable name";
|
||||
|
||||
static void
|
||||
usage(int ret)
|
||||
@@ -194,7 +195,7 @@ main(int argc, char **argv)
|
||||
char *s;
|
||||
ret = krb5_unparse_name(context, c2, &s);
|
||||
if (ret)
|
||||
s = "unparseable name";
|
||||
s = unparseable_name;
|
||||
krb5_errx(context, 1, "Unauthorized connection from %s", s);
|
||||
}
|
||||
krb5_free_principal(context, c1);
|
||||
@@ -260,7 +261,7 @@ main(int argc, char **argv)
|
||||
char *s;
|
||||
ret = krb5_unparse_name(context, entry.entry.principal, &s);
|
||||
if (ret)
|
||||
s = strdup("unparseable name");
|
||||
s = strdup(unparseable_name);
|
||||
krb5_warnx(context, "Entry exists: %s", s);
|
||||
free(s);
|
||||
} else if(ret)
|
||||
|
Reference in New Issue
Block a user