extensions/umode_hide_idle_time: mask times for hidden sources (#373)

[solanum.git] / modules / m_user.c

diff --git a/modules/m_user.c b/modules/m_user.c
index cd8c7c13619344987daea9c741fb764ff2584070..fc657c9ba62e089cf92a0c2cbf7d03926874be9a 100644 (file)
--- a/modules/m_user.c
+++ b/modules/m_user.c
@@ -33,7 +33,6 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
-#include "blacklist.h"
 #include "s_assert.h"
 
 static const char user_desc[] =
@@ -64,7 +63,7 @@ mr_user(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
        static char buf[BUFSIZE];
        char *p;
 
-       if (strlen(client_p->id) == 3)
+       if (strlen(client_p->id) == 3 || (source_p->preClient && !EmptyString(source_p->preClient->id)))
        {
                exit_client(client_p, client_p, client_p, "Mixing client and server protocol");
                return;
@@ -92,7 +91,6 @@ do_local_user(struct Client *client_p, struct Client *source_p,
 
        make_user(source_p);
 
-       lookup_blacklists(source_p);
        source_p->flags |= FLAGS_SENTUSER;
 
        rb_strlcpy(source_p->info, realname, sizeof(source_p->info));