steffen: server/kolabd/kolabd kolab_bootstrap,1.9,1.10

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv9704

Modified Files:
	kolab_bootstrap 
Log Message:
die if ldap problem

Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kolab_bootstrap	3 Jan 2005 13:18:21 -0000	1.9
+++ kolab_bootstrap	20 Jan 2005 06:19:06 -0000	1.10
@@ -367,7 +367,7 @@
 #      system("$kolab_prefix/bin/openpkg rc openldap stop");
 #      sleep 5;
 
-      # Make sure that no rouge daemons are running
+      # Make sure that no rogue daemons are running
       tryConnect( '127.0.0.1', 389 ) && die "A process is already listening to port 389 (ldap)\n"
         ."Please stop any running ldap server and bootstrap again\n";
       tryConnect( '127.0.0.1', 9999 ) && die "A process is already listening to port 9999 (kolabd)\n"
@@ -404,10 +404,10 @@
 
     }
 
-    my $ldapuri = URI->new($ldap_uri) || warn "error: could not parse given uri";
-    my $ldap = Net::LDAP->new($ldap_uri, verify => 'none' ) || warn "could not connect ldap server $ldap_uri";
+    my $ldapuri = URI->new($ldap_uri) || die "error: could not parse given uri";
+    my $ldap = Net::LDAP->new($ldap_uri, verify => 'none' ) || die "could not connect ldap server $ldap_uri";
     if ($ldap) {
-      $ldap->bind($bind_dn, password=> $bind_pw) || warn "could not bind to ldap server $ldap_uri";
+      $ldap->bind($bind_dn, password=> $bind_pw) || die "could not bind to ldap server $ldap_uri";
       my $mesg = $ldap->search(base=> "$base_dn", scope=> 'exact', filter=> "(objectclass=*)");
       if ($mesg && $mesg->count != 1) {
         print "no $base_dn object found, creating one\n";