Improve logging for kick/ban

diff --git a/src/ban.c b/src/ban.c
index d91fb5a40090c53f5c7da009093aa426ff147896..fbf711ac22a6762cf66013e9cbec07774fd6a667 100644 (file)
--- a/src/ban.c
+++ b/src/ban.c
@@ -53,9 +53,9 @@ void Ban_UserBan(client_t *client, char *reason)
        list_add_tail(&ban->node, &banlist);
        
        SSLi_hash2hex(ban->hash, hexhash);
-       Log_info("User %s kickbanned. Reason: '%s' Hash: %s IP: %s Banned for: %d seconds",
-                ban->name, ban->reason, hexhash, inet_ntoa(*((struct in_addr *)&ban->address)),
-                getIntConf(BAN_LENGTH));
+       Log_info_client(client, "User kickbanned. Reason: '%s' Hash: %s IP: %s Banned for: %d seconds",
+                       ban->name, ban->reason, hexhash, inet_ntoa(*((struct in_addr *)&ban->address)),
+                       getIntConf(BAN_LENGTH));
 }
 
 

diff --git a/src/messagehandler.c b/src/messagehandler.c
index 1e7a5566ab30e817fe99bbda820ea9b402332634..50b648a29fbecf31a8d9e22d3b8d276945f16ada 100644 (file)
--- a/src/messagehandler.c
+++ b/src/messagehandler.c
@@ -187,7 +187,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
                if (strlen(getStrConf(ADMIN_PASSPHRASE)) > 0 &&
                    Client_token_match(client, getStrConf(ADMIN_PASSPHRASE))) {
                        client->isAdmin = true;
-                       Log_info("User is admin");
+                       Log_info_client(client, "User provided admin password");
                }
                
                /* Setup UDP encryption */
@@ -837,7 +837,8 @@ void Mh_handle_message(client_t *client, message_t *msg)
                if (msg->payload.userRemove->has_ban && msg->payload.userRemove->ban) {
                        Ban_UserBan(target, msg->payload.userRemove->reason);
                } else {
-                       Log_info("User kicked");
+                       Log_info_client(target, "User kicked. Reason: '%s'",
+                                       strlen(msg->payload.userRemove->reason) == 0 ? "N/A" : msg->payload.userRemove->reason);
                }
                /* Re-use message */
                Msg_inc_ref(msg);