--- libaitrpc/src/srv.c	2012/05/14 14:51:57	1.9.2.1
+++ libaitrpc/src/srv.c	2012/05/14 15:22:22	1.9.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.9.2.1 2012/05/14 14:51:57 misho Exp $
+* $Id: srv.c,v 1.9.2.2 2012/05/14 15:22:22 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -704,52 +704,20 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 {
 	rpc_srv_t *srv = NULL;
 	int n = 1;
-	struct hostent *host = NULL;
 	io_sockaddr_t sa;
 
-	if (!concurentClients || !regProgID || 
-			(family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) {
-		rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init RPC server ...\n");
+	if (!concurentClients || !regProgID) {
+		rpc_SetErr(EINVAL, "Invalid parameters can`t init RPC server");
 		return NULL;
 	}
+	if (!io_gethostbyname(csHost, Port, &sa))
+		return NULL;
 	if (!Port)
 		Port = RPC_DEFPORT;
 	if (!netBuf)
 		netBuf = BUFSIZ;
 	else
 		netBuf = io_align(netBuf, 1);	/* align netBuf length */
-	if (csHost && family != AF_LOCAL) {
-		host = gethostbyname2(csHost, family);
-		if (!host) {
-			rpc_SetErr(h_errno, "Error:: %s\n", hstrerror(h_errno));
-			return NULL;
-		}
-	}
-	memset(&sa, 0, sizeof sa);
-	sa.sa.sa_family = family;
-	switch (family) {
-		case AF_INET:
-			sa.sin.sin_len = sizeof(struct sockaddr_in);
-			sa.sin.sin_port = htons(Port);
-			if (csHost)
-				memcpy(&sa.sin.sin_addr, host->h_addr, host->h_length);
-			break;
-		case AF_INET6:
-			sa.sin6.sin6_len = sizeof(struct sockaddr_in6);
-			sa.sin6.sin6_port = htons(Port);
-			if (csHost)
-				memcpy(&sa.sin6.sin6_addr, host->h_addr, host->h_length);
-			break;
-		case AF_LOCAL:
-			sa.sun.sun_len = sizeof(struct sockaddr_un);
-			if (csHost)
-				strlcpy(sa.sun.sun_path, csHost, sizeof sa.sun.sun_path);
-			unlink(sa.sun.sun_path);
-			break;
-		default:
-			rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t start RPC server ...\n");
-			return NULL;
-	}
 
 	srv = malloc(sizeof(rpc_srv_t));
 	if (!srv) {
@@ -770,7 +738,7 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 	memcpy(&srv->srv_server.cli_sa, &sa, sizeof sa);
 
 	/* create server socket */
-	srv->srv_server.cli_sock = socket(family, SOCK_STREAM, 0);
+	srv->srv_server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, SOCK_STREAM, 0);
 	if (srv->srv_server.cli_sock == -1) {
 		LOGERR;
 		free(srv);