Commit Diff


commit - 3a5b7b63ae493aeff7b6ec85ebbfbc39202d0bc4
commit + 5a91d621009d6a0f3b8e5ff054aa6ae7e3195191
blob - 493fbdc0d500336714393ea4917002c6ff5fec43
blob + ec856a0c28fc05ff33b5d1930c79ee4bdb3f75b1
--- src/ngircd/parse.c
+++ src/ngircd/parse.c
@@ -381,7 +381,8 @@ static bool
 Handle_Numeric(CLIENT *client, REQUEST *Req)
 {
 	static const struct _NUMERIC Numerics[] = {
-		{ 005, IRC_Num_ISUPPORT },
+		{   5, IRC_Num_ISUPPORT },
+		{  20, NULL },
 		{ 376, IRC_Num_ENDOFMOTD }
 	};
 	int i, num;
@@ -389,8 +390,12 @@ Handle_Numeric(CLIENT *client, REQUEST *Req)
 	CLIENT *prefix, *target = NULL;
 
 	/* Determine target */
-	if (Req->argc > 0)
-		target = Client_Search(Req->argv[0]);
+	if (Req->argc > 0) {
+		if (strcmp(Req->argv[0], "*") != 0)
+			target = Client_Search(Req->argv[0]);
+		else
+			target = Client_ThisServer();
+	}
 
 	if (!target) {
 		/* Status code without target!? */
@@ -409,8 +414,11 @@ Handle_Numeric(CLIENT *client, REQUEST *Req)
 		num = atoi(Req->command);
 
 		for (i = 0; i < (int) ARRAY_SIZE(Numerics); i++) {
-			if (num == Numerics[i].numeric)
+			if (num == Numerics[i].numeric) {
+				if (!Numerics[i].function)
+					return CONNECTED;
 				return Numerics[i].function(client, Req);
+			}
 		}
 
 		LogDebug("Ignored status code %s from \"%s\".",