r23674: Merge changes from Samba 3 SVN r23539:

Avoid code duplication in winbind_nss_linux.h

diff --git a/source/nsswitch/winbind_nss.h b/source/nsswitch/winbind_nss.h
index 5416ae211e3d479e5b15f96b5cf4f49fc1ff755a..c7abf77ea0f2aa9389fef8566d61deeaa3c8eea4 100644 (file)
--- 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 1c7e83003733f95b005563cd0e676aecd8927456..456bfa5c143f56d687a2d67ecdf7f9515efe10e8 100644 (file)
--- 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 */