nss_winbind: When returning NSS_UNAVAIL, squash errno to ENOENT

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

diff --git a/source/nsswitch/wb_common.c b/source/nsswitch/wb_common.c
index 52913668e588afb03c660abaac3acbaf2da8bb6e..6e6d2bbbf84d4f90fc18819dff9708c27ce2de00 100644 (file)
--- a/source/nsswitch/wb_common.c
+++ b/source/nsswitch/wb_common.c
@@ -24,10 +24,6 @@
 
 #include "winbind_client.h"
 
 
 #include "winbind_client.h"
 

-BOOL winbind_env_set( void );
-BOOL winbind_off( void );
-BOOL winbind_on( void );
-

 /* Global variables.  These are effectively the client state information */
 
 int winbindd_fd = -1;           /* fd for winbindd socket */
 /* Global variables.  These are effectively the client state information */
 
 int winbindd_fd = -1;           /* fd for winbindd socket */


@@ -35,7 +31,7 @@ static int is_privileged = 0;
 
 /* Free a response structure */
 
 
 /* Free a response structure */
 

-void free_response(struct winbindd_response *response)
+void winbindd_free_response(struct winbindd_response *response)

 {
        /* Free any allocated extra_data */
 
 {
        /* Free any allocated extra_data */
 


@@ -45,7 +41,7 @@ void free_response(struct winbindd_response *response)
 
 /* Initialise a request structure */
 
 
 /* Initialise a request structure */
 

-void init_request(struct winbindd_request *request, int request_type)
+void winbindd_init_request(struct winbindd_request *request, int request_type)

 {
        request->length = sizeof(struct winbindd_request);
 
 {
        request->length = sizeof(struct winbindd_request);
 


@@ -65,7 +61,7 @@ static void init_response(struct winbindd_response *response)
 
 /* Close established socket */
 
 
 /* Close established socket */
 

-void close_sock(void)
+void winbind_close_sock(void)

 {
        if (winbindd_fd != -1) {
                close(winbindd_fd);
 {
        if (winbindd_fd != -1) {
                close(winbindd_fd);


@@ -172,54 +168,55 @@ static int winbind_named_pipe_sock(const char *dir)
 {
        struct sockaddr_un sunaddr;
        struct stat st;
 {
        struct sockaddr_un sunaddr;
        struct stat st;

-       pstring path;
+       char *path = NULL;

        int fd;
        int wait_time;
        int slept;
        int fd;
        int wait_time;
        int slept;

-       
+

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

-       
+

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

+               errno = ENOENT;

                return -1;
        }
                return -1;
        }

-       
-       if (!S_ISDIR(st.st_mode) || 
+
+       if (!S_ISDIR(st.st_mode) ||

            (st.st_uid != 0 && st.st_uid != geteuid())) {
            (st.st_uid != 0 && st.st_uid != geteuid())) {

+               errno = ENOENT;

                return -1;
        }
                return -1;
        }

-       
+

        /* Connect to socket */
        /* Connect to socket */

-       
-       strncpy(path, dir, sizeof(path) - 1);
-       path[sizeof(path) - 1] = '\0';
-       
-       strncat(path, "/", sizeof(path) - 1 - strlen(path));
-       path[sizeof(path) - 1] = '\0';
-       
-       strncat(path, WINBINDD_SOCKET_NAME, sizeof(path) - 1 - strlen(path));
-       path[sizeof(path) - 1] = '\0';
-       
+
+       if (asprintf(&path, "%s/%s", dir, WINBINDD_SOCKET_NAME) < 0) {
+               return -1;
+       }
+

        ZERO_STRUCT(sunaddr);
        sunaddr.sun_family = AF_UNIX;
        strncpy(sunaddr.sun_path, path, sizeof(sunaddr.sun_path) - 1);
        ZERO_STRUCT(sunaddr);
        sunaddr.sun_family = AF_UNIX;
        strncpy(sunaddr.sun_path, path, sizeof(sunaddr.sun_path) - 1);

-       
+

        /* If socket file doesn't exist, don't bother trying to connect
           with retry.  This is an attempt to make the system usable when
           the winbindd daemon is not running. */
 
        if (lstat(path, &st) == -1) {
        /* If socket file doesn't exist, don't bother trying to connect
           with retry.  This is an attempt to make the system usable when
           the winbindd daemon is not running. */
 
        if (lstat(path, &st) == -1) {

+               errno = ENOENT;
+               SAFE_FREE(path);

                return -1;
        }
                return -1;
        }

-       
+
+       SAFE_FREE(path);

        /* Check permissions on unix socket file */
        /* Check permissions on unix socket file */

-       
-       if (!S_ISSOCK(st.st_mode) || 
+
+       if (!S_ISSOCK(st.st_mode) ||

            (st.st_uid != 0 && st.st_uid != geteuid())) {
            (st.st_uid != 0 && st.st_uid != geteuid())) {

+               errno = ENOENT;

                return -1;
        }
                return -1;
        }

-       
+

        /* Connect to socket */
        /* Connect to socket */

-       
+

        if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
                return -1;
        }
        if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
                return -1;
        }


@@ -284,6 +281,20 @@ static int winbind_named_pipe_sock(const char *dir)
        return -1;
 }
 
        return -1;
 }
 

+static const char *winbindd_socket_dir(void)
+{
+#ifdef SOCKET_WRAPPER
+       const char *env_dir;
+
+       env_dir = getenv(WINBINDD_SOCKET_DIR_ENVVAR);
+       if (env_dir) {
+               return env_dir;
+       }
+#endif
+
+       return WINBINDD_SOCKET_DIR;
+}
+

 /* Connect to winbindd socket */
 
 static int winbind_open_pipe_sock(int recursing, int need_priv)
 /* Connect to winbindd socket */
 
 static int winbind_open_pipe_sock(int recursing, int need_priv)


@@ -296,12 +307,12 @@ static int winbind_open_pipe_sock(int recursing, int need_priv)
        ZERO_STRUCT(response);
 
        if (our_pid != getpid()) {
        ZERO_STRUCT(response);
 
        if (our_pid != getpid()) {

-               close_sock();
+               winbind_close_sock();

                our_pid = getpid();
        }
 
        if ((need_priv != 0) && (is_privileged == 0)) {
                our_pid = getpid();
        }
 
        if ((need_priv != 0) && (is_privileged == 0)) {

-               close_sock();
+               winbind_close_sock();

        }
        
        if (winbindd_fd != -1) {
        }
        
        if (winbindd_fd != -1) {


@@ -312,7 +323,7 @@ static int winbind_open_pipe_sock(int recursing, int need_priv)
                return -1;
        }
 
                return -1;
        }
 

-       if ((winbindd_fd = winbind_named_pipe_sock(WINBINDD_SOCKET_DIR)) == -1) {
+       if ((winbindd_fd = winbind_named_pipe_sock(winbindd_socket_dir())) == -1) {

                return -1;
        }
 
                return -1;
        }
 


@@ -320,15 +331,15 @@ static int winbind_open_pipe_sock(int recursing, int need_priv)
 
        /* version-check the socket */
 
 
        /* version-check the socket */
 

-       request.flags = WBFLAG_RECURSE;
+       request.wb_flags = WBFLAG_RECURSE;

        if ((winbindd_request_response(WINBINDD_INTERFACE_VERSION, &request, &response) != NSS_STATUS_SUCCESS) || (response.data.interface_version != WINBIND_INTERFACE_VERSION)) {
        if ((winbindd_request_response(WINBINDD_INTERFACE_VERSION, &request, &response) != NSS_STATUS_SUCCESS) || (response.data.interface_version != WINBIND_INTERFACE_VERSION)) {

-               close_sock();
+               winbind_close_sock();

                return -1;
        }
 
        /* try and get priv pipe */
 
                return -1;
        }
 
        /* try and get priv pipe */
 

-       request.flags = WBFLAG_RECURSE;
+       request.wb_flags = WBFLAG_RECURSE;

        if (winbindd_request_response(WINBINDD_PRIV_PIPE_DIR, &request, &response) == NSS_STATUS_SUCCESS) {
                int fd;
                if ((fd = winbind_named_pipe_sock((char *)response.extra_data.data)) != -1) {
        if (winbindd_request_response(WINBINDD_PRIV_PIPE_DIR, &request, &response) == NSS_STATUS_SUCCESS) {
                int fd;
                if ((fd = winbind_named_pipe_sock((char *)response.extra_data.data)) != -1) {


@@ -352,7 +363,7 @@ static int winbind_open_pipe_sock(int recursing, int need_priv)
 
 /* Write data to winbindd socket */
 
 
 /* Write data to winbindd socket */
 

-int write_sock(void *buffer, int count, int recursing, int need_priv)
+int winbind_write_sock(void *buffer, int count, int recursing, int need_priv)

 {
        int result, nwritten;
        
 {
        int result, nwritten;
        


@@ -361,6 +372,7 @@ int write_sock(void *buffer, int count, int recursing, int need_priv)
  restart:
        
        if (winbind_open_pipe_sock(recursing, need_priv) == -1) {
  restart:
        
        if (winbind_open_pipe_sock(recursing, need_priv) == -1) {

+               errno = ENOENT;

                return -1;
        }
        
                return -1;
        }
        


@@ -380,7 +392,7 @@ int write_sock(void *buffer, int count, int recursing, int need_priv)
                ZERO_STRUCT(tv);
                
                if (select(winbindd_fd + 1, &r_fds, NULL, NULL, &tv) == -1) {
                ZERO_STRUCT(tv);
                
                if (select(winbindd_fd + 1, &r_fds, NULL, NULL, &tv) == -1) {

-                       close_sock();
+                       winbind_close_sock();

                        return -1;                   /* Select error */
                }
                
                        return -1;                   /* Select error */
                }
                


@@ -398,7 +410,7 @@ int write_sock(void *buffer, int count, int recursing, int need_priv)
                                
                                /* Write failed */
                                
                                
                                /* Write failed */
                                

-                               close_sock();
+                               winbind_close_sock();

                                return -1;
                        }
                        
                                return -1;
                        }
                        


@@ -408,7 +420,7 @@ int write_sock(void *buffer, int count, int recursing, int need_priv)
                        
                        /* Pipe has closed on remote end */
                        
                        
                        /* Pipe has closed on remote end */
                        

-                       close_sock();
+                       winbind_close_sock();

                        goto restart;
                }
        }
                        goto restart;
                }
        }


@@ -418,9 +430,9 @@ int write_sock(void *buffer, int count, int recursing, int need_priv)
 
 /* Read data from winbindd socket */
 
 
 /* Read data from winbindd socket */
 

-static int read_sock(void *buffer, int count)
+int winbind_read_sock(void *buffer, int count)

 {
 {

-       int result = 0, nread = 0;
+       int nread = 0;

        int total_time = 0, selret;
 
        if (winbindd_fd == -1) {
        int total_time = 0, selret;
 
        if (winbindd_fd == -1) {


@@ -442,7 +454,7 @@ static int read_sock(void *buffer, int count)
                tv.tv_sec = 5;
 
                if ((selret = select(winbindd_fd + 1, &r_fds, NULL, NULL, &tv)) == -1) {
                tv.tv_sec = 5;
 
                if ((selret = select(winbindd_fd + 1, &r_fds, NULL, NULL, &tv)) == -1) {

-                       close_sock();
+                       winbind_close_sock();

                        return -1;                   /* Select error */
                }
                
                        return -1;                   /* Select error */
                }
                


@@ -450,7 +462,7 @@ static int read_sock(void *buffer, int count)
                        /* Not ready for read yet... */
                        if (total_time >= 30) {
                                /* Timeout */
                        /* Not ready for read yet... */
                        if (total_time >= 30) {
                                /* Timeout */

-                               close_sock();
+                               winbind_close_sock();

                                return -1;
                        }
                        total_time += 5;
                                return -1;
                        }
                        total_time += 5;


@@ -461,7 +473,7 @@ static int read_sock(void *buffer, int count)
                        
                        /* Do the Read */
                        
                        
                        /* Do the Read */
                        

-                       result = read(winbindd_fd, (char *)buffer + nread, 
+                       int result = read(winbindd_fd, (char *)buffer + nread, 

                              count - nread);
                        
                        if ((result == -1) || (result == 0)) {
                              count - nread);
                        
                        if ((result == -1) || (result == 0)) {


@@ -470,7 +482,7 @@ static int read_sock(void *buffer, int count)
                                   can do here is just return -1 and fail since the
                                   transaction has failed half way through. */
                        
                                   can do here is just return -1 and fail since the
                                   transaction has failed half way through. */
                        

-                               close_sock();
+                               winbind_close_sock();

                                return -1;
                        }
                        
                                return -1;
                        }
                        


@@ -479,12 +491,12 @@ static int read_sock(void *buffer, int count)
                }
        }
        
                }
        }
        

-       return result;
+       return nread;

 }
 
 /* Read reply */
 
 }
 
 /* Read reply */
 

-int read_reply(struct winbindd_response *response)
+int winbindd_read_reply(struct winbindd_response *response)

 {
        int result1, result2 = 0;
 
 {
        int result1, result2 = 0;
 


@@ -494,9 +506,9 @@ int read_reply(struct winbindd_response *response)
        
        /* Read fixed length response */
        
        
        /* Read fixed length response */
        

-       if ((result1 = read_sock(response, sizeof(struct winbindd_response)))
-           == -1) {
-               
+       result1 = winbind_read_sock(response,
+                                   sizeof(struct winbindd_response));
+       if (result1 == -1) {

                return -1;
        }
        
                return -1;
        }
        


@@ -518,9 +530,10 @@ int read_reply(struct winbindd_response *response)
                        return -1;
                }
                
                        return -1;
                }
                

-               if ((result2 = read_sock(response->extra_data.data, extra_data_len))
-                   == -1) {
-                       free_response(response);
+               result2 = winbind_read_sock(response->extra_data.data,
+                                           extra_data_len);
+               if (result2 == -1) {
+                       winbindd_free_response(response);

                        return -1;
                }
        }
                        return -1;
                }
        }


