X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/8901cbdc7435a3fa380faeddd3dde060340e3b2b..b5482c91035029ff8b7c970d8f5b23dcbb885da3:/src/s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index 1d385e1..f8d5e0c 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -39,7 +39,7 @@
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "s_stats.h"
 #include "scache.h"
@@ -94,7 +94,7 @@ int user_modes[256] = {
 	0,			/* W */
 	0,			/* X */
 	0,			/* Y */
-	0,			/* Z */
+	UMODE_SSLCLIENT,	/* Z */
 	/* 0x5B */ 0, 0, 0, 0, 0, 0, /* 0x60 */
 	UMODE_ADMIN,		/* a */
 	0,			/* b */
@@ -414,7 +414,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 	   (xconf = find_xline(source_p->info, 1)) != NULL)
 	{
 		ServerStats.is_ref++;
-		add_reject(source_p);
+		add_reject(source_p, xconf->name, NULL);
 		exit_client(client_p, source_p, &me, "Bad user info");
 		return CLIENT_EXITED;
 	}
@@ -446,7 +446,7 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 			sendto_one_notice(source_p, ":*** Your IP address %s is listed in %s",
 					source_p->sockhost, source_p->preClient->dnsbl_listed->host);
 			source_p->preClient->dnsbl_listed->hits++;
-			add_reject(source_p);
+			add_reject(source_p, NULL, NULL);
 			exit_client(client_p, source_p, &me, "*** Banned (DNS blacklist)");
 			return CLIENT_EXITED;
 		}
@@ -522,10 +522,14 @@ register_local_user(struct Client *client_p, struct Client *source_p, const char
 		add_to_id_hash(source_p->id, source_p);
 	}
 
+	if (IsSSL(source_p))
+		source_p->umodes |= UMODE_SSLCLIENT;
+
 	if (source_p->umodes & UMODE_INVISIBLE)
 		Count.invisi++;
 
 	s_assert(!IsClient(source_p));
+	del_unknown_ip(source_p);
 	rb_dlinkMoveNode(&source_p->localClient->tnode, &unknown_list, &lclient_list);
 	SetClient(source_p);
 
@@ -1006,6 +1010,7 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
 
 		/* can only be set on burst */
 		case 'S':
+		case 'Z':
 		case ' ':
 		case '\n':
 		case '\r':
@@ -1368,7 +1373,7 @@ construct_umodebuf(void)
 
 void
 change_nick_user_host(struct Client *target_p,	const char *nick, const char *user,
-		      const char *host, int newts, char *format, ...)
+		      const char *host, int newts, const char *format, ...)
 {
 	rb_dlink_node *ptr;
 	struct Channel *chptr;