From 0e6af5bcf6de7a345f81a41d08256efb8276d531 Mon Sep 17 00:00:00 2001
From: nohar <nohar>
Date: Mon, 1 Aug 2005 11:16:39 +0000
Subject: [PATCH] lame bug found by jj

---
 src/connection.c |  1 -
 src/irc.c        | 24 ++++++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index 176bc29..18afc29 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1136,7 +1136,6 @@ static int bip_ssl_verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
 	SSL *ssl;
 	connection_t *c;
 	X509_OBJECT xobj;
-	int is_in_store;
 	int result;
 
 	err_cert = X509_STORE_CTX_get_current_cert(ctx);
diff --git a/src/irc.c b/src/irc.c
index 74a52ce..15c7c44 100644
--- a/src/irc.c
+++ b/src/irc.c
@@ -556,7 +556,7 @@ static char *get_str_elem(char *str, int num)
 	char *cur = str;
 	int index = 0;
 
-	while (c = strchr(cur, PASS_SEP)){
+	while ((c = strchr(cur, PASS_SEP))) {
 		if (index < num) {
 			index++;
 			cur = c + 1;
@@ -1367,15 +1367,8 @@ static int irc_mode(struct link_server *server, struct line *line)
 	if (line->elemc < 3)
 		return ERR_PROTOCOL;
 
-	if (ischannel(line->elemv[1][0])) {
-		channel = hash_get(&server->channels, line->elemv[1]);
-		/* we can't get mode message for chans we're not on */
-		if (!channel)
-			return ERR_PROTOCOL;
-		log_mode(LINK(server)->log, line->origin, line->elemv[1],
-				line->elemv[2], line->elemv + 3,
-				line->elemc - 3);
-	} else if (strcmp(line->elemv[1], server->nick) == 0) {
+	/* nick mode change */
+	if (strcmp(line->elemv[1], server->nick) == 0) {
 		log_mode(LINK(server)->log, line->origin, line->elemv[1],
 				line->elemv[2], line->elemv + 3,
 				line->elemc - 3);
@@ -1383,6 +1376,17 @@ static int irc_mode(struct link_server *server, struct line *line)
 		return OK_COPY;
 	}
 
+	if (!ischannel(line->elemv[1][0]))
+		return ERR_PROTOCOL;
+
+	/* channel mode change */
+	channel = hash_get(&server->channels, line->elemv[1]);
+	/* we can't get mode message for chans we're not on */
+	if (!channel)
+		return ERR_PROTOCOL;
+	log_mode(LINK(server)->log, line->origin, line->elemv[1],
+			line->elemv[2], line->elemv + 3, line->elemc - 3);
+
 	/*       
 	 * MODE -a+b.. #channel args
 	 *         ^            ^