Home Explore Help
Sign In
erkanisik
/
main
mirror of https://github.com/pisilinux/main.git
Watch 1
Star 0
Fork 0
Files Issues 0 Wiki
Branch: master
Branches Tags
main
/
util
/
crypt
/
nss
/
files
/
fedora
/
nss-539183.patch

nss-539183.patch 1.9 KB
Permalink History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455 
  1. diff -up nss/cmd/httpserv/httpserv.c.539183 nss/cmd/httpserv/httpserv.c
    2. 

  2. --- nss/cmd/httpserv/httpserv.c.539183	2013-05-28 14:43:24.000000000 -0700
    3. 

  3. +++ nss/cmd/httpserv/httpserv.c	2013-05-30 22:16:46.685373471 -0700
    4. 

  4. @@ -661,14 +661,18 @@ getBoundListenSocket(unsigned short port
    5. 

  5.      PRStatus	       prStatus;
    6. 

  6.      PRNetAddr          addr;
    7. 

  7.      PRSocketOptionData opt;
    8. 

  8. +    PRUint16           socketDomain = PR_AF_INET;
    9. 

  9.  
    10. 

  10. -    addr.inet.family = PR_AF_INET;
    11. 

  11. -    addr.inet.ip     = PR_INADDR_ANY;
    12. 

  12. -    addr.inet.port   = PR_htons(port);
    13. 

  13. +    if (PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, port, &addr) != PR_SUCCESS) {
    14. 

  14. +	errExit("PR_SetNetAddr");
    15. 

  15. +    }
    16. 

  16.  
    17. 

  17. -    listen_sock = PR_NewTCPSocket();
    18. 

  18. +    if (PR_GetEnv("NSS_USE_SDP")) {
    19. 

  19. +        socketDomain = PR_AF_INET_SDP;
    20. 

  20. +    }
    21. 

  21. +    listen_sock = PR_OpenTCPSocket(PR_AF_INET6);
    22. 

  22.      if (listen_sock == NULL) {
    23. 

  23. -	errExit("PR_NewTCPSocket");
    24. 

  24. +	errExit("PR_OpenTCPSocket error");
    25. 

  25.      }
    26. 

  26.  
    27. 

  27.      opt.option = PR_SockOpt_Nonblocking;
    28. 

  28. diff -up nss/cmd/selfserv/selfserv.c.539183 nss/cmd/selfserv/selfserv.c
    29. 

  29. --- nss/cmd/selfserv/selfserv.c.539183	2013-05-28 14:43:24.000000000 -0700
    30. 

  30. +++ nss/cmd/selfserv/selfserv.c	2013-05-30 22:16:46.688373495 -0700
    31. 

  31. @@ -1687,14 +1687,18 @@ getBoundListenSocket(unsigned short port
    32. 

  32.      PRStatus	       prStatus;
    33. 

  33.      PRNetAddr          addr;
    34. 

  34.      PRSocketOptionData opt;
    35. 

  35. +    PRUint16           socketDomain = PR_AF_INET;
    36. 

  36.  
    37. 

  37. -    addr.inet.family = PR_AF_INET;
    38. 

  38. -    addr.inet.ip     = PR_INADDR_ANY;
    39. 

  39. -    addr.inet.port   = PR_htons(port);
    40. 

  40. +    if (PR_SetNetAddr(PR_IpAddrAny, PR_AF_INET6, port, &addr) != PR_SUCCESS) {
    41. 

  41. +	errExit("PR_SetNetAddr");
    42. 

  42. +    }
    43. 

  43.  
    44. 

  44. -    listen_sock = PR_NewTCPSocket();
    45. 

  45. +    if (PR_GetEnv("NSS_USE_SDP")) {
    46. 

  46. +        socketDomain = PR_AF_INET_SDP;
    47. 

  47. +    }
    48. 

  48. +    listen_sock = PR_OpenTCPSocket(PR_AF_INET6);
    49. 

  49.      if (listen_sock == NULL) {
    50. 

  50. -	errExit("PR_NewTCPSocket");
    51. 

  51. +        errExit("PR_OpenTCPSocket error");
    52. 

  52.      }
    53. 

  53.  
    54. 

  54.      opt.option = PR_SockOpt_Nonblocking;
    55. 

  55.