diff options
author | Michael Reifenberger <mr@FreeBSD.org> | 2003-06-18 09:11:34 +0000 |
---|---|---|
committer | Michael Reifenberger <mr@FreeBSD.org> | 2003-06-18 09:11:34 +0000 |
commit | bdf56035003d342f8b4c513cb7b4af08c544bce8 (patch) | |
tree | 3e374b0f50cb295eb6cd799e9c9f938cc11176ea /kerberos5 | |
parent | 777ca648ab9669d8440d9699771f639ab189c547 (diff) | |
download | src-bdf56035003d342f8b4c513cb7b4af08c544bce8.tar.gz src-bdf56035003d342f8b4c513cb7b4af08c544bce8.zip |
Add (optional, default off) support to kerberos5 for supporting openldap.
Tests with openldap20 where successful whereas openldap21 didn't like
the way hdb-ldap accessed openldap (doesn't like non-bind access).
To activate the support put a USE_OPENLDAP=yes in your make.conf.
The OPENLDAPBASE is also optional and points to /usr/local as default.
Approved by: markm
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=116517
Diffstat (limited to 'kerberos5')
-rw-r--r-- | kerberos5/Makefile.inc | 7 | ||||
-rw-r--r-- | kerberos5/lib/libhdb/Makefile | 3 | ||||
-rw-r--r-- | kerberos5/libexec/hpropd/Makefile | 7 | ||||
-rw-r--r-- | kerberos5/libexec/ipropd-master/Makefile | 7 | ||||
-rw-r--r-- | kerberos5/libexec/ipropd-slave/Makefile | 7 | ||||
-rw-r--r-- | kerberos5/libexec/kadmind/Makefile | 7 | ||||
-rw-r--r-- | kerberos5/libexec/kdc/Makefile | 7 | ||||
-rw-r--r-- | kerberos5/libexec/kpasswdd/Makefile | 7 | ||||
-rw-r--r-- | kerberos5/usr.bin/kadmin/Makefile | 7 | ||||
-rw-r--r-- | kerberos5/usr.sbin/kstash/Makefile | 7 |
10 files changed, 41 insertions, 25 deletions
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc index b172f89d6e77..452e0e7396f7 100644 --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -13,6 +13,13 @@ CFLAGS+=-I${INCLUDEOBJDIR} -DHAVE_CONFIG_H CFLAGS+=-DINET6 +.if defined(USE_OPENLDAP) +OPENLDAPBASE?= /usr/local +LDAPLIBS=-lldap -llber +LDAPCFLAGS=-I${OPENLDAPBASE}/include -DOPENLDAP=1 +LDAPLDADD=-L${OPENLDAPBASE}/lib ${LDAPLIBS} +.endif + .if exists(${.OBJDIR}/../../include) INCLUDEOBJDIR= ${.OBJDIR}/../../include .else diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile index d1888a6fe3ae..e6c5513cea14 100644 --- a/kerberos5/lib/libhdb/Makefile +++ b/kerberos5/lib/libhdb/Makefile @@ -8,7 +8,8 @@ CFLAGS+=-I${KRB5DIR}/include \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken \ -I${.OBJDIR} \ - -I${ASN1OBJDIR} + -I${ASN1OBJDIR} \ + ${LDAPCFLAGS} SRCS= \ common.c \ diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile index 0b987529b75e..606d65d0aab3 100644 --- a/kerberos5/libexec/hpropd/Makefile +++ b/kerberos5/libexec/hpropd/Makefile @@ -11,13 +11,14 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ - -I${.OBJDIR} + -I${.OBJDIR} \ + ${LDAPCFLAGS} LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} MAN= hpropd.8 .include <bsd.prog.mk> diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile index f77b54ee7864..544a94d11352 100644 --- a/kerberos5/libexec/ipropd-master/Makefile +++ b/kerberos5/libexec/ipropd-master/Makefile @@ -11,15 +11,16 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ - -I${.OBJDIR} + -I${.OBJDIR} \ + ${LDAPCFLAGS} LDADD= \ -L${KADM5SOBJDIR} -lkadm5srv \ -L${KRB5OBJDIR} -lkrb5 \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} NOMAN= yes .include <bsd.prog.mk> diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile index 0614f5a05c4a..3d304d448e0e 100644 --- a/kerberos5/libexec/ipropd-slave/Makefile +++ b/kerberos5/libexec/ipropd-slave/Makefile @@ -11,15 +11,16 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ - -I${.OBJDIR} + -I${.OBJDIR} \ + ${LDAPCFLAGS} LDADD= \ -L${KADM5SOBJDIR} -lkadm5srv \ -L${KRB5OBJDIR} -lkrb5 \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} NOMAN= yes .include <bsd.prog.mk> diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile index 46ca5d5b2597..3f746638124c 100644 --- a/kerberos5/libexec/kadmind/Makefile +++ b/kerberos5/libexec/kadmind/Makefile @@ -13,16 +13,17 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kadmin \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ - -I${.OBJDIR} + -I${.OBJDIR} \ + ${LDAPCFLAGS} LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ -L${KADM5SOBJDIR} -lkadm5srv \ -L${HDBOBJDIR} -lhdb \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} NOMAN= yes .include <bsd.prog.mk> diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile index ac0d3ba52159..5526063c2f2a 100644 --- a/kerberos5/libexec/kdc/Makefile +++ b/kerberos5/libexec/kdc/Makefile @@ -19,13 +19,14 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ - -I${.OBJDIR} + -I${.OBJDIR} \ + ${LDAPCFLAGS} LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} MAN= kdc.8 .include <bsd.prog.mk> diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile index faae57493452..1d82ce0f9087 100644 --- a/kerberos5/libexec/kpasswdd/Makefile +++ b/kerberos5/libexec/kpasswdd/Makefile @@ -12,13 +12,14 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kpasswd \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ - -I${.OBJDIR} + -I${.OBJDIR} \ + ${LDAPCFLAGS} LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ -L${KADM5SOBJDIR} -lkadm5srv -L${HDBOBJDIR} -lhdb \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} DPADD= ${LIBKRB5} ${LIBROKEN} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} MAN= kpasswdd.8 .include <bsd.prog.mk> diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile index a220cb6f1749..ee6681bd39bc 100644 --- a/kerberos5/usr.bin/kadmin/Makefile +++ b/kerberos5/usr.bin/kadmin/Makefile @@ -32,18 +32,19 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kadmin \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ - -I${.OBJDIR} + -I${.OBJDIR} \ + ${LDAPCFLAGS} LDADD= -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ -L${HDBOBJDIR} -lhdb \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err \ - -L${SLOBJDIR} -lsl -lreadline -lcurses + -L${SLOBJDIR} -lsl -lreadline -lcurses ${LDAPLDADD} DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ - ${LIBSL} ${LIBREADLINE} ${LIBCURSES} + ${LIBSL} ${LIBREADLINE} ${LIBCURSES} ${LDAPLIBS} MAN= kadmin.8 .include <bsd.prog.mk> diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile index cb5a7ccc5c4e..21abed2cbd3b 100644 --- a/kerberos5/usr.sbin/kstash/Makefile +++ b/kerberos5/usr.sbin/kstash/Makefile @@ -10,14 +10,15 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/kdc \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ - -I${.OBJDIR} + -I${.OBJDIR} \ + ${LDAPCFLAGS} LDADD= -L${HDBOBJDIR} -lhdb \ -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} MAN= kstash.8 .include <bsd.prog.mk> |