summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-09-07 05:41:23 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-09-07 05:41:23 +0000
commit885f4f9379b48e74de132d6e6c24f11e8b06ce26 (patch)
tree295d933dd14a3a0d0a79fb86da5a30589ee1a7dd /source3/include
parentec4f2af04a09a50e87a95c0ad494a581b0364f03 (diff)
downloadsamba-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/include')
-rw-r--r--source3/include/includes.h2
-rw-r--r--source3/include/smb.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index dacac356e3..eaa0d25239 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -762,6 +762,8 @@ extern int errno;
#include "mangle.h"
+#include "nsswitch/winbind_client.h"
+
/*
* Type for wide character dirent structure.
* Only d_name is defined by POSIX.
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 2ee2f0cb72..a1b3faa343 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1623,8 +1623,6 @@ struct unix_error_map {
#define SAFE_NETBIOS_CHARS ". -_"
-#include "nsswitch/winbindd_nss.h"
-
/* generic iconv conversion structure */
typedef struct {
size_t (*direct)(void *cd, char **inbuf, size_t *inbytesleft,