diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | servconf.c | 22 | ||||
-rw-r--r-- | servconf.h | 3 | ||||
-rw-r--r-- | session.c | 21 | ||||
-rw-r--r-- | sshd.8 | 8 |
5 files changed, 21 insertions, 41 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20010912 | ||
2 | - (bal) OpenBSD CVS Sync | ||
3 | - jakob@cvs.openbsd.org 2001/08/16 19:18:34 | ||
4 | [servconf.c servconf.h session.c sshd.8] | ||
5 | deprecate CheckMail. ok markus@ | ||
6 | |||
1 | 20010815 | 7 | 20010815 |
2 | - (bal) Fixed stray code in readconf.c that went in by mistake. | 8 | - (bal) Fixed stray code in readconf.c that went in by mistake. |
3 | - OpenBSD CVS Sync | 9 | - OpenBSD CVS Sync |
@@ -6320,4 +6326,4 @@ | |||
6320 | - Wrote replacements for strlcpy and mkdtemp | 6326 | - Wrote replacements for strlcpy and mkdtemp |
6321 | - Released 1.0pre1 | 6327 | - Released 1.0pre1 |
6322 | 6328 | ||
6323 | $Id: ChangeLog,v 1.1484 2001/08/16 00:09:49 mouring Exp $ | 6329 | $Id: ChangeLog,v 1.1485 2001/09/12 16:32:14 mouring Exp $ |
diff --git a/servconf.c b/servconf.c index 0f16c851e..6297143f1 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: servconf.c,v 1.88 2001/07/11 00:24:53 itojun Exp $"); | 13 | RCSID("$OpenBSD: servconf.c,v 1.89 2001/08/16 19:18:34 jakob Exp $"); |
14 | 14 | ||
15 | #if defined(KRB4) || defined(KRB5) | 15 | #if defined(KRB4) || defined(KRB5) |
16 | #include <krb.h> | 16 | #include <krb.h> |
@@ -56,7 +56,6 @@ initialize_server_options(ServerOptions *options) | |||
56 | options->ignore_user_known_hosts = -1; | 56 | options->ignore_user_known_hosts = -1; |
57 | options->print_motd = -1; | 57 | options->print_motd = -1; |
58 | options->print_lastlog = -1; | 58 | options->print_lastlog = -1; |
59 | options->check_mail = -1; | ||
60 | options->x11_forwarding = -1; | 59 | options->x11_forwarding = -1; |
61 | options->x11_display_offset = -1; | 60 | options->x11_display_offset = -1; |
62 | options->xauth_location = NULL; | 61 | options->xauth_location = NULL; |
@@ -138,8 +137,6 @@ fill_default_server_options(ServerOptions *options) | |||
138 | options->ignore_rhosts = 1; | 137 | options->ignore_rhosts = 1; |
139 | if (options->ignore_user_known_hosts == -1) | 138 | if (options->ignore_user_known_hosts == -1) |
140 | options->ignore_user_known_hosts = 0; | 139 | options->ignore_user_known_hosts = 0; |
141 | if (options->check_mail == -1) | ||
142 | options->check_mail = 0; | ||
143 | if (options->print_motd == -1) | 140 | if (options->print_motd == -1) |
144 | options->print_motd = 1; | 141 | options->print_motd = 1; |
145 | if (options->print_lastlog == -1) | 142 | if (options->print_lastlog == -1) |
@@ -241,7 +238,7 @@ typedef enum { | |||
241 | sPasswordAuthentication, sKbdInteractiveAuthentication, sListenAddress, | 238 | sPasswordAuthentication, sKbdInteractiveAuthentication, sListenAddress, |
242 | sPrintMotd, sPrintLastLog, sIgnoreRhosts, | 239 | sPrintMotd, sPrintLastLog, sIgnoreRhosts, |
243 | sX11Forwarding, sX11DisplayOffset, | 240 | sX11Forwarding, sX11DisplayOffset, |
244 | sStrictModes, sEmptyPasswd, sKeepAlives, sCheckMail, | 241 | sStrictModes, sEmptyPasswd, sKeepAlives, |
245 | sUseLogin, sAllowTcpForwarding, | 242 | sUseLogin, sAllowTcpForwarding, |
246 | sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups, | 243 | sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups, |
247 | sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile, | 244 | sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile, |
@@ -249,7 +246,7 @@ typedef enum { | |||
249 | sBanner, sReverseMappingCheck, sHostbasedAuthentication, | 246 | sBanner, sReverseMappingCheck, sHostbasedAuthentication, |
250 | sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, | 247 | sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, |
251 | sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, | 248 | sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, |
252 | sPAMAuthenticationViaKbdInt | 249 | sDeprecated, sPAMAuthenticationViaKbdInt |
253 | } ServerOpCodes; | 250 | } ServerOpCodes; |
254 | 251 | ||
255 | /* Textual representation of the tokens. */ | 252 | /* Textual representation of the tokens. */ |
@@ -289,7 +286,7 @@ static struct { | |||
289 | { "kbdinteractiveauthentication", sKbdInteractiveAuthentication }, | 286 | { "kbdinteractiveauthentication", sKbdInteractiveAuthentication }, |
290 | { "challengeresponseauthentication", sChallengeResponseAuthentication }, | 287 | { "challengeresponseauthentication", sChallengeResponseAuthentication }, |
291 | { "skeyauthentication", sChallengeResponseAuthentication }, /* alias */ | 288 | { "skeyauthentication", sChallengeResponseAuthentication }, /* alias */ |
292 | { "checkmail", sCheckMail }, | 289 | { "checkmail", sDeprecated }, |
293 | { "listenaddress", sListenAddress }, | 290 | { "listenaddress", sListenAddress }, |
294 | { "printmotd", sPrintMotd }, | 291 | { "printmotd", sPrintMotd }, |
295 | { "printlastlog", sPrintLastLog }, | 292 | { "printlastlog", sPrintLastLog }, |
@@ -625,10 +622,6 @@ parse_flag: | |||
625 | intptr = &options->kbd_interactive_authentication; | 622 | intptr = &options->kbd_interactive_authentication; |
626 | goto parse_flag; | 623 | goto parse_flag; |
627 | 624 | ||
628 | case sCheckMail: | ||
629 | intptr = &options->check_mail; | ||
630 | goto parse_flag; | ||
631 | |||
632 | case sChallengeResponseAuthentication: | 625 | case sChallengeResponseAuthentication: |
633 | intptr = &options->challenge_response_authentication; | 626 | intptr = &options->challenge_response_authentication; |
634 | goto parse_flag; | 627 | goto parse_flag; |
@@ -842,6 +835,13 @@ parse_flag: | |||
842 | intptr = &options->client_alive_count_max; | 835 | intptr = &options->client_alive_count_max; |
843 | goto parse_int; | 836 | goto parse_int; |
844 | 837 | ||
838 | case sDeprecated: | ||
839 | log("%s line %d: Deprecated option %s", | ||
840 | filename, linenum, arg); | ||
841 | while(arg) | ||
842 | arg = strdelim(&cp); | ||
843 | break; | ||
844 | |||
845 | case sPAMAuthenticationViaKbdInt: | 845 | case sPAMAuthenticationViaKbdInt: |
846 | intptr = &options->pam_authentication_via_kbd_int; | 846 | intptr = &options->pam_authentication_via_kbd_int; |
847 | goto parse_flag; | 847 | goto parse_flag; |
diff --git a/servconf.h b/servconf.h index 55f2ee287..ec38880c3 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.47 2001/06/26 17:27:24 markus Exp $"); */ | 14 | /* RCSID("$OpenBSD: servconf.h,v 1.48 2001/08/16 19:18:34 jakob Exp $"); */ |
15 | 15 | ||
16 | #ifndef SERVCONF_H | 16 | #ifndef SERVCONF_H |
17 | #define SERVCONF_H | 17 | #define SERVCONF_H |
@@ -52,7 +52,6 @@ typedef struct { | |||
52 | * for RhostsRsaAuth */ | 52 | * for RhostsRsaAuth */ |
53 | int print_motd; /* If true, print /etc/motd. */ | 53 | int print_motd; /* If true, print /etc/motd. */ |
54 | int print_lastlog; /* If true, print lastlog */ | 54 | int print_lastlog; /* If true, print lastlog */ |
55 | int check_mail; /* If true, check for new mail. */ | ||
56 | int x11_forwarding; /* If true, permit inet (spoofing) X11 fwd. */ | 55 | int x11_forwarding; /* If true, permit inet (spoofing) X11 fwd. */ |
57 | int x11_display_offset; /* What DISPLAY number to start | 56 | int x11_display_offset; /* What DISPLAY number to start |
58 | * searching at */ | 57 | * searching at */ |
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.99 2001/07/09 07:04:53 deraadt Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.100 2001/08/16 19:18:34 jakob Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -1459,25 +1459,6 @@ do_child(Session *s, const char *command) | |||
1459 | if (!options.use_login) { | 1459 | if (!options.use_login) { |
1460 | char buf[256]; | 1460 | char buf[256]; |
1461 | 1461 | ||
1462 | /* | ||
1463 | * Check for mail if we have a tty and it was enabled | ||
1464 | * in server options. | ||
1465 | */ | ||
1466 | if (s->ttyfd != -1 && options.check_mail) { | ||
1467 | char *mailbox; | ||
1468 | struct stat mailstat; | ||
1469 | |||
1470 | mailbox = getenv("MAIL"); | ||
1471 | if (mailbox != NULL) { | ||
1472 | if (stat(mailbox, &mailstat) != 0 || | ||
1473 | mailstat.st_size == 0) | ||
1474 | printf("No mail.\n"); | ||
1475 | else if (mailstat.st_mtime < mailstat.st_atime) | ||
1476 | printf("You have mail.\n"); | ||
1477 | else | ||
1478 | printf("You have new mail.\n"); | ||
1479 | } | ||
1480 | } | ||
1481 | /* Start the shell. Set initial character to '-'. */ | 1462 | /* Start the shell. Set initial character to '-'. */ |
1482 | buf[0] = '-'; | 1463 | buf[0] = '-'; |
1483 | strncpy(buf + 1, cp, sizeof(buf) - 1); | 1464 | strncpy(buf + 1, cp, sizeof(buf) - 1); |
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: sshd.8,v 1.139 2001/08/01 22:16:45 markus Exp $ | 37 | .\" $OpenBSD: sshd.8,v 1.140 2001/08/16 19:18:34 jakob Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD 8 | 39 | .Dt SSHD 8 |
40 | .Os | 40 | .Os |
@@ -367,12 +367,6 @@ All authentication styles from | |||
367 | are supported. | 367 | are supported. |
368 | The default is | 368 | The default is |
369 | .Dq yes . | 369 | .Dq yes . |
370 | .It Cm CheckMail | ||
371 | Specifies whether | ||
372 | .Nm | ||
373 | should check for new mail for interactive logins. | ||
374 | The default is | ||
375 | .Dq no . | ||
376 | .It Cm Ciphers | 370 | .It Cm Ciphers |
377 | Specifies the ciphers allowed for protocol version 2. | 371 | Specifies the ciphers allowed for protocol version 2. |
378 | Multiple ciphers must be comma-separated. | 372 | Multiple ciphers must be comma-separated. |