Remove DEBUG statement from wb_common.c as it should not be there.
[samba.git] / source3 / nsswitch / wb_common.c
index 3671cf2e4fbf10095a4e7fe00664c3fbb8ea5a6b..f146391653a19e07cf6a70f5a8bd76f267de7ce5 100644 (file)
@@ -1,11 +1,12 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 2.0
+   Unix SMB/CIFS implementation.
 
    winbind client common code
 
    Copyright (C) Tim Potter 2000
    Copyright (C) Andrew Tridgell 2000
+   Copyright (C) Andrew Bartlett 2002
+   
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    Boston, MA  02111-1307, USA.   
 */
 
-#include "winbind_nss_config.h"
-#include "winbindd_nss.h"
+#include "winbind_client.h"
 
 /* Global variables.  These are effectively the client state information */
 
-static int established_socket = -1;           /* fd for winbindd socket */
+int winbindd_fd = -1;           /* fd for winbindd socket */
+
+/* Free a response structure */
+
+void free_response(struct winbindd_response *response)
+{
+       /* Free any allocated extra_data */
+
+       if (response)
+               SAFE_FREE(response->extra_data);
+}
 
 /* Initialise a request structure */
 
 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->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 */
@@ -59,59 +57,107 @@ void init_response(struct winbindd_response *response)
 {
        /* Initialise return value */
 
-       response->result = (enum winbindd_result)NSS_STATUS_UNAVAIL;
+       response->result = WINBINDD_ERROR;
 }
 
 /* Close established socket */
 
 void close_sock(void)
 {
-       if (established_socket != -1) {
-               close(established_socket);
-               established_socket = -1;
+       if (winbindd_fd != -1) {
+               close(winbindd_fd);
+               winbindd_fd = -1;
        }
 }
 
-/* Connect to winbindd socket */
+/* Make sure socket handle isn't stdin, stdout or stderr */
+#define RECURSION_LIMIT 3
 
-static int open_pipe_sock(void)
+static int make_nonstd_fd_internals(int fd, int limit /* Recursion limiter */) 
 {
-       struct sockaddr_un sunaddr;
-       static pid_t our_pid;
-       struct stat st;
-       pstring path;
-       
-       if (our_pid != getpid()) {
-               if (established_socket != -1) {
-                       close(established_socket);
+       int new_fd;
+       if (fd >= 0 && fd <= 2) {
+#ifdef F_DUPFD 
+               if ((new_fd = fcntl(fd, F_DUPFD, 3)) == -1) {
+                       return -1;
                }
-               established_socket = -1;
-               our_pid = getpid();
+               /* Paranoia */
+               if (new_fd < 3) {
+                       close(new_fd);
+                       return -1;
+               }
+               close(fd);
+               return new_fd;
+#else
+               if (limit <= 0)
+                       return -1;
+               
+               new_fd = dup(fd);
+               if (new_fd == -1) 
+                       return -1;
+
+               /* use the program stack to hold our list of FDs to close */
+               new_fd = make_nonstd_fd_internals(new_fd, limit - 1);
+               close(fd);
+               return new_fd;
+#endif
+       }
+       return fd;
+}
+
+static int make_safe_fd(int fd) 
+{
+       int result, flags;
+       int new_fd = make_nonstd_fd_internals(fd, RECURSION_LIMIT);
+       if (new_fd == -1) {
+               close(fd);
+               return -1;
        }
+       /* Socket should be closed on exec() */
        
-       if (established_socket != -1) {
-               return established_socket;
+#ifdef FD_CLOEXEC
+       result = flags = fcntl(new_fd, F_GETFD, 0);
+       if (flags >= 0) {
+               flags |= FD_CLOEXEC;
+               result = fcntl( new_fd, F_SETFD, flags );
+       }
+       if (result < 0) {
+               close(new_fd);
+               return -1;
        }
+#endif
+       return new_fd;
+}
+
+/* Connect to winbindd socket */
+
+static int winbind_named_pipe_sock(const char *dir)
+{
+       struct sockaddr_un sunaddr;
+       struct stat st;
+       pstring path;
+       int fd;
        
        /* Check permissions on unix socket directory */
        
-       if (lstat(WINBINDD_SOCKET_DIR, &st) == -1) {
+       if (lstat(dir, &st) == -1) {
                return -1;
        }
        
-       if (!S_ISDIR(st.st_mode) || (st.st_uid != 0)) {
+       if (!S_ISDIR(st.st_mode) || 
+           (st.st_uid != 0 && st.st_uid != geteuid())) {
                return -1;
        }
        
        /* Connect to socket */
        
-       strncpy(path, WINBINDD_SOCKET_DIR, sizeof(path) - 1);
+       strncpy(path, dir, sizeof(path) - 1);
        path[sizeof(path) - 1] = '\0';
        
-       strncat(path, "/", sizeof(path) - 1);
+       strncat(path, "/", sizeof(path) - 1 - strlen(path));
        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);
@@ -128,26 +174,80 @@ static int open_pipe_sock(void)
        
        /* Check permissions on unix socket file */
        
-       if (!S_ISSOCK(st.st_mode) || (st.st_uid != 0)) {
+       if (!S_ISSOCK(st.st_mode) || 
+           (st.st_uid != 0 && st.st_uid != geteuid())) {
                return -1;
        }
        
        /* Connect to socket */
        
-       if ((established_socket = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
+       if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
                return -1;
        }
+
+       if ((fd = make_safe_fd( fd)) == -1) {
+               return fd;
+       }
        
-       if (connect(established_socket, (struct sockaddr *)&sunaddr, 
+       if (connect(fd, (struct sockaddr *)&sunaddr, 
                    sizeof(sunaddr)) == -1) {
-               close_sock();
+               close(fd);
                return -1;
        }
         
-       return established_socket;
+       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;
+#else
+       return -1;
+#endif /* HAVE_UNIXSOCKET */
 }
 
-/* Write data to winbindd socket with timeout */
+/* Write data to winbindd socket */
 
 int write_sock(void *buffer, int count)
 {
@@ -157,7 +257,7 @@ int write_sock(void *buffer, int count)
        
  restart:
        
-       if (open_pipe_sock() == -1) {
+       if (winbind_open_pipe_sock() == -1) {
                return -1;
        }
        
@@ -168,28 +268,26 @@ int write_sock(void *buffer, int count)
        while(nwritten < count) {
                struct timeval tv;
                fd_set r_fds;
-               int selret;
                
                /* Catch pipe close on other end by checking if a read()
                   call would not block by calling select(). */
 
                FD_ZERO(&r_fds);
-               FD_SET(established_socket, &r_fds);
+               FD_SET(winbindd_fd, &r_fds);
                ZERO_STRUCT(tv);
                
-               if ((selret = select(established_socket + 1, &r_fds, 
-                                    NULL, NULL, &tv)) == -1) {
+               if (select(winbindd_fd + 1, &r_fds, NULL, NULL, &tv) == -1) {
                        close_sock();
                        return -1;                   /* Select error */
                }
                
                /* Write should be OK if fd not available for reading */
                
-               if (!FD_ISSET(established_socket, &r_fds)) {
+               if (!FD_ISSET(winbindd_fd, &r_fds)) {
                        
                        /* Do the write */
                        
-                       result = write(established_socket,
+                       result = write(winbindd_fd,
                                       (char *)buffer + nwritten, 
                                       count - nwritten);
                        
@@ -215,7 +313,7 @@ int write_sock(void *buffer, int count)
        return nwritten;
 }
 
-/* Read data from winbindd socket with timeout */
+/* Read data from winbindd socket */
 
 static int read_sock(void *buffer, int count)
 {
@@ -225,7 +323,7 @@ static int read_sock(void *buffer, int count)
        
        while(nread < count) {
                
-               result = read(established_socket, (char *)buffer + nread, 
+               result = read(winbindd_fd, (char *)buffer + nread, 
                              count - nread);
                
                if ((result == -1) || (result == 0)) {
@@ -282,6 +380,7 @@ int read_reply(struct winbindd_response *response)
                
                if ((result2 = read_sock(response->extra_data, extra_data_len))
                    == -1) {
+                       free_response(response);
                        return -1;
                }
        }
@@ -291,36 +390,22 @@ int read_reply(struct winbindd_response *response)
        return result1 + result2;
 }
 
-/* Free a response structure */
-
-void free_response(struct winbindd_response *response)
-{
-       /* Free any allocated extra_data */
-
-       if (response && response->extra_data) {
-               free(response->extra_data);
-               response->extra_data = NULL;
-       }
-}
-
-/* Handle simple types of requests */
+/* 
+ * send simple types of requests 
+ */
 
-enum nss_status winbindd_request(int req_type, 
-                                struct winbindd_request *request,
-                                struct winbindd_response *response)
+NSS_STATUS winbindd_send_request(int req_type, struct winbindd_request *request)
 {
        struct winbindd_request lrequest;
-       struct winbindd_response lresponse;
-
+       char *env;
+       int  value;
+       
        /* Check for our tricky environment variable */
 
-       if (getenv(WINBINDD_DONT_ENV)) {
-               return NSS_STATUS_NOTFOUND;
-       }
-
-       if (!response) {
-               ZERO_STRUCT(lresponse);
-               response = &lresponse;
+       if ( (env = getenv(WINBINDD_DONT_ENV)) != NULL ) {
+               value = atoi(env);
+               if ( value == 1 )
+                       return NSS_STATUS_NOTFOUND;
        }
 
        if (!request) {
@@ -331,12 +416,29 @@ enum nss_status winbindd_request(int req_type,
        /* Fill in request and send down pipe */
 
        init_request(request, req_type);
-       init_response(response);
        
        if (write_sock(request, sizeof(*request)) == -1) {
                return NSS_STATUS_UNAVAIL;
        }
        
+       return NSS_STATUS_SUCCESS;
+}
+
+/*
+ * Get results from winbindd request
+ */
+
+NSS_STATUS winbindd_get_response(struct winbindd_response *response)
+{
+       struct winbindd_response lresponse;
+
+       if (!response) {
+               ZERO_STRUCT(lresponse);
+               response = &lresponse;
+       }
+
+       init_response(response);
+
        /* Wait for reply */
        if (read_reply(response) == -1) {
                return NSS_STATUS_UNAVAIL;
@@ -354,3 +456,33 @@ enum nss_status winbindd_request(int req_type,
        
        return NSS_STATUS_SUCCESS;
 }
+
+/* Handle simple types of requests */
+
+NSS_STATUS winbindd_request(int req_type, 
+                           struct winbindd_request *request,
+                           struct winbindd_response *response)
+{
+       NSS_STATUS status;
+
+       status = winbindd_send_request(req_type, request);
+       if (status != NSS_STATUS_SUCCESS) 
+               return(status);
+       return winbindd_get_response(response);
+}
+
+/*************************************************************************
+ A couple of simple jfunctions to disable winbindd lookups and re-
+ enable them
+ ************************************************************************/
+BOOL winbind_off( void )
+{
+       return (setenv( WINBINDD_DONT_ENV, "1", 1 ) != -1); 
+}
+
+BOOL winbind_on( void )
+{
+       return (setenv( WINBINDD_DONT_ENV, "0", 1 ) != -1); 
+}
+