From 40a7b53203b5a0ddbf06a18a1ce7991d0c240009 Mon Sep 17 00:00:00 2001 From: Paul van Tilburg Date: Sat, 12 Mar 2011 01:44:24 +0100 Subject: [PATCH] Bundled of small fixes. * Listen on 0.0.0.0, updates over IPv4 are crucial, and there is an IPv6-support bug in GServer. * Enable GServer logging (for now). * Fixed ildus/server/backend/ldap.rb header. * Make the welcome message (prot. 220) give the real hostname instead of the hardcoded "localhost". --- lib/ildus/server.rb | 3 ++- lib/ildus/server/domain_backends/ldap.rb | 2 +- lib/ildus/server/handler.rb | 6 +++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/ildus/server.rb b/lib/ildus/server.rb index f754e97..74bcce1 100644 --- a/lib/ildus/server.rb +++ b/lib/ildus/server.rb @@ -15,7 +15,7 @@ module Ildus class Server < GServer # The interface to listen specified default by the hostname. - DEFAULT_HOST = '::' + DEFAULT_HOST = '0.0.0.0' # The maximal number of connections. MAX_CONNECTIONS = 20 @@ -30,6 +30,7 @@ module Ildus parse_config(config_file) super(config['port'], DEFAULT_HOST, 20, $stderr, true, false) + self.audit = true end def serve(io) diff --git a/lib/ildus/server/domain_backends/ldap.rb b/lib/ildus/server/domain_backends/ldap.rb index 039cd52..842e7f0 100644 --- a/lib/ildus/server/domain_backends/ldap.rb +++ b/lib/ildus/server/domain_backends/ldap.rb @@ -1,4 +1,4 @@ -# = ildus/server/backend - ldap domain backend library +# = ildus/server/backend/ldap - ldap domain backend library # # Copyright (C) 2005 Paul van Tilburg # diff --git a/lib/ildus/server/handler.rb b/lib/ildus/server/handler.rb index bef0745..08dca06 100644 --- a/lib/ildus/server/handler.rb +++ b/lib/ildus/server/handler.rb @@ -86,7 +86,7 @@ module Ildus end def handle_client - prot_msg 220, "localhost", Program, Version, Time.now.to_s + prot_msg 220, own_hostname, Program, Version, Time.now.to_s cmd_errs = 0 @io.each_line do |line| @@ -151,6 +151,10 @@ module Ildus prot_msg(code, *args) end + def own_hostname + Socket.gethostbyname(Socket.gethostname).first + end + ################## # Commands methods