Fixed connect command to work on backup router too.

[silc.git] / apps / silcd / command.c

diff --git a/apps/silcd/command.c b/apps/silcd/command.c
index d42af0780c340fe46f36aced184e9e851a3e4fa0..c89aaf71c14261fb590a696abb2dae1cd42ee07d 100644 (file)
--- a/apps/silcd/command.c
+++ b/apps/silcd/command.c
@@ -1707,6 +1707,7 @@ static void silc_server_command_join_channel(SilcServer server,
   bool resolve;
   unsigned char *fkey = NULL;
   SilcUInt32 fkey_len = 0;
+  const char *cipher;
 
   SILC_LOG_DEBUG(("Joining client to channel"));
 
@@ -1917,12 +1918,11 @@ static void silc_server_command_join_channel(SilcServer server,
 
   if (!(channel->mode & SILC_CHANNEL_MODE_PRIVKEY)) {
     tmp = silc_id_id2str(channel->id, SILC_ID_CHANNEL);
+    cipher = silc_cipher_get_name(channel->channel_key);
     keyp = silc_channel_key_payload_encode(silc_id_get_len(channel->id,
                                                           SILC_ID_CHANNEL), 
                                           tmp,
-                                          strlen(channel->channel_key->
-                                                 cipher->name),
-                                          channel->channel_key->cipher->name,
+                                          strlen(cipher), cipher,
                                           channel->key_len / 8, channel->key);
     silc_free(tmp);
   }
@@ -2611,8 +2611,8 @@ SILC_SERVER_CMD_FUNC(cmode)
       silc_server_send_channel_key(server, NULL, channel, 
                                   server->server_type == SILC_ROUTER ? 
                                   FALSE : !server->standalone);
-       
-      cipher = channel->channel_key->cipher->name;
+
+      cipher = (char *)silc_cipher_get_name(channel->channel_key);
       hmac = (char *)silc_hmac_get_name(channel->hmac);
     }
   }
@@ -2898,8 +2898,8 @@ SILC_SERVER_CMD_FUNC(cumode)
   SilcServer server = cmd->server;
   SilcClientEntry client = (SilcClientEntry)cmd->sock->user_data;
   SilcIDListData idata = (SilcIDListData)client;
-  SilcChannelID *channel_id;
-  SilcClientID *client_id;
+  SilcChannelID *channel_id = NULL;
+  SilcClientID *client_id = NULL;
   SilcChannelEntry channel;
   SilcClientEntry target_client;
   SilcChannelClientEntry chl;
@@ -3244,11 +3244,11 @@ SILC_SERVER_CMD_FUNC(cumode)
                          packet->data, packet->len, FALSE);
     
   silc_buffer_free(packet);
-  silc_free(channel_id);
-  silc_free(client_id);
   silc_buffer_free(idp);
 
  out:
+  silc_free(channel_id);
+  silc_free(client_id);
   silc_free(fkey);
   silc_server_command_free(cmd);
 }
@@ -3442,6 +3442,9 @@ SILC_SERVER_CMD_FUNC(oper)
       silc_server_command_send_status_reply(cmd, SILC_COMMAND_OPER,
                                            SILC_STATUS_ERR_AUTH_FAILED,
                                            0);
+      SILC_LOG_INFO(("OPER authentication failed for username '%s' by"
+                    "nickname '%s' from %s", username,
+                    client->nickname, cmd->sock->hostname));
       goto out;
     }
   }
@@ -3835,6 +3838,9 @@ SILC_SERVER_CMD_FUNC(silcoper)
     if (!admin) {
       silc_server_command_send_status_reply(cmd, SILC_COMMAND_SILCOPER,
                                            SILC_STATUS_ERR_AUTH_FAILED, 0);
+      SILC_LOG_INFO(("SILCOPER authentication failed for username '%s' by"
+                    "nickname '%s' from %s", username,
+                    client->nickname, cmd->sock->hostname));
       goto out;
     }
   }
@@ -4471,7 +4477,7 @@ SILC_SERVER_CMD_FUNC(connect)
     goto out;
   }
 
-  if (server->server_type == SILC_ROUTER && 
+  if (server->server_type == SILC_ROUTER && !server->backup_router &&
       client->mode & SILC_UMODE_SERVER_OPERATOR) {
     silc_server_command_send_status_reply(cmd, SILC_COMMAND_PRIV_CONNECT,
                                          SILC_STATUS_ERR_NO_ROUTER_PRIV, 0);