Add LDAP_TAG_LDAPCRED macro.

[openldap] / include / ldap_log.h

diff --git a/include/ldap_log.h b/include/ldap_log.h
index 335adb794558dd8bbc0b67820b51038c23a78867..c6b6c4f13bbaaea96387c6eddae93172a321affb 100644 (file)
--- a/include/ldap_log.h
+++ b/include/ldap_log.h
@@ -39,7 +39,7 @@ LDAP_BEGIN_DECL
 #define LDAP_DEBUG_SHELL       0x0400
 #define LDAP_DEBUG_PARSE       0x0800
 
-#define LDAP_DEBUG_DEPRECIATED 0x1000
+#define LDAP_DEBUG_DEPRECATED  0x1000
 #define LDAP_DEBUG_NONE                0x8000
 #define LDAP_DEBUG_ANY         -1
 
@@ -58,25 +58,25 @@ extern int  ldap_syslog_level;
 /* this doesn't below as part of ldap.h */
 #ifdef LDAP_SYSLOG
 #define Debug( level, fmt, arg1, arg2, arg3 )  \
-       { \
-               if ( ldap_debug & (level) ) \
-                       fprintf( stderr, (fmt), (arg1), (arg2), (arg3) ); \
+       do { \
+               lutil_debug( ldap_debug, (level), (fmt), (arg1), (arg2), (arg3) ); \
                if ( ldap_syslog & (level) ) \
                        syslog( ldap_syslog_level, (fmt), (arg1), (arg2), (arg3) ); \
-       }
-#else /* LDAP_SYSLOG */
-#ifndef HAVE_WINSOCK
+       } while ( 0 )
+
+#else
 #define Debug( level, fmt, arg1, arg2, arg3 ) \
-               if ( ldap_debug & (level) ) \
-                       fprintf( stderr, (fmt), (arg1), (arg2), (arg3) );
-#else /* !WINSOCK */
-extern void Debug( int level, char* fmt, ... );
-#endif /* !WINSOCK */
-#endif /* LDAP_SYSLOG */
+       lutil_debug( ldap_debug, (level), (fmt), (arg1), (arg2), (arg3) )
+#endif
+
 #else /* LDAP_DEBUG */
 #define Debug( level, fmt, arg1, arg2, arg3 )
 #endif /* LDAP_DEBUG */
 
+LDAP_F(void) lutil_debug LDAP_P((
+       int debug, int level,
+       const char* fmt, ... ));
+
 LDAP_END_DECL
 
 #endif /* _LDAP_LOG_H */