2010-02-14 Michael Bunk <mb@computer-leipzig.com>

	* NEWS, lib/gshadow.c: Fix parsing of gshadow entries.

diff --git a/ChangeLog b/ChangeLog
index 5940ba7445c39836a0098d1b2a2c7437c4c2fcea..cdc10f78709d27820aa35e712450755031e8c634 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-14  Michael Bunk  <mb@computer-leipzig.com>
+
+       * NEWS, lib/gshadow.c: Fix parsing of gshadow entries.
+
 2010-01-30  Paweł Hajdan, Jr.  <phajdan.jr@gentoo.org>
 
        * NEWS: Add support for TCB.

diff --git a/NEWS b/NEWS
index 9d4bebfe20bcd053c2e1b068b27a1432e3c0e819..01c1df90745130aa63952a5041fea32605f352d2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,8 @@ shadow-4.1.4.2 -> shadow-4.1.4.3                                      UNRELEASED
     sending a SIGTERM), and kill it only if it did not terminate by itself.
     No delay will be enforced if the child cooperates.
   * Default ENV_SUPATH is /sbin:/bin:/usr/sbin:/usr/bin
+- newgrp, sg, groupmems
+  * Fix parsing of gshadow entries.
 
 *** translation
   * Updated Czech translation.

diff --git a/lib/gshadow.c b/lib/gshadow.c
index 8427fc2381119271f2635bac2a09f4a7088e0d18..e5a0f61eeb1f0403063c5ef539bee989b5412d0c 100644 (file)
--- a/lib/gshadow.c
+++ b/lib/gshadow.c
@@ -222,6 +222,7 @@ void endsgent (void)
                if (NULL == buf) {
                        return NULL;
                }
+               buflen = BUFSIZ;
        }
 
        if (NULL == fp) {
@@ -229,9 +230,9 @@ void endsgent (void)
        }
 
 #ifdef USE_NIS
-       while (fgetsx (buf, (int) sizeof buf, fp) == buf)
+       while (fgetsx (buf, (int) buflen, fp) == buf)
 #else
-       if (fgetsx (buf, (int) sizeof buf, fp) == buf)
+       if (fgetsx (buf, (int) buflen, fp) == buf)
 #endif
        {
                while (   ((cp = strrchr (buf, '\n')) == NULL)