From: Kurt Zeilenga Date: Sun, 9 Aug 1998 04:13:55 +0000 (+0000) Subject: Merged LDAPworldCurrent (P1-10,13,15,16,19-22) X-Git-Tag: LDAP_3_3+prerelease~27 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fcbca73f90d6f4dd09e7ff34533b6ac1baff2135;p=openldap Merged LDAPworldCurrent (P1-10,13,15,16,19-22) Cleaned up old rcs keyworld subs --- fcbca73f90d6f4dd09e7ff34533b6ac1baff2135 diff --cc build/platforms/freebsd-gcc/Make-platform index b1e28023da,9ddba04dc7..e7aef0ed8b --- a/build/platforms/freebsd-gcc/Make-platform +++ b/build/platforms/freebsd-gcc/Make-platform @@@ -11,7 -11,9 +11,9 @@@ # ------------------------------------------------------------------------- # you will probably not need to edit anything below this point # ------------------------------------------------------------------------- -CC = gcc +CC = cc PLATFORMCFLAGS= -Dfreebsd - PLATFORMLIBS= -lcrypt + + # uncomment this line if using for LDAP_CRYPT + PLATFORMLIBS= -lcrypt diff --cc libraries/msdos/winsock/include/krb/des.h index 256f9269f1,58699c59dc..6afe20873d --- a/libraries/msdos/winsock/include/krb/des.h +++ b/libraries/msdos/winsock/include/krb/des.h @@@ -1,8 -1,8 +1,4 @@@ /* - * $Source: /data/CVS-Repository/pkg/ldap/libraries/msdos/winsock/include/krb/des.h,v $ - * $Author: kurt $ - * $Header: /data/CVS-Repository/pkg/ldap/libraries/msdos/winsock/include/krb/des.h,v 1.1.4.1 1998/08/08 23:05:24 kurt Exp $ - * $Source: Q:/SRC/KRB/MIT/ORIGINAL/INCLUDE/RCS/DES.H $ - * $Author: shabby $ - * $Header: Q:/SRC/KRB/MIT/ORIGINAL/INCLUDE/RCS/DES.H 1.3 1994/08/31 07:02:28 shabby Exp $ -- * * Copyright 1987, 1988 by the Massachusetts Institute of Technology. * * For copying and distribution information, please see the file diff --cc libraries/msdos/winsock/include/krb/krb.h index 354c9263ab,d9e2b178a4..128255cec9 --- a/libraries/msdos/winsock/include/krb/krb.h +++ b/libraries/msdos/winsock/include/krb/krb.h @@@ -1,8 -1,8 +1,4 @@@ /* - * $Source: /data/CVS-Repository/pkg/ldap/libraries/msdos/winsock/include/krb/krb.h,v $ - * $Author: kurt $ - * $Header: /data/CVS-Repository/pkg/ldap/libraries/msdos/winsock/include/krb/krb.h,v 1.1.4.1 1998/08/08 23:05:24 kurt Exp $ - * $Source: Q:/SRC/KRB/MIT/ORIGINAL/RCS/KRB.H $ - * $Author: pbh $ - * $Header: Q:/SRC/KRB/MIT/ORIGINAL/RCS/KRB.H 1.5 1994/09/08 22:47:00 pbh Exp $ -- * * Copyright 1987, 1988 by the Massachusetts Institute of Technology. * * For copying and distribution information, please see the file diff --cc libraries/msdos/winsock/include/krb/mit/conf-pc.h index 51256bbe09,169a5e27c6..4c779aa730 --- a/libraries/msdos/winsock/include/krb/mit/conf-pc.h +++ b/libraries/msdos/winsock/include/krb/mit/conf-pc.h @@@ -1,8 -1,8 +1,4 @@@ /* - * $Source: /data/CVS-Repository/pkg/ldap/libraries/msdos/winsock/include/krb/mit/conf-pc.h,v $ - * $Author: kurt $ - * $Header: /data/CVS-Repository/pkg/ldap/libraries/msdos/winsock/include/krb/mit/conf-pc.h,v 1.1.4.1 1998/08/08 23:05:25 kurt Exp $ - * $Source: F:/DOSDEV/NEWKRB/INCLUDE/RCS/conf-pc.h $ - * $Author: pbh $ - * $Header: F:/DOSDEV/NEWKRB/INCLUDE/RCS/conf-pc.h 1.2 1994/08/16 18:43:42 pbh Exp $ -- * * Copyright 1988 by the Massachusetts Institute of Technology. * * For copying and distribution information, please see the file diff --cc libraries/msdos/winsock/include/krb/mit/conf.h index 3196e42e14,17c53458ae..cd33f6ebe9 --- a/libraries/msdos/winsock/include/krb/mit/conf.h +++ b/libraries/msdos/winsock/include/krb/mit/conf.h @@@ -1,8 -1,8 +1,4 @@@ /* - * $Source: /data/CVS-Repository/pkg/ldap/libraries/msdos/winsock/include/krb/mit/conf.h,v $ - * $Author: kurt $ - * $Header: /data/CVS-Repository/pkg/ldap/libraries/msdos/winsock/include/krb/mit/conf.h,v 1.1.4.1 1998/08/08 23:05:24 kurt Exp $ - * $Source: F:/DOSDEV/NEWKRB/INCLUDE/RCS/conf.h $ - * $Author: pbh $ - * $Header: F:/DOSDEV/NEWKRB/INCLUDE/RCS/conf.h 1.2 1994/08/16 18:43:42 pbh Exp $ -- * * Copyright 1988 by the Massachusetts Institute of Technology. * * For copying and distribution information, please see the file diff --cc libraries/msdos/winsock/include/krb/mit/hesiod.h index a7fde97708,c357444bcf..5bc39e8d36 --- a/libraries/msdos/winsock/include/krb/mit/hesiod.h +++ b/libraries/msdos/winsock/include/krb/mit/hesiod.h @@@ -5,13 -5,11 +5,8 @@@ * * Original version by Steve Dyer, IBM/Project Athena. * - * $Author: kurt $ - * $Author: probe $ -- * $Athena: hesiod.h,v 1.3 88/08/07 21:52:39 treese Locked $ - * $Header: /data/CVS-Repository/pkg/ldap/libraries/msdos/winsock/include/krb/mit/hesiod.h,v 1.1.4.1 1998/08/08 23:05:25 kurt Exp $ - * $Source: /data/CVS-Repository/pkg/ldap/libraries/msdos/winsock/include/krb/mit/hesiod.h,v $ - * - * $Header: /afs/rel-eng.athena.mit.edu/project/release/current/source/athena/athena.lib/hesiod/RCS/hesiod.h,v 1.6 90/07/20 13:09:16 probe Exp $ - * $Source: /afs/rel-eng.athena.mit.edu/project/release/current/source/athena/athena.lib/hesiod/RCS/hesiod.h,v $ - * $Log: hesiod.h,v $ + * Vendor History + * * Revision 1.6 90/07/20 13:09:16 probe * Incorrect declaration of hes_getpwnam() * diff --cc libraries/msdos/winsock/include/krb/mit/osconf.h index 252021c777,644b0e3139..ac614b0c6d --- a/libraries/msdos/winsock/include/krb/mit/osconf.h +++ b/libraries/msdos/winsock/include/krb/mit/osconf.h @@@ -1,8 -1,8 +1,4 @@@ /* - * $Source: /data/CVS-Repository/pkg/ldap/libraries/msdos/winsock/include/krb/mit/osconf.h,v $ - * $Author: kurt $ - * $Header: /data/CVS-Repository/pkg/ldap/libraries/msdos/winsock/include/krb/mit/osconf.h,v 1.1.4.1 1998/08/08 23:05:25 kurt Exp $ - * $Source: F:/DOSDEV/NEWKRB/INCLUDE/RCS/osconf.h $ - * $Author: pbh $ - * $Header: F:/DOSDEV/NEWKRB/INCLUDE/RCS/osconf.h 1.2 1994/08/16 18:43:42 pbh Exp $ -- * * Copyright 1988 by the Massachusetts Institute of Technology. * * For copying and distribution information, please see the file diff --cc servers/slapd/back-ldbm/Make-template index f2fe468b1e,f2fe468b1e..bc46d3a589 --- a/servers/slapd/back-ldbm/Make-template +++ b/servers/slapd/back-ldbm/Make-template @@@ -89,8 -89,8 +89,9 @@@ dn2id.o: ../../../include/ldif.h ../../ id2entry.o: id2entry.c ../../../include/avl.h ../../../include/proto-lber.h id2entry.o: ../../../include/proto-ldap.h ../../../include/ldif.h id2entry.o: ../../../include/ldbm.h --index.o: index.c ../../../include/proto-lber.h ../../../include/proto-ldap.h --index.o: ../../../include/ldif.h ../../../include/ldbm.h ++index.o: index.c ../../../include/avl.h ../../../include/proto-lber.h ++index.o: ../../../include/proto-ldap.h ../../../include/ldif.h ++index.o: ../../../include/ldbm.h id2children.o: id2children.c ../../../include/proto-lber.h id2children.o: ../../../include/proto-ldap.h ../../../include/ldif.h id2children.o: ../../../include/ldbm.h