openldap-bugs

openldap-bugs@openldap.org

1 participants
21065 discussions

Re: (ITS#6947) ldapadd crashes with LDIFs with invalid line termination
by jvcelak＠redhat.com 04 Jun '11

04 Jun '11

> > adding entries to LDAP database from file using ldapadd tool causes > > memory > > corruption error, when the last line of the input file is not > > terminated by '\n' > > character. > > Don't do that. I agree. But the tool should not crash on invalid output anyway. > > I am attaching proposed patch, which fixes this issue. > > The patch uses a GNU-specific function. Since GLIBC is not supported > on all of > the platforms OpenLDAP supports, the patch is not acceptable as-is. Sorry, I missed that. I will fix it and resend the patch. Jan

1 0

Re: (ITS#6946) ldapexop: ber_free_buf: Assertion failed
by hyc＠symas.com 03 Jun '11

03 Jun '11

jvcelak(a)redhat.com wrote: > Full_Name: Jan Vcelak > Version: 2.4.25 > OS: Linux > URL: ftp://ftp.openldap.org/incoming/jvcelak-110519-ldapexop-double-free.patch > Submission from: (NULL) (209.132.186.34) > > > Hello. > > A problem with crashing ldapexop was reported to our bugzilla. All versions > since 2.4.24 are affected. It seems that the bug was introduced by following > change in ldapexop.c. > > http://www.openldap.org/devel/cvsweb.cgi/clients/tools/ldapexop.c.diff?r1=1… > > Easy to reproduce. With clean configuration run: > $ ldapexop -H ldap:// -x whoami > anonymous > ldapexop: ../../../libraries/liblber/io.c:186: ber_free_buf: Assertion > `((ber)->ber_opts.lbo_valid==0x2)' failed. > Aborted > > Complete steps to reproduce in Fedora are specified in the original bugreport: > https://bugzilla.redhat.com/show_bug.cgi?id=699683 > > I think it is cause by double freeing the result. I am attaching a proposed > patch. Please, review my change. > > Thank you. Thanks for the report, patch applied to git. -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#6947) ldapadd crashes with LDIFs with invalid line termination
by hyc＠symas.com 03 Jun '11

03 Jun '11

jvcelak(a)redhat.com wrote: > Full_Name: Jan Vcelak > Version: 2.4.25 > OS: Linux > URL: ftp://ftp.openldap.org/incoming/jvcelak-20110519-ldif-countlines.patch > Submission from: (NULL) (209.132.186.34) > > > Hello, > > adding entries to LDAP database from file using ldapadd tool causes memory > corruption error, when the last line of the input file is not terminated by '\n' > character. Don't do that. The LDIF specification says that all LDIF elements are terminated by SEP (CR LF or LF). Anything not conforming to this is not valid LDIF. As usual, garbage-in-garbage-out. The entries are added correctly. > > All version since 2.4.23 are affected. > > $ cat>/tmp/input.ldif<< EOF >> dn: cn=A,dc=my-domain,dc=com >> objectClass: inetOrgPerson >> objectClass: organizationalPerson >> objectClass: person >> objectClass: top >> cn: A >> sn: A >> uid: A >> mail: A(a)example.com >> EOF > $ wc -c /tmp/input.ldif > 166 /tmp/input.ldif > $ truncate -s 165 /tmp/input.ldif > $ hexdump -c /tmp/input.ldif > 0000000 d n : c n = A , d c = m y - d > 0000010 o m a i n , d c = c o m \n o b j > 0000020 e c t C l a s s : i n e t O r > 0000030 g P e r s o n \n o b j e c t C l > 0000040 a s s : o r g a n i z a t i o > 0000050 n a l P e r s o n \n o b j e c t > 0000060 C l a s s : p e r s o n \n o b > 0000070 j e c t C l a s s : t o p \n c > 0000080 n : A \n s n : A \n u i d : > 0000090 A \n m a i l : A @ e x a m p l > 00000a0 e . c o m > 00000a5 > $ ldapadd -H ldap:// -D cn=Manager,dc=my-domain,dc=com -x -w password -f > /tmp/input.ldif > adding new entry "cn=A,dc=my-domain,dc=com" > > *** glibc detected *** ldapadd: free(): invalid pointer: 0x0000000001c435c8 *** > ======= Backtrace: ========= > /lib64/libc.so.6[0x3626e76d63] > ldapadd[0x404505] > /lib64/libc.so.6(__libc_start_main+0xfd)[0x3626e1ee5d] > ldapadd[0x4037e9] > ======= Memory map: ======== > ... > > I am attaching proposed patch, which fixes this issue. The patch uses a GNU-specific function. Since GLIBC is not supported on all of the platforms OpenLDAP supports, the patch is not acceptable as-is. -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#6831) Proxycache database corruption
by hyc＠symas.com 03 Jun '11

03 Jun '11

ryans(a)aweber.com wrote: > Some more information: once I changed the search base from ou=Users,dc=example,dc=com to dc=example,dc=com to "fix" the > problem for that particular user (after which the original query with the ou=Users,dc=example,dc=com search base began > working again), the following entries popped up in the log: > ftp://ftp.openldap.org/incoming/ryan-steele-110221.proxycache-log-fixing-br… > > It gets stranger, though. If I start out by using the root entry as the search base (dc=example,dc=com) with a user who > is not yet in the cache, not only will it say it is ANSWERABLE (which it clearly isn't) and then return nothing without > even trying to reach out to the upstream host, but if I then change the search base to ou=Users,dc=example,dc=com, I get > the following error on the CLI (and this is with a successful bind as the directory admin): > > > ldapsearch -x -D cn=admin,dc=example,dc=com -y /etc/ldap.secret -H ldaps://localhost -LLL -b cn=admin,dc=example,dc=com > '(&(|(objectClass=examplecomUtilityUser)(objectClass=examplecomEmployee))(uid=jdoe4))' uid > No such object (32) > Matched DN: dc=example,dc=com > > Debugging logs generated by that query can be found here: > ftp://ftp.openldap.org/incoming/ryan-steele-110221.proxycache-log-attempt-t… I'm not sure I reproduced all the behaviors you were seeing, but I've reproduced at least one of them and fixed it in git. Please pull the latest pcache.c and test, thanks. -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#6959) ldap_dnfree not mentioned anywhere
by hyc＠symas.com 03 Jun '11

03 Jun '11

frank.muzzulini(a)comsoft.aero wrote: > Full_Name: Frank Muzzulini > Version: 2.4.25 > OS: Linux > URL: ftp://ftp.openldap.org/incoming/ > Submission from: (NULL) (91.221.120.78) > > > Hi, > > Reading the documentation of ldap_str2dn I was wondering how to free the > allocated DN. After browsing for a while I loaded the latest tarball to see some > example code and found ldap_dnfree. > > I re-checked and indeed the function is not mentioned anywhere in the docs > ("find doc -type f | xargs grep ldap_dnfree" found nothing). Added to git, thanks for the report. -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#6958) slapd segmentation fault with TLSCRLCheck all
by Howard Chu 03 Jun '11

03 Jun '11

Can't reproduce this on Linux. Someone with a FreeBSD installation will have to investigate this.

1 0

Re: (ITS#6960) Out of memory erro occurs when running LDAP
by hyc＠symas.com 03 Jun '11

03 Jun '11

ArunPrasathSevugan(a)oracle.com wrote: > Full_Name: Arun Prasath > Version: 3 > OS: Window Xp > URL: ftp://ftp.openldap.org/incoming/ > Submission from: (NULL) (220.225.129.57) > > > Hi, > > We have a tool integrated with LDAP to load all the users in Cognos reporting. > There are about 5000+ users and while running LDAPCONFIG we have been getting > out of memory exception issue. > > In the task manage I could see the LDAP is using memory of around 3 GB and > finally errors out. > > Please help us to load the 5000+ users. It doesn't sound like you're using OpenLDAP. We have no LDAPCONFIG to run and we have no "Version 3" of our software. Please try contacting the actual vendor of your LDAP software. Closing this ITS. -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#6864) delta-sync - contextCSN not updating on provider
by hyc＠symas.com 03 Jun '11

03 Jun '11

yuribank(a)gmail.com wrote: > Full_Name: Yuri Bank > Version: 2.4.23-24 > OS: Linux Ubuntu 10.10 > URL: http://yuri.easytospell.net/consumer.provider.txt > Submission from: (NULL) (67.180.182.165) > > > This issue exists in both versions 2.4.23 and 2.4.24 > > I've found an interesting problem with delta-sync replication in which the > ContextCSN on my consumers is higher than the contextCSN on my provider. This is > because the Provider does not properly update its contextCSN for its base suffix > (dc=test,dc=com) when changes are made to group membership. Of couse, if it so > happens that the last change in my database was not a group membership change, > then the contextCSNs will be consistent between my consumers and provider. Sounds like this bug was introduced by patches for ITS#6766 or #6329. Both of those patches have been reverted for ITS#6915. This bug should be fixed in the current git HEAD. > > > I use the following command to check the ContextCSN on each consumer: > > Consumer: 1 > root@neteng1.oak:/etc/ldap# ldapsearch -Y EXTERNAL -H ldapi:/// -s base -b > "dc=test,dc=com" contextCSN dn: dc=test,dc=com > dn: dc=test,dc=com > contextCSN: 20110313041653.752098Z#000000#000#000000 > > Consumer: 2 > ybank@neteng1.iad:~$ ldapsearch -Y EXTERNAL -H ldapi:/// -s base -b > "dc=test,dc=com" contextCSN dn: dc=test,dc=com > dn: dc=test,dc=com > contextCSN: 20110313041653.752098Z#000000#000#000000 > > So we can see that the two consumers have matching contextCSNs: > ContextCSN. 20110313041653.752098Z#000000#000#000000 > > Lets check the Provider now. > > Provider: > root@neteng0.iad:~# ldapsearch -Y EXTERNAL -H ldapi:/// -s base -b > "dc=test,dc=com" ContextCSN dn: dc=test,dc=com > dn: dc=test,dc=com > contextCSN: 20110313041653.709140Z#000000#000#000000 > > The providers CSN is smaller!? > > Lets take a closer look and search cn=accesslog > > These are the last two entries: ( first the user was added, and then the user > was added to a group) > > # 20110313041653.000003Z, accesslog > dn: reqStart=20110313041653.000003Z,cn=accesslog > objectClass: auditAdd > reqStart: 20110313041653.000003Z > reqEnd: 20110313041653.000004Z > reqType: add > reqSession: 34633 > reqAuthzID: cn=admin,dc=test,dc=com > reqDN: cn=Bank\2C Yuri(banky),o=UserAccounts,dc=test,dc=com > reqResult: 0 > reqMod: sn:+ Bank > reqMod: userPassword:+ {SASL}banky > reqMod: uid:+ banky > reqMod: objectClass:+ top > reqMod: objectClass:+ person > reqMod: objectClass:+ shadowAccount > reqMod: structuralObjectClass:+ person > reqMod: cn:+ Bank, Yuri(banky) > reqMod: entryUUID:+ 78a75ef6-e174-102f-9571-ffecbfef68e5 > reqMod: creatorsName:+ cn=admin,dc=test,dc=com > reqMod: createTimestamp:+ 20110313041653Z > reqMod: entryCSN:+ 20110313041653.709140Z#000000#000#000000 > reqMod: modifiersName:+ cn=admin,dc=test,dc=com > reqMod: modifyTimestamp:+ 20110313041653Z > > # 20110313041653.000006Z, accesslog > dn: reqStart=20110313041653.000006Z,cn=accesslog > objectClass: auditModify > reqStart: 20110313041653.000006Z > reqEnd: 20110313041653.000007Z > reqType: modify > reqSession: 34633 > reqAuthzID: cn=admin,dc=test,dc=com > reqDN: cn=SSLVPN,o=Groups,dc=test,dc=com > reqResult: 0 > reqMod: member:+ cn=Bank\2C Yuri(banky),o=UserAccounts,dc=test,dc=com > reqMod: entryCSN:= 20110313041653.752098Z#000000#000#000000 > reqMod: modifiersName:= cn=admin,dc=test,dc=com > reqMod: modifyTimestamp:= 20110313041653Z > > You can see that the consumers have the latest entryCSN (20110313041653.752098Z) > as their contextCSN, but the provider has the entryCSN (20110313041653.709140Z) > before that as its contextCSN: > > If I search the contextCSN on -s base -b cn=accesslog it yields correctly, the > same result as the consumers: > 20110313041653.752098Z#000000#000#000000 > > > As you can see, the provider is not using the latest entryCSN as its ContextCSN, > where as the consumer nodes are. Also notice that the last modification was to > group membership. This problem only seems to exist when Adding/Removing users > from a group. > > A side effect of this issue causes brand new consumers to get stuck in an > infinite loop while syncing for the first time. > > A work around is to make a random change to a User/Person, such as injecting a > random number into their description field AFTER making a change to a group > membership. Such a change will: A. cause the Provider to correctly update its > contextCSN, B. provider and all consumer[s] will have the same contextCSN C. > brand new consumers can be added without getting stuck in an infinite loop when > syncing the database. ( they seem to get stuck on the last entry which makes > sense if the last entry has a higher entryCSN than that of the Providers > contextCSN? ) > > Confgiuration: ( See URL ) > http://yuri.easytospell.net/consumer.provider.txt > > Overlays: > syncprov > accesslog > memberof > > > Please feel free to email me about reproducing this problem. I have a lab with > various configurations and would be happy to give access to anyone interested. > > - Yuri Bank > -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#6962) Download down?
by h.b.furuseth＠usit.uio.no 03 Jun '11

03 Jun '11

demian.djrn(a)gmail.com writes: > all mirrors are down, i can't download the program. The mirror list needs to be updated. These are down or obsolete: Costa Rica: No /openldap directory. Italy: Unknown host it.openldap.org. Korea: No route to host ftp.holywar.net; TTL exceeded. Portugal: Last update was in 2008. The others work for me. -- Hallvard

1 0

Re: (ITS#6883) Improved Makefiles for contrib modules
by bgmilne＠staff.telkomsa.net 03 Jun '11

03 Jun '11

--Boundary-00=_50J6N9eQwpy3uQe Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit On Tuesday, 29 March 2011 21:20:53 quanah(a)zimbra.com wrote: > --On Tuesday, March 29, 2011 3:25 PM +0000 bgmilne(a)staff.telkomsa.net wrote: > > Full_Name: Buchan Milne > > Version: 2.4.25 > > OS: Linux > > URL: ftp://ftp.openldap.org/incoming/ > > Submission from: (NULL) (196.25.124.16) > > > > > > While the code in contrib is not supported, some overlays provide make > > files, some don't, and there were variations in a lot of the make files > > (e.g. use of DESTDIR or not). > > > > In order to add make files for overlays that don't have them, improve the > > consistency of the make files between overlays that had them, and to > > provide some basic sanity testing in a 'test' target, I have created the > > patch at: > > http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/openldap/curre > > nt/SOURCES/openldap-2.4.25-contrib-makefiles-with-tests.patch?revision=64 > > 8744&view=markup > > > > The patch is against 2.4.25, but should apply to master (except that > > there two additional overlays are present in master). Where feasible I > > have retained the majority of an existing make file, in other cases, > > where modifications would exceed the original content, I have replaced > > existing make files wholesale. > > > > The attached patch file is derived from OpenLDAP Software. All of the > > modifications to OpenLDAP Software represented in the following patch(es) > > were developed by Buchan Milne (bgmilne(a)staff.telkomsa.net). I have not > > assigned rights and/or interest in this work to any party. > > Hi Buchan, > > Can you make the patch available via git-format-patch? Please find it attached. Regards, Buchan --Boundary-00=_50J6N9eQwpy3uQe Content-Type: text/x-patch; charset="UTF-8"; name="0001-Fix-contrib-Makefiles-to-use-libtool-and-be-consiste.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-Fix-contrib-Makefiles-to-use-libtool-and-be-consiste.patch" =46rom 168ed0544cfd529c8bdff1e5366c1bc60477b1cb Mon Sep 17 00:00:00 2001 =46rom: Buchan Milne <bgmilne(a)staff.telkomsa.net> Date: Fri, 3 Jun 2011 10:18:39 +0200 Subject: [PATCH] Fix contrib Makefiles to use libtool and be consistent (IT= S#6883) This makes existing Makefiles provided with contrib modules more consistent, using libtool for compiling and linking. A trivial test target has also been added, which tests that the module can be loaded. Existing Makefiles were consulted, but were mainly copied from the first working/tested Makefile. As such, any pre-existing copyright notices have been replaced. Makefiles are also provided for all the contrib modules that did not have Makefiles. =2D-- contrib/slapd-modules/acl/Makefile | 48 +++++++++++++++ contrib/slapd-modules/addpartial/Makefile | 50 ++++++++++++++--- contrib/slapd-modules/allop/Makefile | 47 +++++++++++++++ contrib/slapd-modules/allowed/Makefile | 58 ++++++++++--------- contrib/slapd-modules/autogroup/Makefile | 36 +++++++++--- contrib/slapd-modules/cloak/Makefile | 43 ++++++++++++-- contrib/slapd-modules/denyop/Makefile | 48 +++++++++++++++ contrib/slapd-modules/dsaschema/Makefile | 47 +++++++++++++++ contrib/slapd-modules/dupent/Makefile | 58 +++++++++---------- contrib/slapd-modules/kinit/Makefile | 47 +++++++++++++++ contrib/slapd-modules/lastbind/Makefile | 32 +++++++--- contrib/slapd-modules/lastmod/Makefile | 48 +++++++++++++++ contrib/slapd-modules/noopsrch/Makefile | 58 +++++++++---------- contrib/slapd-modules/nops/Makefile | 47 ++++++++++++---- contrib/slapd-modules/nssov/Makefile | 13 ++++- contrib/slapd-modules/passwd/Makefile | 86 +++++++++++++++---------= =2D--- contrib/slapd-modules/passwd/sha2/Makefile | 48 +++++++++++++--- contrib/slapd-modules/trace/Makefile | 48 +++++++++++++++ 18 files changed, 680 insertions(+), 182 deletions(-) create mode 100644 contrib/slapd-modules/acl/Makefile create mode 100644 contrib/slapd-modules/allop/Makefile create mode 100644 contrib/slapd-modules/denyop/Makefile create mode 100644 contrib/slapd-modules/dsaschema/Makefile create mode 100644 contrib/slapd-modules/kinit/Makefile create mode 100644 contrib/slapd-modules/lastmod/Makefile create mode 100644 contrib/slapd-modules/trace/Makefile diff --git a/contrib/slapd-modules/acl/Makefile b/contrib/slapd-modules/acl= /Makefile new file mode 100644 index 0000000..9f48c0d =2D-- /dev/null +++ b/contrib/slapd-modules/acl/Makefile @@ -0,0 +1,48 @@ +# $OpenLDAP$ +# Copyright 2011 Buchan Milne <bgmilne(a)staff.telkomsa.net> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted only as authorized by the OpenLDAP +# Public License. +# +# A copy of this license is available in the file LICENSE in the +# top-level directory of the distribution or, alternatively, at +# <http://www.OpenLDAP.org/license.html>. + +CPPFLAGS+=3D-I../../../include -I../../../servers/slapd=20 +CPPFLAGS+=3D-DSLAPD_OVER_ACL=3DSLAPD_MOD_DYNAMIC +LIBTOOL=3D../../../libtool + +ldap_subdir =3D openldap +prefix=3D/usr/local +exec_prefix =3D $(prefix) +libdir =3D $(exec_prefix)/lib +libexecdir =3D $(exec_prefix)/libexec +moduledir =3D $(exec_prefix)/libexec/$(ldap_subdir) +slapd=3D../../../servers/slapd/slapd + +all: posixgroup.la + +%.lo: %.c + $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $< + +%.la: %.lo + $(LIBTOOL) --mode=3Dlink $(CC) -version-info 0:0:0 \ + -rpath $(moduledir) -module -o $@ $< + +clean: + rm -rf *.lo *.la *.o .libs/ + +install: posixgroup.la + mkdir -p $(DESTDIR)$(moduledir) + $(LIBTOOL) --mode=3Dinstall cp $? $(DESTDIR)$(moduledir) + $(LIBTOOL) --finish $(DESTDIR)$(moduledir) + +test: posixgroup.la + @for i in $?;do \ + echo "Testing loading module $$i"; \ + echo "modulepath ." > test-slapd.conf; \ + echo "moduleload $$i" >> test-slapd.conf; \ + $(slapd) -T test -f test-slapd.conf && rm -f test-slapd.conf; \ + done diff --git a/contrib/slapd-modules/addpartial/Makefile b/contrib/slapd-modu= les/addpartial/Makefile index 3b68815..2f1fd31 100644 =2D-- a/contrib/slapd-modules/addpartial/Makefile +++ b/contrib/slapd-modules/addpartial/Makefile @@ -1,13 +1,47 @@ # $OpenLDAP$ =2DOPENLDAP_SRC=3D../../.. =2DOPENLDAP_BLD=3D../../.. =2DCPPFLAGS+=3D-I${OPENLDAP_SRC}/include -I${OPENLDAP_SRC}/servers/slapd -I= ${OPENLDAP_BLD}/include =2DCC=3Dgcc +# Copyright 2011 Buchan Milne <bgmilne(a)staff.telkomsa.net> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted only as authorized by the OpenLDAP +# Public License. +# +# A copy of this license is available in the file LICENSE in the +# top-level directory of the distribution or, alternatively, at +# <http://www.OpenLDAP.org/license.html>. =20 =2Dall: addpartial-overlay.so +CPPFLAGS+=3D-I../../../include -I../../../servers/slapd=20 +LIBTOOL=3D../../../libtool =20 =2Daddpartial-overlay.so: addpartial-overlay.c =2D $(CC) -shared $(CPPFLAGS) $(LDFLAGS) -Wall -o $@ $? +ldap_subdir =3D openldap +prefix=3D/usr/local +exec_prefix =3D $(prefix) +libdir =3D $(exec_prefix)/lib +libexecdir =3D $(exec_prefix)/libexec +moduledir =3D $(exec_prefix)/libexec/$(ldap_subdir) +slapd=3D../../../servers/slapd/slapd + +all: addpartial.la + +%.lo: addpartial-overlay.c + $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $< -o addpartial.lo + +%.la: %.lo + $(LIBTOOL) --mode=3Dlink $(CC) -version-info 0:0:0 \ + -rpath $(moduledir) -module -o $@ $< =20 clean: =2D rm addpartial-overlay.so + rm -rf *.lo *.la *.o .libs/ + +install: addpartial.la + mkdir -p $(DESTDIR)$(moduledir) + $(LIBTOOL) --mode=3Dinstall cp $? $(DESTDIR)$(moduledir) + $(LIBTOOL) --finish $(DESTDIR)$(moduledir) + +test: addpartial.la + @for i in $?;do \ + echo "Testing loading module $$i"; \ + echo "modulepath ." > test-slapd.conf; \ + echo "moduleload $$i" >> test-slapd.conf; \ + $(slapd) -T test -f test-slapd.conf && rm -f test-slapd.conf; \ + done diff --git a/contrib/slapd-modules/allop/Makefile b/contrib/slapd-modules/a= llop/Makefile new file mode 100644 index 0000000..a995e61 =2D-- /dev/null +++ b/contrib/slapd-modules/allop/Makefile @@ -0,0 +1,47 @@ +# $OpenLDAP$ +# Copyright 2011 Buchan Milne <bgmilne(a)staff.telkomsa.net> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted only as authorized by the OpenLDAP +# Public License. +# +# A copy of this license is available in the file LICENSE in the +# top-level directory of the distribution or, alternatively, at +# <http://www.OpenLDAP.org/license.html>. + +CPPFLAGS+=3D-I../../../include -I../../../servers/slapd=20 +LIBTOOL=3D../../../libtool + +ldap_subdir =3D openldap +prefix=3D/usr/local +exec_prefix =3D $(prefix) +libdir =3D $(exec_prefix)/lib +libexecdir =3D $(exec_prefix)/libexec +moduledir =3D $(exec_prefix)/libexec/$(ldap_subdir) +slapd=3D../../../servers/slapd/slapd + +all: allop.la + +%.lo: %.c + $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $< + +%.la: %.lo + $(LIBTOOL) --mode=3Dlink $(CC) -version-info 0:0:0 \ + -rpath $(moduledir) -module -o $@ $< + +clean: + rm -rf *.lo *.la *.o .libs/ + +install: allop.la + mkdir -p $(DESTDIR)$(moduledir) + $(LIBTOOL) --mode=3Dinstall cp $? $(DESTDIR)$(moduledir) + $(LIBTOOL) --finish $(DESTDIR)$(moduledir) + +test: allop.la + @for i in $?;do \ + echo "Testing loading module $$i"; \ + echo "modulepath ." > test-slapd.conf; \ + echo "moduleload $$i" >> test-slapd.conf; \ + $(slapd) -T test -f test-slapd.conf && rm -f test-slapd.conf; \ + done diff --git a/contrib/slapd-modules/allowed/Makefile b/contrib/slapd-modules= /allowed/Makefile index 8f5be91..75e63c1 100644 =2D-- a/contrib/slapd-modules/allowed/Makefile +++ b/contrib/slapd-modules/allowed/Makefile @@ -1,8 +1,6 @@ =2D# $OpenLDAP$ =2D# This work is part of OpenLDAP Software <http://www.openldap.org/>. =2D# =2D# Copyright 1998-2011 The OpenLDAP Foundation. =2D# Copyright 2004 Howard Chu, Symas Corp. All Rights Reserved. +# $$ +# Copyright 2011 Buchan Milne <bgmilne(a)staff.telkomsa.net> +# All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted only as authorized by the OpenLDAP @@ -12,35 +10,39 @@ # top-level directory of the distribution or, alternatively, at # <http://www.OpenLDAP.org/license.html>. =20 =2DPREFIX=3D/opt/openldap-HEAD =2D +CPPFLAGS+=3D-I../../../include -I../../../servers/slapd=20 +CPPFLAGS+=3D-DSLAPD_OVER_ALLOWED=3DSLAPD_MOD_DYNAMIC LIBTOOL=3D../../../libtool =2DOPT=3D-g -O2 =2DCC=3Dgcc =2D =2DDEFS=3D-DSLAPD_OVER_ALLOWED=3DSLAPD_MOD_DYNAMIC =2D =2DLDAP_INC=3D-I../../../include -I../../../servers/slapd =2DINCS=3D$(LDAP_INC) =2D =2DLDAP_LIB=3D-lldap_r -llber -L../../../lib =2DLDAP_LIB=3D =2DLIBS=3D$(LDAP_LIB) =20 =2Dall: allowed.la +ldap_subdir =3D openldap +prefix=3D/usr/local +exec_prefix =3D $(prefix) +libdir =3D $(exec_prefix)/lib +libexecdir =3D $(exec_prefix)/libexec +moduledir =3D $(exec_prefix)/libexec/$(ldap_subdir) +slapd=3D../../../servers/slapd/slapd =20 +all: allowed.la =20 =2Dallowed.lo: allowed.c =2D $(LIBTOOL) --mode=3Dcompile $(CC) $(OPT) $(DEFS) $(INCS) -c $? +%.lo: %.c + $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $< =20 =2Dallowed.la: allowed.lo =2D $(LIBTOOL) --mode=3Dlink $(CC) $(OPT) -version-info 0:0:0 \ =2D -rpath $(PREFIX)/lib -module -o $@ $? $(LIBS) +%.la: %.lo + $(LIBTOOL) --mode=3Dlink $(CC) -version-info 0:0:0 \ + -rpath $(moduledir) -module -o $@ $< =20 clean: =2D rm -f allowed.o allowed.lo allowed.la + rm -rf *.lo *.la *.o .libs/ =20 install: allowed.la =2D mkdir -p $(PREFIX)/libexec/openldap =2D $(LIBTOOL) --mode=3Dinstall cp allowed.la $(PREFIX)/libexec/openldap =2D $(LIBTOOL) --finish $(PREFIX)/libexec/openldap + mkdir -p $(DESTDIR)$(moduledir) + $(LIBTOOL) --mode=3Dinstall cp $? $(DESTDIR)$(moduledir) + $(LIBTOOL) --finish $(DESTDIR)$(moduledir) + +test: allowed.la + @for i in $?;do \ + echo "Testing loading module $$i"; \ + echo "modulepath ." > test-slapd.conf; \ + echo "moduleload $$i" >> test-slapd.conf; \ + $(slapd) -T test -f test-slapd.conf && rm -f test-slapd.conf; \ + done diff --git a/contrib/slapd-modules/autogroup/Makefile b/contrib/slapd-modul= es/autogroup/Makefile index 70146ac..4438cbf 100644 =2D-- a/contrib/slapd-modules/autogroup/Makefile +++ b/contrib/slapd-modules/autogroup/Makefile @@ -1,6 +1,17 @@ =2DLIBTOOL=3D../../../libtool +# $OpenLDAP$ +# Copyright 2011 Buchan Milne <bgmilne(a)staff.telkomsa.net> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted only as authorized by the OpenLDAP +# Public License. +# +# A copy of this license is available in the file LICENSE in the +# top-level directory of the distribution or, alternatively, at +# <http://www.OpenLDAP.org/license.html>. =20 =2DCPPFLAGS+=3D-I../../../include -I../../../servers/slapd +CPPFLAGS+=3D-I../../../include -I../../../servers/slapd=20 +LIBTOOL=3D../../../libtool =20 ldap_subdir =3D openldap prefix=3D/usr/local @@ -8,20 +19,29 @@ exec_prefix =3D $(prefix) libdir =3D $(exec_prefix)/lib libexecdir =3D $(exec_prefix)/libexec moduledir =3D $(exec_prefix)/libexec/$(ldap_subdir) +slapd=3D../../../servers/slapd/slapd =20 all: autogroup.la =20 =2Dautogroup.lo: autogroup.c =2D $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $? +%.lo: %.c + $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $< =20 =2Dautogroup.la: autogroup.lo +%.la: %.lo $(LIBTOOL) --mode=3Dlink $(CC) -version-info 0:0:0 \ =2D -rpath $(libdir) -module -o $@ $?=20 + -rpath $(moduledir) -module -o $@ $< =20 clean: =2D rm -f autogroup.lo autogroup.la + rm -rf *.lo *.la *.o .libs/ =20 install: autogroup.la mkdir -p $(DESTDIR)$(moduledir) =2D $(LIBTOOL) --mode=3Dinstall cp autogroup.la $(DESTDIR)$(moduledir) + $(LIBTOOL) --mode=3Dinstall cp $? $(DESTDIR)$(moduledir) $(LIBTOOL) --finish $(DESTDIR)$(moduledir) + +test: autogroup.la + @for i in $?;do \ + echo "Testing loading module $$i"; \ + echo "modulepath ." > test-slapd.conf; \ + echo "moduleload $$i" >> test-slapd.conf; \ + $(slapd) -T test -f test-slapd.conf && rm -f test-slapd.conf; \ + done diff --git a/contrib/slapd-modules/cloak/Makefile b/contrib/slapd-modules/c= loak/Makefile index 4562fcb..d92ff8b 100644 =2D-- a/contrib/slapd-modules/cloak/Makefile +++ b/contrib/slapd-modules/cloak/Makefile @@ -1,17 +1,48 @@ # $OpenLDAP$ +# Copyright 2011 Buchan Milne <bgmilne(a)staff.telkomsa.net> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted only as authorized by the OpenLDAP +# Public License. +# +# A copy of this license is available in the file LICENSE in the +# top-level directory of the distribution or, alternatively, at +# <http://www.OpenLDAP.org/license.html>. + CPPFLAGS+=3D-I../../../include -I../../../servers/slapd=20 CPPFLAGS+=3D-DSLAPD_OVER_CLOAK=3DSLAPD_MOD_DYNAMIC =2DLIBS=3D-lldap_r -llber -lcrypto LIBTOOL=3D../../../libtool =20 +ldap_subdir =3D openldap +prefix=3D/usr/local +exec_prefix =3D $(prefix) +libdir =3D $(exec_prefix)/lib +libexecdir =3D $(exec_prefix)/libexec +moduledir =3D $(exec_prefix)/libexec/$(ldap_subdir) +slapd=3D../../../servers/slapd/slapd + all: cloak.la =20 =2Dcloak.lo: cloak.c =2D $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -c $? +%.lo: %.c + $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $< =20 =2Dcloak.la: cloak.lo +%.la: %.lo $(LIBTOOL) --mode=3Dlink $(CC) -version-info 0:0:0 \ =2D -rpath $(PREFIX)/lib -module -o $@ $? $(LIBS) + -rpath $(moduledir) -module -o $@ $< =20 clean: =2D rm cloak.lo cloak.la + rm -rf *.lo *.la *.o .libs/ + +install: cloak.la + mkdir -p $(DESTDIR)$(moduledir) + $(LIBTOOL) --mode=3Dinstall cp $? $(DESTDIR)$(moduledir) + $(LIBTOOL) --finish $(DESTDIR)$(moduledir) + +test: cloak.la + @for i in $?;do \ + echo "Testing loading module $$i"; \ + echo "modulepath ." > test-slapd.conf; \ + echo "moduleload $$i" >> test-slapd.conf; \ + $(slapd) -T test -f test-slapd.conf && rm -f test-slapd.conf; \ + done diff --git a/contrib/slapd-modules/denyop/Makefile b/contrib/slapd-modules/= denyop/Makefile new file mode 100644 index 0000000..711eee7 =2D-- /dev/null +++ b/contrib/slapd-modules/denyop/Makefile @@ -0,0 +1,48 @@ +# $OpenLDAP$ +# Copyright 2011 Buchan Milne <bgmilne(a)staff.telkomsa.net> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted only as authorized by the OpenLDAP +# Public License. +# +# A copy of this license is available in the file LICENSE in the +# top-level directory of the distribution or, alternatively, at +# <http://www.OpenLDAP.org/license.html>. + +CPPFLAGS+=3D-I../../../include -I../../../servers/slapd=20 +CPPFLAGS+=3D-DSLAPD_OVER_DENYOP=3DSLAPD_MOD_DYNAMIC +LIBTOOL=3D../../../libtool + +ldap_subdir =3D openldap +prefix=3D/usr/local +exec_prefix =3D $(prefix) +libdir =3D $(exec_prefix)/lib +libexecdir =3D $(exec_prefix)/libexec +moduledir =3D $(exec_prefix)/libexec/$(ldap_subdir) +slapd=3D../../../servers/slapd/slapd + +all: denyop.la + +%.lo: %.c + $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $< + +%.la: %.lo + $(LIBTOOL) --mode=3Dlink $(CC) -version-info 0:0:0 \ + -rpath $(moduledir) -module -o $@ $< + +clean: + rm -rf *.lo *.la *.o .libs/ + +install: denyop.la + mkdir -p $(DESTDIR)$(moduledir) + $(LIBTOOL) --mode=3Dinstall cp $? $(DESTDIR)$(moduledir) + $(LIBTOOL) --finish $(DESTDIR)$(moduledir) + +test: denyop.la + @for i in $?;do \ + echo "Testing loading module $$i"; \ + echo "modulepath ." > test-slapd.conf; \ + echo "moduleload $$i" >> test-slapd.conf; \ + $(slapd) -T test -f test-slapd.conf && rm -f test-slapd.conf; \ + done diff --git a/contrib/slapd-modules/dsaschema/Makefile b/contrib/slapd-modul= es/dsaschema/Makefile new file mode 100644 index 0000000..90f711e =2D-- /dev/null +++ b/contrib/slapd-modules/dsaschema/Makefile @@ -0,0 +1,47 @@ +# $OpenLDAP$ +# Copyright 2011 Buchan Milne <bgmilne(a)staff.telkomsa.net> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted only as authorized by the OpenLDAP +# Public License. +# +# A copy of this license is available in the file LICENSE in the +# top-level directory of the distribution or, alternatively, at +# <http://www.OpenLDAP.org/license.html>. + +CPPFLAGS+=3D-I../../../include -I../../../servers/slapd=20 +LIBTOOL=3D../../../libtool + +ldap_subdir =3D openldap +prefix=3D/usr/local +exec_prefix =3D $(prefix) +libdir =3D $(exec_prefix)/lib +libexecdir =3D $(exec_prefix)/libexec +moduledir =3D $(exec_prefix)/libexec/$(ldap_subdir) +slapd=3D../../../servers/slapd/slapd + +all: dsaschema.la + +%.lo: %.c + $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $< + +%.la: %.lo + $(LIBTOOL) --mode=3Dlink $(CC) -version-info 0:0:0 \ + -rpath $(moduledir) -module -o $@ $< + +clean: + rm -rf *.lo *.la *.o .libs/ + +install: dsaschema.la + mkdir -p $(DESTDIR)$(moduledir) + $(LIBTOOL) --mode=3Dinstall cp $? $(DESTDIR)$(moduledir) + $(LIBTOOL) --finish $(DESTDIR)$(moduledir) + +test: dsaschema.la + @for i in $?;do \ + echo "Testing loading module $$i"; \ + echo "modulepath ." > test-slapd.conf; \ + echo "moduleload $$i" >> test-slapd.conf; \ + $(slapd) -T test -f test-slapd.conf && rm -f test-slapd.conf; \ + done diff --git a/contrib/slapd-modules/dupent/Makefile b/contrib/slapd-modules/= dupent/Makefile index 54a69ce..c1e8997 100644 =2D-- a/contrib/slapd-modules/dupent/Makefile +++ b/contrib/slapd-modules/dupent/Makefile @@ -1,8 +1,6 @@ # $OpenLDAP$ =2D# This work is part of OpenLDAP Software <http://www.openldap.org/>. =2D# =2D# Copyright 1998-2011 The OpenLDAP Foundation. =2D# Copyright 2004 Howard Chu, Symas Corp. All Rights Reserved. +# Copyright 2011 Buchan Milne <bgmilne(a)staff.telkomsa.net> +# All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted only as authorized by the OpenLDAP @@ -12,41 +10,39 @@ # top-level directory of the distribution or, alternatively, at # <http://www.OpenLDAP.org/license.html>. =20 +CPPFLAGS+=3D-I../../../include -I../../../servers/slapd=20 +CPPFLAGS+=3D-DSLAPD_OVER_DUPENT=3DSLAPD_MOD_DYNAMIC -g -O2 LIBTOOL=3D../../../libtool =2DOPT=3D-DSLAPD_OVER_DUPENT=3D2 -g -O2 =2D#LIBTOOL=3D../../../../ldap-devel/libtool =2D#OPT=3D-DSLAPD_OVER_DUPENT=3D2 -g -O0 =2DCC=3Dgcc =2D =2DLDAP_INC=3D-I../../../include -I../../../servers/slapd =2D#LDAP_INC=3D-I../../../include -I../../../servers/slapd -I../../../../ld= ap-devel/include =2DINCS=3D$(LDAP_INC) =2D =2DLDAP_LIB=3D-lldap_r -llber =2DLIBS=3D$(LDAP_LIB) =20 +ldap_subdir =3D openldap prefix=3D/usr/local =2Dexec_prefix=3D$(prefix) =2Dldap_subdir=3D/openldap +exec_prefix =3D $(prefix) +libdir =3D $(exec_prefix)/lib +libexecdir =3D $(exec_prefix)/libexec +moduledir =3D $(exec_prefix)/libexec/$(ldap_subdir) +slapd=3D../../../servers/slapd/slapd =20 =2Dlibdir=3D$(exec_prefix)/lib =2Dlibexecdir=3D$(exec_prefix)/libexec =2Dmoduledir =3D $(libexecdir)$(ldap_subdir) +all: dupent.la =20 =2Dall: dupent.la +%.lo: %.c + $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $< =20 =2D =2Ddupent.lo: dupent.c =2D $(LIBTOOL) --mode=3Dcompile $(CC) $(OPT) $(DEFS) $(INCS) -c $? =2D =2Ddupent.la: dupent.lo =2D $(LIBTOOL) --mode=3Dlink $(CC) $(OPT) -version-info 0:0:0 \ =2D -rpath $(moduledir) -module -o $@ $? $(LIBS) +%.la: %.lo + $(LIBTOOL) --mode=3Dlink $(CC) -version-info 0:0:0 \ + -rpath $(moduledir) -module -o $@ $< =20 clean: =2D rm -f dupent.lo dupent.la + rm -rf *.lo *.la *.o .libs/ =20 install: dupent.la mkdir -p $(DESTDIR)$(moduledir) =2D $(LIBTOOL) --mode=3Dinstall cp dupent.la $(DESTDIR)$(moduledir) =2D + $(LIBTOOL) --mode=3Dinstall cp $? $(DESTDIR)$(moduledir) + $(LIBTOOL) --finish $(DESTDIR)$(moduledir) + +test: dupent.la + @for i in $?;do \ + echo "Testing loading module $$i"; \ + echo "modulepath ." > test-slapd.conf; \ + echo "moduleload $$i" >> test-slapd.conf; \ + $(slapd) -T test -f test-slapd.conf && rm -f test-slapd.conf; \ + done diff --git a/contrib/slapd-modules/kinit/Makefile b/contrib/slapd-modules/k= init/Makefile new file mode 100644 index 0000000..750c7b9 =2D-- /dev/null +++ b/contrib/slapd-modules/kinit/Makefile @@ -0,0 +1,47 @@ +# $OpenLDAP$ +# Copyright 2011 Buchan Milne <bgmilne(a)staff.telkomsa.net> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted only as authorized by the OpenLDAP +# Public License. +# +# A copy of this license is available in the file LICENSE in the +# top-level directory of the distribution or, alternatively, at +# <http://www.OpenLDAP.org/license.html>. + +CPPFLAGS+=3D-I../../../include -I../../../servers/slapd=20 +LIBTOOL=3D../../../libtool + +ldap_subdir =3D openldap +prefix=3D/usr/local +exec_prefix =3D $(prefix) +libdir =3D $(exec_prefix)/lib +libexecdir =3D $(exec_prefix)/libexec +moduledir =3D $(exec_prefix)/libexec/$(ldap_subdir) +slapd=3D../../../servers/slapd/slapd + +all: kinit.la + +%.lo: %.c + $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $< + +%.la: %.lo + $(LIBTOOL) --mode=3Dlink $(CC) -version-info 0:0:0 \ + -rpath $(moduledir) -module -o $@ $< -lkrb5 + +clean: + rm -rf *.lo *.la *.o .libs/ + +install: kinit.la + mkdir -p $(DESTDIR)$(moduledir) + $(LIBTOOL) --mode=3Dinstall cp $? $(DESTDIR)$(moduledir) + $(LIBTOOL) --finish $(DESTDIR)$(moduledir) + +test: kinit.la + @for i in $?;do \ + echo "Testing loading module $$i"; \ + echo "modulepath ." > test-slapd.conf; \ + echo "moduleload $$i" >> test-slapd.conf; \ + $(slapd) -T test -f test-slapd.conf && rm -f test-slapd.conf; \ + done diff --git a/contrib/slapd-modules/lastbind/Makefile b/contrib/slapd-module= s/lastbind/Makefile index ecc9ed1..643b0c1 100644 =2D-- a/contrib/slapd-modules/lastbind/Makefile +++ b/contrib/slapd-modules/lastbind/Makefile @@ -1,5 +1,5 @@ # $OpenLDAP$ =2D# Copyright 2009 Jonathan Clarke <jonathan(a)phillipoux.net>. +# Copyright 2011 Buchan Milne <bgmilne(a)staff.telkomsa.net> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -12,23 +12,37 @@ =20 CPPFLAGS+=3D-I../../../include -I../../../servers/slapd=20 CPPFLAGS+=3D-DSLAPD_OVER_LASTBIND=3DSLAPD_MOD_DYNAMIC =2D#LIBTOOL=3Dlibtool LIBTOOL=3D../../../libtool =20 +ldap_subdir =3D openldap prefix=3D/usr/local +exec_prefix =3D $(prefix) +libdir =3D $(exec_prefix)/lib +libexecdir =3D $(exec_prefix)/libexec +moduledir =3D $(exec_prefix)/libexec/$(ldap_subdir) +slapd=3D../../../servers/slapd/slapd =20 all: lastbind.la =20 =2Dlastbind.lo: lastbind.c =2D $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $? +%.lo: %.c + $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $< =20 =2Dlastbind.la: lastbind.lo +%.la: %.lo $(LIBTOOL) --mode=3Dlink $(CC) -version-info 0:0:0 \ =2D -rpath $(prefix)/lib -module -o $@ $? + -rpath $(moduledir) -module -o $@ $< =20 clean: =2D rm -rf lastbind.lo lastbind.la lastbind.o .libs/ + rm -rf *.lo *.la *.o .libs/ =20 install: lastbind.la =2D mkdir -p $(prefix)/libexec/openldap =2D $(LIBTOOL) --mode=3Dinstall cp lastbind.la $(prefix)/libexec/openldap + mkdir -p $(DESTDIR)$(moduledir) + $(LIBTOOL) --mode=3Dinstall cp $? $(DESTDIR)$(moduledir) + $(LIBTOOL) --finish $(DESTDIR)$(moduledir) + +test: lastbind.la + @for i in $?;do \ + echo "Testing loading module $$i"; \ + echo "modulepath ." > test-slapd.conf; \ + echo "moduleload $$i" >> test-slapd.conf; \ + $(slapd) -T test -f test-slapd.conf && rm -f test-slapd.conf; \ + done diff --git a/contrib/slapd-modules/lastmod/Makefile b/contrib/slapd-modules= /lastmod/Makefile new file mode 100644 index 0000000..e9f0408 =2D-- /dev/null +++ b/contrib/slapd-modules/lastmod/Makefile @@ -0,0 +1,48 @@ +# $OpenLDAP$ +# Copyright 2011 Buchan Milne <bgmilne(a)staff.telkomsa.net> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted only as authorized by the OpenLDAP +# Public License. +# +# A copy of this license is available in the file LICENSE in the +# top-level directory of the distribution or, alternatively, at +# <http://www.OpenLDAP.org/license.html>. + +CPPFLAGS+=3D-I../../../include -I../../../servers/slapd=20 +CPPFLAGS+=3D-DSLAPD_OVER_LASTMOD=3DSLAPD_MOD_DYNAMIC +LIBTOOL=3D../../../libtool + +ldap_subdir =3D openldap +prefix=3D/usr/local +exec_prefix =3D $(prefix) +libdir =3D $(exec_prefix)/lib +libexecdir =3D $(exec_prefix)/libexec +moduledir =3D $(exec_prefix)/libexec/$(ldap_subdir) +slapd=3D../../../servers/slapd/slapd + +all: lastmod.la + +%.lo: %.c + $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $< + +%.la: %.lo + $(LIBTOOL) --mode=3Dlink $(CC) -version-info 0:0:0 \ + -rpath $(moduledir) -module -o $@ $< + +clean: + rm -rf *.lo *.la *.o .libs/ + +install: lastmod.la + mkdir -p $(DESTDIR)$(moduledir) + $(LIBTOOL) --mode=3Dinstall cp $? $(DESTDIR)$(moduledir) + $(LIBTOOL) --finish $(DESTDIR)$(moduledir) + +test: lastmod.la + @for i in $?;do \ + echo "Testing loading module $$i"; \ + echo "modulepath ." > test-slapd.conf; \ + echo "moduleload $$i" >> test-slapd.conf; \ + $(slapd) -T test -f test-slapd.conf && rm -f test-slapd.conf; \ + done diff --git a/contrib/slapd-modules/noopsrch/Makefile b/contrib/slapd-module= s/noopsrch/Makefile index d90bc59..7227582 100644 =2D-- a/contrib/slapd-modules/noopsrch/Makefile +++ b/contrib/slapd-modules/noopsrch/Makefile @@ -1,8 +1,6 @@ # $OpenLDAP$ =2D# This work is part of OpenLDAP Software <http://www.openldap.org/>. =2D# =2D# Copyright 1998-2011 The OpenLDAP Foundation. =2D# Copyright 2004 Howard Chu, Symas Corp. All Rights Reserved. +# Copyright 2011 Buchan Milne <bgmilne(a)staff.telkomsa.net> +# All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted only as authorized by the OpenLDAP @@ -12,41 +10,39 @@ # top-level directory of the distribution or, alternatively, at # <http://www.OpenLDAP.org/license.html>. =20 +CPPFLAGS+=3D-I../../../include -I../../../servers/slapd=20 +CPPFLAGS+=3D-DSLAPD_OVER_NOOPSRCH=3DSLAPD_MOD_DYNAMIC -g -O2 LIBTOOL=3D../../../libtool =2DOPT=3D-DSLAPD_OVER_NOOPSRCH=3D2 -g -O2 =2D#LIBTOOL=3D../../../../ldap-devel/libtool =2D#OPT=3D-DSLAPD_OVER_NOOPSRCH=3D2 -g -O0 =2DCC=3Dgcc =2D =2DLDAP_INC=3D-I../../../include -I../../../servers/slapd =2D#LDAP_INC=3D-I../../../include -I../../../servers/slapd -I../../../../ld= ap-devel/include =2DINCS=3D$(LDAP_INC) =2D =2DLDAP_LIB=3D-lldap_r -llber =2DLIBS=3D$(LDAP_LIB) =20 +ldap_subdir =3D openldap prefix=3D/usr/local =2Dexec_prefix=3D$(prefix) =2Dldap_subdir=3D/openldap +exec_prefix =3D $(prefix) +libdir =3D $(exec_prefix)/lib +libexecdir =3D $(exec_prefix)/libexec +moduledir =3D $(exec_prefix)/libexec/$(ldap_subdir) +slapd=3D../../../servers/slapd/slapd =20 =2Dlibdir=3D$(exec_prefix)/lib =2Dlibexecdir=3D$(exec_prefix)/libexec =2Dmoduledir =3D $(libexecdir)$(ldap_subdir) +all: noopsrch.la =20 =2Dall: noopsrch.la +%.lo: %.c + $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $< =20 =2D =2Dnoopsrch.lo: noopsrch.c =2D $(LIBTOOL) --mode=3Dcompile $(CC) $(OPT) $(DEFS) $(INCS) -c $? =2D =2Dnoopsrch.la: noopsrch.lo =2D $(LIBTOOL) --mode=3Dlink $(CC) $(OPT) -version-info 0:0:0 \ =2D -rpath $(moduledir) -module -o $@ $? $(LIBS) +%.la: %.lo + $(LIBTOOL) --mode=3Dlink $(CC) -version-info 0:0:0 \ + -rpath $(moduledir) -module -o $@ $< =20 clean: =2D rm -f noopsrch.lo noopsrch.la + rm -rf *.lo *.la *.o .libs/ =20 install: noopsrch.la mkdir -p $(DESTDIR)$(moduledir) =2D $(LIBTOOL) --mode=3Dinstall cp noopsrch.la $(DESTDIR)$(moduledir) =2D + $(LIBTOOL) --mode=3Dinstall cp $? $(DESTDIR)$(moduledir) + $(LIBTOOL) --finish $(DESTDIR)$(moduledir) + +test: noopsrch.la + @for i in $?;do \ + echo "Testing loading module $$i"; \ + echo "modulepath ." > test-slapd.conf; \ + echo "moduleload $$i" >> test-slapd.conf; \ + $(slapd) -T test -f test-slapd.conf && rm -f test-slapd.conf; \ + done diff --git a/contrib/slapd-modules/nops/Makefile b/contrib/slapd-modules/no= ps/Makefile index fce44e0..6da5cd0 100644 =2D-- a/contrib/slapd-modules/nops/Makefile +++ b/contrib/slapd-modules/nops/Makefile @@ -1,23 +1,48 @@ # $OpenLDAP$ +# Copyright 2011 Buchan Milne <bgmilne(a)staff.telkomsa.net> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted only as authorized by the OpenLDAP +# Public License. +# +# A copy of this license is available in the file LICENSE in the +# top-level directory of the distribution or, alternatively, at +# <http://www.OpenLDAP.org/license.html>. + CPPFLAGS+=3D-I../../../include -I../../../servers/slapd=20 CPPFLAGS+=3D-DSLAPD_OVER_NOPS=3DSLAPD_MOD_DYNAMIC =2DLIBS=3D-L$(PREFIX)/lib -lldap_r -llber -lcrypto +LIBTOOL=3D../../../libtool + +ldap_subdir =3D openldap +prefix=3D/usr/local +exec_prefix =3D $(prefix) +libdir =3D $(exec_prefix)/lib +libexecdir =3D $(exec_prefix)/libexec +moduledir =3D $(exec_prefix)/libexec/$(ldap_subdir) +slapd=3D../../../servers/slapd/slapd =20 all: nops.la =20 =2Dnops.lo: nops.c =2D $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -c $? +%.lo: %.c + $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $< =20 =2Dnops.la: nops.lo +%.la: %.lo $(LIBTOOL) --mode=3Dlink $(CC) -version-info 0:0:0 \ =2D -rpath $(PREFIX)/lib -module -o $@ $? $(LIBS) + -rpath $(moduledir) -module -o $@ $< =20 clean: =2D rm -f nops.lo nops.la + rm -rf *.lo *.la *.o .libs/ =20 install: nops.la =2D mkdir -p $(PREFIX)/lib/openldap=20 =2D mkdir -p $(PREFIX)/man/man5 =2D $(LIBTOOL) --mode=3Dinstall cp nops.la $(PREFIX)/lib/openldap =2D $(LIBTOOL) --finish $(PREFIX)/lib =2D cp nops.5 $(PREFIX)/man/man5 + mkdir -p $(DESTDIR)$(moduledir) + $(LIBTOOL) --mode=3Dinstall cp $? $(DESTDIR)$(moduledir) + $(LIBTOOL) --finish $(DESTDIR)$(moduledir) + +test: nops.la + @for i in $?;do \ + echo "Testing loading module $$i"; \ + echo "modulepath ." > test-slapd.conf; \ + echo "moduleload $$i" >> test-slapd.conf; \ + $(slapd) -T test -f test-slapd.conf && rm -f test-slapd.conf; \ + done diff --git a/contrib/slapd-modules/nssov/Makefile b/contrib/slapd-modules/n= ssov/Makefile index 322fcdd..f1ec793 100644 =2D-- a/contrib/slapd-modules/nssov/Makefile +++ b/contrib/slapd-modules/nssov/Makefile @@ -28,7 +28,7 @@ NLDAPD_INC=3D-Inss-pam-ldapd INCS=3D$(LDAP_INC) $(NLDAPD_INC) =20 LDAP_LIB=3D-lldap_r -llber =2DLIBS=3D$(LDAP_LIB) +LIBS=3D-L../../../libraries/liblber -L../../../libraries/libldap_r $(LDAP_= LIB) =20 prefix=3D/usr/local exec_prefix=3D$(prefix) @@ -39,6 +39,7 @@ libexecdir=3D$(exec_prefix)/libexec moduledir =3D $(libexecdir)$(ldap_subdir) sysconfdir =3D $(prefix)/etc$(ldap_subdir) schemadir =3D $(sysconfdir)/schema +slapd=3D../../../servers/slapd/slapd =20 all: nssov.la =20 @@ -59,7 +60,7 @@ $(OBJS): nssov.h =20 nssov.la: $(OBJS) $(XOBJS) $(LIBTOOL) --mode=3Dlink $(CC) $(OPT) -version-info 0:0:0 \ =2D -rpath $(libdir) -module -o $@ $(OBJS) $(XOBJS) $(LIBS) + -rpath $(moduledir) -module -o $@ $(OBJS) $(XOBJS) $(LIBS) =20 install: nssov.la mkdir -p $(DESTDIR)$(moduledir) @@ -69,3 +70,11 @@ install: nssov.la clean: rm -f *.*o *.la .libs/* rm -rf .libs + +test: nssov.la + @for i in $?;do \ + echo "Testing loading module $$i"; \ + echo "modulepath ." > test-slapd.conf; \ + echo "moduleload $$i" >> test-slapd.conf; \ + $(slapd) -T test -f test-slapd.conf && rm -f test-slapd.conf; \ + done diff --git a/contrib/slapd-modules/passwd/Makefile b/contrib/slapd-modules/= passwd/Makefile index 1e49e6a..748b4ce 100644 =2D-- a/contrib/slapd-modules/passwd/Makefile +++ b/contrib/slapd-modules/passwd/Makefile @@ -1,46 +1,52 @@ # $OpenLDAP$ =2DCPPFLAGS+=3D-I../../../include -I../../../servers/slapd =2D =2Dall: kerberos.la netscape.la radius.la apr1.la =2D =2Dkerberos.lo: kerberos.c =2D $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -DHAVE_KRB5 -Wall -c $? =2D =2Dkerberos.la: kerberos.lo =2D $(LIBTOOL) --mode=3Dlink $(CC) -version-info 0:0:0 \ =2D -rpath $(PREFIX)/lib -module -o $@ $? -lkrb5 =2D =2Dnetscape.lo: netscape.c =2D $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $? =2D =2Dnetscape.la: netscape.lo +# Copyright 2011 Buchan Milne <bgmilne(a)staff.telkomsa.net> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted only as authorized by the OpenLDAP +# Public License. +# +# A copy of this license is available in the file LICENSE in the +# top-level directory of the distribution or, alternatively, at +# <http://www.OpenLDAP.org/license.html>. + +CPPFLAGS+=3D-I../../../include -I../../../servers/slapd=20 +LIBTOOL=3D../../../libtool +SUBDIRS =3D sha2 + +ldap_subdir =3D openldap +prefix=3D/usr/local +exec_prefix =3D $(prefix) +libdir =3D $(exec_prefix)/lib +libexecdir =3D $(exec_prefix)/libexec +moduledir =3D $(exec_prefix)/libexec/$(ldap_subdir) +slapd=3D../../../servers/slapd/slapd + +all: kerberos.la netscape.la radius.la + +%.lo: %.c + $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $< + +kerberos.la: kerberos.lo $(LIBTOOL) --mode=3Dlink $(CC) -version-info 0:0:0 \ =2D -rpath $(PREFIX)/lib -module -o $@ $?=20 =2D =2Dradius.lo: radius.c =2D $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $? =2D =2Dradius.la: radius.lo =2D $(LIBTOOL) --mode=3Dlink $(CC) -version-info 0:0:0 \ =2D -rpath $(PREFIX)/lib -module -o $@ $? -lradius =2D =2Dapr1.lo: apr1.c =2D $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $? + -rpath $(moduledir) -module -o $@ $< -lkrb5 =20 =2Dapr1.la: apr1.lo +%.la: %.lo $(LIBTOOL) --mode=3Dlink $(CC) -version-info 0:0:0 \ =2D -rpath $(PREFIX)/lib -module -o $@ $?=20 + -rpath $(moduledir) -module -o $@ $< =20 clean: =2D rm -f kerberos.lo kerberos.la =2D rm -f netscape.lo netscape.la =2D rm -f radius.lo radius.la =2D rm -f apr1.lo apr1.la =2D =2Dinstall: kerberos.la netscape.la radius.la apr1.la =2D mkdir -p $(PREFIX)/lib/openldap =2D $(LIBTOOL) --mode=3Dinstall cp kerberos.la $(PREFIX)/lib/openldap =2D $(LIBTOOL) --mode=3Dinstall cp netscape.la $(PREFIX)/lib/openldap =2D $(LIBTOOL) --mode=3Dinstall cp radius.la $(PREFIX)/lib/openldap =2D $(LIBTOOL) --mode=3Dinstall cp apr1.la $(PREFIX)/lib/openldap =2D $(LIBTOOL) --finish $(PREFIX)/lib + rm -rf *.lo *.la *.o .libs/ + +install: kerberos.la netscape.la radius.la + mkdir -p $(DESTDIR)$(moduledir) + $(LIBTOOL) --mode=3Dinstall cp $? $(DESTDIR)$(moduledir) + $(LIBTOOL) --finish $(DESTDIR)$(moduledir) + +test: kerberos.la netscape.la radius.la + @for i in $?;do \ + echo "Testing loading module $$i"; \ + echo "modulepath ." > test-slapd.conf; \ + echo "moduleload $$i" >> test-slapd.conf; \ + $(slapd) -T test -f test-slapd.conf && rm -f test-slapd.conf; \ + done diff --git a/contrib/slapd-modules/passwd/sha2/Makefile b/contrib/slapd-mod= ules/passwd/sha2/Makefile index 5dcb1db..d03297d 100644 =2D-- a/contrib/slapd-modules/passwd/sha2/Makefile +++ b/contrib/slapd-modules/passwd/sha2/Makefile @@ -1,15 +1,47 @@ # $OpenLDAP$ +# Copyright 2011 Buchan Milne <bgmilne(a)staff.telkomsa.net> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted only as authorized by the OpenLDAP +# Public License. +# +# A copy of this license is available in the file LICENSE in the +# top-level directory of the distribution or, alternatively, at +# <http://www.OpenLDAP.org/license.html>. =20 =2DOPENLDAP :=3D ../../../.. +CPPFLAGS+=3D-I../../../../include -I../../../../servers/slapd=20 +LIBTOOL=3D../../../../libtool =20 =2D#CCFLAGS =3D -Wall -g -DSLAPD_SHA2_DEBUG =2DCCFLAGS =3D -Wall -g +ldap_subdir =3D openldap +prefix=3D/usr/local +exec_prefix =3D $(prefix) +libdir =3D $(exec_prefix)/lib +libexecdir =3D $(exec_prefix)/libexec +moduledir =3D $(exec_prefix)/libexec/$(ldap_subdir) +slapd=3D../../../../servers/slapd/slapd =20 =2Dslapd-sha2.so: slapd-sha2.o sha2.o =2D $(CC) -I$(OPENLDAP)/include -shared -Wall -g $^ -o $@ +all: sha2.la =20 =2D%.o: %.c =2D $(CC) -I$(OPENLDAP)/include $(CCFLAGS) -c $< +%.lo: slapd-sha2.c sha2.c + $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $< + +%.la: slapd-sha2.lo sha2.lo + $(LIBTOOL) --mode=3Dlink $(CC) -version-info 0:0:0 \ + -rpath $(moduledir) -module -o $@ $< =20 clean: =2D @rm -f slapd-sha2.so *.o + rm -rf *.lo *.la *.o .libs/ + +install: sha2.la + mkdir -p $(DESTDIR)$(moduledir) + $(LIBTOOL) --mode=3Dinstall cp $? $(DESTDIR)$(moduledir) + $(LIBTOOL) --finish $(DESTDIR)$(moduledir) + +test: sha2.la + @for i in $?;do \ + echo "Testing loading module $$i"; \ + echo "modulepath ." > test-slapd.conf; \ + echo "moduleload $$i" >> test-slapd.conf; \ + $(slapd) -T test -f test-slapd.conf && rm -f test-slapd.conf; \ + done diff --git a/contrib/slapd-modules/trace/Makefile b/contrib/slapd-modules/t= race/Makefile new file mode 100644 index 0000000..948ffef =2D-- /dev/null +++ b/contrib/slapd-modules/trace/Makefile @@ -0,0 +1,48 @@ +# $OpenLDAP$ +# Copyright 2011 Buchan Milne <bgmilne(a)staff.telkomsa.net> +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted only as authorized by the OpenLDAP +# Public License. +# +# A copy of this license is available in the file LICENSE in the +# top-level directory of the distribution or, alternatively, at +# <http://www.OpenLDAP.org/license.html>. + +CPPFLAGS+=3D-I../../../include -I../../../servers/slapd=20 +CPPFLAGS+=3D-DSLAPD_OVER_TRACE=3DSLAPD_MOD_DYNAMIC +LIBTOOL=3D../../../libtool + +ldap_subdir =3D openldap +prefix=3D/usr/local +exec_prefix =3D $(prefix) +libdir =3D $(exec_prefix)/lib +libexecdir =3D $(exec_prefix)/libexec +moduledir =3D $(exec_prefix)/libexec/$(ldap_subdir) +slapd=3D../../../servers/slapd/slapd + +all: trace.la + +%.lo: %.c + $(LIBTOOL) --mode=3Dcompile $(CC) $(CPPFLAGS) -Wall -c $< + +%.la: %.lo + $(LIBTOOL) --mode=3Dlink $(CC) -version-info 0:0:0 \ + -rpath $(moduledir) -module -o $@ $< + +clean: + rm -rf *.lo *.la *.o .libs/ + +install: trace.la + mkdir -p $(DESTDIR)$(moduledir) + $(LIBTOOL) --mode=3Dinstall cp $? $(DESTDIR)$(moduledir) + $(LIBTOOL) --finish $(DESTDIR)$(moduledir) + +test: trace.la + @for i in $?;do \ + echo "Testing loading module $$i"; \ + echo "modulepath ." > test-slapd.conf; \ + echo "moduleload $$i" >> test-slapd.conf; \ + $(slapd) -T test -f test-slapd.conf && rm -f test-slapd.conf; \ + done =2D-=20 1.7.1 --Boundary-00=_50J6N9eQwpy3uQe--

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

openldap-bugs