mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-15 03:01:09 +08:00
dc07e765f2
This commit includes many changes. All changes compile under NT but
have not been tested under UNIX.
A Summary of changes (likely incomplete):
NT changes:
Removed lint.
Clean up configuration support for "Debug", "Release", "SDebug",
and "SRelease" configurations.
Share output directories for clients, libraries,
and slapd. (maybe they should be combined further
and moved to build/{,S}{Debug,Release}).
Enable threading when _MT is defined.
Enable debuging when _DEBUG is defined.
Disable setting of NDEBUG under Release/SRelease. Asserts
are disabled in <ac/assert.h> when LDAP_DEBUG is not
defined.
Added 'build/main.dsp' Master project.
Removed non-slapd projects from slapd.dsp (see main.dsp).
Removed replaced many uses of _WIN32 macro with feature based
macros.
ldap_cdefs.h changes
#define LDAP_CONST const
(see below)
#define LDAP_F(type) LDAP_F_PRE type LDAP_F_POST
To allow specifiers to be added before and after
the type declaration. (For DLL handling)
LBER/LDAP changes
Namespace changes:
s/lber_/ber_/ for here and there.
s/NAME_ERROR/LDAP_NAME_ERROR/g
Deleted NULLMSG and other NULL* macros for namespace reasons.
"const" libraries. Installed headers (ie: lber.h, ldap.h)
use LDAP_CONST macro. Normally set to 'const' when
__STDC__. Can be set externally to enable/disable
'constification' of external interface. Internal
interface always uses 'const'. Did not fix warnings
in -lldif (in lieu of new LDIF parser).
Added _ext API implementations (excepting search and bind).
Need to implement ldap_int_get_controls() for reponses
with controls.
Added numberous assert() checks.
LDAP_R
_MT defines HAVE_NT_THREADS
Added numberous assert() checks.
Changed ldap_pthread_t back to unsigned long. Used cast
to HANDLE in _join().
LDBM
Replaced _WIN32 with HAVE_SYSLOG
ud
Added version string if MKVERSION is not defined. (MKVERSION
needs to be set under UNIX).
slapd
Made connection sockbuf field a pointer to a sockbuf. This
removed slap.h dependency on lber-int.h. lber-int.h now only
included by those files needing to mess with the sockbuf.
Used ber_* functions/macros to access sockbuf internals whenever
possible.
Added version string if MKVERSION is not defined. (MKVERSION
needs to be set under UNIX).
Removed FD_SET unsigned lint
slapd/tools
Used EXEEXT to added ".exe" to routines. Need to define EXEEXT
under UNIX.
ldappasswd
Added ldappasswd.dsp. Ported to NT. Used getpid() to seed rand().
nt_debug
Minor cleanup. Added "portable.h" include and used <ac/*.h> where
appropriate. Added const to char* format argument.
105 lines
2.7 KiB
C
105 lines
2.7 KiB
C
/*
|
|
* Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms are permitted only
|
|
* as authorized by the OpenLDAP Public License. A copy of this
|
|
* license is available at http://www.OpenLDAP.org/license.html or
|
|
* in file LICENSE in the top-level directory of the distribution.
|
|
*/
|
|
/* Portions
|
|
* Copyright (c) 1993, 1994 Regents of the University of Michigan.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms are permitted
|
|
* provided that this notice is preserved and that due credit is given
|
|
* to the University of Michigan at Ann Arbor. The name of the University
|
|
* may not be used to endorse or promote products derived from this
|
|
* software without specific prior written permission. This software
|
|
* is provided ``as is'' without express or implied warranty.
|
|
*
|
|
* searchpref.h: display template library defines
|
|
* 16 May 1994 by Gordon Good
|
|
*/
|
|
|
|
|
|
#ifndef _SRCHPREF_H
|
|
#define _SRCHPREF_H
|
|
|
|
#include <ldap_cdefs.h>
|
|
|
|
LDAP_BEGIN_DECL
|
|
|
|
struct ldap_searchattr {
|
|
char *sa_attrlabel;
|
|
char *sa_attr;
|
|
/* max 32 matchtypes for now */
|
|
unsigned long sa_matchtypebitmap;
|
|
char *sa_selectattr;
|
|
char *sa_selecttext;
|
|
struct ldap_searchattr *sa_next;
|
|
};
|
|
|
|
struct ldap_searchmatch {
|
|
char *sm_matchprompt;
|
|
char *sm_filter;
|
|
struct ldap_searchmatch *sm_next;
|
|
};
|
|
|
|
struct ldap_searchobj {
|
|
char *so_objtypeprompt;
|
|
unsigned long so_options;
|
|
char *so_prompt;
|
|
short so_defaultscope;
|
|
char *so_filterprefix;
|
|
char *so_filtertag;
|
|
char *so_defaultselectattr;
|
|
char *so_defaultselecttext;
|
|
struct ldap_searchattr *so_salist;
|
|
struct ldap_searchmatch *so_smlist;
|
|
struct ldap_searchobj *so_next;
|
|
};
|
|
|
|
#define NULLSEARCHOBJ ((struct ldap_searchobj *)0)
|
|
|
|
/*
|
|
* global search object options
|
|
*/
|
|
#define LDAP_SEARCHOBJ_OPT_INTERNAL 0x00000001
|
|
|
|
#define LDAP_IS_SEARCHOBJ_OPTION_SET( so, option ) \
|
|
(((so)->so_options & (option) ) != 0 )
|
|
|
|
#define LDAP_SEARCHPREF_VERSION_ZERO 0
|
|
#define LDAP_SEARCHPREF_VERSION 1
|
|
|
|
#define LDAP_SEARCHPREF_ERR_VERSION 1
|
|
#define LDAP_SEARCHPREF_ERR_MEM 2
|
|
#define LDAP_SEARCHPREF_ERR_SYNTAX 3
|
|
#define LDAP_SEARCHPREF_ERR_FILE 4
|
|
|
|
|
|
LDAP_F( int )
|
|
ldap_init_searchprefs LDAP_P(( char *file,
|
|
struct ldap_searchobj **solistp ));
|
|
|
|
LDAP_F( int )
|
|
ldap_init_searchprefs_buf LDAP_P(( char *buf,
|
|
long buflen,
|
|
struct ldap_searchobj **solistp ));
|
|
|
|
LDAP_F( void )
|
|
ldap_free_searchprefs LDAP_P(( struct ldap_searchobj *solist ));
|
|
|
|
LDAP_F( struct ldap_searchobj * )
|
|
ldap_first_searchobj LDAP_P(( struct ldap_searchobj *solist ));
|
|
|
|
LDAP_F( struct ldap_searchobj * )
|
|
ldap_next_searchobj LDAP_P(( struct ldap_searchobj *sollist,
|
|
struct ldap_searchobj *so ));
|
|
|
|
|
|
LDAP_END_DECL
|
|
|
|
#endif /* _SRCHPREF_H */
|