1 # The man page change here is Solaris-specific and thus is not being |
1 # The man page change here is Solaris-specific and thus is not being |
2 # contributed back to the upstream community. The servconf.c change |
2 # contributed back to the upstream community. The servconf.c change |
3 # was developed in-house and has been submitted upstream to OpenSSH for |
3 # was developed in-house and has been submitted upstream to OpenSSH for |
4 # their consideration: |
4 # their consideration: |
5 # https://bugzilla.mindrot.org/show_bug.cgi?id=2278 |
5 # https://bugzilla.mindrot.org/show_bug.cgi?id=2278 |
|
6 # |
|
7 # Update - accepted upstream: |
|
8 # https://github.com/openssh/openssh-portable/commit/ac908c1eeacccfa |
6 # |
9 # |
7 # OpenSSH normally updates lastlog when users login and reads lastlog to |
10 # OpenSSH normally updates lastlog when users login and reads lastlog to |
8 # determine the last login time of the user however on Solaris the |
11 # determine the last login time of the user however on Solaris the |
9 # pam_unix_session(5) module handles both of these tasks so we compile |
12 # pam_unix_session(5) module handles both of these tasks so we compile |
10 # OpenSSH with --disable-lastlog to disable all lastlog references. |
13 # OpenSSH with --disable-lastlog to disable all lastlog references. |
11 # This means the sshd_config option of PrintLastLog is now ignored and |
14 # This means the sshd_config option of PrintLastLog is now ignored and |
12 # can't be changed so we update sshd's configuration parsing to flag |
15 # can't be changed so we update sshd's configuration parsing to flag |
13 # this as unsupported and update the man page here. |
16 # this as unsupported and update the man page here. |
14 # |
17 # |
15 diff -pur old/servconf.c new/servconf.c |
|
16 --- old/servconf.c |
|
17 +++ new/servconf.c |
|
18 @@ -504,7 +504,11 @@ static struct { |
|
19 { "listenaddress", sListenAddress, SSHCFG_GLOBAL }, |
|
20 { "addressfamily", sAddressFamily, SSHCFG_GLOBAL }, |
|
21 { "printmotd", sPrintMotd, SSHCFG_GLOBAL }, |
|
22 +#ifdef DISABLE_LASTLOG |
|
23 + { "printlastlog", sUnsupported, SSHCFG_GLOBAL }, |
|
24 +#else |
|
25 { "printlastlog", sPrintLastLog, SSHCFG_GLOBAL }, |
|
26 +#endif |
|
27 { "ignorerhosts", sIgnoreRhosts, SSHCFG_GLOBAL }, |
|
28 { "ignoreuserknownhosts", sIgnoreUserKnownHosts, SSHCFG_GLOBAL }, |
|
29 { "x11forwarding", sX11Forwarding, SSHCFG_ALL }, |
|
30 @@ -2268,7 +2272,9 @@ dump_config(ServerOptions *o) |
|
31 dump_cfg_fmtint(sChallengeResponseAuthentication, |
|
32 o->challenge_response_authentication); |
|
33 dump_cfg_fmtint(sPrintMotd, o->print_motd); |
|
34 +#ifndef DISABLE_LASTLOG |
|
35 dump_cfg_fmtint(sPrintLastLog, o->print_lastlog); |
|
36 +#endif /* !DISABLE_LASTLOG */ |
|
37 dump_cfg_fmtint(sX11Forwarding, o->x11_forwarding); |
|
38 dump_cfg_fmtint(sX11UseLocalhost, o->x11_use_localhost); |
|
39 dump_cfg_fmtint(sPermitTTY, o->permit_tty); |
|
40 diff -pur old/sshd_config.5 new/sshd_config.5 |
18 diff -pur old/sshd_config.5 new/sshd_config.5 |
41 --- old/sshd_config.5 |
19 --- old/sshd_config.5 |
42 +++ new/sshd_config.5 |
20 +++ new/sshd_config.5 |
43 @@ -1300,8 +1300,8 @@ Specifies whether |
21 @@ -1300,8 +1300,8 @@ Specifies whether |
44 .Xr sshd 8 |
22 .Xr sshd 8 |