3 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 61c08bc35..3493db72b 100644
--- 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 af0886cde..9969a5216 100644
--- 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 40cf72963..8d5a251b5 100644
--- 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);