summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2007-06-18 13:59:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:26 -0500
commitfb2246f3030ba23d598ac2fdbb4f43fcb9373f76 (patch)
tree1cdc9db98d522e51885aa8403146a647b5341592
parent8908bd64eab93e763d8b943732bc19ed9d276eb2 (diff)
downloadsamba-fb2246f3030ba23d598ac2fdbb4f43fcb9373f76.tar.gz
samba-fb2246f3030ba23d598ac2fdbb4f43fcb9373f76.tar.bz2
samba-fb2246f3030ba23d598ac2fdbb4f43fcb9373f76.zip
r23539: Remove code duplication and unify behaviour of winbind_nss_*.h files
(This used to be commit 13c6eacff02b55b9fd6201406802f271dcf13e8e)
-rw-r--r--source3/nsswitch/winbind_nss.h3
-rw-r--r--source3/nsswitch/winbind_nss_linux.h4
2 files changed, 1 insertions, 6 deletions
diff --git a/source3/nsswitch/winbind_nss.h b/source3/nsswitch/winbind_nss.h
index 3bef6ca595..c9331d9166 100644
--- a/source3/nsswitch/winbind_nss.h
+++ b/source3/nsswitch/winbind_nss.h
@@ -39,8 +39,7 @@
* Linux (glibc)
*/
-#include <nss.h>
-typedef enum nss_status NSS_STATUS;
+#include "nsswitch/winbind_nss_linux.h"
#elif HAVE_NS_API_H
diff --git a/source3/nsswitch/winbind_nss_linux.h b/source3/nsswitch/winbind_nss_linux.h
index 1c7e830037..456bfa5c14 100644
--- a/source3/nsswitch/winbind_nss_linux.h
+++ b/source3/nsswitch/winbind_nss_linux.h
@@ -24,12 +24,8 @@
#ifndef _WINBIND_NSS_LINUX_H
#define _WINBIND_NSS_LINUX_H
-#if HAVE_NSS_H
-
#include <nss.h>
typedef enum nss_status NSS_STATUS;
-#endif /* HAVE_NSS_H */
-
#endif /* _WINBIND_NSS_LINUX_H */