diff options
Diffstat (limited to 'loginutils')
-rw-r--r-- | loginutils/cryptpw.c | 4 | ||||
-rw-r--r-- | loginutils/getty.c | 4 | ||||
-rw-r--r-- | loginutils/sulogin.c | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/loginutils/cryptpw.c b/loginutils/cryptpw.c index 23a1884f4..9f5f40686 100644 --- a/loginutils/cryptpw.c +++ b/loginutils/cryptpw.c | |||
@@ -111,8 +111,8 @@ int cryptpw_main(int argc UNUSED_PARAM, char **argv) | |||
111 | opt_m = CONFIG_FEATURE_DEFAULT_PASSWD_ALGO; | 111 | opt_m = CONFIG_FEATURE_DEFAULT_PASSWD_ALGO; |
112 | opt_S = NULL; | 112 | opt_S = NULL; |
113 | /* at most two non-option arguments; -P NUM */ | 113 | /* at most two non-option arguments; -P NUM */ |
114 | opt_complementary = "?2:P+"; | 114 | opt_complementary = "?2"; |
115 | getopt32(argv, "sP:S:m:a:", &fd, &opt_S, &opt_m, &opt_m); | 115 | getopt32(argv, "sP:+S:m:a:", &fd, &opt_S, &opt_m, &opt_m); |
116 | argv += optind; | 116 | argv += optind; |
117 | 117 | ||
118 | /* have no idea how to handle -s... */ | 118 | /* have no idea how to handle -s... */ |
diff --git a/loginutils/getty.c b/loginutils/getty.c index b10bdbdbf..162c1697e 100644 --- a/loginutils/getty.c +++ b/loginutils/getty.c | |||
@@ -131,7 +131,7 @@ struct globals { | |||
131 | //usage: "\n" | 131 | //usage: "\n" |
132 | //usage: "\nBAUD_RATE of 0 leaves it unchanged" | 132 | //usage: "\nBAUD_RATE of 0 leaves it unchanged" |
133 | 133 | ||
134 | static const char opt_string[] ALIGN1 = "I:LH:f:hil:mt:wn"; | 134 | static const char opt_string[] ALIGN1 = "I:LH:f:hil:mt:+wn"; |
135 | #define F_INITSTRING (1 << 0) /* -I */ | 135 | #define F_INITSTRING (1 << 0) /* -I */ |
136 | #define F_LOCAL (1 << 1) /* -L */ | 136 | #define F_LOCAL (1 << 1) /* -L */ |
137 | #define F_FAKEHOST (1 << 2) /* -H */ | 137 | #define F_FAKEHOST (1 << 2) /* -H */ |
@@ -179,7 +179,7 @@ static void parse_args(char **argv) | |||
179 | char *ts; | 179 | char *ts; |
180 | int flags; | 180 | int flags; |
181 | 181 | ||
182 | opt_complementary = "-2:t+"; /* at least 2 args; -t N */ | 182 | opt_complementary = "-2"; /* at least 2 args; -t N */ |
183 | flags = getopt32(argv, opt_string, | 183 | flags = getopt32(argv, opt_string, |
184 | &G.initstring, &G.fakehost, &G.issue, | 184 | &G.initstring, &G.fakehost, &G.issue, |
185 | &G.login, &G.timeout | 185 | &G.login, &G.timeout |
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c index f32469551..6befea933 100644 --- a/loginutils/sulogin.c +++ b/loginutils/sulogin.c | |||
@@ -43,8 +43,7 @@ int sulogin_main(int argc UNUSED_PARAM, char **argv) | |||
43 | logmode = LOGMODE_BOTH; | 43 | logmode = LOGMODE_BOTH; |
44 | openlog(applet_name, 0, LOG_AUTH); | 44 | openlog(applet_name, 0, LOG_AUTH); |
45 | 45 | ||
46 | opt_complementary = "t+"; /* -t N */ | 46 | getopt32(argv, "t:+", &timeout); |
47 | getopt32(argv, "t:", &timeout); | ||
48 | argv += optind; | 47 | argv += optind; |
49 | 48 | ||
50 | if (argv[0]) { | 49 | if (argv[0]) { |