r6149: Fixes bugs #2498 and 2484.

[samba.git] / source / nsswitch / wb_common.c

diff --git a/source/nsswitch/wb_common.c b/source/nsswitch/wb_common.c
index 88bda4eabe33188362ca3a6e27cc8dab51064865..6ba0cbbf4287cd1fc4d039a48c281621d117552d 100644 (file)
--- a/source/nsswitch/wb_common.c
+++ b/source/nsswitch/wb_common.c
@@ -24,8 +24,10 @@
    Boston, MA  02111-1307, USA.   
 */
 
    Boston, MA  02111-1307, USA.   
 */
 

-#include "winbind_nss_config.h"
-#include "winbindd_nss.h"
+#include "winbind_client.h"
+
+#define CONST_DISCARD(type, ptr)      ((type) ((void *) (ptr)))
+#define CONST_ADD(type, ptr)          ((type) ((const void *) (ptr)))

 
 /* Global variables.  These are effectively the client state information */
 
 
 /* Global variables.  These are effectively the client state information */
 


@@ -45,25 +47,11 @@ void free_response(struct winbindd_response *response)
 
 void init_request(struct winbindd_request *request, int request_type)
 {
 
 void init_request(struct winbindd_request *request, int request_type)
 {

-        static char *domain_env;
-        static BOOL initialised;
-

        request->length = sizeof(struct winbindd_request);
 
        request->cmd = (enum winbindd_cmd)request_type;
        request->pid = getpid();
        request->length = sizeof(struct winbindd_request);
 
        request->cmd = (enum winbindd_cmd)request_type;
        request->pid = getpid();

-       request->domain[0] = '\0';
-
-       if (!initialised) {
-               initialised = True;
-               domain_env = getenv(WINBINDD_DOMAIN_ENV);
-       }

 
 

-       if (domain_env) {
-               strncpy(request->domain, domain_env,
-                       sizeof(request->domain) - 1);
-               request->domain[sizeof(request->domain) - 1] = '\0';
-       }

 }
 
 /* Initialise a response structure */
 }
 
 /* Initialise a response structure */


@@ -85,6 +73,10 @@ void close_sock(void)
        }
 }
 
        }
 }
 

+#define CONNECT_TIMEOUT 30
+#define WRITE_TIMEOUT CONNECT_TIMEOUT
+#define READ_TIMEOUT CONNECT_TIMEOUT
+

 /* Make sure socket handle isn't stdin, stdout or stderr */
 #define RECURSION_LIMIT 3
 
 /* Make sure socket handle isn't stdin, stdout or stderr */
 #define RECURSION_LIMIT 3
 


@@ -96,7 +88,7 @@ static int make_nonstd_fd_internals(int fd, int limit /* Recursion limiter */)
                if ((new_fd = fcntl(fd, F_DUPFD, 3)) == -1) {
                        return -1;
                }
                if ((new_fd = fcntl(fd, F_DUPFD, 3)) == -1) {
                        return -1;
                }

-               /* Parinoia */
+               /* Paranoia */

                if (new_fd < 3) {
                        close(new_fd);
                        return -1;
                if (new_fd < 3) {
                        close(new_fd);
                        return -1;


@@ -120,6 +112,14 @@ static int make_nonstd_fd_internals(int fd, int limit /* Recursion limiter */)
        return fd;
 }
 
        return fd;
 }
 

+/****************************************************************************
+ Set a fd into blocking/nonblocking mode. Uses POSIX O_NONBLOCK if available,
+ else
+ if SYSV use O_NDELAY
+ if BSD use FNDELAY
+ Set close on exec also.
+****************************************************************************/
+

 static int make_safe_fd(int fd) 
 {
        int result, flags;
 static int make_safe_fd(int fd) 
 {
        int result, flags;


@@ -128,8 +128,32 @@ static int make_safe_fd(int fd)
                close(fd);
                return -1;
        }
                close(fd);
                return -1;
        }

+
+       /* Socket should be nonblocking. */
+#ifdef O_NONBLOCK
+#define FLAG_TO_SET O_NONBLOCK
+#else
+#ifdef SYSV
+#define FLAG_TO_SET O_NDELAY
+#else /* BSD */
+#define FLAG_TO_SET FNDELAY
+#endif
+#endif
+
+       if ((flags = fcntl(new_fd, F_GETFL)) == -1) {
+               close(new_fd);
+               return -1;
+       }
+
+       flags |= FLAG_TO_SET;
+       if (fcntl(new_fd, F_SETFL, flags) == -1) {
+               close(new_fd);
+               return -1;
+       }
+
+#undef FLAG_TO_SET
+

        /* Socket should be closed on exec() */
        /* Socket should be closed on exec() */

