Misc LDAPbis comment update

Remove unnecessary ISOC notices

diff --git a/libraries/libldap/abandon.c b/libraries/libldap/abandon.c
index 30742ea8258ae5fb495fde4457f20c768c2bed80..d340286cb11fad0739ef9f2ee7d2c52688332212 100644 (file)
--- a/libraries/libldap/abandon.c
+++ b/libraries/libldap/abandon.c
@@ -16,14 +16,6 @@
 /* Portions  Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  */
-/* Portions Copyright (C) The Internet Society (1997).
- * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
- */
-
-/*
- * An abandon request looks like this:
- *     AbandonRequest ::= MessageID
- */
 
 #include "portable.h"
 
@@ -37,6 +29,12 @@
 
 #include "ldap-int.h"
 
+/*
+ * An abandon request looks like this:
+ *             AbandonRequest ::= [APPLICATION 16] MessageID
+ * and has no response.  (Source: RFC 4511)
+ */
+
 static int
 do_abandon(
        LDAP *ld,

diff --git a/libraries/libldap/add.c b/libraries/libldap/add.c
index 3f4487354cea426c952c91aa1c9d02be5a1e7bd5..95b0742a375ed38293c1385d823239efcc74f266 100644 (file)
--- a/libraries/libldap/add.c
+++ b/libraries/libldap/add.c
@@ -16,20 +16,6 @@
 /* Portions Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  */
-/* Portions Copyright (C) The Internet Society (1997).
- * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
- */
-
-/*
- * An add request looks like this:
- *     AddRequest ::= SEQUENCE {
- *             entry   DistinguishedName,
- *             attrs   SEQUENCE OF SEQUENCE {
- *                     type    AttributeType,
- *                     values  SET OF AttributeValue
- *             }
- *     }
- */
 
 #include "portable.h"
 
@@ -41,6 +27,30 @@
 
 #include "ldap-int.h"
 
+/* An LDAP Add Request/Response looks like this:
+ *        AddRequest ::= [APPLICATION 8] SEQUENCE {
+ *            entry           LDAPDN,
+ *            attributes      AttributeList }
+ *
+ *        AttributeList ::= SEQUENCE OF attribute Attribute
+ *
+ *        Attribute ::= PartialAttribute(WITH COMPONENTS {
+ *             ...,
+ *             vals (SIZE(1..MAX))})
+ *
+ *        PartialAttribute ::= SEQUENCE {
+ *             type       AttributeDescription,
+ *             vals       SET OF value AttributeValue }
+ *
+ *        AttributeDescription ::= LDAPString           
+ *             -- Constrained to <attributedescription> [RFC4512]
+ *                                      
+ *        AttributeValue ::= OCTET STRING
+ *        
+ *        AddResponse ::= [APPLICATION 9] LDAPResult 
+ * (Source: RFC 4511)
+ */
+
 /*
  * ldap_add - initiate an ldap add operation.  Parameters:
  *

diff --git a/libraries/libldap/bind.c b/libraries/libldap/bind.c
index 91d682bc69ed213f6b4bd3325368b150d3b78ffe..2e7dd74ada172c8dd583844435bbbb3b9a512bc3 100644 (file)
--- a/libraries/libldap/bind.c
+++ b/libraries/libldap/bind.c
@@ -16,9 +16,19 @@
 /* Portions Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  */
-/* Portions Copyright (C) The Internet Society (1997)
- * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
- */
+
+#include "portable.h"
+
+#include <stdio.h>
+
+#include <ac/stdlib.h>
+
+#include <ac/socket.h>
+#include <ac/string.h>
+#include <ac/time.h>
+
+#include "ldap-int.h"
+#include "ldap_log.h"
 
 /*
  *     BindRequest ::= SEQUENCE {
@@ -39,21 +49,9 @@
  *             serverSaslCreds         OCTET STRING OPTIONAL -- LDAPv3
  *     }
  *
+ * (Source: RFC 2251)
  */
 
-#include "portable.h"
-
-#include <stdio.h>
-
-#include <ac/stdlib.h>
-
-#include <ac/socket.h>
-#include <ac/string.h>
-#include <ac/time.h>
-
-#include "ldap-int.h"
-#include "ldap_log.h"
-
 /*
  * ldap_bind - bind to the ldap server (and X.500).  The dn and password
  * of the entry to which to bind are supplied, along with the authentication

diff --git a/libraries/libldap/compare.c b/libraries/libldap/compare.c
index 18db9c31986a0e696464c0b5d20df882368f6c79..879caff5b7b1ce7cca0e1bc250c96cd204dc0631 100644 (file)
--- a/libraries/libldap/compare.c
+++ b/libraries/libldap/compare.c
@@ -15,19 +15,6 @@
 /* Portions Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  */
-/* Portions Copyright (C) The Internet Society (1997)
- * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
- */
-
-/* The compare request looks like this:
- *     CompareRequest ::= SEQUENCE {
- *             entry   DistinguishedName,
- *             ava     SEQUENCE {
- *                     type    AttributeType,
- *                     value   AttributeValue
- *             }
- *     }
- */
 
 #include "portable.h"
 
@@ -40,6 +27,16 @@
 #include "ldap-int.h"
 #include "ldap_log.h"
 
+/* The compare request looks like this:
+ *     CompareRequest ::= SEQUENCE {
+ *             entry   DistinguishedName,
+ *             ava     SEQUENCE {
+ *                     type    AttributeType,
+ *                     value   AttributeValue
+ *             }
+ *     }
+ */
+
 /*
  * ldap_compare_ext - perform an ldap extended compare operation.  The dn
  * of the entry to compare to and the attribute and value to compare (in

diff --git a/libraries/libldap/controls.c b/libraries/libldap/controls.c
index ad8384e9c3abaf57374b411a9d163214a007595d..067e4eaa5eccba9f85d797bcf08d3e01615394b1 100644 (file)
--- a/libraries/libldap/controls.c
+++ b/libraries/libldap/controls.c
@@ -30,9 +30,15 @@
  * can be found in the file "build/LICENSE-2.0.1" in this distribution
  * of OpenLDAP Software.
  */
-/* Portions Copyright (C) The Internet Society (2006)
- * ASN.1 fragments are from RFC 4511; see RFC for full legal notices.
- */
+
+#include "portable.h"
+
+#include <ac/stdlib.h>
+
+#include <ac/time.h>
+#include <ac/string.h>
+
+#include "ldap-int.h"
 
 /* LDAPv3 Controls (RFC 4511)
  *
@@ -45,16 +51,6 @@
  *     }
  */
 
-#include "portable.h"
-
-#include <ac/stdlib.h>
-
-#include <ac/time.h>
-#include <ac/string.h>
-
-#include "ldap-int.h"
-
-
 /*
  * ldap_int_put_controls
  */

diff --git a/libraries/libldap/delete.c b/libraries/libldap/delete.c
index 2226ff61c8ff103e5072d42949c7066ed9b2f94f..dcb2bde47e779038cccd5b1666268d4b2a31d5be 100644 (file)
--- a/libraries/libldap/delete.c
+++ b/libraries/libldap/delete.c
@@ -15,15 +15,6 @@
 /* Portions Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  */
-/*
- * Portions Copyright (C) The Internet Society (1997)
- * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
- */
-
-/*
- * A delete request looks like this:
- *     DelRequet ::= DistinguishedName,
- */
 
 #include "portable.h"
 
@@ -35,6 +26,12 @@
 
 #include "ldap-int.h"
 
+/*
+ * A delete request looks like this:
+ *     DelRequet ::= DistinguishedName,
+ */
+
+
 /*
  * ldap_delete_ext - initiate an ldap extended delete operation. Parameters:
  *

diff --git a/libraries/libldap/error.c b/libraries/libldap/error.c
index ac28ccc880138617822cae3a23fb16c7e06d8de9..59200249037b1a65c7990159f006b9611d0dfc4d 100644 (file)
--- a/libraries/libldap/error.c
+++ b/libraries/libldap/error.c
@@ -12,9 +12,6 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
-/* Portions Copyright (C) The Internet Society (1997)
- * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
- */
 
 #include "portable.h"
 

diff --git a/libraries/libldap/extended.c b/libraries/libldap/extended.c
index 6afc1d7f63087cd56f060a112bab2a5154aeae3c..391a7ef48695df533ebbcd591993f93ac6426c5a 100644 (file)
--- a/libraries/libldap/extended.c
+++ b/libraries/libldap/extended.c
@@ -12,9 +12,18 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
-/* Portions Copyright (C) The Internet Society (1997).
- * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
- */
+
+#include "portable.h"
+
+#include <stdio.h>
+#include <ac/stdlib.h>
+
+#include <ac/socket.h>
+#include <ac/string.h>
+#include <ac/time.h>
+
+#include "ldap-int.h"
+#include "ldap_log.h"
 
 /*
  * LDAPv3 Extended Operation Request
@@ -30,20 +39,9 @@
  *             response         [11] OCTET STRING OPTIONAL
  *     }
  *
+ * (Source RFC 4511)
  */
 
-#include "portable.h"
-
-#include <stdio.h>
-#include <ac/stdlib.h>
-
-#include <ac/socket.h>
-#include <ac/string.h>
-#include <ac/time.h>
-
-#include "ldap-int.h"
-#include "ldap_log.h"
-
 int
 ldap_extended_operation(
        LDAP                    *ld,

diff --git a/libraries/libldap/filter.c b/libraries/libldap/filter.c
index c6453a09fa47cb6ff6df7289abcbb875ef5bc6cb..673147225af9f408813780062f7f859b6a3e7a6c 100644 (file)
--- a/libraries/libldap/filter.c
+++ b/libraries/libldap/filter.c
@@ -16,9 +16,6 @@
 /* Portions Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  */
-/* Portions Copyright (C) The Internet Society (2006)
- * ASN.1 fragments are from RFC 4511; see RFC for full legal notices.
- */
 
 #include "portable.h"
 
@@ -804,6 +801,8 @@ put_vrFilter( BerElement *ber, const char *str_in )
         *              matchingRule    [1] MatchingRuleId OPTIONAL,
         *              type            [2] AttributeDescription OPTIONAL,
         *              matchValue      [3] AssertionValue }
+        *
+        * (Source: RFC 3876)
         */
 
        Debug( LDAP_DEBUG_TRACE, "put_vrFilter: \"%s\"\n", str_in, 0, 0 );

diff --git a/libraries/libldap/ftest.c b/libraries/libldap/ftest.c
index e7c1c8be79b68c687f95a5068b813c817a743507..a70e457da03afcfc372d8b93641972508c2c6bd8 100644 (file)
--- a/libraries/libldap/ftest.c
+++ b/libraries/libldap/ftest.c
@@ -38,7 +38,7 @@ int usage()
 {
        fprintf( stderr, "usage:\n"
                "  ftest [-d n] filter\n"
-               "    filter - RFC 2254 string representation of an "
+               "    filter - RFC 4515 string representation of an "
                        "LDAP search filter\n" );
        return EXIT_FAILURE;
 }

diff --git a/libraries/libldap/getdn.c b/libraries/libldap/getdn.c
index 389dd0a03c4e0f7c4f0b5b722cd9553511066996..5d9d7e1a1c76871387fcb9ae99d122d544f596b4 100644 (file)
--- a/libraries/libldap/getdn.c
+++ b/libraries/libldap/getdn.c
@@ -337,16 +337,16 @@ ldap_dn2ad_canonical( LDAP_CONST char *dn )
  * from ( fin & LDAP_DN_FORMAT_MASK ) to ( fout & LDAP_DN_FORMAT_MASK )
  * 
  * fin can be one of:
- *     LDAP_DN_FORMAT_LDAP             (rfc 2253 and ldapbis liberal, 
- *                                     plus some rfc 1779)
- *     LDAP_DN_FORMAT_LDAPV3           (rfc 2253 and ldapbis)
- *     LDAP_DN_FORMAT_LDAPV2           (rfc 1779)
+ *     LDAP_DN_FORMAT_LDAP             (RFC 4514 and ldapbis liberal, 
+ *                                     plus some RFC 1779)
+ *     LDAP_DN_FORMAT_LDAPV3   (RFC 4514 and ldapbis)
+ *     LDAP_DN_FORMAT_LDAPV2   (RFC 1779)
  *     LDAP_DN_FORMAT_DCE              (?)
  *
  * fout can be any of the above except
  *     LDAP_DN_FORMAT_LDAP
  * plus:
- *     LDAP_DN_FORMAT_UFN              (rfc 1781, partial and with extensions)
+ *     LDAP_DN_FORMAT_UFN              (RFC 1781, partial and with extensions)
  *     LDAP_DN_FORMAT_AD_CANONICAL     (?)
  */
 int

diff --git a/libraries/libldap/kbind.c b/libraries/libldap/kbind.c
index ef21432fddcf974d585ff2ae146cfc7702b3fa07..473a2cf325ae242e478b8d6a9303b165cd05a64f 100644 (file)
--- a/libraries/libldap/kbind.c
+++ b/libraries/libldap/kbind.c
@@ -15,9 +15,20 @@
 /* Portions Copyright (c) 1993 Regents of the University of Michigan.
  * All rights reserved.
  */
-/* Portions Copyright (C) The Internet Society (1997)
- * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
- */
+
+#include "portable.h"
+
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
+
+#include <stdio.h>
+#include <ac/stdlib.h>
+
+#include <ac/krb.h>
+#include <ac/socket.h>
+#include <ac/string.h>
+#include <ac/time.h>
+
+#include "ldap-int.h"
 
 /*
  *     BindRequest ::= SEQUENCE {
@@ -40,20 +51,6 @@
  *
  */
 
-#include "portable.h"
-
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
-
-#include <stdio.h>
-#include <ac/stdlib.h>
-
-#include <ac/krb.h>
-#include <ac/socket.h>
-#include <ac/string.h>
-#include <ac/time.h>
-
-#include "ldap-int.h"
-
 /*
  * ldap_kerberos_bind1 - initiate a bind to the ldap server using
  * kerberos authentication.  The dn is supplied.  It is assumed the user

diff --git a/libraries/libldap/modify.c b/libraries/libldap/modify.c
index 6c8fb38420bb0df4c07009df9a49582a3b93d735..45ccfbc98a3cc30cae66ab57197fbc76a30a9fd9 100644 (file)
--- a/libraries/libldap/modify.c
+++ b/libraries/libldap/modify.c
@@ -15,9 +15,6 @@
 /* Portions Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  */
-/* Portions Copyright (C) The Internet Society (1997)
- * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
- */
 
 #include "portable.h"
 
@@ -29,6 +26,32 @@
 
 #include "ldap-int.h"
 
+/* A modify request/response looks like this:
+ *        ModifyRequest ::= [APPLICATION 6] SEQUENCE {              
+ *             object          LDAPDN,
+ *             changes         SEQUENCE OF change SEQUENCE {
+ *                  operation       ENUMERATED {      
+ *                       add     (0),                
+ *                       delete  (1),                 
+ *                       replace (2),
+ *                       ...  },
+ *                  modification    PartialAttribute } }                  
+ *
+ *        PartialAttribute ::= SEQUENCE {
+ *             type       AttributeDescription,
+ *             vals       SET OF value AttributeValue }
+ *
+ *        AttributeDescription ::= LDAPString           
+ *              -- Constrained to <attributedescription> [RFC4512]
+ *                                      
+ *        AttributeValue ::= OCTET STRING
+ *             
+ *        ModifyResponse ::= [APPLICATION 7] LDAPResult
+ *
+ * (Source: RFC 4511)
+ */
+
+
 /*
  * ldap_modify_ext - initiate an ldap extended modify operation.
  *
@@ -65,25 +88,6 @@ ldap_modify_ext( LDAP *ld,
        int             i, rc;
        ber_int_t       id;
 
-       /*
-        * A modify request looks like this:
-        *      ModifyRequet ::= SEQUENCE {
-        *              object          DistinguishedName,
-        *              modifications   SEQUENCE OF SEQUENCE {
-        *                      operation       ENUMERATED {
-        *                              add     (0),
-        *                              delete (1),
-        *                              replace (2),
-        *                              increment (3) -- extension
-        *                      },
-        *                      modification    SEQUENCE {
-        *                              type    AttributeType,
-        *                              values  SET OF AttributeValue
-        *                      }
-        *              }
-        *      }
-        */
-
        Debug( LDAP_DEBUG_TRACE, "ldap_modify_ext\n", 0, 0, 0 );
 
        /* check client controls */

diff --git a/libraries/libldap/modrdn.c b/libraries/libldap/modrdn.c
index c160ea87b408f42652452e7bc44f000c91045d70..2973b12ecdf588f0e8befd997fd2da56404cddf8 100644 (file)
--- a/libraries/libldap/modrdn.c
+++ b/libraries/libldap/modrdn.c
@@ -23,14 +23,21 @@
  * without restriction or fee of any kind as long as this notice
  * is preserved.
  */
-/* Portions Copyright (C) The Internet Society (1997)
- * ASN.1 fragments are from RFC 2251; see RFC 2251 for full legal notices.
- */
 
 /* ACKNOWLEDGEMENTS:
  *     Juan C. Gomez
  */
 
+#include "portable.h"
+
+#include <stdio.h>
+
+#include <ac/socket.h>
+#include <ac/string.h>
+#include <ac/time.h>
+
+#include "ldap-int.h"
+
 /*
  * A modify rdn request looks like this:
  *     ModifyRDNRequest ::= SEQUENCE {
@@ -41,15 +48,6 @@
  *     }
  */
 
-#include "portable.h"
-
-#include <stdio.h>
-
-#include <ac/socket.h>
-#include <ac/string.h>
-#include <ac/time.h>
-
-#include "ldap-int.h"
 
 /*
  * ldap_rename - initiate an ldap extended modifyDN operation.

diff --git a/libraries/libldap/pagectrl.c b/libraries/libldap/pagectrl.c
index c6f1c4ab7578376f97e05fa17922ae6224219a05..6e444fa54b73bce3540408b243239161b78479f8 100644 (file)
--- a/libraries/libldap/pagectrl.c
+++ b/libraries/libldap/pagectrl.c
@@ -12,9 +12,6 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
-/* Portions Copyright (C) The Internet Society (1999)
- * ASN.1 fragments are from RFC 2696; see RFC for full legal notices.
- */
 
 #include "portable.h"
 

diff --git a/libraries/libldap/passwd.c b/libraries/libldap/passwd.c
index ab330a81b7a347b72f0c694923046c88e41efe41..222dd285efe254f6e25ea989fbedbbcd59e77cd6 100644 (file)
--- a/libraries/libldap/passwd.c
+++ b/libraries/libldap/passwd.c
@@ -27,7 +27,7 @@
 #include "ldap-int.h"
 
 /*
- * LDAP Password Modify (Extended) Operation <RFC 3062>
+ * LDAP Password Modify (Extended) Operation (RFC 3062)
  */
 
 int ldap_parse_passwd(

diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index f1ed0d91d2472ff234171d942543d4e6d222d539..242eb4eb1b1da48c8609534e9f918507c7625013 100644 (file)
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -37,9 +37,6 @@
  * can be found in the file "build/LICENSE-2.0.1" in this distribution
  * of OpenLDAP Software.
  */
-/* Portions Copyright (C) The Internet Society (2006)
- * ASN.1 fragments are from RFC 4511; see RFC for full legal notices.
- */
 
 /*
  * LDAPv3 (RFC 4511)

diff --git a/libraries/libldap/sasl.c b/libraries/libldap/sasl.c
index 0624394c3f859c05037a065de7f738aabe6478a9..5d612be319f7f9d18013d77cd47321a6b3ef2980 100644 (file)
--- a/libraries/libldap/sasl.c
+++ b/libraries/libldap/sasl.c
@@ -12,9 +12,6 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
-/* Portions Copyright (C) The Internet Society (1997)
- * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
- */
 
 /*
  *     BindRequest ::= SEQUENCE {

diff --git a/libraries/libldap/sbind.c b/libraries/libldap/sbind.c
index 15a04defc4392c99f7dc4b718dd6658e5cf5809a..c72389dceba2c96e0268e2096c7e20bb95ca4d75 100644 (file)
--- a/libraries/libldap/sbind.c
+++ b/libraries/libldap/sbind.c
@@ -15,9 +15,6 @@
 /* Portions Copyright (c) 1993 Regents of the University of Michigan.
  * All rights reserved.
  */
-/* Portions Copyright (C) The Internet Society (1997)
- * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
- */
 
 /*
  *     BindRequest ::= SEQUENCE {

diff --git a/libraries/libldap/sortctrl.c b/libraries/libldap/sortctrl.c
index 185046167210961c320f7f947c90a62eab58caa9..0594018cea975f33bfc37425dbd6ccd685634350 100644 (file)
--- a/libraries/libldap/sortctrl.c
+++ b/libraries/libldap/sortctrl.c
@@ -27,9 +27,6 @@
  * can be found in the file "build/LICENSE-2.0.1" in this distribution
  * of OpenLDAP Software.
  */
-/* Portions Copyright (C) The Internet Society (1997)
- * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
- */
 
 #include "portable.h"
 

diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index da4163354592dd74a5016b8b57f6dde9a2350b3d..29abb750267623344519055c84559bbc57b4a586 100644 (file)
--- a/libraries/libldap/unbind.c
+++ b/libraries/libldap/unbind.c
@@ -15,16 +15,6 @@
 /* Portions Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  */
-/* Portions Copyright (C) The Internet Society (1997)
- * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
- */
-
-/* An Unbind Request looks like this:
- *
- *     UnbindRequest ::= NULL
- *
- * and has no response.
- */
 
 #include "portable.h"
 
@@ -37,6 +27,13 @@
 
 #include "ldap-int.h"
 
+/* An Unbind Request looks like this:
+ *
+ *     UnbindRequest ::= [APPLICATION 2] NULL
+ *
+ * and has no response.  (Source: RFC 4511)
+ */
+
 int
 ldap_unbind_ext(
        LDAP *ld,

diff --git a/libraries/libldap/url.c b/libraries/libldap/url.c
index df9be5e0a23f25c0d218c13da8b481ece52e1c2e..0780b6ca072d4ebe98c26df25b6de4f46a3b1a1a 100644 (file)
--- a/libraries/libldap/url.c
+++ b/libraries/libldap/url.c
@@ -1,4 +1,4 @@
-/* LIBLDAP url.c -- LDAP URL (RFC 2255) related routines */
+/* LIBLDAP url.c -- LDAP URL (RFC 4516) related routines */
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
@@ -25,7 +25,7 @@
  *  where:
  *   attributes is a comma separated list
  *   scope is one of these three strings:  base one sub (default=base)
- *   filter is an string-represented filter as in RFC 2254
+ *   filter is an string-represented filter as in RFC 4515
  *
  *  e.g.,  ldap://host:port/dc=com?o,cn?base?(o=openldap)?extension
  *

diff --git a/libraries/libldap/vlvctrl.c b/libraries/libldap/vlvctrl.c
index 86528c503c010a3807cf63ed9edcf857245460eb..cd3efba1398a8b866937c3c3079914ab14c3bcc0 100644 (file)
--- a/libraries/libldap/vlvctrl.c
+++ b/libraries/libldap/vlvctrl.c
@@ -27,9 +27,6 @@
  * can be found in the file "build/LICENSE-2.0.1" in this distribution
  * of OpenLDAP Software.
  */
-/* Portions Copyright (C) The Internet Society (1997)
- * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
- */
 
 #include "portable.h"