bc4ac545c9
- Adjust patches to new sources - Remove builtin patch which isn't needed due to the update - update sources
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
diff -up ./mozilla/security/nss/cmd/selfserv/selfserv.c.539183 ./mozilla/security/nss/cmd/selfserv/selfserv.c
|
|
--- ./mozilla/security/nss/cmd/selfserv/selfserv.c.539183 2011-10-06 10:42:06.913919000 -0700
|
|
+++ ./mozilla/security/nss/cmd/selfserv/selfserv.c 2011-10-06 10:43:14.858987000 -0700
|
|
@@ -1491,14 +1491,18 @@ getBoundListenSocket(unsigned short port
|
|
PRStatus prStatus;
|
|
PRNetAddr addr;
|
|
PRSocketOptionData opt;
|
|
+ PRUint16 socketDomain = PR_AF_INET;
|
|
|
|
- addr.inet.family = PR_AF_INET;
|
|
- addr.inet.ip = PR_INADDR_ANY;
|
|
- addr.inet.port = PR_htons(port);
|
|
+ if (PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, port, &addr) != PR_SUCCESS) {
|
|
+ errExit("PR_SetNetAddr");
|
|
+ }
|
|
|
|
- listen_sock = PR_NewTCPSocket();
|
|
+ if (PR_GetEnv("NSS_USE_SDP")) {
|
|
+ socketDomain = PR_AF_INET_SDP;
|
|
+ }
|
|
+ listen_sock = PR_OpenTCPSocket(PR_AF_INET6);
|
|
if (listen_sock == NULL) {
|
|
- errExit("PR_NewTCPSocket");
|
|
+ errExit("PR_OpenTCPSocket error");
|
|
}
|
|
|
|
opt.option = PR_SockOpt_Nonblocking;
|