From: Dan Fandrich <dan@coneharvesters.com>
Date: Fri, 2 Sep 2011 20:15:58 +0000 (-0700)
Subject: Fix NTLM winbind support to pass the torture tests
X-Git-Tag: curl-7_22_0~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ded3638d972f4512b4e90aaec1625b9b0890b233;p=thirdparty%2Fcurl.git

Fix NTLM winbind support to pass the torture tests

Calling sclose() both in the child and the parent fools the
socket leak detector into thinking it's been closed twice.
Calling close() in the child instead overcomes this problem. It's
not as portable as the sclose() macro, but this code is highly
POSIX-specific, anyway.
---

diff --git a/lib/curl_ntlm_wb.c b/lib/curl_ntlm_wb.c
index b9cc314ef8..ff7339373b 100644
--- a/lib/curl_ntlm_wb.c
+++ b/lib/curl_ntlm_wb.c
@@ -166,8 +166,8 @@ static CURLcode ntlm_wb_init(struct connectdata *conn, const char *userp)
      * child process
      */
 
-    sclose(sockfds[0]);
-
+    /* Don't use sclose in the child since it fools the socket leak detector */
+    close(sockfds[0]);
     if(dup2(sockfds[1], STDIN_FILENO) == -1) {
       error = ERRNO;
       failf(conn->data, "Could not redirect child stdin. errno %d: %s",
@@ -197,7 +197,7 @@ static CURLcode ntlm_wb_init(struct connectdata *conn, const char *userp)
             NULL);
 
     error = ERRNO;
-    sclose(sockfds[1]);
+    close(sockfds[1]);
     failf(conn->data, "Could not execl(). errno %d: %s",
           error, Curl_strerror(conn, error));
     exit(1);