mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-23 18:23:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

- (tim) [krl.c Makefile.in regress/Makefile regress/modpipe.c] remove unneeded

Browse Source 
err.h include from krl.c. Additional portability fixes for modpipe. OK djm
This commit is contained in:
Tim Rice 2013-02-19 19:01:51 -08:00
parent c08b3ef6f4
commit c31db8cd6e
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,7 @@
20130220
- (tim) [regress/cipher-speed.sh regress/try-ciphers.sh] shell portability fix.
- (tim) [krl.c Makefile.in regress/Makefile regress/modpipe.c] remove unneeded
err.h include from krl.c. Additional portability fixes for modpipe. OK djm
20130219
- OpenBSD CVS Sync
@ -13,6 +15,8 @@
we actually reach $offset
- (djm) [regress/integrity.sh] Skip SHA2-based MACs on configurations that
lack support for SHA2.
- (djm) [regress/modpipe.c] Add local err, and errx functions for platforms
that do not have them.
20130217
- OpenBSD CVS Sync

12
Makefile.in
View File

@ -1,4 +1,4 @@
# $Id: Makefile.in,v 1.331 2013/02/12 00:00:34 djm Exp $
# $Id: Makefile.in,v 1.332 2013/02/20 03:01:51 tim Exp $
# uncomment if you run a non bourne compatable shell. Ie. csh
#SHELL = @SH@
@ -379,14 +379,16 @@ uninstall:
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
tests interop-tests: $(TARGETS)
regress/modpipe: $(srcdir)/regress/modpipe.c
[ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \
$(CC) $(CPPFLAGS) -o $@ $? \
$(LDFLAGS) -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
tests interop-tests: $(TARGETS) regress/modpipe
BUILDDIR=`pwd`; \
[ -d `pwd`/regress ] || mkdir -p `pwd`/regress; \
[ -f `pwd`/regress/Makefile ] || \
ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile ; \
[ -f `pwd`/regress/modpipe.c ] || \
ln -s `cd $(srcdir) && pwd`/regress/modpipe.c `pwd`/regress/modpipe.c; \
(cd regress && make prereq); \
TEST_SHELL="@TEST_SHELL@"; \
TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \

1
krl.c
View File

@ -33,7 +33,6 @@
#include "buffer.h"
#include "key.h"
#include "authfile.h"
#include "err.h"
#include "misc.h"
#include "log.h"
#include "xmalloc.h"

6
regress/Makefile
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.62 2013/01/18 00:45:29 djm Exp $
REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t-exec
tests: prereq $(REGRESS_TARGETS)
tests: $(REGRESS_TARGETS)
# Interop tests are not run by default
interop interop-tests: t-exec-interop
@ -146,10 +146,6 @@ t9: $(OBJ)/t9.out
test "${TEST_SSH_ECC}" != yes || \
${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t9.out > /dev/null
prereq: modpipe
modpipe: modpipe.c
t-exec: ${LTESTS:=.sh}
@if [ "x$?" = "x" ]; then exit 0; fi; \
for TEST in ""$?; do \

3
regress/modpipe.c
View File

@ -14,7 +14,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: modpipe.c,v 1.2 2013/02/19 02:15:08 djm Exp $ */
/* $Id: modpipe.c,v 1.3 2013/02/20 03:01:52 tim Exp $ */
#include <sys/types.h>
#include <unistd.h>
@ -23,6 +23,7 @@
#include <stdarg.h>
#include <stdlib.h>
#include <errno.h>
#include "openbsd-compat/getopt.c"
static void err(int, const char *, ...) __attribute__((format(printf, 2, 3)));
static void errx(int, const char *, ...) __attribute__((format(printf, 2, 3)));