From: rettenbe <rettenbe@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 16 Jun 2009 14:16:26 +0000 (+0000)
Subject: bugfix: commandline option -h does not exit gosa-si process
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dda31beff2bdfc9190c2490e8d93931313cacce9;p=gosa.git

bugfix: commandline option -h does not exit gosa-si process


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13722 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 7d03c9af8..be587d270 100755
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -320,9 +320,8 @@ usage: $prg [-hvf] [-c config] [-d number]
                           32 : ldap connectivity
                           64 : database status and connectivity
                          128 : main process 
- 
 EOF
-    print "\n" ;
+	exit(0);
 }
 
 
@@ -431,11 +430,7 @@ sub check_cmdline_param () {
 	}
 
 	# Exit if an error occour
-    if( $err_counter > 0 ) 
-	{
-        &usage( "", 1 );
-        exit( -1 );
-    }
+    if( $err_counter > 0 ) { &usage( "", 1 ); }
 }
 
 
@@ -3420,7 +3415,7 @@ GetOptions("h|help" => \&usage,
         "v|verbose+" => \$verbose,
         "no-arp+" => \$no_arp,
 		"d=s" => \$debug_parts,
-           ) or (&usage("", 1)&&(exit(-1))); 
+           ) or &usage("", 1); 
 
 #  read and set config parameters
 &check_cmdline_param ;