@@ -530,18 +543,6 @@ int read_reply(struct winbindd_response *response)
        return result1 + result2;
 }
 
        return result1 + result2;
 }
 

-BOOL winbind_env_set( void )
-{
-       char *env;
-       
-       if ((env=getenv(WINBINDD_DONT_ENV)) != NULL) {
-               if(strcmp(env, "1") == 0) {
-                       return True;
-               }
-       }
-       return False;
-}
-

 /* 
  * send simple types of requests 
  */
 /* 
  * send simple types of requests 
  */


@@ -564,16 +565,27 @@ NSS_STATUS winbindd_send_request(int req_type, int need_priv,
        
        /* Fill in request and send down pipe */
 
        
        /* Fill in request and send down pipe */
 

-       init_request(request, req_type);
+       winbindd_init_request(request, req_type);

        
        

-       if (write_sock(request, sizeof(*request),
-                      request->flags & WBFLAG_RECURSE, need_priv) == -1) {
+       if (winbind_write_sock(request, sizeof(*request),
+                              request->wb_flags & WBFLAG_RECURSE,
+                              need_priv) == -1) 
+       {
+               /* Set ENOENT for consistency.  Required by some apps */
+               errno = ENOENT;
+               

                return NSS_STATUS_UNAVAIL;
        }
 
        if ((request->extra_len != 0) &&
                return NSS_STATUS_UNAVAIL;
        }
 
        if ((request->extra_len != 0) &&

-           (write_sock(request->extra_data.data, request->extra_len,
-                       request->flags & WBFLAG_RECURSE, need_priv) == -1)) {
+           (winbind_write_sock(request->extra_data.data,
+                               request->extra_len,
+                               request->wb_flags & WBFLAG_RECURSE,
+                               need_priv) == -1)) 
+       {
+               /* Set ENOENT for consistency.  Required by some apps */
+               errno = ENOENT;
+

                return NSS_STATUS_UNAVAIL;
        }
        
                return NSS_STATUS_UNAVAIL;
        }
        


@@ -596,13 +608,16 @@ NSS_STATUS winbindd_get_response(struct winbindd_response *response)
        init_response(response);
 
        /* Wait for reply */
        init_response(response);
 
        /* Wait for reply */

-       if (read_reply(response) == -1) {
+       if (winbindd_read_reply(response) == -1) {
+               /* Set ENOENT for consistency.  Required by some apps */
+               errno = ENOENT;
+

                return NSS_STATUS_UNAVAIL;
        }
 
        /* Throw away extra data if client didn't request it */
        if (response == &lresponse) {
                return NSS_STATUS_UNAVAIL;
        }
 
        /* Throw away extra data if client didn't request it */
        if (response == &lresponse) {

-               free_response(response);
+               winbindd_free_response(response);

        }
 
        /* Copy reply data from socket */
        }
 
        /* Copy reply data from socket */


@@ -652,24 +667,24 @@ NSS_STATUS winbindd_priv_request_response(int req_type,
 }
 
 /*************************************************************************
 }
 
 /*************************************************************************

- 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 )
+const char *nss_err_str(NSS_STATUS ret)

 {
 {

-       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;
+       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!!!!!!!";
+       }

 }
 }

-