From de0f8d4cffdece57312d0849ec5485c743671571 Mon Sep 17 00:00:00 2001 From: mr Date: Wed, 18 Jun 2003 09:11:34 +0000 Subject: 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 --- kerberos5/Makefile.inc | 7 +++++++ kerberos5/lib/libhdb/Makefile | 3 ++- kerberos5/libexec/hpropd/Makefile | 7 ++++--- kerberos5/libexec/ipropd-master/Makefile | 7 ++++--- kerberos5/libexec/ipropd-slave/Makefile | 7 ++++--- kerberos5/libexec/kadmind/Makefile | 7 ++++--- kerberos5/libexec/kdc/Makefile | 7 ++++--- kerberos5/libexec/kpasswdd/Makefile | 7 ++++--- kerberos5/usr.bin/kadmin/Makefile | 7 ++++--- kerberos5/usr.sbin/kstash/Makefile | 7 ++++--- 10 files changed, 41 insertions(+), 25 deletions(-) (limited to 'kerberos5') diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc index b172f89..452e0e7 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 d1888a6..e6c5513 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 0b98752..606d65d 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 diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile index f77b54e..544a94d 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 diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile index 0614f5a..3d304d4 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 diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile index 46ca5d5..3f74663 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 diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile index ac0d3ba..5526063 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 diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile index faae574..1d82ce0 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 diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile index a220cb6..ee6681b 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 diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile index cb5a7cc..21abed2 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 -- cgit v1.1