updates.

diff --git a/TODO b/TODO
index 52cb1ac84781f12da2258ff4909062c1975b2c29..9ddc1324a4c066a151d4e6ddfe4971939b8e3843 100644 (file)
--- a/TODO
+++ b/TODO
@@ -8,6 +8,8 @@ TODO/bugs in Irssi SILC client
    in (fe.) /usr/local/share but binary checks from /usr/local/lib and
    never from share.
 
+ o /KEY is broken?  KEY is broken when negotiating with itself.
+
 
 TODO/bugs In SILC Client Library
 ================================

diff --git a/apps/silcd/server.c b/apps/silcd/server.c
index 53fcb72efcc049c189497196d1d7c418cce21e67..3d7b9686234f1514a10e60c4efc867cbdb61af9a 100644 (file)
--- a/apps/silcd/server.c
+++ b/apps/silcd/server.c
@@ -1160,7 +1160,8 @@ static void
 silc_server_accept_new_connection_lookup(SilcSocketConnection sock,
                                         void *context)
 {
-  SilcServerKEInternalContext *proto_ctx = (SilcServerKEInternalContext *)context;
+  SilcServerKEInternalContext *proto_ctx = 
+    (SilcServerKEInternalContext *)context;
   SilcServer server = (SilcServer)proto_ctx->server;
   SilcServerConfigClient *cconfig = NULL;
   SilcServerConfigServer *sconfig = NULL;
@@ -1197,7 +1198,8 @@ silc_server_accept_new_connection_lookup(SilcSocketConnection sock,
   SILC_LOG_INFO(("Incoming connection %s (%s)", sock->hostname,
                 sock->ip));
 
-  port = server->sockets[(SilcUInt32)proto_ctx->context]->port; /* Listenning port */
+  /* Listenning port */
+  port = server->sockets[(SilcUInt32)proto_ctx->context]->port;
 
   /* Check whether this connection is denied to connect to us. */
   deny = silc_server_config_find_denied(server, sock->ip);

diff --git a/doc/example_silcd.conf.in b/doc/example_silcd.conf.in
index 32726e0bf5b74cdd3728f2c2dd3df7b38fb28615..b26eb31d9dcdeefaf44341aae2f0a4502b32cfe1 100644 (file)
--- a/doc/example_silcd.conf.in
+++ b/doc/example_silcd.conf.in
@@ -146,11 +146,25 @@ General {
 #
 ServerInfo {
        #
-       # Server FQDN and IP address
+       # Server name (FQDN)
        #
        hostname = "lassi.kuo.fi.ssh.com";
-       ip = "10.2.1.6";
-       port = 706;
+
+       #
+       # Primary listener.  Specify the IP address and the port to bind
+       # the server.
+       #
+       Primary {
+               ip = "10.2.1.6";
+               port = 706;
+       };
+
+       #
+       # Secondary listener(s).  If you need to bind your server into
+       # several interfaces use the Secondary to specify the listener(s).
+       #
+       #Secondary { ip = "10.2.1.60"; port = 706; };
+       #Secondary { ip = "10.2.1.160"; port = 706; };
 
        #
        # ServerType field specifies the purpose of this server