summaryrefslogtreecommitdiffstats
path: root/login-utils
diff options
context:
space:
mode:
authorKarel Zak2012-09-05 11:26:20 +0200
committerKarel Zak2012-09-05 11:26:20 +0200
commitbda67d64de47bd6e3c04bb163e76517e78dfd5db (patch)
tree0326e6762a25ef9dbe952b3e7e8c98dd8975f3cd /login-utils
parentsu: verify writing to streams was successful (diff)
downloadkernel-qcow2-util-linux-bda67d64de47bd6e3c04bb163e76517e78dfd5db.tar.gz
kernel-qcow2-util-linux-bda67d64de47bd6e3c04bb163e76517e78dfd5db.tar.xz
kernel-qcow2-util-linux-bda67d64de47bd6e3c04bb163e76517e78dfd5db.zip
su: move long options to main()
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'login-utils')
-rw-r--r--login-utils/su-common.c29
1 files changed, 14 insertions, 15 deletions
diff --git a/login-utils/su-common.c b/login-utils/su-common.c
index 65ecc24af..23ad57dc3 100644
--- a/login-utils/su-common.c
+++ b/login-utils/su-common.c
@@ -115,21 +115,6 @@ static pam_handle_t *pamh = NULL;
static int restricted = 1; /* zero for root user */
-static struct option const longopts[] =
-{
- {"command", required_argument, NULL, 'c'},
- {"session-command", required_argument, NULL, 'C'},
- {"fast", no_argument, NULL, 'f'},
- {"login", no_argument, NULL, 'l'},
- {"preserve-environment", no_argument, NULL, 'p'},
- {"shell", required_argument, NULL, 's'},
- {"group", required_argument, NULL, 'g'},
- {"supp-group", required_argument, NULL, 'G'},
- {"help", no_argument, 0, 'h'},
- {"version", no_argument, 0, 'V'},
- {NULL, 0, NULL, 0}
-};
-
static struct passwd *
current_getpwuid(void)
@@ -780,6 +765,20 @@ su_main (int argc, char **argv, int mode)
int num_supp_groups = 0;
int use_gid = 0;
+ static const struct option longopts[] = {
+ {"command", required_argument, NULL, 'c'},
+ {"session-command", required_argument, NULL, 'C'},
+ {"fast", no_argument, NULL, 'f'},
+ {"login", no_argument, NULL, 'l'},
+ {"preserve-environment", no_argument, NULL, 'p'},
+ {"shell", required_argument, NULL, 's'},
+ {"group", required_argument, NULL, 'g'},
+ {"supp-group", required_argument, NULL, 'G'},
+ {"help", no_argument, 0, 'h'},
+ {"version", no_argument, 0, 'V'},
+ {NULL, 0, NULL, 0}
+ };
+
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);