upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-26 08:42:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Misc LDAPbis comment update

Browse source 
Remove unnecessary ISOC notices
This commit is contained in:
Kurt Zeilenga 2006-10-27 19:37:04 +00:00
parent 051cbd3990
commit 4587e053e7
23 changed files with 151 additions and 183 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/libldap/abandon.c
View file

@ -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,

38
libraries/libldap/add.c
View file

@ -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:
*

30
libraries/libldap/bind.c
View file

@ -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

23
libraries/libldap/compare.c
View file

@ -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

22
libraries/libldap/controls.c
View file

@ -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
*/

15
libraries/libldap/delete.c
View file

@ -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:
*

3
libraries/libldap/error.c
View file

@ -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"

28
libraries/libldap/extended.c
View file

@ -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,

5
libraries/libldap/filter.c
View file

@ -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 );

2
libraries/libldap/ftest.c
View file

@ -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;
}

10
libraries/libldap/getdn.c
View file

@ -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

31
libraries/libldap/kbind.c
View file

@ -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

48
libraries/libldap/modify.c
View file

@ -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 */

24
libraries/libldap/modrdn.c
View file

@ -23,24 +23,11 @@
* 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
*/
/*
* A modify rdn request looks like this:
* ModifyRDNRequest ::= SEQUENCE {
* entry DistinguishedName,
* newrdn RelativeDistinguishedName,
* deleteoldrdn BOOLEAN
* newSuperior [0] DistinguishedName [v3 only]
* }
*/
#include "portable.h"
#include <stdio.h>
@ -51,6 +38,17 @@
#include "ldap-int.h"
/*
* A modify rdn request looks like this:
* ModifyRDNRequest ::= SEQUENCE {
* entry DistinguishedName,
* newrdn RelativeDistinguishedName,
* deleteoldrdn BOOLEAN
* newSuperior [0] DistinguishedName [v3 only]
* }
*/
/*
* ldap_rename - initiate an ldap extended modifyDN operation.
*

3
libraries/libldap/pagectrl.c
View file

@ -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"

2
libraries/libldap/passwd.c
View file

@ -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(

3
libraries/libldap/result.c
View file

@ -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)

3
libraries/libldap/sasl.c
View file

@ -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 {

3
libraries/libldap/sbind.c
View file

@ -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 {

3
libraries/libldap/sortctrl.c
View file

@ -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"

17
libraries/libldap/unbind.c
View file

@ -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,

4
libraries/libldap/url.c
View file

@ -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
*

3
libraries/libldap/vlvctrl.c
View file

@ -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"