-20000131
+20010131
- (djm) OpenBSD CVS Sync:
- djm@cvs.openbsd.org 2001/01/30 15:48:53
[sshconnect.c]
respectively.
- (djm) Don't log SSH2 PAM KbdInt responses to debug, they may contain
passwords.
+ - (bal) Reorder. Move all bsd-*, fake-*, next-*, and cygwin* stuff to
+ openbsd-compat/. And resolve all ./configure and Makefile.in issues
+ assocated.
-20000130
+20010130
- (djm) OpenBSD CVS Sync:
- markus@cvs.openbsd.org 2001/01/29 09:55:37
[channels.c channels.h clientloop.c serverloop.c]
Allow invocation of sybsystem by commandline (-s); ok markus@
- (stevesk) configure.in: remove duplicate PROG_LS
-20000129
+20010129
- (stevesk) sftp-server.c: use %lld vs. %qd
20010128
LD=@LD@
PATHS=-DETCDIR=\"$(sysconfdir)\" -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\"
CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir) $(PATHS) @DEFS@
+CPPFLAGS=@CPPFLAGS@ -I. -Iopenbsd-compat/ -I$(srcdir) $(PATHS) @DEFS@
LIBS=@LIBS@
AR=@AR@
RANLIB=@RANLIB@
PERL=@PERL@
ENT=@ENT@
XAUTH_PATH=@XAUTH_PATH@
-LDFLAGS=-L. @LDFLAGS@
+LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
EXEEXT=@EXEEXT@
SSH_MODE= @SSHMODE@
TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) $(SFTP-SERVER)
-LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o cli.o compat.o compress.o crc32.o cygwin_util.o deattack.o dispatch.o hmac.o hostfile.o key.o kex.o log.o match.o misc.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o
-
-LIBOPENBSD_COMPAT_OBJS=bsd-arc4random.o bsd-base64.o bsd-bindresvport.o bsd-daemon.o bsd-getcwd.o bsd-getgrouplist.o bsd-inet_aton.o bsd-inet_ntoa.o bsd-misc.o bsd-mktemp.o bsd-realpath.o bsd-rresvport.o bsd-setenv.o bsd-sigaction.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o bsd-strmode.o bsd-strsep.o bsd-strtok.o bsd-vis.o bsd-setproctitle.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o next-posix.o
+LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o cli.o compat.o compress.o crc32.o deattack.o dispatch.o hmac.o hostfile.o key.o kex.o log.o match.o misc.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o
SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o log-client.o readconf.o clientloop.o
.c.o:
$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
-libopenbsd-compat.a: $(LIBOPENBSD_COMPAT_OBJS)
- $(AR) rv $@ $(LIBOPENBSD_COMPAT_OBJS)
- $(RANLIB) $@
+libopenbsd-compat.a:
+ (cd openbsd-compat; make)
libssh.a: $(LIBSSH_OBJS)
$(AR) rv $@ $(LIBSSH_OBJS)
$(FIXPATHSCMD) $(srcdir)/$@
clean:
+ (cd openbsd-compat; make clean)
rm -f *.o *.a $(TARGETS) logintest config.cache config.log
rm -f *.out core
distclean: clean
+ (cd openbsd-compat; make distclean)
rm -f Makefile config.h config.status ssh_prng_cmds *~
mrproper: distclean
AC_EXEEXT
-AC_OUTPUT(Makefile ssh_prng_cmds)
+AC_OUTPUT(Makefile openbsd-compat/Makefile ssh_prng_cmds)
# Print summary of options
#include "config.h"
-#include "next-posix.h"
+#include "bsd-nextstep.h"
#include <sys/types.h>
#include <sys/socket.h>
#endif
#include "version.h"
#include "openbsd-compat.h"
-#include "cygwin_util.h"
+#include "bsd-cygwin_util.h"
#include "entropy.h"
#endif /* INCLUDES_H */
--- /dev/null
+sysconfdir=@sysconfdir@
+piddir=@piddir@
+srcdir=@srcdir@
+top_srcdir=@top_srcdir@
+
+CC=@CC@
+LD=@LD@
+CFLAGS=@CFLAGS@
+CPPFLAGS=@CPPFLAGS@ -I. -I.. -I$(srcdir) @DEFS@
+LIBS=@LIBS@
+AR=@AR@
+RANLIB=@RANLIB@
+INSTALL=@INSTALL@
+LDFLAGS=-L. @LDFLAGS@
+
+OPENBSD=base64.o bindresvport.o daemon.o getcwd.o getgrouplist.o inet_aton.o inet_ntoa.o mktemp.o realpath.o rresvport.o setenv.o setproctitle.o sigaction.o strlcat.o strlcpy.o strmode.o strsep.o strtok.o vis.o
+
+COMPAT=bsd-arc4random.o bsd-cygwin_util.o bsd-misc.o bsd-nextstep.o bsd-snprintf.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o
+
+
+all: libopenbsd-compat.a
+
+$(BSDCOMPAT): ../config.h
+
+libopenbsd-compat.a: $(COMPAT) $(OPENBSD)
+ $(AR) rv $@ $(COMPAT) $(OPENBSD)
+ $(RANLIB) $@
+
+clean:
+ rm -f *.o *.a core
+
+distclean: clean
+ rm -f Makefile *~
#include <stdlib.h>
#include <string.h>
-#include "bsd-base64.h"
+#include "base64.h"
#define Assert(Cond) if (!(Cond)) abort()
--- /dev/null
+#ifndef _OPENBSD_H
+#define _OPENBSD_H
+
+#include "config.h"
+
+/* OpenBSD function replacements */
+#include "bindresvport.h"
+#include "getcwd.h"
+#include "realpath.h"
+#include "rresvport.h"
+#include "strlcpy.h"
+#include "strlcat.h"
+#include "strmode.h"
+#include "mktemp.h"
+#include "daemon.h"
+#include "base64.h"
+#include "sigaction.h"
+#include "inet_aton.h"
+#include "inet_ntoa.h"
+#include "strsep.h"
+#include "strtok.h"
+#include "vis.h"
+#include "setproctitle.h"
+#include "getgrouplist.h"
+
+/* Home grown routines */
+#include "bsd-arc4random.h"
+#include "bsd-misc.h"
+#include "bsd-snprintf.h"
+#include "bsd-waitpid.h"
+
+/* rfc2553 socket API replacements */
+#include "fake-getaddrinfo.h"
+#include "fake-getnameinfo.h"
+#include "fake-socket.h"
+
+#endif /* _OPENBSD_H */
#include <signal.h>
#include "config.h"
-#include "bsd-sigaction.h"
+#include "sigaction.h"
/* This file provides sigaction() emulation using sigvec() */
/* Use only if this is non POSIX system */