mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +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.
78 lines
1.2 KiB
C
78 lines
1.2 KiB
C
/*
|
|
* Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
|
|
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
|
|
*/
|
|
|
|
#include "portable.h"
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <ac/ctype.h>
|
|
#include <ac/stdarg.h>
|
|
#include <ac/string.h>
|
|
#include <ac/time.h>
|
|
|
|
#include "ldap-int.h"
|
|
|
|
/*
|
|
* ldap log
|
|
*/
|
|
|
|
static int ldap_log_check( LDAP *ld, int loglvl )
|
|
{
|
|
int errlvl;
|
|
|
|
if(ld == NULL) {
|
|
errlvl = ldap_debug;
|
|
} else {
|
|
errlvl = ld->ld_errno;
|
|
}
|
|
|
|
return errlvl & loglvl ? 1 : 0;
|
|
}
|
|
|
|
int ldap_log_printf
|
|
#ifdef HAVE_STDARG
|
|
( LDAP *ld, int loglvl, const char *fmt, ... )
|
|
#else
|
|
( va_alist )
|
|
va_dcl
|
|
#endif
|
|
{
|
|
char buf[ 1024 ];
|
|
va_list ap;
|
|
|
|
#ifdef HAVE_STDARG
|
|
va_start( ap, fmt );
|
|
#else
|
|
LDAP *ld;
|
|
int loglvl;
|
|
char *fmt;
|
|
|
|
va_start( ap );
|
|
|
|
ld = va_arg( ap, LDAP * );
|
|
loglvl = va_arg( ap, int );
|
|
fmt = va_arg( ap, char * );
|
|
#endif
|
|
|
|
if ( !ldap_log_check( ld, loglvl )) {
|
|
return 0;
|
|
}
|
|
|
|
#ifdef HAVE_VSNPRINTF
|
|
buf[sizeof(buf) - 1] = '\0';
|
|
vsnprintf( buf, sizeof(buf)-1, fmt, ap );
|
|
#elif HAVE_VSPRINTF
|
|
vsprintf( buf, fmt, ap ); /* hope it's not too long */
|
|
#else
|
|
/* use doprnt() */
|
|
chokeme = "choke me! I don't have a doprnt manual handy!";
|
|
#endif
|
|
|
|
va_end(ap);
|
|
|
|
(*ber_pvt_log_print)( buf );
|
|
return 1;
|
|
}
|