projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New modules unistr/u*-mbsnlen.
[gnulib.git]
/
lib
/
userspec.c
diff --git
a/lib/userspec.c
b/lib/userspec.c
index
fbdc2f9
..
c1f580a
100644
(file)
--- a/
lib/userspec.c
+++ b/
lib/userspec.c
@@
-1,5
+1,5
@@
/* userspec.c -- Parse a user and group string.
/* userspec.c -- Parse a user and group string.
- Copyright (C) 1989-1992, 1997-1998, 2000, 2002-200
5
Free Software
+ Copyright (C) 1989-1992, 1997-1998, 2000, 2002-200
7
Free Software
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
@@
-18,9
+18,7
@@
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "userspec.h"
/* Specification. */
#include "userspec.h"
@@
-43,7
+41,6
@@
#include "intprops.h"
#include "inttostr.h"
#include "intprops.h"
#include "inttostr.h"
-#include "strdup.h"
#include "xalloc.h"
#include "xstrtol.h"
#include "xalloc.h"
#include "xstrtol.h"
@@
-109,8
+106,7
@@
parse_with_separator (char const *spec, char const *separator,
{
static const char *E_invalid_user = N_("invalid user");
static const char *E_invalid_group = N_("invalid group");
{
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_bad_spec = N_("invalid spec");
const char *error_msg;
struct passwd *pwd;
const char *error_msg;
struct passwd *pwd;
@@
-159,12
+155,17
@@
parse_with_separator (char const *spec, char const *separator,
if (u != NULL)
{
if (u != NULL)
{
- pwd = getpwnam (u);
+ /* If it starts with "+", skip the look-up. */
+ pwd = (*u == '+' ? NULL : getpwnam (u));
if (pwd == NULL)
{
bool use_login_group = (separator != NULL && g == NULL);
if (use_login_group)
if (pwd == NULL)
{
bool use_login_group = (separator != NULL && g == NULL);
if (use_login_group)
- error_msg = E_bad_spec;
+ {
+ /* If there is no group,
+ then there may not be a trailing ":", either. */
+ error_msg = E_bad_spec;
+ }
else
{
unsigned long int tmp;
else
{
unsigned long int tmp;
@@
-195,7
+196,8
@@
parse_with_separator (char const *spec, char const *separator,
if (g != NULL && error_msg == NULL)
{
/* Explicit group. */
if (g != NULL && error_msg == NULL)
{
/* Explicit group. */
- grp = getgrnam (g);
+ /* If it starts with "+", skip the look-up. */
+ grp = (*g == '+' ? NULL : getgrnam (g));
if (grp == NULL)
{
unsigned long int tmp;
if (grp == NULL)
{
unsigned long int tmp;