From a572df9a4eda44decdb6cfb8b96ef48ea3bba04b Mon Sep 17 00:00:00 2001 From: "emaldona%redhat.com" Date: Wed, 17 Aug 2011 15:22:12 +0000 Subject: [PATCH] Bug 172051 - Revert an unwanted change - a fedora-only workaround that should not have been included in previous commit git-svn-id: svn://10.0.0.236/trunk@262714 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/cmd/selfserv/selfserv.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/mozilla/security/nss/cmd/selfserv/selfserv.c b/mozilla/security/nss/cmd/selfserv/selfserv.c index 9406abc941d..d78881de254 100644 --- a/mozilla/security/nss/cmd/selfserv/selfserv.c +++ b/mozilla/security/nss/cmd/selfserv/selfserv.c @@ -1491,18 +1491,14 @@ getBoundListenSocket(unsigned short port) PRStatus prStatus; PRNetAddr addr; PRSocketOptionData opt; - PRUint16 socketDomain = PR_AF_INET; - if (PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, port, &addr) != PR_SUCCESS) { - errExit("PR_SetNetAddr"); - } + addr.inet.family = PR_AF_INET; + addr.inet.ip = PR_INADDR_ANY; + addr.inet.port = PR_htons(port); - if (PR_GetEnv("NSS_USE_SDP")) { - socketDomain = PR_AF_INET_SDP; - } - listen_sock = PR_OpenTCPSocket(PR_AF_INET6); + listen_sock = PR_NewTCPSocket(); if (listen_sock == NULL) { - errExit("PR_OpenTCPSocket error"); + errExit("PR_NewTCPSocket"); } opt.option = PR_SockOpt_Nonblocking;