summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in5
-rw-r--r--configure.ac23
-rw-r--r--ssh-keysign.c6
4 files changed, 13 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index 285918544..16926cc3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120020607
2 - (bal) Missed __progname in ssh-keysign.c patch by dtucker@zip.com.au
3
120020606 420020606
2 - (bal) OpenBSD CVS Sync 5 - (bal) OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2002/05/15 21:56:38 6 - markus@cvs.openbsd.org 2002/05/15 21:56:38
@@ -822,4 +825,4 @@
822 - (stevesk) entropy.c: typo in debug message 825 - (stevesk) entropy.c: typo in debug message
823 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 826 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
824 827
825$Id: ChangeLog,v 1.2185 2002/06/07 03:19:35 mouring Exp $ 828$Id: ChangeLog,v 1.2186 2002/06/07 14:37:00 mouring Exp $
diff --git a/Makefile.in b/Makefile.in
index fa1265593..b6ba30671 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.212 2002/06/07 03:11:38 mouring Exp $ 1# $Id: Makefile.in,v 1.213 2002/06/07 14:37:00 mouring Exp $
2 2
3# uncomment if you run a non bourne compatable shell. Ie. csh 3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@ 4#SHELL = @SH@
@@ -51,7 +51,6 @@ ENT=@ENT@
51XAUTH_PATH=@XAUTH_PATH@ 51XAUTH_PATH=@XAUTH_PATH@
52LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ 52LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
53EXEEXT=@EXEEXT@ 53EXEEXT=@EXEEXT@
54SSH_MODE= @SSHMODE@
55 54
56INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ 55INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
57INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@ 56INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@
@@ -212,7 +211,7 @@ install-files: scard-install
212 $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1 211 $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
213 $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8 212 $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
214 $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir) 213 $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
215 $(INSTALL) -m $(SSH_MODE) -s ssh $(DESTDIR)$(bindir)/ssh 214 $(INSTALL) -m 0755 -s ssh $(DESTDIR)$(bindir)/ssh
216 $(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp 215 $(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp
217 $(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add 216 $(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add
218 $(INSTALL) -m 0755 -s ssh-agent $(DESTDIR)$(bindir)/ssh-agent 217 $(INSTALL) -m 0755 -s ssh-agent $(DESTDIR)$(bindir)/ssh-agent
diff --git a/configure.ac b/configure.ac
index 628adb392..59d61fd65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.64 2002/05/28 00:37:33 tim Exp $ 1# $Id: configure.ac,v 1.65 2002/06/07 14:37:00 mouring Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -230,13 +230,11 @@ mips-sony-bsd|mips-sony-newsos4)
230*-*-sysv4.2*) 230*-*-sysv4.2*)
231 CPPFLAGS="$CPPFLAGS -I/usr/local/include" 231 CPPFLAGS="$CPPFLAGS -I/usr/local/include"
232 LDFLAGS="$LDFLAGS -L/usr/local/lib" 232 LDFLAGS="$LDFLAGS -L/usr/local/lib"
233# enable_suid_ssh=no
234 AC_DEFINE(USE_PIPES) 233 AC_DEFINE(USE_PIPES)
235 ;; 234 ;;
236*-*-sysv5*) 235*-*-sysv5*)
237 CPPFLAGS="$CPPFLAGS -I/usr/local/include" 236 CPPFLAGS="$CPPFLAGS -I/usr/local/include"
238 LDFLAGS="$LDFLAGS -L/usr/local/lib" 237 LDFLAGS="$LDFLAGS -L/usr/local/lib"
239# enable_suid_ssh=no
240 AC_DEFINE(USE_PIPES) 238 AC_DEFINE(USE_PIPES)
241 ;; 239 ;;
242*-*-sysv*) 240*-*-sysv*)
@@ -2096,25 +2094,6 @@ AC_ARG_WITH(bsd-auth,
2096 ] 2094 ]
2097) 2095)
2098 2096
2099AC_MSG_CHECKING(whether to install ssh as suid root)
2100AC_ARG_ENABLE(suid-ssh,
2101[ --enable-suid-ssh Install ssh as suid root (default)
2102 --disable-suid-ssh Install ssh without suid bit],
2103[ case "$enableval" in
2104 no)
2105 AC_MSG_RESULT(no)
2106 SSHMODE=0711
2107 ;;
2108 *) AC_MSG_RESULT(yes)
2109 SSHMODE=4711
2110 ;;
2111 esac ],
2112 AC_MSG_RESULT(yes)
2113 SSHMODE=4711
2114)
2115AC_SUBST(SSHMODE)
2116
2117
2118# Where to place sshd.pid 2097# Where to place sshd.pid
2119piddir=/var/run 2098piddir=/var/run
2120# make sure the directory exists 2099# make sure the directory exists
diff --git a/ssh-keysign.c b/ssh-keysign.c
index bb70c7dfb..660294bc9 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -38,6 +38,12 @@ RCSID("$OpenBSD: ssh-keysign.c,v 1.2 2002/05/31 10:30:33 markus Exp $");
38#include "canohost.h" 38#include "canohost.h"
39#include "pathnames.h" 39#include "pathnames.h"
40 40
41#ifdef HAVE___PROGNAME
42extern char *__progname;
43#else
44char *__progname;
45#endif
46
41static int 47static int
42valid_request(struct passwd *pw, char *host, Key **ret, u_char *data, 48valid_request(struct passwd *pw, char *host, Key **ret, u_char *data,
43 u_int datalen) 49 u_int datalen)