diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-15 03:08:27 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-15 03:08:27 +0000 |
commit | d8a9021f3652d8ab99d0fed2460420c3eb4e10a2 (patch) | |
tree | a736e9a286d99325d80815c85f3353c1fa347d82 /servconf.h | |
parent | 06b33aa0e83163f3dcd679317afec1ee95910512 (diff) |
- 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)
Diffstat (limited to 'servconf.h')
-rw-r--r-- | servconf.h | 12 |
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 @@ | |||
11 | * called by a name other than "ssh" or "Secure Shell". | 11 | * called by a name other than "ssh" or "Secure Shell". |
12 | */ | 12 | */ |
13 | 13 | ||
14 | /* RCSID("$OpenBSD: servconf.h,v 1.37 2001/02/11 12:59:25 markus Exp $"); */ | 14 | /* RCSID("$OpenBSD: servconf.h,v 1.38 2001/02/12 16:16:23 markus Exp $"); */ |
15 | 15 | ||
16 | #ifndef SERVCONF_H | 16 | #ifndef SERVCONF_H |
17 | #define SERVCONF_H | 17 | #define SERVCONF_H |
@@ -25,6 +25,14 @@ | |||
25 | #define MAX_SUBSYSTEMS 256 /* Max # subsystems. */ | 25 | #define MAX_SUBSYSTEMS 256 /* Max # subsystems. */ |
26 | #define MAX_HOSTKEYS 256 /* Max # hostkeys. */ | 26 | #define MAX_HOSTKEYS 256 /* Max # hostkeys. */ |
27 | 27 | ||
28 | /* permit_root_login */ | ||
29 | #define PERMIT_NOT_SET -1 | ||
30 | #define PERMIT_NO 0 | ||
31 | #define PERMIT_FORCED_ONLY 1 | ||
32 | #define PERMIT_NO_PASSWD 2 | ||
33 | #define PERMIT_YES 3 | ||
34 | |||
35 | |||
28 | typedef struct { | 36 | typedef struct { |
29 | u_int num_ports; | 37 | u_int num_ports; |
30 | u_int ports_from_cmdline; | 38 | u_int ports_from_cmdline; |
@@ -38,7 +46,7 @@ typedef struct { | |||
38 | int login_grace_time; /* Disconnect if no auth in this time | 46 | int login_grace_time; /* Disconnect if no auth in this time |
39 | * (sec). */ | 47 | * (sec). */ |
40 | int key_regeneration_time; /* Server key lifetime (seconds). */ | 48 | int key_regeneration_time; /* Server key lifetime (seconds). */ |
41 | int permit_root_login; /* If true, permit root login. */ | 49 | int permit_root_login; /* PERMIT_*, see above */ |
42 | int ignore_rhosts; /* Ignore .rhosts and .shosts. */ | 50 | int ignore_rhosts; /* Ignore .rhosts and .shosts. */ |
43 | int ignore_user_known_hosts; /* Ignore ~/.ssh/known_hosts | 51 | int ignore_user_known_hosts; /* Ignore ~/.ssh/known_hosts |
44 | * for RhostsRsaAuth */ | 52 | * for RhostsRsaAuth */ |