* NEWS, src/groupmod.c: Fixed groupmod when configured with

	--enable-account-tools-setuid.

diff --git a/ChangeLog b/ChangeLog
index 63ffd0e681d26e12c8c6f9d8e0d8efb08dbb2fdd..d26a6a98686fe96f9cb433cb7e49b527a942c6f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-05  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * NEWS, src/groupmod.c: Fixed groupmod when configured with
+       --enable-account-tools-setuid.
+
 2009-11-01  Nicolas François  <nicolas.francois@centraliens.net>
 
        * NEWS, man/login.defs.d/ENV_SUPATH.xml, libmisc/setupenv.c:

diff --git a/NEWS b/NEWS
index 064e6bddc7d1161fea95a475d6b53d594d5fa5d8..474ef8b083305d86c866e5a7e0036fd32a30551c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ shadow-4.1.4.2 -> shadow-4.1.4.3                                        UNRELEASED
   * report usage error to stderr, but report usage help to stdout (and return
     zero) when explicitly requested (e.g. with --help).
 
+- groupmod
+  * Fixed groupmod when configured with --enable-account-tools-setuid.
 - su
   * Document the su exit values.
   * When su receives a signal, wait for the child to terminate (after

diff --git a/src/groupmod.c b/src/groupmod.c
index 4205df205dc081264347b0730d94ccc7f56c9c93..da6d77f2c7ba6e01d362d8cd4d4b6b04fd1bdd39 100644 (file)
--- a/src/groupmod.c
+++ b/src/groupmod.c
@@ -724,7 +724,7 @@ int main (int argc, char **argv)
        {
                struct passwd *pampw;
                pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */
-               if (NULL == pamh) {
+               if (NULL == pampw) {
                        fprintf (stderr,
                                 _("%s: Cannot determine your user name.\n"),
                                 Prog);