Merge branch 'development'

[NeonServV5.git] / src / WHOHandler.c

diff --git a/src/WHOHandler.c b/src/WHOHandler.c
index efbd24ecdef357f8e4879f2c37631665bd565ad2..5db3db6a3d58be68ad50a402308033f61d004c6c 100644 (file)
--- a/src/WHOHandler.c
+++ b/src/WHOHandler.c
@@ -23,6 +23,7 @@
 #include "ClientSocket.h"
 #include "IPNode.h"
 #include "modules.h"
+#include "log.h"
 
 #define WHOQUEUETYPE_ISONQUEUE 0x01
 #define WHOQUEUETYPE_USERLIST  0x02
@@ -65,7 +66,7 @@ static struct WHOQueueEntry* addWHOQueueEntry(struct ClientSocket *client) {
     struct WHOQueueEntry *entry = malloc(sizeof(*entry));
     if (!entry)
     {
-        perror("malloc() failed");
+        printf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__);
         DESYNCHRONIZE(whohandler_sync);
         return NULL;
     }
@@ -215,7 +216,7 @@ void get_userauth(struct UserNode *user, int module_id, userauth_callback_t call
         callback(bot, user->nick, NULL, data);
         return;
     }
-    if((user->flags & (USERFLAG_ISAUTHED | USERFLAG_ISIRCOP | USERFLAG_ISBOT | USERFLAG_ISSERVER)) || (time(0) - user->last_who) <= REWHO_TIMEOUT) {
+    if((user->flags & (USERFLAG_ISAUTHED | USERFLAG_ISSERVER)) || (time(0) - user->last_who) <= REWHO_TIMEOUT) {
         callback(bot, user->nick, user, data);
         return;
     }