summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur de Jong <arthur@arthurdejong.org>2009-09-04 11:54:49 +0000
committerArthur de Jong <arthur@arthurdejong.org>2009-09-04 11:54:49 +0000
commit438471ec17f128e95d20c7ff7f1626376a4fe0a3 (patch)
tree8aab5de7842d430d5a99fd03bfae06a1a8990049
parentb5c1d010540c5dbfe5a7e03001bbe7becc031c89 (diff)
some simple changes in includes to make FreeBSD diff smaller
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@986 ef36b2f9-881f-0410-afb5-c4e39611909c
-rw-r--r--configure.ac2
-rw-r--r--nslcd/cfg.c7
-rw-r--r--nslcd/common.c1
-rw-r--r--nss/prototypes.h6
4 files changed, 14 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 94cffbe..8239fb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -229,7 +229,7 @@ then
fi
if test "x$enable_kerberos" = "xyes"
then
- AC_CHECK_HEADERS(gssapi/gssapi_krb5.h gssapi.h)
+ AC_CHECK_HEADERS(gssapi/gssapi.h gssapi/gssapi_generic.h gssapi/gssapi_krb5.h gssapi.h)
fi
# set up directory with compatibility replacement files
diff --git a/nslcd/cfg.c b/nslcd/cfg.c
index a5b8a04..1a09b9d 100644
--- a/nslcd/cfg.c
+++ b/nslcd/cfg.c
@@ -39,10 +39,15 @@
#ifdef HAVE_GSSAPI_H
#include <gssapi.h>
#endif /* HAVE_GSSAPI_H */
-#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
+#ifdef HAVE_GSSAPI_GSSAPI_H
#include <gssapi/gssapi.h>
+#endif /* HAVE_GSSAPI_GSSAPI_H */
+#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
#include <gssapi/gssapi_krb5.h>
#endif /* HAVE_GSSAPI_GSSAPI_KRB5_H */
+#ifdef HAVE_GSSAPI_GSSAPI_GENERIC_H
+#include <gssapi/gssapi_generic.h>
+#endif /* HAVE_GSSAPI_GSSAPI_GENERIC_H */
#include <sys/types.h>
#include <pwd.h>
#include <grp.h>
diff --git a/nslcd/common.c b/nslcd/common.c
index 13d62b1..d88bb60 100644
--- a/nslcd/common.c
+++ b/nslcd/common.c
@@ -27,6 +27,7 @@
#include <stdarg.h>
#include <sys/types.h>
#include <sys/socket.h>
+#include <netinet/in.h>
#include <arpa/inet.h>
#include <strings.h>
#include <limits.h>
diff --git a/nss/prototypes.h b/nss/prototypes.h
index 6d4335c..1a2216d 100644
--- a/nss/prototypes.h
+++ b/nss/prototypes.h
@@ -25,12 +25,18 @@
#include <nss.h>
#include <aliases.h>
+#ifdef HAVE_NETINET_ETHER_H
#include <netinet/ether.h>
+#endif /* HAVE_NETINET_ETHER_H */
+#include <net/ethernet.h>
+#include <sys/socket.h>
#include <sys/types.h>
#include <grp.h>
#include <netdb.h>
#include <pwd.h>
+#ifdef HAVE_SHADOW_H
#include <shadow.h>
+#endif /* HAVE_SHADOW_H */
/* We define struct etherent here because it does not seem to
be defined in any publicly available header file exposed