* NEWS, src/groupmems.c, man/groupmems.8.xml: Document the long

	options.

diff --git a/ChangeLog b/ChangeLog
index ae128bce2c7d90320eba24a951f1bc5db4e7d940..164b3923670787cefcf56b1bff7235b19ab7834e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-04  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * NEWS, src/groupmems.c, man/groupmems.8.xml: Document the long
+       options.
+
 2008-09-03  Nicolas François  <nicolas.francois@centraliens.net>
 
        * lib/prototypes.h, libmisc/audit_help.c: Define new type

diff --git a/NEWS b/NEWS
index 02f90d1e14b919ccf86e6d822586010f7fb79082..4bc228e03cb13475e8a7a81c1c0136eeda6cc069 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,8 @@ shadow-4.1.2.1 -> shadow-4.1.3                                                UNRELEASED
   * Use the groupmems PAM service name instead of groupmod.
   * Fix segmentation faults when adding or removing users from a group.
   * Added support for shadow groups.
+  * Added support long options --add (-a), --delete (-d), --purge (-p),
+    --list (-l), --group (-g).
 - newusers
   * Implement the -r, --system option.
 - passwd

diff --git a/man/groupmems.8.xml b/man/groupmems.8.xml
index 935dc6574f0d1a46c09a759bd5c14c1d9309ad67..0ae274406a7e0de05dc59abc6f3d3abbc935d9b4 100644 (file)
--- a/man/groupmems.8.xml
+++ b/man/groupmems.8.xml
@@ -50,7 +50,7 @@
     </para>
     <variablelist remap='IP'>
       <varlistentry>
-       <term><option>-a</option> <replaceable>user_name</replaceable></term>
+       <term><option>-a</option>, <option>--add</option> <replaceable>user_name</replaceable></term>
        <listitem>
          <para>Add a new user to the group membership list.</para>
          <para condition="gshadow">
@@ -61,7 +61,7 @@
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><option>-d</option> <replaceable>user_name</replaceable></term>
+       <term><option>-d</option>, <option>--delete</option> <replaceable>user_name</replaceable></term>
        <listitem>
          <para>Delete a user from the group membership list.</para>
          <para condition="gshadow">
@@ -77,7 +77,7 @@
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><option>-g</option> <replaceable>group_name</replaceable></term>
+       <term><option>-g</option>, <option>--group</option> <replaceable>group_name</replaceable></term>
        <listitem>
          <para>The superuser can specify which group membership
            list to modify.
@@ -85,13 +85,13 @@
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><option>-l</option></term>
+       <term><option>-l</option>, <option>--list</option></term>
        <listitem>
          <para>List the group membership list.</para>
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><option>-p</option></term>
+       <term><option>-p</option>, <option>--purge</option></term>
        <listitem>
          <para>Purge all users from the group membership list.</para>
          <para condition="gshadow">

diff --git a/src/groupmems.c b/src/groupmems.c
index 3b92348aabb480a0721544ceef954ec42b5be808..f855783903e19bf0043c69b426bbe9034e7af84e 100644 (file)
--- a/src/groupmems.c
+++ b/src/groupmems.c
@@ -362,7 +362,18 @@ static void display_members (const char *const *members)
 
 static void usage (void)
 {
-       (void) fputs (_("Usage: groupmems -a username | -d username | -p | -l [-g groupname]\n"), stderr);
+       (void) fputs (_("Usage: groupmems [options] [action]\n"
+                       "\n"
+                       "Options:\n"
+                       "  -g, --group groupname         change groupname instead of the user's group\n"
+                       "                                (root only)\n"
+                       "\n"
+                       "Actions:\n"
+                       "  -a, --add username            add username to the members of the group\n"
+                       "  -d, --delete username         remove username from the members of the group\n"
+                       "  -p, --purge                   purge all members from the group\n"
+                       "  -l, --list                    list the members of the group\n"
+                       "\n"), stderr);
        fail_exit (EXIT_USAGE);
 }