-       

 #ifdef FD_CLOEXEC
        result = flags = fcntl(new_fd, F_GETFD, 0);
        if (flags >= 0) {
 #ifdef FD_CLOEXEC
        result = flags = fcntl(new_fd, F_GETFD, 0);
        if (flags >= 0) {


@@ -146,26 +170,18 @@ static int make_safe_fd(int fd)
 
 /* Connect to winbindd socket */
 
 
 /* Connect to winbindd socket */
 

-int winbind_open_pipe_sock(void)
+static int winbind_named_pipe_sock(const char *dir)

 {
        struct sockaddr_un sunaddr;
 {
        struct sockaddr_un sunaddr;

-       static pid_t our_pid;

        struct stat st;
        pstring path;
        int fd;
        struct stat st;
        pstring path;
        int fd;

-       
-       if (our_pid != getpid()) {
-               close_sock();
-               our_pid = getpid();
-       }
-       
-       if (winbindd_fd != -1) {
-               return winbindd_fd;
-       }
+       int wait_time;
+       int slept;

        
        /* Check permissions on unix socket directory */
        
        
        /* Check permissions on unix socket directory */
        

-       if (lstat(WINBINDD_SOCKET_DIR, &st) == -1) {
+       if (lstat(dir, &st) == -1) {

                return -1;
        }
        
                return -1;
        }
        


@@ -176,13 +192,13 @@ int winbind_open_pipe_sock(void)
        
        /* Connect to socket */
        
        
        /* Connect to socket */
        

-       strncpy(path, WINBINDD_SOCKET_DIR, sizeof(path) - 1);
+       strncpy(path, dir, sizeof(path) - 1);

        path[sizeof(path) - 1] = '\0';
        
        path[sizeof(path) - 1] = '\0';
        

-       strncat(path, "/", sizeof(path) - 1);
+       strncat(path, "/", sizeof(path) - 1 - strlen(path));

        path[sizeof(path) - 1] = '\0';
        
        path[sizeof(path) - 1] = '\0';
        

-       strncat(path, WINBINDD_SOCKET_NAME, sizeof(path) - 1);
+       strncat(path, WINBINDD_SOCKET_NAME, sizeof(path) - 1 - strlen(path));

        path[sizeof(path) - 1] = '\0';
        
        ZERO_STRUCT(sunaddr);
        path[sizeof(path) - 1] = '\0';
        
        ZERO_STRUCT(sunaddr);


@@ -210,17 +226,120 @@ int winbind_open_pipe_sock(void)
                return -1;
        }
 
                return -1;
        }
 

-       if ((winbindd_fd = make_safe_fd( fd)) == -1) {
-               return winbindd_fd;
+       /* Set socket non-blocking and close on exec. */
+
+       if ((fd = make_safe_fd( fd)) == -1) {
+               return fd;

        }
        }

-       
-       if (connect(winbindd_fd, (struct sockaddr *)&sunaddr, 
+
+       for (wait_time = 0; connect(fd, (struct sockaddr *)&sunaddr, sizeof(sunaddr)) == -1;
+                       wait_time += slept) {
+               struct timeval tv;
+               fd_set w_fds;
+               int ret;
+               int connect_errno = 0, errnosize;
+
+               if (wait_time >= CONNECT_TIMEOUT)
+                       goto error_out;
+
+               switch (errno) {
+                       case EINPROGRESS:
+                               FD_ZERO(&w_fds);
+                               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);
+
+                               if (ret > 0) {
+                                       errnosize = sizeof(connect_errno);
+
+                                       ret = getsockopt(fd, SOL_SOCKET,
+                                                       SO_ERROR, &connect_errno, &errnosize);
+
+                                       if (ret >= 0 && connect_errno == 0) {
+                                               /* Connect succeed */
+                                               goto out;
+                                       }
+                               }
+
+                               slept = CONNECT_TIMEOUT;
+                               break;
+                       case EAGAIN:
+                               slept = rand() % 3 + 1;
+                               sleep(slept);
+                               break;
+                       default:
+                               goto error_out;
+               }
+
+       }
+
+  out:
+
+       return fd;
+
+  error_out:
+
+       close(fd);
+       return -1;
+
+       if (connect(fd, (struct sockaddr *)&sunaddr, 

                    sizeof(sunaddr)) == -1) {
                    sizeof(sunaddr)) == -1) {

-               close_sock();
+               close(fd);

                return -1;
        }
         
                return -1;
        }
         

+       return fd;
+}
+
+/* Connect to winbindd socket */
+
+int winbind_open_pipe_sock(void)
+{
+#ifdef HAVE_UNIXSOCKET
+       static pid_t our_pid;
+       struct winbindd_request request;
+       struct winbindd_response response;
+       ZERO_STRUCT(request);
+       ZERO_STRUCT(response);
+
+       if (our_pid != getpid()) {
+               close_sock();
+               our_pid = getpid();
+       }
+       
+       if (winbindd_fd != -1) {
+               return winbindd_fd;
+       }
+
+       if ((winbindd_fd = winbind_named_pipe_sock(WINBINDD_SOCKET_DIR)) == -1) {
+               return -1;
+       }
+
+       /* version-check the socket */
+
+       if ((winbindd_request(WINBINDD_INTERFACE_VERSION, &request, &response) != NSS_STATUS_SUCCESS) || (response.data.interface_version != WINBIND_INTERFACE_VERSION)) {
+               close_sock();
+               return -1;
+       }
+
+       /* try and get priv pipe */
+
+       if (winbindd_request(WINBINDD_PRIV_PIPE_DIR, &request, &response) == NSS_STATUS_SUCCESS) {
+               int fd;
+               if ((fd = winbind_named_pipe_sock(response.extra_data)) != -1) {
+                       close(winbindd_fd);
+                       winbindd_fd = fd;
+               }
+       }
+
+       SAFE_FREE(response.extra_data);
+

        return winbindd_fd;
        return winbindd_fd;

+#else
+       return -1;
+#endif /* HAVE_UNIXSOCKET */

 }
 
 /* Write data to winbindd socket */
 }
 
 /* Write data to winbindd socket */


