From: Nalin Dahyabhai Date: Sat, 8 Feb 2014 01:14:24 +0000 (-0500) Subject: Make use of strtoul() unconditional in locate_kdc X-Git-Tag: krb5-1.13-alpha1~173 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d03aff9fa23a5ad223bb7e7a8c48c070d64e1aa3;p=thirdparty%2Fkrb5.git Make use of strtoul() unconditional in locate_kdc When parsing port numbers, we previously attempted to conditionalize use of strtoul() on whether or not it was available, falling back to atoi() instead, but we did so in a way that would always fall back to using atoi(). We also call strtoul() from elsewhere without that condition, so we don't gain anything by trying to be careful about it here. --- diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c index f0b84818db..88d55a8752 100644 --- a/src/lib/krb5/os/locate_kdc.c +++ b/src/lib/krb5/os/locate_kdc.c @@ -217,14 +217,10 @@ locate_srv_conf_1(krb5_context context, const krb5_data *realm, if (port) { unsigned long l; -#ifdef HAVE_STROUL char *endptr; l = strtoul (port, &endptr, 10); if (endptr == NULL || *endptr != 0) return EINVAL; -#else - l = atoi (port); -#endif /* L is unsigned, don't need to check <0. */ if (l > 65535) return EINVAL;