X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Fsilcd%2Fcommand_reply.c;h=dee4e0bef9bcd7a1838c08a96a06445caec96082;hb=386c883d8774999c6e74d7c6c37e52e4163a4cb1;hp=0b4ca602d8a4105fdf7f2bf0da8c2132a16f4fff;hpb=1eb298744baad994b2a6cda057c9125e27729e6f;p=silc.git

diff --git a/apps/silcd/command_reply.c b/apps/silcd/command_reply.c
index 0b4ca602..dee4e0be 100644
--- a/apps/silcd/command_reply.c
+++ b/apps/silcd/command_reply.c
@@ -823,6 +823,8 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
     silc_buffer_pull_tail(keyp, SILC_BUFFER_END(keyp));
     silc_buffer_put(keyp, tmp, len);
   }
+
+  /* Parse the Channel ID */
   id = silc_id_payload_parse_id(id_string, id_len);
   if (!id)
     goto out;
@@ -891,19 +893,19 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
     server->stat.my_channels++;
   } else {
     /* The entry exists. */
-    silc_free(cache->id);
-    entry->id = id;
-    cache->id = entry->id;
+
+    /* If ID has changed, then update it to the cache too. */
+    if (!SILC_ID_CHANNEL_COMPARE(entry->id, id))
+      silc_idlist_replace_channel_id(server->local_list, entry->id, id);
+
     entry->disabled = FALSE;
 
     /* Remove the founder auth data if the mode is not set but we have
        them in the entry */
     if (!(mode & SILC_CHANNEL_MODE_FOUNDER_AUTH) && entry->founder_key) {
       silc_pkcs_public_key_free(entry->founder_key);
-      if (entry->founder_passwd) {
-	silc_free(entry->founder_passwd);
-	entry->founder_passwd = NULL;
-      }
+      silc_free(entry->founder_passwd);
+      entry->founder_passwd = NULL;
     }
   }
 
@@ -915,26 +917,21 @@ SILC_SERVER_CMD_REPLY_FUNC(join)
   /* Get the ban list */
   tmp = silc_argument_get_arg_type(cmd->args, 8, &len);
   if (tmp) {
-    if (entry->ban_list)
-      silc_free(entry->ban_list);
-    entry->ban_list = silc_calloc(len, sizeof(*entry->ban_list));
-    memcpy(entry->ban_list, tmp, len);
+    silc_free(entry->ban_list);
+    entry->ban_list = silc_memdup(tmp, len);
   }
 
   /* Get the invite list */
   tmp = silc_argument_get_arg_type(cmd->args, 9, &len);
   if (tmp) {
-    if (entry->invite_list)
-      silc_free(entry->invite_list);
-    entry->invite_list = silc_calloc(len, sizeof(*entry->invite_list));
-    memcpy(entry->invite_list, tmp, len);
+    silc_free(entry->invite_list);
+    entry->invite_list = silc_memdup(tmp, len);
   }
 
   /* Get the topic */
   tmp = silc_argument_get_arg_type(cmd->args, 10, &len);
   if (tmp) {
-    if (entry->topic)
-      silc_free(entry->topic);
+    silc_free(entry->topic);
     entry->topic = strdup(tmp);
   }
 
@@ -1202,6 +1199,8 @@ SILC_SERVER_CMD_REPLY_FUNC(list)
       cache->expire = time(NULL) + 60;
   }
 
+  channel->user_count = usercount;
+
   if (topic) {
     silc_free(channel->topic);
     channel->topic = strdup(topic);