1 # This change is Solaris-specific and thus is not being contributed back |
1 # The man page change here is Solaris-specific and thus is not being |
2 # to the upstream community. Details: |
2 # contributed back to the upstream community. The servconf.c change |
|
3 # was developed in-house and has been submitted upstream to OpenSSH for |
|
4 # their consideration: |
|
5 # https://bugzilla.mindrot.org/show_bug.cgi?id=2278 |
3 # |
6 # |
4 # OpenSSH updates lastlog when users login however on Solaris the |
7 # OpenSSH normally updates lastlog when users login and reads lastlog to |
5 # pam_open_session(3PAM) function handles this so we avoid the |
8 # determine the last login time of the user however on Solaris the |
6 # redundant additional upating of lastlog here. We can't disable all |
9 # pam_unix_session(5) module handles both of these tasks so we compile |
7 # lastlog references with --disable-lastlog or NO_SSH_LASTLOG since that |
10 # OpenSSH with --disable-lastlog to disable all lastlog references. |
8 # prevents the 'Last login: ...' message from being displayed. Thus |
11 # This means the sshd_config option of PrintLastLog is now ignored and |
9 # we just prevent OpenSSH from updating lastlog since reading from |
12 # can't be changed so we update sshd's configuration parsing to flag |
10 # lastlog is fine. Other PAM implementations don't update lastlog |
13 # this as unsupported and update the man page here. |
11 # during session management so this change is Solaris-specific and |
|
12 # thus isn't being contributed back to the upstream community. |
|
13 # |
14 # |
14 *** orig/loginrec.c Thu Oct 4 16:08:42 2012 |
15 *** old/servconf.c Wed Sep 17 02:54:26 2014 |
15 --- new/loginrec.c Thu Sep 4 16:41:24 2014 |
16 --- new/servconf.c Wed Sep 17 02:56:55 2014 |
16 *************** |
17 *************** |
17 *** 444,450 **** |
18 *** 432,438 **** |
18 #ifdef USE_LOGIN |
19 --- 432,442 ---- |
19 syslogin_write_entry(li); |
20 { "listenaddress", sListenAddress, SSHCFG_GLOBAL }, |
20 #endif |
21 { "addressfamily", sAddressFamily, SSHCFG_GLOBAL }, |
21 ! #ifdef USE_LASTLOG |
22 { "printmotd", sPrintMotd, SSHCFG_GLOBAL }, |
22 if (li->type == LTYPE_LOGIN) |
23 + #ifdef DISABLE_LASTLOG |
23 lastlog_write_entry(li); |
24 + { "printlastlog", sUnsupported, SSHCFG_GLOBAL }, |
24 #endif |
25 + #else |
25 --- 444,450 ---- |
26 { "printlastlog", sPrintLastLog, SSHCFG_GLOBAL }, |
26 #ifdef USE_LOGIN |
27 + #endif |
27 syslogin_write_entry(li); |
28 { "ignorerhosts", sIgnoreRhosts, SSHCFG_GLOBAL }, |
28 #endif |
29 { "ignoreuserknownhosts", sIgnoreUserKnownHosts, SSHCFG_GLOBAL }, |
29 ! #if defined(USE_LASTLOG) && !defined(PAM_SUN_CODEBASE) |
30 { "x11forwarding", sX11Forwarding, SSHCFG_ALL }, |
30 if (li->type == LTYPE_LOGIN) |
31 *** old/sshd_config.5 Tue Sep 16 06:24:13 2014 |
31 lastlog_write_entry(li); |
32 --- new/sshd_config.5 Tue Sep 16 06:47:47 2014 |
32 #endif |
33 *************** |
|
34 *** 1008,1015 **** |
|
35 .Xr sshd 1M |
|
36 should print the date and time of the last user login when a user logs |
|
37 in interactively. |
|
38 ! The default is |
|
39 ! .Dq yes . |
|
40 .It Cm PrintMotd |
|
41 Specifies whether |
|
42 .Xr sshd 1M |
|
43 --- 1008,1015 ---- |
|
44 .Xr sshd 1M |
|
45 should print the date and time of the last user login when a user logs |
|
46 in interactively. |
|
47 ! On Solaris this option is always ignored since pam_unix_session(5) |
|
48 ! reports the last login time. |
|
49 .It Cm PrintMotd |
|
50 Specifies whether |
|
51 .Xr sshd 1M |
|
52 *************** |
|
53 *** 1349,1355 **** |
|
54 (though not necessary) that it be world-readable. |
|
55 .El |
|
56 .Sh SEE ALSO |
|
57 ! .Xr sshd 8 |
|
58 .Sh AUTHORS |
|
59 OpenSSH is a derivative of the original and free |
|
60 ssh 1.2.12 release by Tatu Ylonen. |
|
61 --- 1349,1356 ---- |
|
62 (though not necessary) that it be world-readable. |
|
63 .El |
|
64 .Sh SEE ALSO |
|
65 ! .Xr sshd 8 , |
|
66 ! .Xr pam_unix_session 5 |
|
67 .Sh AUTHORS |
|
68 OpenSSH is a derivative of the original and free |
|
69 ssh 1.2.12 release by Tatu Ylonen. |