From: Kai Blin <kai@samba.org>
Date: Mon, 18 Jun 2007 13:59:09 +0000 (+0000)
Subject: r23539: Remove code duplication and unify behaviour of winbind_nss_*.h files
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=13c6eacff02b55b9fd6201406802f271dcf13e8e;p=thirdparty%2Fsamba.git

r23539: Remove code duplication and unify behaviour of winbind_nss_*.h files
---

diff --git a/source/nsswitch/winbind_nss.h b/source/nsswitch/winbind_nss.h
index 3bef6ca5954..c9331d91666 100644
--- a/source/nsswitch/winbind_nss.h
+++ b/source/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/source/nsswitch/winbind_nss_linux.h b/source/nsswitch/winbind_nss_linux.h
index 1c7e8300373..456bfa5c143 100644
--- a/source/nsswitch/winbind_nss_linux.h
+++ b/source/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 */