X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fuserspec.c;h=67bde6574d298324af290f7efd3b299f98334f33;hb=f7aee7431e94dcef216d52c775e006bb57471968;hp=135a36c5d949a0aa4aede0c3ae448bc0e8ba6c29;hpb=2cbc4063244a149c6454b87eaa061fc290f1c6e3;p=gnulib.git diff --git a/lib/userspec.c b/lib/userspec.c index 135a36c5d..67bde6574 100644 --- a/lib/userspec.c +++ b/lib/userspec.c @@ -40,6 +40,14 @@ char *alloca (); #include #include +#if HAVE_SYS_PARAM_H +# include +#endif + +#if HAVE_LIMITS_H +# include +#endif + #if HAVE_STRING_H # include #else @@ -57,6 +65,17 @@ char *alloca (); # include #endif +#include "xalloc.h" +#include "xstrtol.h" + +#if ENABLE_NLS +# include +# define _(Text) gettext (Text) +#else +# define _(Text) Text +#endif +#define N_(Text) Text + #ifndef _POSIX_VERSION struct passwd *getpwnam (); struct group *getgrnam (); @@ -71,6 +90,34 @@ struct group *getgrgid (); # define endpwent() ((void) 0) #endif +#ifndef CHAR_BIT +# define CHAR_BIT 8 +#endif + +/* The extra casts work around common compiler bugs. */ +#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) +/* The outer cast is needed to work around a bug in Cray C 5.0.3.0. + It is necessary at least when t == time_t. */ +#define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \ + ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0)) +#define TYPE_MAXIMUM(t) ((t) (~ (t) 0 - TYPE_MINIMUM (t))) + +#ifndef UID_T_MAX +# define UID_T_MAX TYPE_MAXIMUM (uid_t) +#endif + +#ifndef GID_T_MAX +# define GID_T_MAX TYPE_MAXIMUM (gid_t) +#endif + +/* MAXUID may come from limits.h or sys/params.h. */ +#ifndef MAXUID +# define MAXUID UID_T_MAX +#endif +#ifndef MAXGID +# define MAXGID GID_T_MAX +#endif + /* Perform the equivalent of the statement `dest = strdup (src);', but obtaining storage via alloca instead of from the heap. */ @@ -112,8 +159,12 @@ is_number (const char *str) /* Extract from NAME, which has the form "[user][:.][group]", a USERNAME, UID U, GROUPNAME, and GID G. Either user or group, or both, must be present. - If the group is omitted but the ":" or "." separator is given, + If the group is omitted but the ":" separator is given, use the given user's login group. + If SPEC_ARG contains a `:', then use that as the separator, ignoring + any `.'s. If there is no `:', but there is a `.', then first look + up SPEC_ARG as a login name. If that look-up fails, then try again + interpreting the `.' as a separator. USERNAME and GROUPNAME will be in newly malloc'd memory. Either one might be NULL instead, indicating that it was not @@ -125,13 +176,21 @@ const char * parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid, char **username_arg, char **groupname_arg) { - static const char *tired = "virtual memory exhausted"; + static const char *E_invalid_user = N_("invalid user"); + static const char *E_invalid_group = N_("invalid group"); + static const char *E_bad_spec = + N_("cannot get the login group of a numeric UID"); + static const char *E_cannot_omit_both = + N_("cannot omit both user and group"); + const char *error_msg; char *spec; /* A copy we can write on. */ struct passwd *pwd; struct group *grp; char *g, *u, *separator; char *groupname; + int maybe_retry = 0; + char *dot = NULL; error_msg = NULL; *username_arg = *groupname_arg = NULL; @@ -139,10 +198,24 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid, V_STRDUP (spec, spec_arg); - /* Find the separator if there is one. */ + /* Find the POSIX `:' separator if there is one. */ separator = strchr (spec, ':'); + + /* If there is no colon, then see if there's a `.'. */ if (separator == NULL) - separator = strchr (spec, '.'); + { + dot = strchr (spec, '.'); + /* If there's no colon but there is a `.', then first look up the + whole spec, in case it's an OWNER name that includes a dot. + If that fails, then we'll try again, but interpreting the `.' + as a separator. */ + /* FIXME: accepting `.' as the separator is contrary to POSIX. + someday we should drop support for this. */ + if (dot) + maybe_retry = 1; + } + + retry: /* Replace separator with a NUL. */ if (separator != NULL) @@ -157,7 +230,7 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid, : separator + 1); if (u == NULL && g == NULL) - return "can not omit both user and group"; + return _(E_cannot_omit_both); #ifdef __DJGPP__ /* Pretend that we are the user U whose group is G. This makes @@ -175,17 +248,21 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid, { if (!is_number (u)) - error_msg = "invalid user"; + error_msg = E_invalid_user; else { int use_login_group; use_login_group = (separator != NULL && g == NULL); if (use_login_group) - error_msg = "cannot get the login group of a numeric UID"; + error_msg = E_bad_spec; else { - /* FIXME: don't use atoi! */ - *uid = atoi (u); + unsigned long int tmp_long; + if (xstrtoul (u, NULL, 0, &tmp_long, NULL) != LONGINT_OK + || tmp_long > MAXUID) + return _(E_invalid_user); + printf ("MAXUID: %u\n", (uid_t) MAXUID); + *uid = tmp_long; } } } @@ -224,11 +301,14 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid, if (grp == NULL) { if (!is_number (g)) - error_msg = "invalid group"; + error_msg = E_invalid_group; else { - /* FIXME: don't use atoi! */ - *gid = atoi (g); + unsigned long int tmp_long; + if (xstrtoul (u, NULL, 0, &tmp_long, NULL) != LONGINT_OK + || tmp_long > MAXGID) + return _(E_invalid_group); + *gid = tmp_long; } } else @@ -245,7 +325,7 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid, { *username_arg = strdup (u); if (*username_arg == NULL) - error_msg = tired; + error_msg = xalloc_msg_memory_exhausted; } if (groupname != NULL && error_msg == NULL) @@ -258,12 +338,20 @@ parse_user_spec (const char *spec_arg, uid_t *uid, gid_t *gid, free (*username_arg); *username_arg = NULL; } - error_msg = tired; + error_msg = xalloc_msg_memory_exhausted; } } } - return error_msg; + if (error_msg && maybe_retry) + { + maybe_retry = 0; + separator = dot; + error_msg = NULL; + goto retry; + } + + return _(error_msg); } #ifdef TEST