tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-09-22 17:39:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (bal) Missed __progname in ssh-keysign.c patch by dtucker@zip.com.au

Browse Source
This commit is contained in:
Ben Lindstrom 2002-06-07 14:37:00 +00:00
parent 03bab2861e
commit 3545352dc4
4 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,6 @@
20020607
- (bal) Missed __progname in ssh-keysign.c patch by dtucker@zip.com.au
20020606 20020606
- (bal) OpenBSD CVS Sync - (bal) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2002/05/15 21:56:38 - markus@cvs.openbsd.org 2002/05/15 21:56:38
@ -822,4 +825,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2185 2002/06/07 03:19:35 mouring Exp $ $Id: ChangeLog,v 1.2186 2002/06/07 14:37:00 mouring Exp $

5
Makefile.in
View File

@ -1,4 +1,4 @@
# $Id: Makefile.in,v 1.212 2002/06/07 03:11:38 mouring Exp $ # $Id: Makefile.in,v 1.213 2002/06/07 14:37:00 mouring Exp $
# uncomment if you run a non bourne compatable shell. Ie. csh # uncomment if you run a non bourne compatable shell. Ie. csh
#SHELL = @SH@ #SHELL = @SH@
@ -51,7 +51,6 @@ ENT=@ENT@
XAUTH_PATH=@XAUTH_PATH@ XAUTH_PATH=@XAUTH_PATH@
LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
EXEEXT=@EXEEXT@ EXEEXT=@EXEEXT@
SSH_MODE= @SSHMODE@
INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@ INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@ INSTALL_SSH_RAND_HELPER=@INSTALL_SSH_RAND_HELPER@
@ -212,7 +211,7 @@ install-files: scard-install
$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1 $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8 $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
$(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir) $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
$(INSTALL) -m $(SSH_MODE) -s ssh $(DESTDIR)$(bindir)/ssh $(INSTALL) -m 0755 -s ssh $(DESTDIR)$(bindir)/ssh
$(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp $(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp
$(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add $(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add
$(INSTALL) -m 0755 -s ssh-agent $(DESTDIR)$(bindir)/ssh-agent $(INSTALL) -m 0755 -s ssh-agent $(DESTDIR)$(bindir)/ssh-agent

23
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.64 2002/05/28 00:37:33 tim Exp $ # $Id: configure.ac,v 1.65 2002/06/07 14:37:00 mouring Exp $
AC_INIT AC_INIT
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
@ -230,13 +230,11 @@ mips-sony-bsd|mips-sony-newsos4)
*-*-sysv4.2*) *-*-sysv4.2*)
CPPFLAGS="$CPPFLAGS -I/usr/local/include" CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib" LDFLAGS="$LDFLAGS -L/usr/local/lib"
# enable_suid_ssh=no
AC_DEFINE(USE_PIPES) AC_DEFINE(USE_PIPES)
;; ;;
*-*-sysv5*) *-*-sysv5*)
CPPFLAGS="$CPPFLAGS -I/usr/local/include" CPPFLAGS="$CPPFLAGS -I/usr/local/include"
LDFLAGS="$LDFLAGS -L/usr/local/lib" LDFLAGS="$LDFLAGS -L/usr/local/lib"
# enable_suid_ssh=no
AC_DEFINE(USE_PIPES) AC_DEFINE(USE_PIPES)
;; ;;
*-*-sysv*) *-*-sysv*)
@ -2096,25 +2094,6 @@ AC_ARG_WITH(bsd-auth,
] ]
) )
AC_MSG_CHECKING(whether to install ssh as suid root)
AC_ARG_ENABLE(suid-ssh,
[ --enable-suid-ssh Install ssh as suid root (default)
--disable-suid-ssh Install ssh without suid bit],
[ case "$enableval" in
no)
AC_MSG_RESULT(no)
SSHMODE=0711
;;
*) AC_MSG_RESULT(yes)
SSHMODE=4711
;;
esac ],
AC_MSG_RESULT(yes)
SSHMODE=4711
)
AC_SUBST(SSHMODE)
# Where to place sshd.pid # Where to place sshd.pid
piddir=/var/run piddir=/var/run
# make sure the directory exists # make sure the directory exists

6
ssh-keysign.c
View File

@ -38,6 +38,12 @@ RCSID("$OpenBSD: ssh-keysign.c,v 1.2 2002/05/31 10:30:33 markus Exp $");
#include "canohost.h" #include "canohost.h"
#include "pathnames.h" #include "pathnames.h"
#ifdef HAVE___PROGNAME
extern char *__progname;
#else
char *__progname;
#endif
static int static int
valid_request(struct passwd *pw, char *host, Key **ret, u_char *data, valid_request(struct passwd *pw, char *host, Key **ret, u_char *data,
u_int datalen) u_int datalen)