Changeset 740 for vendor/current/nsswitch/wb_common.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/nsswitch/wb_common.c (modified) (13 diffs)

vendor/current/nsswitch/wb_common.c

@@ -23 +23 @@
 */
 
+#include "replace.h"
+#include "system/select.h"
 #include "winbind_client.h"
 
@@ -42 +44 @@
 /* Initialise a request structure */
 
-void winbindd_init_request(struct winbindd_request *request, int request_type)
+static void winbindd_init_request(struct winbindd_request *request,
+                                  int request_type)
 {
         request->length = sizeof(struct winbindd_request);
@@ -65 +68 @@
 __attribute__((destructor))
 #endif
-void winbind_close_sock(void)
+static void winbind_close_sock(void)
 {
         if (winbindd_fd != -1) {
@@ -233 +236 @@
         for (wait_time = 0; connect(fd, (struct sockaddr *)&sunaddr, sizeof(sunaddr)) == -1;
                         wait_time += slept) {
-                struct timeval tv;
-                fd_set w_fds;
+                struct pollfd pfd;
                 int ret;
                 int connect_errno = 0;
@@ -244 +246 @@
                 switch (errno) {
                         case EINPROGRESS:
-                                FD_ZERO(&w_fds);
-                                if (fd < 0 || fd >= FD_SETSIZE) {
-                                        errno = EBADF;
-                                        goto error_out;
-                                }
-                                FD_SET(fd, &w_fds);
-                                tv.tv_sec = CONNECT_TIMEOUT - wait_time;
-                                tv.tv_usec = 0;
-
-                                ret = select(fd + 1, NULL, &w_fds, NULL, &tv);
+                                pfd.fd = fd;
+                                pfd.events = POLLOUT;
+
+                                ret = poll(&pfd, 1, (CONNECT_TIMEOUT - wait_time) * 1000);
 
                                 if (ret > 0) {
@@ -371 +367 @@
 /* Write data to winbindd socket */
 
-int winbind_write_sock(void *buffer, int count, int recursing, int need_priv)
+static int winbind_write_sock(void *buffer, int count, int recursing,
+                              int need_priv)
 {
         int result, nwritten;
@@ -389 +386 @@
 
         while(nwritten < count) {
-                struct timeval tv;
-                fd_set r_fds;
+                struct pollfd pfd;
+                int ret;
 
                 /* Catch pipe close on other end by checking if a read()
-                   call would not block by calling select(). */
-
-                FD_ZERO(&r_fds);
-                if (winbindd_fd < 0 || winbindd_fd >= FD_SETSIZE) {
-                        errno = EBADF;
+                   call would not block by calling poll(). */
+
+                pfd.fd = winbindd_fd;
+                pfd.events = POLLIN|POLLHUP;
+
+                ret = poll(&pfd, 1, 0);
+                if (ret == -1) {
+                        winbind_close_sock();
+                        return -1;                   /* poll error */
+                }
+
+                /* Write should be OK if fd not available for reading */
+
+                if ((ret == 1) && (pfd.revents & (POLLIN|POLLHUP|POLLERR))) {
+
+                        /* Pipe has closed on remote end */
+
+                        winbind_close_sock();
+                        goto restart;
+                }
+
+                /* Do the write */
+
+                result = write(winbindd_fd,
+                               (char *)buffer + nwritten,
+                               count - nwritten);
+
+                if ((result == -1) || (result == 0)) {
+
+                        /* Write failed */
+
                         winbind_close_sock();
                         return -1;
                 }
-                FD_SET(winbindd_fd, &r_fds);
-                ZERO_STRUCT(tv);
-
-                if (select(winbindd_fd + 1, &r_fds, NULL, NULL, &tv) == -1) {
-                        winbind_close_sock();
-                        return -1;                   /* Select error */
-                }
-
-                /* Write should be OK if fd not available for reading */
-
-                if (!FD_ISSET(winbindd_fd, &r_fds)) {
-
-                        /* Do the write */
-
-                        result = write(winbindd_fd,
-                                       (char *)buffer + nwritten,
-                                       count - nwritten);
-
-                        if ((result == -1) || (result == 0)) {
-
-                                /* Write failed */
-
-                                winbind_close_sock();
-                                return -1;
-                        }
-
-                        nwritten += result;
-
-                } else {
-
-                        /* Pipe has closed on remote end */
-
-                        winbind_close_sock();
-                        goto restart;
-                }
+
+                nwritten += result;
         }
 
@@ -443 +433 @@
 /* Read data from winbindd socket */
 
-int winbind_read_sock(void *buffer, int count)
+static int winbind_read_sock(void *buffer, int count)
 {
         int nread = 0;
-        int total_time = 0, selret;
+        int total_time = 0;
 
         if (winbindd_fd == -1) {
@@ -454 +444 @@
         /* Read data from socket */
         while(nread < count) {
-                struct timeval tv;
-                fd_set r_fds;
+                struct pollfd pfd;
+                int ret;
 
                 /* Catch pipe close on other end by checking if a read()
-                   call would not block by calling select(). */
-
-                FD_ZERO(&r_fds);
-                if (winbindd_fd < 0 || winbindd_fd >= FD_SETSIZE) {
-                        errno = EBADF;
+                   call would not block by calling poll(). */
+
+                pfd.fd = winbindd_fd;
+                pfd.events = POLLIN|POLLHUP;
+
+                /* Wait for 5 seconds for a reply. May need to parameterise this... */
+
+                ret = poll(&pfd, 1, 5000);
+                if (ret == -1) {
                         winbind_close_sock();
-                        return -1;
-                }
-                FD_SET(winbindd_fd, &r_fds);
-                ZERO_STRUCT(tv);
-                /* Wait for 5 seconds for a reply. May need to parameterise this... */
-                tv.tv_sec = 5;
-
-                if ((selret = select(winbindd_fd + 1, &r_fds, NULL, NULL, &tv)) == -1) {
-                        winbind_close_sock();
-                        return -1;                   /* Select error */
-                }
-
-                if (selret == 0) {
+                        return -1;                   /* poll error */
+                }
+
+                if (ret == 0) {
                         /* Not ready for read yet... */
                         if (total_time >= 30) {
@@ -487 +472 @@
                 }
 
-                if (FD_ISSET(winbindd_fd, &r_fds)) {
+                if ((ret == 1) && (pfd.revents & (POLLIN|POLLHUP|POLLERR))) {
 
                         /* Do the Read */
@@ -514 +499 @@
 /* Read reply */
 
-int winbindd_read_reply(struct winbindd_response *response)
+static int winbindd_read_reply(struct winbindd_response *response)
 {
         int result1, result2 = 0;
@@ -527 +512 @@
                                     sizeof(struct winbindd_response));
         if (result1 == -1) {
+                return -1;
+        }
+
+        if (response->length < sizeof(struct winbindd_response)) {
                 return -1;
         }
@@ -683 +672 @@
         return status;
 }
-
-/*************************************************************************
- ************************************************************************/
-
-const char *nss_err_str(NSS_STATUS ret)
-{
-        switch (ret) {
-                case NSS_STATUS_TRYAGAIN:
-                        return "NSS_STATUS_TRYAGAIN";
-                case NSS_STATUS_SUCCESS:
-                        return "NSS_STATUS_SUCCESS";
-                case NSS_STATUS_NOTFOUND:
-                        return "NSS_STATUS_NOTFOUND";
-                case NSS_STATUS_UNAVAIL:
-                        return "NSS_STATUS_UNAVAIL";
-#ifdef NSS_STATUS_RETURN
-                case NSS_STATUS_RETURN:
-                        return "NSS_STATUS_RETURN";
-#endif
-                default:
-                        return "UNKNOWN RETURN CODE!!!!!!!";
-        }
-}