X-Git-Url: http://git.tuebingen.mpg.de/?p=adu.git;a=blobdiff_plain;f=adu.c;h=07248e99a592e6466cb7f42abeb9d45fbeab905f;hp=42d1b19bcae5a70fde2a9655ad82dd1c62b55c5a;hb=9ca6c5e46bfbfeb6341a54703a21e25c15ef0f7e;hpb=b01ff57775258c8df4c486b0962fc67cfdfef439 diff --git a/adu.c b/adu.c index 42d1b19..07248e9 100644 --- a/adu.c +++ b/adu.c @@ -166,61 +166,6 @@ static struct osl_column_description user_table_cols[] = { }, }; -static int check_uid_arg(const char *arg, uint32_t *uid) -{ - const uint32_t max = ~0U; - /* - * we need an 64-bit int for string -> uid conversion because strtoll() - * returns a signed value. - */ - int64_t val; - int ret = atoi64(arg, &val); - - if (ret < 0) - return ret; - if (val < 0 || val > max) - return -ERRNO_TO_ERROR(EINVAL); - *uid = val; - return 1; -} - -static int parse_uid_range(const char *orig_arg, struct uid_range *ur) -{ - int ret; - char *arg = adu_strdup(orig_arg), *p = strchr(arg, '-'); - - if (!p || p == arg) { /* -42 or 42 */ - ret = check_uid_arg(p? p + 1 : arg, &ur->high); - if (ret < 0) - goto out; - ur->low = p? 0 : ur->high; - ret = 1; - goto out; - } - /* 42- or 42-4711 */ - *p = '\0'; - p++; - ret = check_uid_arg(arg, &ur->low); - if (ret < 0) - goto out; - ur->high = ~0U; - if (*p) { /* 42-4711 */ - ret = check_uid_arg(p, &ur->high); - if (ret < 0) - goto out; - } - if (ur->low > ur->high) - ret = -ERRNO_TO_ERROR(EINVAL); -out: - if (ret < 0) - ERROR_LOG("bad uid option: %s\n", orig_arg); - else - INFO_LOG("admissible uid range: %u - %u\n", ur->low, - ur->high); - free(arg); - return ret; -} - /** * The log function. *