X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/6f3b64079f6cfa25d3e862994a417a2100be85be..c387fc41ae496de901a556928e0c65736d5ced4f:/src/s_serv.c

diff --git a/src/s_serv.c b/src/s_serv.c
index ed8f037..10c0fab 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -59,10 +59,6 @@
 #define INADDR_NONE ((unsigned int) 0xffffffff)
 #endif
 
-#ifndef HAVE_SOCKETPAIR
-static int inet_socketpair(int d, int type, int protocol, int sv[2]);
-#endif
-
 int MaxConnectionCount = 1;
 int MaxClientCount = 1;
 int refresh_user_links = 0;
@@ -91,6 +87,7 @@ struct Capability captab[] = {
 	{ "RSFNC",	CAP_RSFNC },
 	{ "SAVE",	CAP_SAVE },
 	{ "EUID",	CAP_EUID },
+	{ "EOPMOD",	CAP_EOPMOD },
 	{0, 0}
 };
 
@@ -156,41 +153,23 @@ hunt_server(struct Client *client_p, struct Client *source_p,
 	 * Again, if there are no wild cards involved in the server
 	 * name, use the hash lookup
 	 */
-	if(!target_p)
+	if(!target_p && wilds)
 	{
-		if(!wilds)
+		RB_DLINK_FOREACH(ptr, global_client_list.head)
 		{
-			if(MyClient(source_p) || !IsDigit(parv[server][0]))
-				sendto_one_numeric(source_p, ERR_NOSUCHSERVER,
-						   form_str(ERR_NOSUCHSERVER),
-						   parv[server]);
-			return (HUNTED_NOSUCH);
-		}
-		else
-		{
-			target_p = NULL;
-
-			RB_DLINK_FOREACH(ptr, global_client_list.head)
+			if(match(new, ((struct Client *) (ptr->data))->name))
 			{
-				if(match(new, ((struct Client *) (ptr->data))->name))
-				{
-					target_p = ptr->data;
-					break;
-				}
+				target_p = ptr->data;
+				break;
 			}
 		}
 	}
 
+	if(target_p && !IsRegistered(target_p))
+		target_p = NULL;
+
 	if(target_p)
 	{
-		if(!IsRegistered(target_p))
-		{
-			sendto_one_numeric(source_p, ERR_NOSUCHSERVER,
-					   form_str(ERR_NOSUCHSERVER),
-					   parv[server]);
-			return HUNTED_NOSUCH;
-		}
-
 		if(IsMe(target_p) || MyClient(target_p))
 			return HUNTED_ISME;
 
@@ -507,7 +486,7 @@ burst_TS6(struct Client *client_p)
 			ubuf[1] = '\0';
 		}
 
-		if(has_id(target_p) && IsCapable(client_p, CAP_EUID))
+		if(IsCapable(client_p, CAP_EUID))
 			sendto_one(client_p, ":%s EUID %s %d %ld %s %s %s %s %s %s %s :%s",
 				   target_p->servptr->id, target_p->name,
 				   target_p->hopcount + 1, 
@@ -518,7 +497,7 @@ burst_TS6(struct Client *client_p)
 				   IsDynSpoof(target_p) ? target_p->orighost : "*",
 				   EmptyString(target_p->user->suser) ? "*" : target_p->user->suser,
 				   target_p->info);
-		else if(has_id(target_p))
+		else
 			sendto_one(client_p, ":%s UID %s %d %ld %s %s %s %s %s :%s",
 				   target_p->servptr->id, target_p->name,
 				   target_p->hopcount + 1, 
@@ -526,16 +505,8 @@ burst_TS6(struct Client *client_p)
 				   target_p->username, target_p->host,
 				   IsIPSpoof(target_p) ? "0" : target_p->sockhost,
 				   target_p->id, target_p->info);
-		else
-			sendto_one(client_p, "NICK %s %d %ld %s %s %s %s :%s",
-					target_p->name,
-					target_p->hopcount + 1,
-					(long) target_p->tsinfo,
-					ubuf,
-					target_p->username, target_p->host,
-					target_p->servptr->name, target_p->info);
-
-		if(!has_id(target_p) || !IsCapable(client_p, CAP_EUID))
+
+		if(!IsCapable(client_p, CAP_EUID))
 		{
 			if(IsDynSpoof(target_p))
 				sendto_one(client_p, ":%s ENCAP * REALHOST %s",
@@ -1186,7 +1157,13 @@ serv_connect_ssl_callback(rb_fde_t *F, int status, void *data)
 		serv_connect_callback(F, status, data);
 		return;
 	}
-	rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF[0], &xF[1], "Outgoing ssld connection");
+	if(rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF[0], &xF[1], "Outgoing ssld connection") == -1)
+	{
+                ilog_error("rb_socketpair failed for server");
+		serv_connect_callback(F, RB_ERROR, data);
+		return;
+		
+	}
 	del_from_cli_fd_hash(client_p);
 	client_p->localClient->F = xF[0];
 	add_to_cli_fd_hash(client_p);
@@ -1278,9 +1255,6 @@ serv_connect_callback(rb_fde_t *F, int status, void *data)
 	/* Next, send the initial handshake */
 	SetHandshake(client_p);
 
-	/* kludge, if we're not using TS6, dont ever send
-	 * ourselves as being TS6 capable.
-	 */
 	if(!EmptyString(server_p->spasswd))
 	{
 		sendto_one(client_p, "PASS %s TS %d :%s", 
@@ -1313,60 +1287,3 @@ serv_connect_callback(rb_fde_t *F, int status, void *data)
 	/* If we get here, we're ok, so lets start reading some data */
 	read_packet(F, client_p);
 }
-
-#ifndef HAVE_SOCKETPAIR
-static int
-inet_socketpair(int d, int type, int protocol, int sv[2])
-{
-	struct sockaddr_in addr1, addr2, addr3;
-	int addr3_len = sizeof(addr3);
-	int fd, rc;
-	int port_no = 20000;
-	
-	if(d != AF_INET || type != SOCK_STREAM || protocol)
-	{
-		errno = EAFNOSUPPORT;
-		return -1;
-	}
-	if(((sv[0] = socket(AF_INET, SOCK_STREAM, 0)) < 0) || ((sv[1] = socket(AF_INET, SOCK_STREAM, 0)) < 0))
-		return -1;
-	
-	addr1.sin_port = htons(port_no);
-	addr1.sin_family = AF_INET;
-	addr1.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-	while ((rc = bind (sv[0], (struct sockaddr *) &addr1, sizeof (addr1))) < 0 && errno == EADDRINUSE)
-		addr1.sin_port = htons(++port_no);
-	
-	if(rc < 0)
-		return -1;
-	
-	if(listen(sv[0], 1) < 0)
-	{
-		close(sv[0]);
-		close(sv[1]);
-		return -1;
-	}
-	
-	addr2.sin_port = htons(port_no);
-	addr2.sin_family = AF_INET;
-	addr2.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-	if(connect (sv[1], (struct sockaddr *) &addr2, sizeof (addr2)) < 0) 
-	{
-		close(sv[0]);
-		close(sv[1]);
-		return -1;
-	}
-	
-	if((fd = accept(sv[1], (struct sockaddr *) &addr3, &addr3_len)) < 0)
-	{
-		close(sv[0]);
-		close(sv[1]);
-		return -1;
-	}
-	close(sv[0]);
-	sv[0] = fd;
-	
-	return(0);
-
-}
-#endif