summaryrefslogtreecommitdiff
path: root/methods
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-03-10 15:57:50 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-03-10 15:57:50 +0100
commitc5734bad6fde191ff67054878cf494906082027b (patch)
treede6322e7c32eb7a7956deab63e3838ca1d1d2a1a /methods
parent67da93c38eb3904b36537e025e2f63f77d830e20 (diff)
* debian/zzapt.cron.daily:
- move cron job to the end of execution (LP: #727685) * methods/rsh.cc - fix rsh/ssh option parsing (LP: #678080), thanks to Ville Mattila
Diffstat (limited to 'methods')
-rw-r--r--methods/rsh.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/methods/rsh.cc b/methods/rsh.cc
index 97b4ef151..21f0d0a22 100644
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -110,6 +110,8 @@ bool RSHConn::Connect(string Host, string User)
// Probably should do
// dup2(open("/dev/null",O_RDONLY),STDERR_FILENO);
+ Args[i++] = Prog;
+
// Insert user-supplied command line options
Configuration::Item const *Opts = RshOptions;
if (Opts != 0)
@@ -123,7 +125,6 @@ bool RSHConn::Connect(string Host, string User)
}
}
- Args[i++] = Prog;
if (User.empty() == false) {
Args[i++] = "-l";
Args[i++] = User.c_str();