- (djm) Fix scp user@host handling

 - (djm) Don't clobber ssh_prng_cmds on install

diff --git a/ChangeLog b/ChangeLog
index 61c08bc357b9d911983377286cff8787a86bd2a5..3493db72bb6467b655fca5bbbfc4cc830f16dba5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -78,6 +78,8 @@
    - markus@cvs.openbsd.org  2000/10/13 13:12:02
      [myproposal.h]
      prefer no compression
+ - (djm) Fix scp user@host handling
+ - (djm) Don't clobber ssh_prng_cmds on install
 
 20001007
  - (stevesk) Print PAM return value in PAM log messages to aid

diff --git a/Makefile.in b/Makefile.in
index af0886cdede0f895c8a93d9d58611514736d045e..9969a5216a6d9278ffc7efd45ead85bd1d0386ad 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -154,7 +154,9 @@ install-files:
        fi
        if [ -f ssh_prng_cmds -a ! -z "$(INSTALL_SSH_PRNG_CMDS)" ]; then \
                $(PERL) $(srcdir)/fixprogs ssh_prng_cmds $(ENT); \
-               $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
+               if [ ! -f $(DESTDIR)$(sysconfdir)/ssh_prng_cmds ] ; then \
+                       $(INSTALL) -m 644 ssh_prng_cmds.out $(DESTDIR)$(sysconfdir)/ssh_prng_cmds; \
+               fi ; \
        fi
 
 host-key: ssh-keygen$(EXEEXT)

diff --git a/scp.c b/scp.c
index 40cf72963b0911cb2c62fc21d5cae3ad243396ac..8d5a251b58e39d166db7eec118e701a3daa8486e 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -179,7 +179,7 @@ do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout, int argc)
 
                args.list[0] = ssh_program;
                if (remuser != NULL)
-                       addargs("-l %s", remuser);
+                       addargs("-l%s", remuser);
                addargs("%s", host);
                addargs("%s", cmd);