updates

diff --git a/CHANGES b/CHANGES
index 2d3e39bca9940fb4ca0d8455c2ba11fad5de050c..e90d3d410aeb7a253b64a095780b5858023d70c6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -11,7 +11,7 @@ Mon Jun  4 17:57:16 CEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
          not have username resolved.  The affected file is
          lib/silcclient/command_reply.c.  Also, changed the IDENTIFY
          command to WHOIS command to really resolve stuff.  The USERS
-         is not used any more in any critical section so WHOIS can
+         is not used an ymore in any critical section so WHOIS can
          be used even though it might be slower than IDENTIFY.
 
 Sun Jun  3 14:21:32 EEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>

diff --git a/apps/irssi/src/silc/core/client_ops.c b/apps/irssi/src/silc/core/client_ops.c
index 5c5e33559aa3baaf046d8128f46ecdaa4af0ac5c..841af21efd3aac7da7154bab22e597dff8c0764b 100644 (file)
--- a/apps/irssi/src/silc/core/client_ops.c
+++ b/apps/irssi/src/silc/core/client_ops.c
@@ -100,7 +100,7 @@ void silc_channel_message(SilcClient client, SilcClientConnection conn,
   else
     signal_emit("message public", 6, server, msg,
                nick == NULL ? "[<unknown>]" : nick->nick,
-               nick == NULL ? NULL : nick->host,
+               nick == NULL ? "" : nick->host == NULL ? "" : nick->host,
                chanrec->name, nick);
 }
 

diff --git a/apps/silcd/silc.conf b/apps/silcd/silc.conf
index 515f8ba0d50dea45e71ffea1011e300655f6d429..f9d798c2b0d9ded36082e69cc598691f9e67550e 100644 (file)
--- a/apps/silcd/silc.conf
+++ b/apps/silcd/silc.conf
@@ -1,31 +1,44 @@
 [Cipher]
-rc6:/home/priikone/silc/lib/silcsim/modules/rc6.sim.so:16:16
-twofish:/home/priikone/silc/lib/silcsim/modules/twofish.sim.so:16:16
-mars:/home/priikone/silc/lib/silcsim/modules/mars.sim.so:16:16
-none:/home/priikone/silc/lib/silcsim/modules/none.sim.so:0:0
-
-[HashFunction]
+aes-256-cbc:../lib/silcsim/modules/aes.sim.so:32:16
+aes-192-cbc:../lib/silcsim/modules/aes.sim.so:24:16
+aes-128-cbc:../lib/silcsim/modules/aes.sim.so:16:16
+twofish-256-cbc:../lib/silcsim/modules/twofish.sim.so:32:16
+twofish-192-cbc:../lib/silcsim/modules/twofish.sim.so:24:16
+twofish-128-cbc:../lib/silcsim/modules/twofish.sim.so:16:16
+mars-256-cbc:../lib/silcsim/modules/mars.sim.so:32:16
+mars-192-cbc:../lib/silcsim/modules/mars.sim.so:24:16
+mars-128-cbc:../lib/silcsim/modules/mars.sim.so:16:16
+none:../lib/silcsim/modules/none.sim.so:0:0
+
+[Hash]
 md5::64:16
 sha1::64:20
 
-#[PKCS]
-#rsa::1024
-#dss::1024
+[hmac]
+hmac-sha1-96:sha1:12
+hmac-md5-96:md5:12
+hmac-sha1:sha1:20
+hmac-md5:md5:16
+
+[PKCS]
+rsa
 
 [AdminInfo]
-Pohjois-Savo Poly-Technics:SILC Test Server:Pekka Riikonen:priikone@poseidon.pspt.fi
+SILC Project:SILCNet Router:Pekka Riikonen:priikone@silcnet.org
 
 [ServerInfo]
-silc.pspt.fi:193.166.51.47:Kuopio, Finland:706
+silc.silcnet.org:195.168.3.187:Slovakia:706
+
+[ServerKeys]
+./pubkey.pub:./privkey.prv
 
 [ListenPort]
-193.166.51.47:193.166.51.47:706
+195.168.3.187:194.168.3.187:706
 
 [Logging]
 infologfile:silcd.log:10000
 warninglogfile:silcd.log:
 errorlogfile:silcd.log:10000
-fatallogfile:silcd.log:
 
 [ConnectionClass]
 1:100:100:100
@@ -33,12 +46,18 @@ fatallogfile:silcd.log:
 
 [ClientConnection]
 :::706:1
+:::707:1
 
 [AdminConnection]
+195.168.3.187:priikone:pekka:passwd:mypasswd99
 
 [ServerConnection]
+195.168.3.187:passwd:sureissecret1101:706:1:1
+195.10.137.227:passwd:sureissecret1010:706:1:1
 
 [RouterConnection]
 
 [DenyConnection]
-[RedirectClient]
+
+[motd]
+./motd

diff --git a/lib/silcclient/command_reply.c b/lib/silcclient/command_reply.c
index 17d0b3301c9eb9deeba88572870afa4490079763..caaabee5a18bebb61d3692ae0ecbbf06901e4054 100644 (file)
--- a/lib/silcclient/command_reply.c
+++ b/lib/silcclient/command_reply.c
@@ -1645,7 +1645,7 @@ SILC_CLIENT_CMD_REPLY_FUNC(users)
     if (!id_cache || !((SilcClientEntry)id_cache->context)->username) {
       /* No we don't have it (or it is incomplete in information), query
         it from the server. Assemble argument table that will be sent
-        for the IDENTIFY command later. */
+        for the WHOIS command later. */
       res_argv = silc_realloc(res_argv, sizeof(*res_argv) *
                              (res_argc + 1));
       res_argv_lens = silc_realloc(res_argv_lens, sizeof(*res_argv_lens) *
@@ -1677,18 +1677,18 @@ SILC_CLIENT_CMD_REPLY_FUNC(users)
   if (res_argc) {
     SilcBuffer res_cmd;
 
-    /* Send the IDENTIFY command to server */
-    res_cmd = silc_command_payload_encode(SILC_COMMAND_IDENTIFY,
+    /* Send the WHOIS command to server */
+    res_cmd = silc_command_payload_encode(SILC_COMMAND_WHOIS,
                                          res_argc, res_argv, res_argv_lens,
                                          res_argv_types, ++conn->cmd_ident);
     silc_client_packet_send(cmd->client, conn->sock, SILC_PACKET_COMMAND, 
                            NULL, 0, NULL, NULL, res_cmd->data, res_cmd->len,
                            TRUE);
 
-    /* Register pending command callback. After we've received the IDENTIFY
+    /* Register pending command callback. After we've received the WHOIS
        command reply we will reprocess this command reply by re-calling this
        USERS command reply callback. */
-    silc_client_command_pending(conn, SILC_COMMAND_IDENTIFY, conn->cmd_ident,
+    silc_client_command_pending(conn, SILC_COMMAND_WHOIS, conn->cmd_ident,
                                NULL, silc_client_command_reply_users, cmd);
 
     silc_buffer_free(res_cmd);