From 6001e35a3fe4dfa41d0296227ea68adb86e288b3 Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Mon, 18 Jun 2001 18:58:00 +0000 Subject: [PATCH] * server_misc.c (passwd_check): cast argument to islower()/isupper(), isdigit(), ispunct() to int. * server_acl.c (acl_parse_line): Cast argument to isupper()/isspace() to int. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13371 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/kadm5/srv/ChangeLog | 8 ++++++++ src/lib/kadm5/srv/server_acl.c | 4 ++-- src/lib/kadm5/srv/server_misc.c | 8 ++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog index 9c87ae5fc..a00855be1 100644 --- a/src/lib/kadm5/srv/ChangeLog +++ b/src/lib/kadm5/srv/ChangeLog @@ -1,3 +1,11 @@ +2001-06-18 Ezra Peisach + + * server_misc.c (passwd_check): cast argument to + islower()/isupper(), isdigit(), ispunct() to int. + + * server_acl.c (acl_parse_line): Cast argument to + isupper()/isspace() to int. + 2001-06-08 Ezra Peisach * svr_principal.c (check_pw_reuse): Cleanup assignment in conditional. diff --git a/src/lib/kadm5/srv/server_acl.c b/src/lib/kadm5/srv/server_acl.c index 0ecc4cc52..e114bfc86 100644 --- a/src/lib/kadm5/srv/server_acl.c +++ b/src/lib/kadm5/srv/server_acl.c @@ -197,7 +197,7 @@ acl_parse_line(lp) for (op=acle_ops; *op; op++) { char rop; - rop = (isupper(*op)) ? tolower(*op) : *op; + rop = (isupper((int) *op)) ? tolower((int) *op) : *op; found = 0; for (t=0; acl_op_table[t].ao_op; t++) { if (rop == acl_op_table[t].ao_op) { @@ -240,7 +240,7 @@ acl_parse_line(lp) char *trailing; trailing = &acle_restrictions[strlen(acle_restrictions)-1]; - while ( isspace(*trailing) ) + while ( isspace((int) *trailing) ) trailing--; trailing[1] = '\0'; acle->ae_restriction_string = strdup(acle_restrictions); diff --git a/src/lib/kadm5/srv/server_misc.c b/src/lib/kadm5/srv/server_misc.c index fac47bb2f..02c7dced6 100644 --- a/src/lib/kadm5/srv/server_misc.c +++ b/src/lib/kadm5/srv/server_misc.c @@ -139,17 +139,17 @@ passwd_check(kadm5_server_handle_t handle, return KADM5_PASS_Q_TOOSHORT; s = password; while ((c = *s++)) { - if (islower(c)) { + if (islower((int) c)) { nlower = 1; continue; } - else if (isupper(c)) { + else if (isupper((int) c)) { nupper = 1; continue; - } else if (isdigit(c)) { + } else if (isdigit((int) c)) { ndigit = 1; continue; - } else if (ispunct(c)) { + } else if (ispunct((int) c)) { npunct = 1; continue; } else { -- 2.26.2