mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-15 03:01:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Misc cleanup

Browse Source
This commit is contained in:
Kurt Zeilenga 2003-12-03 01:07:06 +00:00
parent 93d0c25c45
commit 51358be911
3 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/lber.h
View File

@ -582,16 +582,16 @@ LBER_F( struct berval * )
ber_bvdup LDAP_P((
struct berval *src ));
LBER_F( struct berval * )
ber_str2bv LDAP_P((
LDAP_CONST char *, ber_len_t len, int dup, struct berval *bv));
LBER_F( struct berval * )
ber_mem2bv LDAP_P((
LDAP_CONST char *, ber_len_t len, int dup, struct berval *bv));
#define ber_bvstr(a) ber_str2bv(a, 0, 0, NULL)
#define ber_bvstrdup(a) ber_str2bv(a, 0, 1, NULL)
LBER_F( struct berval * )
ber_str2bv LDAP_P((
LDAP_CONST char *, ber_len_t len, int dup, struct berval *bv));
#define ber_bvstr(a) ((ber_str2bv)((a), 0, 0, NULL))
#define ber_bvstrdup(a) ((ber_str2bv)((a), 0, 1, NULL))
LBER_F( char * )
ber_strdup LDAP_P((

38
include/ldap.h
View File

@ -66,6 +66,7 @@ LDAP_BEGIN_DECL
/* #define LDAP_API_OPERATION_SESSION_SAFE 1 */
#endif
#define LDAP_PORT 389 /* ldap:/// default LDAP port */
#define LDAPS_PORT 636 /* ldaps:/// default LDAP over TLS port */
@ -482,13 +483,11 @@ typedef struct ldapcontrol {
#define LDAP_ASSERTION_FAILED 0x10f
#ifdef LDAP_EXOP_X_CANCEL
/* resultCode for Cancel Response */
#define LDAP_CANCELLED 0x110
#define LDAP_NO_SUCH_OPERATION 0x111
#define LDAP_TOO_LATE 0x112
#define LDAP_CANNOT_CANCEL 0x113
#endif
/* LDAP SYNC request type */
#define LDAP_SYNC_NONE 0x00
@ -1525,8 +1524,7 @@ ldap_mods_free LDAP_P((
/*
* in sort.c
* (deprecated)
* in sort.c (deprecated)
*/
typedef int (LDAP_SORT_AD_CMP_PROC) LDAP_P(( /* deprecated */
LDAP_CONST char *left,
@ -1553,7 +1551,6 @@ ldap_sort_strcasecmp LDAP_P((
LDAP_CONST void *a,
LDAP_CONST void *b ));
/*
* in url.c
*/
@ -1582,12 +1579,14 @@ LDAP_F( void )
ldap_free_urldesc LDAP_P((
LDAPURLDesc *ludp ));
/*
* in sortctrl.c
*/
/*
* structure for a sort-key
* LDAP Server Side Sort
* in sortctrl.c
*/
#define LDAP_API_FEATURE_SERVER_SIDE_SORT 1000
/* structure for a sort-key */
typedef struct ldapsortkey {
char * attributeType;
char * orderingRule;
@ -1619,21 +1618,21 @@ ldap_parse_sort_control LDAP_P((
/*
* in vlvctrl.c
* LDAP Virtual List View
* in vlvctrl.c
*/
#define LDAP_API_FEATURE_VIRTUAL_LIST_VIEW 1000
/*
* structure for virtual list.
*/
/* structure for virtual list */
typedef struct ldapvlvinfo {
int ldvlv_version;
unsigned long ldvlv_before_count;
unsigned long ldvlv_after_count;
unsigned long ldvlv_offset;
unsigned long ldvlv_count;
struct berval *ldvlv_attrvalue;
struct berval *ldvlv_context;
void *ldvlv_extradata;
struct berval * ldvlv_attrvalue;
struct berval * ldvlv_context;
void * ldvlv_extradata;
} LDAPVLVInfo;
LDAP_F( int )
@ -1652,7 +1651,8 @@ ldap_parse_vlv_control LDAP_P((
int *errcodep ));
/*
* LDAP Who Am I? (whoami.c)
* LDAP Who Am I?
* in whoami.c
*/
LDAP_F( int )
@ -1675,7 +1675,8 @@ ldap_whoami_s LDAP_P((
LDAPControl **cctrls ));
/*
* in passwd.c
* LDAP Password Modify
* in passwd.c
*/
LDAP_F( int )
@ -1703,5 +1704,6 @@ ldap_passwd_s LDAP_P((
LDAPControl **sctrls,
LDAPControl **cctrls ));
LDAP_END_DECL
#endif /* _LDAP_H */

6
include/ldap_features.h.in
View File

@ -60,10 +60,4 @@
/* LDAP v2 Referrals */
#undef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
/* LDAP Server Side Sort. */
#define LDAP_API_FEATURE_SERVER_SIDE_SORT 1000
/* LDAP Virtual List View. */
#define LDAP_API_FEATURE_VIRTUAL_LIST_VIEW 1000
#endif /* LDAP_FEATURES */