diff options
| -rw-r--r-- | src/appl/simple/server/sim_server.c | 2 | ||||
| -rw-r--r-- | src/kadmin/dbutil/dump.c | 2 | ||||
| -rw-r--r-- | src/kadmin/dbutil/kdb5_destroy.c | 1 | ||||
| -rw-r--r-- | src/kadmin/server/ovsec_kadmd.c | 2 | ||||
| -rw-r--r-- | src/kdc/kdc_authdata.c | 4 | ||||
| -rw-r--r-- | src/lib/apputils/net-server.c | 2 | ||||
| -rw-r--r-- | src/lib/gssapi/krb5/accept_sec_context.c | 2 | ||||
| -rw-r--r-- | src/lib/krb5/unicode/ure/ure.c | 2 |
8 files changed, 6 insertions, 11 deletions
diff --git a/src/appl/simple/server/sim_server.c b/src/appl/simple/server/sim_server.c index 19d8f5f18..fce5a9c6f 100644 --- a/src/appl/simple/server/sim_server.c +++ b/src/appl/simple/server/sim_server.c @@ -73,7 +73,6 @@ main(int argc, char *argv[]) struct sockaddr_in c_sock; /* client's address */ char full_hname[MAXHOSTNAMELEN]; char *cp; - extern int opterr, optind; extern char * optarg; int ch; @@ -100,7 +99,6 @@ main(int argc, char *argv[]) * Parse command line arguments * */ - opterr = 0; while ((ch = getopt(argc, argv, "p:s:S:")) != -1) { switch (ch) { case 'p': diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c index d4e80908a..8bff367eb 100644 --- a/src/kadmin/dbutil/dump.c +++ b/src/kadmin/dbutil/dump.c @@ -1479,8 +1479,6 @@ load_db(int argc, char **argv) { krb5_error_code ret; FILE *f = NULL; - extern char *optarg; - extern int optind; char *dumpfile = NULL, *dbname, buf[BUFSIZ]; dump_version *load = NULL; int aindex; diff --git a/src/kadmin/dbutil/kdb5_destroy.c b/src/kadmin/dbutil/kdb5_destroy.c index f32988a6d..e5895523b 100644 --- a/src/kadmin/dbutil/kdb5_destroy.c +++ b/src/kadmin/dbutil/kdb5_destroy.c @@ -43,7 +43,6 @@ kdb5_destroy(argc, argv) int argc; char *argv[]; { - extern char *optarg; extern int optind; int optchar; char *dbname; diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c index 37e66316e..1273b0711 100644 --- a/src/kadmin/server/ovsec_kadmd.c +++ b/src/kadmin/server/ovsec_kadmd.c @@ -210,8 +210,6 @@ char *dump_file = KPROP_DEFAULT_FILE; int main(int argc, char *argv[]) { - extern char *optarg; - extern int optind, opterr; int ret; OM_uint32 OMret, major_status, minor_status; char *whoami; diff --git a/src/kdc/kdc_authdata.c b/src/kdc/kdc_authdata.c index 731c7d5d1..e70a27b83 100644 --- a/src/kdc/kdc_authdata.c +++ b/src/kdc/kdc_authdata.c @@ -280,7 +280,7 @@ load_authdata_plugins(krb5_context context) void *pctx = NULL; ftable = authdata_plugins_ftables_v2[i]; - if ((ftable->authdata_proc == NULL)) { + if (ftable->authdata_proc == NULL) { continue; } server_init_proc = ftable->init_proc; @@ -316,7 +316,7 @@ load_authdata_plugins(krb5_context context) void *pctx = NULL; ftable = authdata_plugins_ftables_v0[i]; - if ((ftable->authdata_proc == NULL)) { + if (ftable->authdata_proc == NULL) { continue; } server_init_proc = ftable->init_proc; diff --git a/src/lib/apputils/net-server.c b/src/lib/apputils/net-server.c index 7780b8a7d..b4be585d4 100644 --- a/src/lib/apputils/net-server.c +++ b/src/lib/apputils/net-server.c @@ -983,6 +983,7 @@ setup_udp_port(void *P_data, struct sockaddr *addr) #ifdef HAVE_STRUCT_RT_MSGHDR #include <net/route.h> +#if 0 static char * rtm_type_name(int type) { @@ -1006,6 +1007,7 @@ rtm_type_name(int type) default: return "?"; } } +#endif static void do_network_reconfig(verto_ctx *ctx, verto_ev *ev) diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c index 82f03b7cc..f3a9803cc 100644 --- a/src/lib/gssapi/krb5/accept_sec_context.c +++ b/src/lib/gssapi/krb5/accept_sec_context.c @@ -791,7 +791,7 @@ kg_accept_krb5(minor_status, context_handle, TREAD_INT16(ptr, option.length, 0); i -= 4; - if (i < option.length || option.length < 0) { + if (i < option.length) { code = KG_BAD_LENGTH; major_status = GSS_S_FAILURE; goto fail; diff --git a/src/lib/krb5/unicode/ure/ure.c b/src/lib/krb5/unicode/ure/ure.c index 91ef7c95b..b3fa986bd 100644 --- a/src/lib/krb5/unicode/ure/ure.c +++ b/src/lib/krb5/unicode/ure/ure.c @@ -1864,7 +1864,7 @@ ure_write_dfa(ure_dfa_t dfa, FILE *out) if (sym->props & (1 << k)) { if (h != 0) putc(',', out); - fprintf(out, "%hd", k + 1); + fprintf(out, "%d", k + 1); h = 1; } } |