- (djm) Fix scp user@host handling

- (djm) Don't clobber ssh_prng_cmds on install
2000-10-14 17:45:58 +11:00 · 2000-10-14 17:45:58 +11:00 · e4041c9d81
parent 874d77bb13
commit e4041c9d81
3 changed files with 6 additions and 2 deletions
--- a/2
+++ b/2
@ -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
--- 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)
--- 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);