Cleanup.

diff --git a/TODO b/TODO
index 165c657f5a26e21d3d4e35bd7d307de4958dcf66..2559986ceb142383cf03f1c135dda24ee25cb75e 100644 (file)
--- a/TODO
+++ b/TODO
@@ -30,9 +30,6 @@ TODO/bugs In SILC Client Library
 TODO/bugs In SILC Server
 ========================
 
- o Add support for the <Requested Attributes> in WHOIS.  Sending and
-   reception, with clients and servers should be added.
-
  o Backup router related issues:
 
        o Add special handling in router and server for "connection
@@ -57,6 +54,8 @@ TODO/bugs In SILC Server
 TODO/bugs In SILC Libraries
 ===========================
 
+ o Add support for SILC_ATTRIBUTE_USER_INFo attribute (VCard).
+
  o WIN32 silc_net_create_connection_async does not work the same way
    than on Unix.  Do it with threads on WIN32.  The function works but
    is not actually async currently (Fix this to 0.9.x).

diff --git a/lib/silccore/silcattrs.c b/lib/silccore/silcattrs.c
index 1f38dc683138221d2a3fed63740e3fb405a245bd..370d91ef7b6c8165c4739a171a61ebec67ccf097 100644 (file)
--- a/lib/silccore/silcattrs.c
+++ b/lib/silccore/silcattrs.c
@@ -95,9 +95,6 @@ SilcBuffer silc_attribute_payload_encode(SilcBuffer attrs,
 
     switch (attribute) {
 
-    case SILC_ATTRIBUTE_NONE:
-      break;
-
     case SILC_ATTRIBUTE_USER_INFO:
       SILC_NOT_IMPLEMENTED("SILC_ATTRIBUTE_USER_INFO");
       break;
@@ -233,7 +230,7 @@ SilcBuffer silc_attribute_payload_encode(SilcBuffer attrs,
       break;
 
     default:
-      /* Other attributes must be in correct format already */
+      return NULL;
       break;
     }
   }