@@ -294,25 +413,58 @@ int write_sock(void *buffer, int count)
 static int read_sock(void *buffer, int count)
 {
        int result = 0, nread = 0;
 static int read_sock(void *buffer, int count)
 {
        int result = 0, nread = 0;

+       int total_time = 0, selret;

 
        /* Read data from socket */
 
        /* Read data from socket */

-       

        while(nread < count) {
        while(nread < count) {

+               struct timeval tv;
+               fd_set r_fds;

                
                

-               result = read(winbindd_fd, (char *)buffer + nread, 
-                             count - nread);
+               /* Catch pipe close on other end by checking if a read()
+                  call would not block by calling select(). */
+
+               FD_ZERO(&r_fds);
+               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) {
+                       close_sock();
+                       return -1;                   /* Select error */
+               }

                
                

-               if ((result == -1) || (result == 0)) {
+               if (selret == 0) {
+                       /* Not ready for read yet... */
+                       if (total_time >= 30) {
+                               /* Timeout */
+                               close_sock();
+                               return -1;
+                       }
+                       total_time += 5;
+                       continue;
+               }
+
+               if (FD_ISSET(winbindd_fd, &r_fds)) {

                        
                        

-                       /* Read failed.  I think the only useful thing we
-                          can do here is just return -1 and fail since the
-                          transaction has failed half way through. */
+                       /* Do the Read */
+                       
+                       result = read(winbindd_fd, (char *)buffer + nread, 
+                             count - nread);
+                       
+                       if ((result == -1) || (result == 0)) {
+                               
+                               /* Read failed.  I think the only useful thing we
+                                  can do here is just return -1 and fail since the
+                                  transaction has failed half way through. */
+                       
+                               close_sock();
+                               return -1;
+                       }
+                       
+                       nread += result;

                        
                        

-                       close_sock();
-                       return -1;

                }
                }

-               
-               nread += result;

        }
        
        return result;
        }
        
        return result;


@@ -373,11 +525,15 @@ int read_reply(struct winbindd_response *response)
 NSS_STATUS winbindd_send_request(int req_type, struct winbindd_request *request)
 {
        struct winbindd_request lrequest;
 NSS_STATUS winbindd_send_request(int req_type, struct winbindd_request *request)
 {
        struct winbindd_request lrequest;

-
+       char *env;
+       int  value;
+       

        /* Check for our tricky environment variable */
 
        /* Check for our tricky environment variable */
 

-       if (getenv(WINBINDD_DONT_ENV)) {
-               return NSS_STATUS_NOTFOUND;
+       if ( (env = getenv(WINBINDD_DONT_ENV)) != NULL ) {
+               value = atoi(env);
+               if ( value == 1 )
+                       return NSS_STATUS_NOTFOUND;

        }
 
        if (!request) {
        }
 
        if (!request) {


@@ -442,3 +598,25 @@ NSS_STATUS winbindd_request(int req_type,
                return(status);
        return winbindd_get_response(response);
 }
                return(status);
        return winbindd_get_response(response);
 }

+
+/*************************************************************************
+ A couple of simple functions to disable winbindd lookups and re-
+ enable them
+ ************************************************************************/
+ 
+/* Use putenv() instead of setenv() in these functions as not all
+   environments have the latter. */
+
+BOOL winbind_off( void )
+{
+        static char *s = CONST_DISCARD(char *, WINBINDD_DONT_ENV "=1");
+
+       return putenv(s) != -1;
+}
+
+BOOL winbind_on( void )
+{
+       static char *s = CONST_DISCARD(char *, WINBINDD_DONT_ENV "=0");
+
+       return putenv(s) != -1;
+}