- markus@cvs.openbsd.org 2001/02/12 16:16:23

     [auth-passwd.c auth.c auth.h auth1.c auth2.c servconf.c servconf.h
      ssh-keygen.c sshd.8]
     PermitRootLogin={yes,without-password,forced-commands-only,no}
     (before this change, root could login even if PermitRootLogin==no)

1 files changed, 10 insertions, 2 deletions

diff --git a/servconf.h b/servconf.h
index 8236a6391..1009ce217 100644
--- a/servconf.h
+++ b/servconf.h
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: servconf.h,v 1.37 2001/02/11 12:59:25 markus Exp $"); */
+/* RCSID("$OpenBSD: servconf.h,v 1.38 2001/02/12 16:16:23 markus Exp $"); */
 
 #ifndef SERVCONF_H
 #define SERVCONF_H
@@ -25,6 +25,14 @@
 #define MAX_SUBSYSTEMS          256     /* Max # subsystems. */
 #define MAX_HOSTKEYS            256     /* Max # hostkeys. */
 
+/* permit_root_login */
+#define PERMIT_NOT_SET          -1
+#define PERMIT_NO               0
+#define PERMIT_FORCED_ONLY      1
+#define PERMIT_NO_PASSWD        2
+#define PERMIT_YES              3
+
+
 typedef struct {
         u_int num_ports;
         u_int ports_from_cmdline;
@@ -38,7 +46,7 @@ typedef struct {
         int     login_grace_time;       /* Disconnect if no auth in this time
                                          * (sec). */
         int     key_regeneration_time;  /* Server key lifetime (seconds). */
-        int     permit_root_login;      /* If true, permit root login. */
+        int     permit_root_login;      /* PERMIT_*, see above */
         int     ignore_rhosts;  /* Ignore .rhosts and .shosts. */
         int     ignore_user_known_hosts;        /* Ignore ~/.ssh/known_hosts
                                                  * for RhostsRsaAuth */