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 c3a1221624c7196e339d7de95336a4114d5f8cff..8c7894e16f516a5dc05bffac2205557a50616850 100644 (file)
--- a/include/lutil.h
+++ b/include/lutil.h
@@ -1,13 +1,16 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted only as authorized by the OpenLDAP
- * Public License.  A copy of this license is available at
- * http://www.OpenLDAP.org/license.html or in file LICENSE in the
- * top-level directory of the distribution.
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _LUTIL_H
@@ -26,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 */
@@ -57,12 +60,7 @@ lutil_entropy LDAP_P((
        ber_len_t nbytes ));
 
 /* passfile.c */
-#ifndef _LBER_H
-struct berval { /* avoid pulling in lber.h */
-       ber_len_t       bv_len;
-       char            *bv_val;
-};
-#endif
+struct berval; /* avoid pulling in lber.h */
 
 LDAP_LUTIL_F( int )
 lutil_get_filed_password LDAP_P((
@@ -72,23 +70,26 @@ lutil_get_filed_password LDAP_P((
 /* passwd.c */
 struct lutil_pw_scheme;
 
-typedef int (*LUTIL_PASSWD_CHK_FUNC)(
-       const struct lutil_pw_scheme *scheme,
-       const struct berval *passwd,
-       const struct berval *cred );
+#define LUTIL_PASSWD_OK                (0)
+#define LUTIL_PASSWD_ERR       (-1)
 
-typedef struct berval * (*LUTIL_PASSWD_HASH_FUNC) (
-       const struct lutil_pw_scheme *scheme,
-       const struct berval *passwd );
+typedef int (LUTIL_PASSWD_CHK_FUNC)(
+       const struct berval *scheme,
+       const struct berval *passwd,
+       const struct berval *cred,
+       const char **text );
 
-struct lutil_pw_scheme {
-       struct berval name;
-       LUTIL_PASSWD_CHK_FUNC chk_fn;
-       LUTIL_PASSWD_HASH_FUNC hash_fn;
-};
+typedef int (LUTIL_PASSWD_HASH_FUNC) (
+       const struct berval *scheme,
+       const struct berval *passwd,
+       struct berval *hash, 
+       const char **text );
 
 LDAP_LUTIL_F( int )
-lutil_passwd_add LDAP_P(( struct lutil_pw_scheme *s ));
+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 ));
@@ -118,15 +119,18 @@ 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 ));
+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 ));
+       const char *method,
+       struct berval *hash,
+       const char **text ));
 
 LDAP_LUTIL_F( int )
 lutil_passwd_scheme LDAP_P((
@@ -143,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 ));
 
@@ -153,8 +165,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 )