--- ocsinventory-agent.orig	2008-10-14 19:51:48.000000000 +0200
+++ ocsinventory-agent	2008-10-20 21:59:57.000000000 +0200
@@ -88,7 +88,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},
@@ -226,6 +226,12 @@
     $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->{'stdout'} && !$params->{'local'} && $params->{server} !~ /^http(|s):\/\//) {
     $logger->debug("the --server passed doesn't have a protocle, assume http as default");