X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/29c92cf95f9b9e669b08e90d13c8a8ba12369d58..63eb8567cb6b6b8b504b20ef6360d0cc79c18afb:/src/s_conf.c

diff --git a/src/s_conf.c b/src/s_conf.c
index d31b1f41..96559c13 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -86,6 +86,7 @@ FILE *conf_fbfile_in;
 extern char yytext[];
 
 static int verify_access(struct Client *client_p, const char *username);
+static struct ConfItem *find_address_conf_by_client(struct Client *client_p, const char *username);
 static int attach_iline(struct Client *, struct ConfItem *);
 
 void
@@ -317,27 +318,8 @@ static int
 verify_access(struct Client *client_p, const char *username)
 {
 	struct ConfItem *aconf;
-	char non_ident[USERLEN + 1];
-
-	if(IsGotId(client_p))
-	{
-		aconf = find_address_conf(client_p->host, client_p->sockhost,
-					client_p->username, client_p->username,
-					(struct sockaddr *) &client_p->localClient->ip,
-					client_p->localClient->ip.ss_family,
-					client_p->localClient->auth_user);
-	}
-	else
-	{
-		rb_strlcpy(non_ident, "~", sizeof(non_ident));
-		rb_strlcat(non_ident, username, sizeof(non_ident));
-		aconf = find_address_conf(client_p->host, client_p->sockhost,
-					non_ident, client_p->username,
-					(struct sockaddr *) &client_p->localClient->ip,
-					client_p->localClient->ip.ss_family,
-					client_p->localClient->auth_user);
-	}
 
+	aconf = find_address_conf_by_client(client_p, username);
 	if(aconf == NULL)
 		return NOT_AUTHORISED;
 
@@ -399,6 +381,37 @@ verify_access(struct Client *client_p, const char *username)
 }
 
 
+/*
+ * find_address_conf_by_client
+ */
+static struct ConfItem *
+find_address_conf_by_client(struct Client *client_p, const char *username)
+{
+	struct ConfItem *aconf;
+	char non_ident[USERLEN + 1];
+
+	if(IsGotId(client_p))
+	{
+		aconf = find_address_conf(client_p->host, client_p->sockhost,
+					client_p->username, client_p->username,
+					(struct sockaddr *) &client_p->localClient->ip,
+					client_p->localClient->ip.ss_family,
+					client_p->localClient->auth_user);
+	}
+	else
+	{
+		rb_strlcpy(non_ident, "~", sizeof(non_ident));
+		rb_strlcat(non_ident, username, sizeof(non_ident));
+		aconf = find_address_conf(client_p->host, client_p->sockhost,
+					non_ident, client_p->username,
+					(struct sockaddr *) &client_p->localClient->ip,
+					client_p->localClient->ip.ss_family,
+					client_p->localClient->auth_user);
+	}
+	return aconf;
+}
+
+
 /*
  * add_ip_limit
  *
@@ -780,6 +793,8 @@ set_default_conf(void)
 	ConfigChannel.channel_target_change = YES;
 	ConfigChannel.disable_local_channels = NO;
 
+	ConfigChannel.autochanmodes = MODE_TOPICLIMIT | MODE_NOPRIVMSGS;
+
 	ConfigServerHide.flatten_links = 0;
 	ConfigServerHide.links_delay = 300;
 	ConfigServerHide.hidden = 0;
@@ -806,6 +821,7 @@ set_default_conf(void)
 	ServerInfo.default_max_clients = MAXCONNECTIONS;
 
 	ConfigFileEntry.nicklen = NICKLEN;
+	ConfigFileEntry.certfp_method = RB_SSL_CERTFP_METH_SHA1;
 
 	if (!alias_dict)
 		alias_dict = irc_dictionary_create(strcasecmp);