ITS#3056 partial fix - from a slurpd perspective, the updatedn

[openldap] / include / lutil.h

diff --git a/include/lutil.h b/include/lutil.h
index 8087647459d2fed26ea373ee44b446834a468e36..8c7894e16f516a5dc05bffac2205557a50616850 100644 (file)
--- a/include/lutil.h
+++ b/include/lutil.h
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,7 @@ LDAP_BEGIN_DECL
 /* Avoid floating point math through extra padding */
 
 #define LUTIL_BASE64_ENCODE_LEN(n)     (((n)+2)/3 * 4)
-#define LUTIL_BASE64_DECODE_LEN(n)     (((n)+3)/4 * 3)
+#define LUTIL_BASE64_DECODE_LEN(n)     ((n)/4*3)
 
 /* ISC Base64 Routines */
 /* base64.c */
@@ -70,15 +70,19 @@ lutil_get_filed_password LDAP_P((
 /* passwd.c */
 struct lutil_pw_scheme;
 
+#define LUTIL_PASSWD_OK                (0)
+#define LUTIL_PASSWD_ERR       (-1)
+
 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) (
+typedef int (LUTIL_PASSWD_HASH_FUNC) (
        const struct berval *scheme,
        const struct berval *passwd,
+       struct berval *hash, 
        const char **text );
 
 LDAP_LUTIL_F( int )
@@ -118,13 +122,14 @@ lutil_passwd LDAP_P((
        const char **methods,
        const char **text ));                   /* error message */
 
-LDAP_LUTIL_F( struct berval * )
-lutil_passwd_generate LDAP_P(( ber_len_t ));
+LDAP_LUTIL_F( int )
+lutil_passwd_generate LDAP_P(( struct berval *pw, ber_len_t ));
 
-LDAP_LUTIL_F( struct berval * )
+LDAP_LUTIL_F( int )
 lutil_passwd_hash LDAP_P((
        const struct berval *passwd,
        const char *method,
+       struct berval *hash,
        const char **text ));
 
 LDAP_LUTIL_F( int )
@@ -142,6 +147,14 @@ lutil_progname LDAP_P((
        int argc,
        char *argv[] ));
 
+#ifdef _WIN32
+LDAP_LUTIL_F( void )
+lutil_slashpath LDAP_P(( char* path ));
+#define        LUTIL_SLASHPATH(p)      lutil_slashpath(p)
+#else
+#define        LUTIL_SLASHPATH(p)
+#endif
+
 LDAP_LUTIL_F( char* )
 lutil_strcopy LDAP_P(( char *dst, const char *src ));