summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-09-04 16:51:03 +1000
committerDamien Miller <djm@mindrot.org>2002-09-04 16:51:03 +1000
commit05913badf373af1142b899d3a0c5633eefb265c4 (patch)
treecf75ec80045ea1f3cb1cf9dc597dcd10ae29120f
parent50b9a60082171c12deed0d52f47c03bdc75d8cb4 (diff)
- stevesk@cvs.openbsd.org 2002/08/29 22:54:10
[ssh_config.5 sshd_config.5] state XAuthLocation is a full pathname
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.54
-rw-r--r--sshd_config.54
3 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 677692981..6c00ce0fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,9 @@
51 - stevesk@cvs.openbsd.org 2002/08/29 19:49:42 51 - stevesk@cvs.openbsd.org 2002/08/29 19:49:42
52 [ssh.c] 52 [ssh.c]
53 shrink initial privilege bracket for setuid case; ok markus@ 53 shrink initial privilege bracket for setuid case; ok markus@
54 - stevesk@cvs.openbsd.org 2002/08/29 22:54:10
55 [ssh_config.5 sshd_config.5]
56 state XAuthLocation is a full pathname
54 57
5520020820 5820020820
56 - OpenBSD CVS Sync 59 - OpenBSD CVS Sync
@@ -1592,4 +1595,4 @@
1592 - (stevesk) entropy.c: typo in debug message 1595 - (stevesk) entropy.c: typo in debug message
1593 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1596 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1594 1597
1595$Id: ChangeLog,v 1.2441 2002/09/04 06:50:06 djm Exp $ 1598$Id: ChangeLog,v 1.2442 2002/09/04 06:51:03 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 625bf6281..ac05a0cea 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -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: ssh_config.5,v 1.4 2002/08/29 16:09:02 stevesk Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.5 2002/08/29 22:54:10 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
@@ -612,7 +612,7 @@ Specifies a file to use for the user
612host key database instead of 612host key database instead of
613.Pa $HOME/.ssh/known_hosts . 613.Pa $HOME/.ssh/known_hosts .
614.It Cm XAuthLocation 614.It Cm XAuthLocation
615Specifies the location of the 615Specifies the full pathname of the
616.Xr xauth 1 616.Xr xauth 1
617program. 617program.
618The default is 618The default is
diff --git a/sshd_config.5 b/sshd_config.5
index 1551126cf..4e6e4c863 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -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_config.5,v 1.10 2002/08/21 19:38:06 stevesk Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.11 2002/08/29 22:54:10 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
@@ -663,7 +663,7 @@ or
663The default is 663The default is
664.Dq yes . 664.Dq yes .
665.It Cm XAuthLocation 665.It Cm XAuthLocation
666Specifies the location of the 666Specifies the full pathname of the
667.Xr xauth 1 667.Xr xauth 1
668program. 668program.
669The default is 669The default is