steffen: server/perl-kolab/Kolab-LDAP-Backend-slurpd slurpd.pm, 1.7, 1.8

cvs at intevation.de cvs at intevation.de
Thu Jul 15 03:10:14 CEST 2004


Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-slurpd
In directory doto:/tmp/cvs-serv22132/Kolab-LDAP-Backend-slurpd

Modified Files:
	slurpd.pm 
Log Message:
no need to listen to anything but localhost anymore

Index: slurpd.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab-LDAP-Backend-slurpd/slurpd.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- slurpd.pm	8 Jul 2004 11:43:48 -0000	1.7
+++ slurpd.pm	15 Jul 2004 01:10:11 -0000	1.8
@@ -30,7 +30,6 @@
 use warnings;
 use IO::Select;
 use IO::Socket::INET;
-use IO::Socket::SSL qw(debug1);
 use Convert::ASN1 qw(:io);
 use Net::LDAP;
 use Net::LDAP::Constant qw(LDAP_SUCCESS LDAP_PROTOCOL_ERROR);
@@ -237,31 +236,14 @@
     my $port = $Kolab::config{'slurpd_port'};
   TRYCONNECT:
     Kolab::log('SD', "Opening listen server on port $port");
-    if( $Kolab::config{'is_master'} eq 'true' ) {
-      # The master has to only listen to localhost
-      # without need for encryption
-      $server = IO::Socket::INET->new(
-          LocalPort   => $port,
-	  Proto       => "tcp",
-          ReuseAddr   => 1,
-          Type        => SOCK_STREAM,
-	  LocalAddr   => "127.0.0.1",
-          Listen      => 10
-       );
-    } else {
-      # Slaves use encrypted comm.
-      $server = IO::Socket::SSL->new(
-          LocalPort   => $port,
-	  Proto       => "tcp",
-          ReuseAddr   => 1,
-          Type        => SOCK_STREAM,
-	  LocalAddr   => "0.0.0.0",
-          Listen      => 10,
-	  SSL_key_file => $Kolab::config{'prefix'} . '/etc/kolab/key.pem',
-          SSL_cert_file => $Kolab::config{'prefix'} . '/etc/kolab/cert.pem',
-          SSL_verify_mode => 0
-      );
-  }
+    $server = IO::Socket::INET->new(
+	LocalPort   => $port,
+	Proto       => "tcp",
+	ReuseAddr   => 1,
+	Type        => SOCK_STREAM,
+	LocalAddr   => "127.0.0.1",
+	Listen      => 10
+     );
     if (!$server) {
         Kolab::log('SD', "Unable to open TCP listen server on port $port, Error = $@", KOLAB_ERROR);
 	sleep 1;





More information about the commits mailing list