diff options
author | Andrew Bartlett <abartlet@samba.org> | 2002-09-07 05:41:23 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2002-09-07 05:41:23 +0000 |
commit | 885f4f9379b48e74de132d6e6c24f11e8b06ce26 (patch) | |
tree | 295d933dd14a3a0d0a79fb86da5a30589ee1a7dd /source3/nsswitch/wbinfo.c | |
parent | ec4f2af04a09a50e87a95c0ad494a581b0364f03 (diff) | |
download | samba-885f4f9379b48e74de132d6e6c24f11e8b06ce26.tar.gz samba-885f4f9379b48e74de132d6e6c24f11e8b06ce26.tar.bz2 samba-885f4f9379b48e74de132d6e6c24f11e8b06ce26.zip |
Winbind client-side cleanups.
The global winbind file descriptor can cause havoc in some situations -
particulary when it becomes 0, 1 or 2. This patch (based on some very nice
work by Hannes Schmidt <mail@schmidt-net.via.t-online.de>) starts to recitfy
the problem by ensuring that the close-on-exec flag is set, and that we move
above 3 in the file descriptor table.
I've also decided that the PAM module can close it's pipe handle on every
request - this isn't performance-critical code.
The next step is to do the same for nss_winbind. (But things like getent()
might get in our way there).
This also cleans up some function prototypes, puts them in just one place.
Andrew Bartlett
(This used to be commit 442eb39657b98f67cd229ed3110b63aae8bf4e3c)
Diffstat (limited to 'source3/nsswitch/wbinfo.c')
-rw-r--r-- | source3/nsswitch/wbinfo.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c index d7d70b9e52..a0fdd033d7 100644 --- a/source3/nsswitch/wbinfo.c +++ b/source3/nsswitch/wbinfo.c @@ -28,11 +28,7 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND -/* Prototypes from common.h */ - -NSS_STATUS winbindd_request(int req_type, - struct winbindd_request *request, - struct winbindd_response *response); +extern int winbindd_fd; static char winbind_separator(void) { @@ -608,13 +604,13 @@ static BOOL wbinfo_set_auth_user(char *username) static BOOL wbinfo_ping(void) { NSS_STATUS result; - + result = winbindd_request(WINBINDD_PING, NULL, NULL); /* Display response */ - d_printf("'ping' to winbindd %s\n", - (result == NSS_STATUS_SUCCESS) ? "succeeded" : "failed"); + d_printf("'ping' to winbindd %s on fd %d\n", + (result == NSS_STATUS_SUCCESS) ? "succeeded" : "failed", winbindd_fd); return result == NSS_STATUS_SUCCESS; } |