--- ocsinventory-agent.orig 2008-04-02 20:27:42.000000000 +0200
+++ ocsinventory-agent 2008-04-02 20:29:12.000000000 +0200
@@ -86,7 +86,7 @@
"p|password=s" => \$params->{password},
"r|realm=s" => \$params->{realm},
"R|remotedir=s" => \$params->{remotedir},
- "s|server=s" => \$params->{server},
+ "s|server=s" => \$params->{optserver},
"stdout" => \$params->{stdout},
"t|tag=s" => \$params->{tag},
"u|user=s" => \$params->{user},
@@ -215,6 +215,13 @@
$params->{nosoftware} = 1
}
+# allow "server" from command line when "local" in config. file
+if (defined($params->{optserver})) {
+ $params->{server}=$params->{optserver};
+ undef $params->{local};
+ undef $params->{optserver};
+}
+
if ($params->{server} !~ /^http(|s):\/\//) {
$logger->debug("the --server passed doesn't have a protocle, assume http as default");
$params->{server} = "http://".$params->{server}