Correctly handle the --no-root-login option.

774c181e · Ludovic Courtès · Niels Möller · 05800b50 · 774c181e · 774c181e
Commit 774c181e authored Mar 29, 2013 by Ludovic Courtès Committed by Niels Möller Mar 29, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

ChangeLog ChangeLog +2 -0

src/lshd.c src/lshd.c +4 -0

No files found.
--- a/ChangeLog
+++ b/ChangeLog
 2013-03-29  Niels Mller  <nisse@lysator.liu.se>

 	From Ludovic Courts:
+	* src/lshd.c (main_argp_parser): Correctly handle the
+	`--no-root-login' option.
 	* src/lsh-pam-checkpw.c (SERVICE_NAME): Use the more descriptive
 	name "lshd".


--- a/src/lshd.c
+++ b/src/lshd.c
@@ -758,6 +758,10 @@ main_argp_parser(int key, char *arg, struct argp_state *state)
      self->allow_root = 1;
      break;

+    case OPT_NO_ROOT_LOGIN:
+      self->allow_root = 0;
+      break;
+
    case OPT_KERBEROS_PASSWD:
      self->pw_helper = PATH_KERBEROS_HELPER;
      break;