From: Wouter Wijngaards Date: Thu, 30 Jun 2011 12:13:55 +0000 (+0000) Subject: - fix comment about rndc port, that referred to the old port number. X-Git-Tag: release-1.4.12rc1~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c9bf883c9214e541fe0a288c1c27e9244df277e;p=thirdparty%2Funbound.git - fix comment about rndc port, that referred to the old port number. - fix that the listening socket is not closed when too many remote control connections are made at the same time. git-svn-id: file:///svn/unbound/trunk@2446 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/daemon/remote.c b/daemon/remote.c index 35dd0fa43..f79888707 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -395,7 +395,6 @@ int remote_accept_callback(struct comm_point* c, void* arg, int err, /* create new commpoint unless we are servicing already */ if(rc->active >= rc->max_active) { log_warn("drop incoming remote control: too many connections"); - comm_point_stop_listening(c); close_exit: #ifndef USE_WINSOCK close(newfd); diff --git a/doc/Changelog b/doc/Changelog index 57760e1ec..dee625211 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -4,6 +4,9 @@ - fix bug#395: id bits of other query may leak out under conditions - fix replyaddr count wrong after jostled queries, which leads to eventual starvation where the daemon has no replyaddrs left to use. + - fix comment about rndc port, that referred to the old port number. + - fix that the listening socket is not closed when too many remote + control connections are made at the same time. 23 June 2011: Wouter - Changed -flto check to support clang compiler. diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in index 5341a28ef..ac48dcd88 100644 --- a/doc/unbound.conf.5.in +++ b/doc/unbound.conf.5.in @@ -894,10 +894,9 @@ By default localhost (127.0.0.1 and ::1) is listened to. Use 0.0.0.0 and ::0 to listen to all interfaces. .TP 5 .B control\-port: -The port number to listen on for control commands, default is 8953 -(that is the same port number named uses to listen to rndc). -If you change this port number, and permissions have been dropped, a -reload is not sufficient to open the port again, you must then restart. +The port number to listen on for control commands, default is 8953. +If you change this port number, and permissions have been dropped, +a reload is not sufficient to open the port again, you must then restart. .TP 5 .B server\-key\-file: "" Path to the server private key, by default unbound_server.key. diff --git a/smallapp/unbound-control-setup.sh b/smallapp/unbound-control-setup.sh index ed78250aa..aca62ac8c 100755 --- a/smallapp/unbound-control-setup.sh +++ b/smallapp/unbound-control-setup.sh @@ -81,7 +81,7 @@ while test $# -ne 0; do echo " -d dir use directory to store keys and certificates." echo " default: $DESTDIR" echo "please run this command using the same user id that the " - echo "unboun daemon uses, it needs read privileges." + echo "unbound daemon uses, it needs read privileges." exit 1 ;; esac