deluser: make it simpler, fix inability to delete user from group

Also makes menuconfig order more sensible

Signed-off-by: Harald Becker <ralda@gmx.de>
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

1 files changed, 42 insertions, 42 deletions

diff --git a/loginutils/Config.src b/loginutils/Config.src
index 5d497c4dc..8158bce74 100644
--- a/loginutils/Config.src
+++ b/loginutils/Config.src
@@ -93,41 +93,18 @@ config USE_BB_CRYPT_SHA
           With this option off, login will fail password check for any
           user which has password encrypted with these algorithms.
 
-config ADDGROUP
-        bool "addgroup"
+config ADDUSER
+        bool "adduser"
         default y
         help
-          Utility for creating a new group account.
+          Utility for creating a new user account.
 
-config FEATURE_ADDGROUP_LONG_OPTIONS
+config FEATURE_ADDUSER_LONG_OPTIONS
         bool "Enable long options"
         default y
-        depends on ADDGROUP && LONG_OPTS
-        help
-          Support long options for the addgroup applet.
-
-config FEATURE_ADDUSER_TO_GROUP
-        bool "Support for adding users to groups"
-        default y
-        depends on ADDGROUP
-        help
-          If  called  with two non-option arguments,
-          addgroup will add an existing user to an
-          existing group.
-
-config DELGROUP
-        bool "delgroup"
-        default y
-        help
-          Utility for deleting a group account.
-
-config FEATURE_DEL_USER_FROM_GROUP
-        bool "Support for removing users from groups"
-        default y
-        depends on DELGROUP
+        depends on ADDUSER && LONG_OPTS
         help
-          If called with two non-option arguments, deluser
-          or delgroup will remove an user from a specified group.
+          Support long options for the adduser applet.
 
 config FEATURE_CHECK_NAMES
         bool "Enable sanity check on user/group names in adduser and addgroup"
@@ -141,19 +118,6 @@ config FEATURE_CHECK_NAMES
           For compatibility with Samba machine accounts "$" is also supported
           at the end of the user or group name.
 
-config ADDUSER
-        bool "adduser"
-        default y
-        help
-          Utility for creating a new user account.
-
-config FEATURE_ADDUSER_LONG_OPTIONS
-        bool "Enable long options"
-        default y
-        depends on ADDUSER && LONG_OPTS
-        help
-          Support long options for the adduser applet.
-
 config FIRST_SYSTEM_ID
         int "First valid system uid or gid for adduser and addgroup"
         depends on ADDUSER || ADDGROUP
@@ -170,12 +134,48 @@ config LAST_SYSTEM_ID
         help
           Last valid system uid or gid for adduser and addgroup
 
+config ADDGROUP
+        bool "addgroup"
+        default y
+        help
+          Utility for creating a new group account.
+
+config FEATURE_ADDGROUP_LONG_OPTIONS
+        bool "Enable long options"
+        default y
+        depends on ADDGROUP && LONG_OPTS
+        help
+          Support long options for the addgroup applet.
+
+config FEATURE_ADDUSER_TO_GROUP
+        bool "Support for adding users to groups"
+        default y
+        depends on ADDGROUP
+        help
+          If  called  with two non-option arguments,
+          addgroup will add an existing user to an
+          existing group.
+
 config DELUSER
         bool "deluser"
         default y
         help
           Utility for deleting a user account.
 
+config DELGROUP
+        bool "delgroup"
+        default y
+        help
+          Utility for deleting a group account.
+
+config FEATURE_DEL_USER_FROM_GROUP
+        bool "Support for removing users from groups"
+        default y
+        depends on DELGROUP
+        help
+          If called with two non-option arguments, deluser
+          or delgroup will remove an user from a specified group.
+
 config GETTY
         bool "getty"
         default y