RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) Patch from Pekka Savola <Pekka.Savola@netcore.fi> to include a few 

more manpage paths in fixpaths calls
 - (djm) Also add xauth path at Pekka's suggestion.
This commit is contained in:
Damien Miller 2000-11-29 13:28:50 +11:00
parent dadc051268
commit a19cf47b0f
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -19,6 +19,9 @@
[ssh-keygen.c ssh.h] [ssh-keygen.c ssh.h]
print keytype when generating a key. print keytype when generating a key.
reasonable defaults for RSA1/RSA/DSA keys. reasonable defaults for RSA1/RSA/DSA keys.
- (djm) Patch from Pekka Savola <Pekka.Savola@netcore.fi> to include a few
more manpage paths in fixpaths calls
- (djm) Also add xauth path at Pekka's suggestion.
20001125 20001125
- (djm) Give up privs when reading seed file - (djm) Give up privs when reading seed file

15
Makefile.in
View File

@ -27,6 +27,7 @@ RANLIB=@RANLIB@
INSTALL=@INSTALL@ INSTALL=@INSTALL@
PERL=@PERL@ PERL=@PERL@
ENT=@ENT@ ENT=@ENT@
XAUTH_PATH=@XAUTH_PATH@
LDFLAGS=-L. @LDFLAGS@ LDFLAGS=-L. @LDFLAGS@
EXEEXT=@EXEEXT@ EXEEXT=@EXEEXT@
SSH_MODE= @SSHMODE@ SSH_MODE= @SSHMODE@
@ -49,7 +50,19 @@ MANPAGES = @MANTYPE@
CONFIGFILES=sshd_config ssh_config primes CONFIGFILES=sshd_config ssh_config primes
PATHSUBS = -D/etc/ssh_config=$(sysconfdir)/ssh_config -D/etc/ssh_known_hosts=$(sysconfdir)/ssh_known_hosts -D/etc/sshd_config=$(sysconfdir)/sshd_config -D/usr/libexec=$(libexecdir) -D/etc/shosts.equiv=$(sysconfdir)/shosts.equiv -D/etc/ssh_host_key=$(sysconfdir)/ssh_host_key -D/etc/ssh_host_dsa_key=$(sysconfdir)/ssh_host_dsa_key -D/etc/ssh_host_rsa_key=$(sysconfdir)/ssh_host_rsa_key -D/var/run/sshd.pid=$(piddir)/sshd.pid -D/etc/primes=$(sysconfdir)/primes PATHSUBS = \
-D/etc/ssh_config=$(sysconfdir)/ssh_config \
-D/etc/ssh_known_hosts=$(sysconfdir)/ssh_known_hosts \
-D/etc/sshd_config=$(sysconfdir)/sshd_config \
-D/usr/libexec=$(libexecdir) \
-D/etc/shosts.equiv=$(sysconfdir)/shosts.equiv \
-D/etc/ssh_host_key=$(sysconfdir)/ssh_host_key \
-D/etc/ssh_host_dsa_key=$(sysconfdir)/ssh_host_dsa_key \
-D/etc/ssh_host_rsa_key=$(sysconfdir)/ssh_host_rsa_key \
-D/var/run/sshd.pid=$(piddir)/sshd.pid \
-D/etc/primes=$(sysconfdir)/primes \
-D/etc/sshrc=$(sysconfdir)/sshrc \
-D/usr/X11R6/bin/xauth=$(XAUTH_PATH)
FIXPATHSCMD = $(PERL) $(srcdir)/fixpaths $(PATHSUBS) FIXPATHSCMD = $(PERL) $(srcdir)/fixpaths $(PATHSUBS)

7
configure.in
View File

@ -936,8 +936,13 @@ AC_ARG_WITH(xauth,
] ]
) )
if test ! -z "$xauth_path" ; then if test -z "$xauth_path" ; then
XAUTH_PATH="undefined"
AC_SUBST(XAUTH_PATH)
else
AC_DEFINE_UNQUOTED(XAUTH_PATH, "$xauth_path") AC_DEFINE_UNQUOTED(XAUTH_PATH, "$xauth_path")
XAUTH_PATH=$xauth_path
AC_SUBST(XAUTH_PATH)
fi fi
if test ! -z "$rsh_path" ; then if test ! -z "$rsh_path" ; then
AC_DEFINE_UNQUOTED(RSH_PATH, "$rsh_path") AC_DEFINE_UNQUOTED(RSH_PATH, "$rsh_path")