steffen: server/kolabd/kolabd kolab_bootstrap,1.11,1.12

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	kolab_bootstrap 
Log Message:
bootstrap script was broken for some reason...

Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- kolab_bootstrap	29 Mar 2005 00:02:44 -0000	1.11
+++ kolab_bootstrap	5 Apr 2005 20:17:44 -0000	1.12
@@ -41,10 +41,10 @@
     chomp $host;
     close( HOSTNAME );
   }
-  if( open( hostname, '/etc/hostname' ) ) {
-    $host = <hostname>;
+  if( open( HOSTNAME, '/etc/hostname' ) ) {
+    $host = <HOSTNAME>;
     chomp $host;
-    close( hostname );
+    close( HOSTNAME );
   }
   if( $host eq '' ) {
     $host = `hostname`;
@@ -62,7 +62,7 @@
   my $paddr   = sockaddr_in($port, $iaddr);
   my $proto   = getprotobyname('tcp');
   socket(SOCK, PF_INET, SOCK_STREAM, $proto)  || die "socket: $!";
-  my $retval = connect(SOCK, $paddr);
+  my $retval = connect(SOCK, $paddr) || 0;
   close( SOCK );
   return $retval;
 }
@@ -284,7 +284,7 @@
 
   $domain = getUserInput("Please enter your Maildomain - if you do not know your mail domain use the fqdn from above", $domain);
   print "proceeding with Maildomain $domain\n";
-  print "Kolab primary email addresses will be of the type user@$domain \n";
+  print "Kolab primary email addresses will be of the type user\@$domain \n";
   
 
   if ( $opt_f || $base_dn =~ /\@\@\@/ || $bind_dn =~ /\@\@\@/ || $bind_pw =~ /\@\@\@/ ) {
@@ -687,7 +687,7 @@
     print "Calendar object not found, please check your input\n";
     goto SLAVESTART;
   }
-  my $entry = $mesg->entry(0);
+  $entry = $mesg->entry(0);
   $calendar_pw = $entry->get_value( 'userPassword' );
 
   $mesg = $ldap->search(base=> "k=kolab,$base_dn", scope=> 'exact',