subtreeSpecification syntax change : -binary +validator

[openldap] / include / lutil.h

diff --git a/include/lutil.h b/include/lutil.h
index 5adc4b998e5c614b669744d966b3835533ad69b6..72a722509857544292e59b5cd906e1cb4c9917b9 100644 (file)
--- a/include/lutil.h
+++ b/include/lutil.h
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,10 +23,10 @@
 LDAP_BEGIN_DECL
 
 /* n octets encode into ceiling(n/3) * 4 bytes */
-/* Avoid floating point math by through extra padding */
+/* Avoid floating point math through extra padding */
 
-#define LUTIL_BASE64_ENCODE_LEN(n)     ((n)/3 * 4 + 4)
-#define LUTIL_BASE64_DECODE_LEN(n)     ((n)/4 * 3)
+#define LUTIL_BASE64_ENCODE_LEN(n)     (((n)+2)/3 * 4)
+#define LUTIL_BASE64_DECODE_LEN(n)     (((n)+3)/4 * 3)
 
 /* ISC Base64 Routines */
 /* base64.c */
@@ -56,8 +56,37 @@ lutil_entropy LDAP_P((
        unsigned char *buf,
        ber_len_t nbytes ));
 
+/* passfile.c */
+struct berval; /* avoid pulling in lber.h */
+
+LDAP_LUTIL_F( int )
+lutil_get_filed_password LDAP_P((
+       const char *filename,
+       struct berval * ));
+
 /* passwd.c */
-struct berval; /* avoid pulling in lber.h */
+struct lutil_pw_scheme;
+
+typedef int (LUTIL_PASSWD_CHK_FUNC)(
+       const struct berval *scheme,
+       const struct berval *passwd,
+       const struct berval *cred );
+
+typedef struct berval * (LUTIL_PASSWD_HASH_FUNC) (
+       const struct berval *scheme,
+       const struct berval *passwd );
+
+LDAP_LUTIL_F( int )
+lutil_passwd_add LDAP_P((
+       struct berval *scheme,
+       LUTIL_PASSWD_CHK_FUNC *chk_fn,
+       LUTIL_PASSWD_HASH_FUNC *hash_fn ));
+
+LDAP_LUTIL_F( void )
+lutil_passwd_init LDAP_P(( void ));
+
+LDAP_LUTIL_F( void )
+lutil_passwd_destroy LDAP_P(( void ));
 
 LDAP_LUTIL_F( int )
 lutil_authpasswd LDAP_P((
@@ -106,10 +135,40 @@ lutil_progname LDAP_P((
        int argc,
        char *argv[] ));
 
+LDAP_LUTIL_F( char* )
+lutil_strcopy LDAP_P(( char *dst, const char *src ));
+
+LDAP_LUTIL_F( char* )
+lutil_strncopy LDAP_P(( char *dst, const char *src, size_t n ));
+
+struct tm;
+
+/* use this macro to statically allocate buffer for lutil_gentime */
+#define LDAP_LUTIL_GENTIME_BUFSIZE     22
+LDAP_LUTIL_F( size_t )
+lutil_gentime LDAP_P(( char *s, size_t max, const struct tm *tm ));
+
+#ifndef HAVE_MKSTEMP
+LDAP_LUTIL_F( int )
+mkstemp LDAP_P (( char * template ));
+#endif
+
 /* sockpair.c */
 LDAP_LUTIL_F( int )
 lutil_pair( ber_socket_t sd[2] );
 
+/* uuid.c */
+/* use this macro to allocate buffer for lutil_uuidstr */
+#define LDAP_LUTIL_UUIDSTR_BUFSIZE     40
+LDAP_LUTIL_F( size_t )
+lutil_uuidstr( char *buf, size_t len );
+
+/* csn.c */
+/* use this macro to allocate buffer for lutil_csnstr */
+#define LDAP_LUTIL_CSNSTR_BUFSIZE      64
+LDAP_LUTIL_F( size_t )
+lutil_csnstr( char *buf, size_t len, unsigned int replica, unsigned int mod );
+
 /*
  * Sometimes not all declarations in a header file are needed.
  * An indicator to this is whether or not the symbol's type has
@@ -124,13 +183,47 @@ LDAP_LUTIL_V (int) is_NT_Service;
 LDAP_LUTIL_V (ldap_pvt_thread_cond_t) started_event;
 #endif /* _LDAP_PVT_THREAD_H */
 
-#ifdef _WINSVC_H
-LDAP_LUTIL_V (SERVICE_STATUS) SLAPDServiceStatus;
-LDAP_LUTIL_V (SERVICE_STATUS_HANDLE) hSLAPDServiceStatus;
+/* macros are different between Windows and Mingw */
+#if defined(_WINSVC_H) || defined(_WINSVC_)
+LDAP_LUTIL_V (SERVICE_STATUS) lutil_ServiceStatus;
+LDAP_LUTIL_V (SERVICE_STATUS_HANDLE) hlutil_ServiceStatus;
 #endif /* _WINSVC_H */
 
+LDAP_LUTIL_F (void)
+lutil_CommenceStartupProcessing( char *serverName, void (*stopper)(int)) ;
+
+LDAP_LUTIL_F (void)
+lutil_ReportShutdownComplete( void );
+
+LDAP_LUTIL_F (void *)
+lutil_getRegParam( char *svc, char *value );
+
+LDAP_LUTIL_F (int)
+lutil_srv_install( char* service, char * displayName, char* filename,
+                int auto_start );
+LDAP_LUTIL_F (int)
+lutil_srv_remove ( char* service, char* filename );
+
 #endif /* HAVE_NT_SERVICE_MANAGER */
 
+#ifdef HAVE_NT_EVENT_LOG
+LDAP_LUTIL_F (void)
+lutil_LogStartedEvent( char *svc, int slap_debug, char *configfile, char *urls );
+
+LDAP_LUTIL_F (void)
+lutil_LogStoppedEvent( char *svc );
+#endif
+
+#ifdef HAVE_EBCDIC
+/* Generally this has only been used to put '\n' to stdout. We need to
+ * make sure it is output in EBCDIC.
+ */
+#undef putchar
+#undef putc
+#define putchar(c)     putc((c), stdout)
+#define putc(c,fp)     do { char x=(c); __atoe_l(&x,1); putc(x,fp); } while(0)
+#endif
+
 LDAP_END_DECL
 
 #endif /* _LUTIL_H */