summaryrefslogtreecommitdiff
path: root/source3/include/includes.h
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-09-05 07:55:54 +0000
committerAndrew Tridgell <tridge@samba.org>2001-09-05 07:55:54 +0000
commit7deed93dd7c451b71d9b3cd801a265dbe8e664fc (patch)
tree6c8154f100096491dc977187ca516670663c5129 /source3/include/includes.h
parentf6b531895ec3cd4883fda6d31f8b6a260a3782e3 (diff)
downloadsamba-7deed93dd7c451b71d9b3cd801a265dbe8e664fc.tar.gz
samba-7deed93dd7c451b71d9b3cd801a265dbe8e664fc.tar.bz2
samba-7deed93dd7c451b71d9b3cd801a265dbe8e664fc.zip
fixed a bunch of compilation errors on Solaris, mostly people getting NSS_STATUS and WINBINDD error codes mixed up
(This used to be commit 66698d6b841df809a8654012a8385bffacb9dc4a)
Diffstat (limited to 'source3/include/includes.h')
-rw-r--r--source3/include/includes.h35
1 files changed, 1 insertions, 34 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index bf82469aa3..ad1633fb87 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -704,40 +704,7 @@ typedef struct smb_wpasswd {
#define UNI_XDIGIT 0x8
#define UNI_SPACE 0x10
-#ifdef HAVE_NSS_COMMON_H
-
-/* Sun Solaris */
-
-#include <nss_common.h>
-#include <nss_dbdefs.h>
-#include <nsswitch.h>
-
-typedef nss_status_t NSS_STATUS;
-
-#define NSS_STATUS_SUCCESS NSS_SUCCESS
-#define NSS_STATUS_NOTFOUND NSS_NOTFOUND
-#define NSS_STATUS_UNAVAIL NSS_UNAVAIL
-#define NSS_STATUS_TRYAGAIN NSS_TRYAGAIN
-
-#elif HAVE_NSS_H
-
-/* GNU */
-
-#include <nss.h>
-
-typedef enum nss_status NSS_STATUS;
-
-#else /* Nothing's defined. Neither gnu nor sun */
-
-typedef enum
-{
- NSS_STATUS_SUCCESS,
- NSS_STATUS_NOTFOUND,
- NSS_STATUS_UNAVAIL,
- NSS_STATUS_TRYAGAIN
-} NSS_STATUS;
-
-#endif
+#include "nsswitch/nss.h"
/***** automatically generated prototypes *****/
#include "proto.h"