author | Jan Parcel <jan.parcel@oracle.com> |
Mon, 25 Jan 2016 10:57:40 -0800 | |
branch | s11u3-sru |
changeset 5324 | 5683175b6e99 |
parent 3946 | b1e0e68de63b |
child 6076 | 0d5715bee554 |
permissions | -rw-r--r-- |
3946
b1e0e68de63b
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
1 |
# The man page change here is Solaris-specific and thus is not being |
b1e0e68de63b
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
2 |
# contributed back to the upstream community. The servconf.c change |
b1e0e68de63b
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
3 |
# was developed in-house and has been submitted upstream to OpenSSH for |
b1e0e68de63b
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
4 |
# their consideration: |
b1e0e68de63b
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
5 |
# https://bugzilla.mindrot.org/show_bug.cgi?id=2278 |
b1e0e68de63b
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
6 |
# |
b1e0e68de63b
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
7 |
# OpenSSH normally updates lastlog when users login and reads lastlog to |
b1e0e68de63b
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
8 |
# determine the last login time of the user however on Solaris the |
b1e0e68de63b
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
9 |
# pam_unix_session(5) module handles both of these tasks so we compile |
b1e0e68de63b
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
10 |
# OpenSSH with --disable-lastlog to disable all lastlog references. |
b1e0e68de63b
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
11 |
# This means the sshd_config option of PrintLastLog is now ignored and |
b1e0e68de63b
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
12 |
# can't be changed so we update sshd's configuration parsing to flag |
b1e0e68de63b
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
13 |
# this as unsupported and update the man page here. |
b1e0e68de63b
PSARC 2012/335 OpenSSH migration
Huie-Ying Lee <huieying.lee@oracle.com>
parents:
diff
changeset
|
14 |
# |
5324
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
15 |
diff -pur old/servconf.c new/servconf.c |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
16 |
--- old/servconf.c |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
17 |
+++ new/servconf.c |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
18 |
@@ -504,7 +504,11 @@ static struct { |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
19 |
{ "listenaddress", sListenAddress, SSHCFG_GLOBAL }, |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
20 |
{ "addressfamily", sAddressFamily, SSHCFG_GLOBAL }, |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
21 |
{ "printmotd", sPrintMotd, SSHCFG_GLOBAL }, |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
22 |
+#ifdef DISABLE_LASTLOG |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
23 |
+ { "printlastlog", sUnsupported, SSHCFG_GLOBAL }, |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
24 |
+#else |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
25 |
{ "printlastlog", sPrintLastLog, SSHCFG_GLOBAL }, |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
26 |
+#endif |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
27 |
{ "ignorerhosts", sIgnoreRhosts, SSHCFG_GLOBAL }, |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
28 |
{ "ignoreuserknownhosts", sIgnoreUserKnownHosts, SSHCFG_GLOBAL }, |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
29 |
{ "x11forwarding", sX11Forwarding, SSHCFG_ALL }, |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
30 |
@@ -2268,7 +2272,9 @@ dump_config(ServerOptions *o) |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
31 |
dump_cfg_fmtint(sChallengeResponseAuthentication, |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
32 |
o->challenge_response_authentication); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
33 |
dump_cfg_fmtint(sPrintMotd, o->print_motd); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
34 |
+#ifndef DISABLE_LASTLOG |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
35 |
dump_cfg_fmtint(sPrintLastLog, o->print_lastlog); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
36 |
+#endif /* !DISABLE_LASTLOG */ |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
37 |
dump_cfg_fmtint(sX11Forwarding, o->x11_forwarding); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
38 |
dump_cfg_fmtint(sX11UseLocalhost, o->x11_use_localhost); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
39 |
dump_cfg_fmtint(sPermitTTY, o->permit_tty); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
40 |
diff -pur old/sshd_config.5 new/sshd_config.5 |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
41 |
--- old/sshd_config.5 |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
42 |
+++ new/sshd_config.5 |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
43 |
@@ -1300,8 +1300,8 @@ Specifies whether |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
44 |
.Xr sshd 8 |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
45 |
should print the date and time of the last user login when a user logs |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
46 |
in interactively. |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
47 |
-The default is |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
48 |
-.Dq yes . |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
49 |
+On Solaris this option is always ignored since pam_unix_session(5) |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
50 |
+reports the last login time. |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
51 |
.It Cm PrintMotd |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
52 |
Specifies whether |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
53 |
.Xr sshd 8 |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
54 |
@@ -1721,7 +1721,8 @@ This file should be writable by root onl |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
55 |
(though not necessary) that it be world-readable. |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
56 |
.El |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
57 |
.Sh SEE ALSO |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
58 |
-.Xr sshd 8 |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
59 |
+.Xr sshd 8 , |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
60 |
+.Xr pam_unix_session 5 |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
61 |
.Sh AUTHORS |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
62 |
OpenSSH is a derivative of the original and free |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
3946
diff
changeset
|
63 |
ssh 1.2.12 release by Tatu Ylonen. |