summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--sshd.88
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index f6aa78cee..9eebcdebe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,12 @@
10 - markus@cvs.openbsd.org 2002/09/24 08:46:04 10 - markus@cvs.openbsd.org 2002/09/24 08:46:04
11 [monitor.c] 11 [monitor.c]
12 only call kerberos code for authctxt->valid 12 only call kerberos code for authctxt->valid
13 - todd@cvs.openbsd.org 2002/09/24 20:59:44
14 [sshd.8]
15 tweak the example $HOME/.ssh/rc script to not show on any cmdline the
16 sensitive data it handles. This fixes bug # 402 as reported by
17 kolya@mit.edu (Nickolai Zeldovich).
18 ok markus@ and stevesk@
13 19
1420020923 2020020923
15 - (tim) [configure.ac] s/return/exit/ patch by dtucker@zip.com.au 21 - (tim) [configure.ac] s/return/exit/ patch by dtucker@zip.com.au
@@ -709,4 +715,4 @@
709 save auth method before monitor_reset_key_state(); bugzilla bug #284; 715 save auth method before monitor_reset_key_state(); bugzilla bug #284;
710 ok provos@ 716 ok provos@
711 717
712$Id: ChangeLog,v 1.2479 2002/09/25 02:20:17 djm Exp $ 718$Id: ChangeLog,v 1.2480 2002/09/25 02:20:52 djm Exp $
diff --git a/sshd.8 b/sshd.8
index 10098b873..22ab70e00 100644
--- a/sshd.8
+++ b/sshd.8
@@ -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.192 2002/09/16 22:03:13 stevesk Exp $ 37.\" $OpenBSD: sshd.8,v 1.193 2002/09/24 20:59:44 todd Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -737,12 +737,12 @@ something similar to:
737if read proto cookie && [ -n "$DISPLAY" ]; then 737if read proto cookie && [ -n "$DISPLAY" ]; then
738 if [ `echo $DISPLAY | cut -c1-10` = 'localhost:' ]; then 738 if [ `echo $DISPLAY | cut -c1-10` = 'localhost:' ]; then
739 # X11UseLocalhost=yes 739 # X11UseLocalhost=yes
740 xauth add unix:`echo $DISPLAY | 740 echo add unix:`echo $DISPLAY |
741 cut -c11-` $proto $cookie 741 cut -c11-` $proto $cookie
742 else 742 else
743 # X11UseLocalhost=no 743 # X11UseLocalhost=no
744 xauth add $DISPLAY $proto $cookie 744 echo add $DISPLAY $proto $cookie
745 fi 745 fi | xauth -q -
746fi 746fi
747.Ed 747.Ed
748.Pp 748.Pp