updates.

diff --git a/CHANGES b/CHANGES
index bae2c482363ffad79d8864a93617dcc1764e5c82..9a644b764b53943af2faa301a78046c36b22b50e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+Sat Mar  3 19:15:43 EET 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
+
+       * Some "Incomplete WHOIS info" errors has been appearing on the
+         log files.  Took away the entry->userinfo check from WHOIS
+         reply sending.  The entry->userinfo is now " " if client did not
+         provide one.  I thought this was fixed earlier but something
+         is wrong still.  Let's see if the error still appears.
+
 Wed Feb 28 20:56:29 EET 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
 
        * Fixed a minor bug in the login when the channel key is

diff --git a/apps/silcd/command.c b/apps/silcd/command.c
index 1e59ea7ff3c5929286547a00cd7257b76be83e2b..78b90087bf315b9f121f941455043e1decdad123 100644 (file)
--- a/apps/silcd/command.c
+++ b/apps/silcd/command.c
@@ -541,25 +541,15 @@ silc_server_command_whois_send_reply(SilcServerCommandContext cmd,
       
       SILC_PUT32_MSB((time(NULL) - entry->data.last_receive), idle);
       
-      /* XXX */
-      if (entry->userinfo)
-       packet = 
-         silc_command_reply_payload_encode_va(SILC_COMMAND_WHOIS,
-                                              status, ident, 5, 
-                                              2, idp->data, idp->len,
-                                              3, nh, strlen(nh),
-                                              4, uh, strlen(uh),
-                                              5, entry->userinfo, 
-                                              strlen(entry->userinfo),
-                                              7, idle, 4);
-      else
-       packet = 
-         silc_command_reply_payload_encode_va(SILC_COMMAND_WHOIS,
-                                              status, ident, 4, 
-                                              2, idp->data, idp->len,
-                                              3, nh, strlen(nh),
-                                              4, uh, strlen(uh),
-                                              7, idle, 4);
+      packet = 
+       silc_command_reply_payload_encode_va(SILC_COMMAND_WHOIS,
+                                            status, ident, 5, 
+                                            2, idp->data, idp->len,
+                                            3, nh, strlen(nh),
+                                            4, uh, strlen(uh),
+                                            5, entry->userinfo, 
+                                            strlen(entry->userinfo),
+                                            7, idle, 4);
     }
     
     silc_server_packet_send(server, cmd->sock, SILC_PACKET_COMMAND_REPLY,

diff --git a/apps/silcd/packet_receive.c b/apps/silcd/packet_receive.c
index 16ae24db06595cbc3f0e8aa131826e245d395b5b..ef57bcd6acf250e4df931a5c280b72c71979815a 100644 (file)
--- a/apps/silcd/packet_receive.c
+++ b/apps/silcd/packet_receive.c
@@ -922,7 +922,7 @@ SilcClientEntry silc_server_new_client(SilcServer server,
   idata->registered = TRUE;
   client->nickname = strdup(username);
   client->username = username;
-  client->userinfo = realname ? realname : strdup("");
+  client->userinfo = realname ? realname : strdup(" ");
   client->id = client_id;
 
   /* Update the cache entry */