20010102

 - (bal) OpenBSD CVS Update
   - markus@cvs.openbsd.org 2001/01/01 14:52:49
     [scp.c]
     use shared fatal(); from stevesk@pobox.com

diff --git a/ChangeLog b/ChangeLog
index 3b3648f373499edf666bb1fc8a2010ef0c2f7711..e48b9e3a0b83d833fc79b1ca340d5914f9ed9a54 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20010102
+ - (bal) OpenBSD CVS Update
+   - markus@cvs.openbsd.org 2001/01/01 14:52:49
+     [scp.c]
+     use shared fatal(); from stevesk@pobox.com
+
 20001231
  - (bal) Reverted out of MAXHOSTNAMELEN.  This should be set per OS.
    for multiple reasons.

diff --git a/Makefile.in b/Makefile.in
index 21a345df4349088b0441284e48246228a3b797f9..e1c1c8157e878bd6ef37672136c00f7a7d4a0fba 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -91,8 +91,8 @@ ssh$(EXEEXT): libopenbsd-compat.a libssh.a $(SSHOBJS)
 sshd$(EXEEXT): libssh.a        libopenbsd-compat.a $(SSHDOBJS)
        $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 
-scp$(EXEEXT): libopenbsd-compat.a libssh.a scp.o
-       $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
+scp$(EXEEXT): libopenbsd-compat.a libssh.a scp.o log-client.o
+       $(LD) -o $@ scp.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 
 ssh-add$(EXEEXT): libopenbsd-compat.a libssh.a ssh-add.o log-client.o
        $(LD) -o $@ ssh-add.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 

diff --git a/scp.c b/scp.c
index 1fb87f42b3db320914c06e90874b1eac908a86dc..74774928170c3f45836c9443e01d788a4119836e 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -75,7 +75,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.47 2000/12/19 23:17:57 markus Exp $");
+RCSID("$OpenBSD: scp.c,v 1.48 2001/01/01 14:52:49 markus Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -198,19 +198,6 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc)
        return 0;
 }
 
-void
-fatal(const char *fmt,...)
-{
-       va_list ap;
-       char buf[1024];
-
-       va_start(ap, fmt);
-       vsnprintf(buf, sizeof(buf), fmt, ap);
-       va_end(ap);
-       fprintf(stderr, "%s\n", buf);
-       exit(255);
-}
-
 typedef struct {
        int cnt;
        char *buf;