Added support for multiple PublicKey instances in the config

[silc.git] / apps / silcd / server.c

diff --git a/apps/silcd/server.c b/apps/silcd/server.c
index d16d3f00d350f8ca05bdabff9e98bdba3b75c286..1f468f1dac29103a9450488c7af211a98e8f44c5 100644 (file)
--- a/apps/silcd/server.c
+++ b/apps/silcd/server.c
@@ -765,20 +765,18 @@ SILC_TASK_CALLBACK(silc_server_connect_to_router_second)
     conn = sconn->conn;
 
   if (conn) {
-    /* Match found. Use the configured authentication method */
+    /* Match found. Use the configured authentication method. Take only
+       the passphrase, since for public key auth we automatically use
+       our local key pair. */
     if (conn->passphrase) {
-      if (conn->publickey && !server->config->prefer_passphrase_auth) {
-       proto_ctx->auth_data = conn->publickey;
-       proto_ctx->auth_data_len = 0;
+      if (conn->publickeys && !server->config->prefer_passphrase_auth) {
        proto_ctx->auth_meth = SILC_AUTH_PUBLIC_KEY;
       } else {
        proto_ctx->auth_data = strdup(conn->passphrase);
        proto_ctx->auth_data_len = strlen(conn->passphrase);
        proto_ctx->auth_meth = SILC_AUTH_PASSWORD;
       }
-    } else if (conn->publickey) {
-      proto_ctx->auth_data = conn->publickey;
-      proto_ctx->auth_data_len = 0;
+    } else if (conn->publickeys) {
       proto_ctx->auth_meth = SILC_AUTH_PUBLIC_KEY;
     } else {
       proto_ctx->auth_meth = SILC_AUTH_NONE;
@@ -1036,7 +1034,7 @@ silc_server_accept_new_connection_lookup(SilcSocketConnection sock,
      later when outgoing data is available. */
   SILC_REGISTER_CONNECTION_FOR_IO(sock->sock);
 
-  SILC_LOG_INFO(("Incoming connection s (%s)", sock->hostname,
+  SILC_LOG_INFO(("Incoming connection %s (%s)", sock->hostname,
                 sock->ip));
 
   port = server->sockets[server->sock]->port; /* Listenning port */
@@ -1311,7 +1309,8 @@ SILC_TASK_CALLBACK(silc_server_accept_new_connection_final)
 
   entry->data.last_receive = time(NULL);
 
-  num_sockets = silc_server_num_sockets_by_ip(server, sock->ip);
+  num_sockets = silc_server_num_sockets_by_ip(server, sock->ip, 
+                                             ctx->conn_type);
 
   switch (ctx->conn_type) {
   case SILC_SOCKET_TYPE_CLIENT:
@@ -1336,7 +1335,7 @@ SILC_TASK_CALLBACK(silc_server_accept_new_connection_final)
        max_per_host = conn->param->connections_max_per_host;
       }
 
-      if (num_sockets > max_per_host) {
+      if (num_sockets >= max_per_host) {
        SILC_LOG_INFO(("Too many connections from %s (%s), closing connection",
                       sock->hostname, sock->ip));
        silc_server_disconnect_remote(server, sock, 
@@ -1347,7 +1346,7 @@ SILC_TASK_CALLBACK(silc_server_accept_new_connection_final)
       }
 
       SILC_LOG_DEBUG(("Remote host is client"));
-      SILC_LOG_INFO(("Connection s (%s) is client", sock->hostname,
+      SILC_LOG_INFO(("Connection %s (%s) is client", sock->hostname,
                     sock->ip));
 
       /* Add the client to the client ID cache. The nickname and Client ID
@@ -1439,7 +1438,7 @@ SILC_TASK_CALLBACK(silc_server_accept_new_connection_final)
        backup_router = sconn->backup_router;
       }
 
-      if (num_sockets > max_per_host) {
+      if (num_sockets >= max_per_host) {
        SILC_LOG_INFO(("Too many connections from %s (%s), closing connection",
                       sock->hostname, sock->ip));
        silc_server_disconnect_remote(server, sock,