Take attributes only once.

diff --git a/apps/silcd/server_query.c b/apps/silcd/server_query.c
index 7ec5daf051fe92fcbe36dda273b15efd7b9dde1b..6d9c111199c2263b4eb25df363cf7c80067f9766 100644 (file)
--- a/apps/silcd/server_query.c
+++ b/apps/silcd/server_query.c
@@ -363,7 +363,7 @@ void silc_server_query_parse(SilcServer server, SilcServerQuery query)
   case SILC_COMMAND_WHOIS:
     /* Get requested attributes if set */
     tmp = silc_argument_get_arg_type(cmd->args, 3, &tmp_len);
-    if (tmp && tmp_len <= SILC_ATTRIBUTE_MAX_REQUEST_LEN) {
+    if (tmp && !query->attrs && tmp_len <= SILC_ATTRIBUTE_MAX_REQUEST_LEN) {
       query->attrs = silc_attribute_payload_parse(tmp, tmp_len);
 
       /* When Requested Attributes is present we will assure that this