2 files changed, 7 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index e6c2db199..40b5c8b6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
    - deraadt@cvs.openbsd.org 2005/03/31 18:39:21
      [scp.c]
      copy argv[] element instead of smashing the one that ps will see; ok otto
+   - djm@cvs.openbsd.org 2005/04/02 12:41:16
+     [scp.c]
+     since ssh has xstrdup, use it instead of strdup+test. unbreaks -Werror
+     build
 
 20050331
  - (dtucker) OpenBSD CVS Sync
@@ -2414,4 +2418,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3735 2005/04/03 00:16:11 djm Exp $
+$Id: ChangeLog,v 1.3736 2005/04/03 00:16:39 djm Exp $
diff --git a/scp.c b/scp.c
index dcea1946b..1d34cc639 100644
--- a/scp.c
+++ b/scp.c
@@ -71,7 +71,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.120 2005/03/31 18:39:21 deraadt Exp $");
+RCSID("$OpenBSD: scp.c,v 1.121 2005/04/02 12:41:16 djm Exp $");
 
 #include "xmalloc.h"
 #include "atomicio.h"
@@ -367,9 +367,7 @@ toremote(char *targ, int argc, char **argv)
         if (*targ == 0)
                 targ = ".";
 
-        arg = strdup(argv[argc - 1]);
-        if (!arg)
-                err(1, "malloc");
+        arg = xstrdup(argv[argc - 1]);
         if ((thost = strrchr(arg, '@'))) {
                 /* user@host */
                 *thost++ = 0;