Move #include ldap_pvt.h after slap.h, to get ldap_bv2dn_x() & co.

[openldap] / include / lutil.h

diff --git a/include/lutil.h b/include/lutil.h
index cae38a34303ee59edfc23a69779e59413602b406..f0930e09c279aa624d3f196dd67d8a2455dbd9e1 100644 (file)
--- a/include/lutil.h
+++ b/include/lutil.h
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 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,9 +23,9 @@
 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_ENCODE_LEN(n)     (((n)+2)/3 * 4)
 #define LUTIL_BASE64_DECODE_LEN(n)     (((n)+3)/4 * 3)
 
 /* ISC Base64 Routines */
@@ -57,7 +57,7 @@ lutil_entropy LDAP_P((
        ber_len_t nbytes ));
 
 /* passfile.c */
-struct berval; /* avoid pulling in lber.h */
+struct berval; /* avoid pulling in lber.h */
 
 LDAP_LUTIL_F( int )
 lutil_get_filed_password LDAP_P((
@@ -65,6 +65,31 @@ lutil_get_filed_password LDAP_P((
        struct berval * ));
 
 /* passwd.c */
+struct lutil_pw_scheme;
+
+typedef int (LUTIL_PASSWD_CHK_FUNC)(
+       const struct berval *scheme,
+       const struct berval *passwd,
+       const struct berval *cred,
+       const char **text );
+
+typedef struct berval * (LUTIL_PASSWD_HASH_FUNC) (
+       const struct berval *scheme,
+       const struct berval *passwd,
+       const char **text );
+
+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((
        const struct berval *passwd,    /* stored password */
@@ -87,7 +112,8 @@ LDAP_LUTIL_F( int )
 lutil_passwd LDAP_P((
        const struct berval *passwd,    /* stored password */
        const struct berval *cred,      /* user supplied value */
-       const char **methods ));
+       const char **methods,
+       const char **text ));                   /* error message */
 
 LDAP_LUTIL_F( struct berval * )
 lutil_passwd_generate LDAP_P(( ber_len_t ));
@@ -95,7 +121,8 @@ lutil_passwd_generate LDAP_P(( ber_len_t ));
 LDAP_LUTIL_F( struct berval * )
 lutil_passwd_hash LDAP_P((
        const struct berval *passwd,
-       const char *method ));
+       const char *method,
+       const char **text ));
 
 LDAP_LUTIL_F( int )
 lutil_passwd_scheme LDAP_P((
@@ -122,8 +149,10 @@ struct tm;
 
 /* use this macro to statically allocate buffer for lutil_gentime */
 #define LDAP_LUTIL_GENTIME_BUFSIZE     22
+#define lutil_gentime(s,m,t)   lutil_localtime((s),(m),(t),0)
 LDAP_LUTIL_F( size_t )
-lutil_gentime LDAP_P(( char *s, size_t max, const struct tm *tm ));
+lutil_localtime LDAP_P(( char *s, size_t smax, const struct tm *tm,
+                       long delta ));
 
 #ifndef HAVE_MKSTEMP
 LDAP_LUTIL_F( int )
@@ -162,12 +191,35 @@ LDAP_LUTIL_V (ldap_pvt_thread_cond_t) started_event;
 
 /* macros are different between Windows and Mingw */
 #if defined(_WINSVC_H) || defined(_WINSVC_)
-LDAP_LUTIL_V (SERVICE_STATUS) SLAPDServiceStatus;
-LDAP_LUTIL_V (SERVICE_STATUS_HANDLE) hSLAPDServiceStatus;
+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.