Merged LDAPworldCurrent (P1-10,13,15,16,19-22)

Cleaned up old rcs keyworld subs

diff --cc build/platforms/freebsd-gcc/Make-platform
index b1e28023da5d6b037e2c13fc7490f7861bdf4f9c,9ddba04dc701458fd1c7f88b7352cd8358a81339..e7aef0ed8b065118bc479c4d015dd8146d1aca55
--- 1/build/platforms/freebsd-gcc/Make-platform
--- 2/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/liblber/decode.c
Simple merge

diff --cc libraries/msdos/winsock/include/krb/des.h
index 256f9269f15658a96ec942cf3c4294af305c2748,58699c59dc53e10800be8ae4091594c69f07549c..6afe20873db7bbaf5ce16211485c16c1091afdae
--- 1/libraries/msdos/winsock/include/krb/des.h
--- 2/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 354c9263aba6aa59dcafd54eab3db70bbbacce91,d9e2b178a45a81ea02bc199cedca146e601fd516..128255cec98de92a7be091b12bea3a1beeb85b90
--- 1/libraries/msdos/winsock/include/krb/krb.h
--- 2/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 51256bbe09ed3800daf55388a5530fcf7739e549,169a5e27c6230f62cbe8fdec1ed21db7783867ea..4c779aa730682aac239f722be4e550699095f7f9
--- 1/libraries/msdos/winsock/include/krb/mit/conf-pc.h
--- 2/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 3196e42e141bd64166d6dfa2e36007d5c301fab2,17c53458ae0af49274e311fbfc572328c0ea08a6..cd33f6ebe9d31090fa9ccd5409fc1b04ab221697
--- 1/libraries/msdos/winsock/include/krb/mit/conf.h
--- 2/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 a7fde977083946760078372bb3f4e216dc406568,c357444bcf6795e8cb01f1a9cb5ac08375c5cb37..5bc39e8d362a2d519021fbffa9b18cc2ce876e77
--- 1/libraries/msdos/winsock/include/krb/mit/hesiod.h
--- 2/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 252021c777ec7a34b2b8408c8f8813d0f95cc33e,644b0e313950c94e84c952bf2c1c841c42f53b71..ac614b0c6daa1c5dfa6a9f7f647987060766326b
--- 1/libraries/msdos/winsock/include/krb/mit/osconf.h
--- 2/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 f2fe468b1e6163b92c22d6a4924b40475ad65b71,f2fe468b1e6163b92c22d6a4924b40475ad65b71..bc46d3a58997e5918f554994210c8b4a4d0873a3
--- 1/servers/slapd/back-ldbm/Make-template
--- 2/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

diff --cc servers/slapd/daemon.c
Simple merge