don't get tricked when option separator occurs past end of berval

[openldap] / include / lutil.h

diff --git a/include/lutil.h b/include/lutil.h
index 3c824aa976c91a4df621c06ef1d9cb34b11fb7cc..c8e8430d51c9817696d14e1d098e760757e3ea2b 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-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -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 )
@@ -106,9 +110,12 @@ lutil_authpasswd_hash LDAP_P((
        struct berval **salt,   /* salt to store */
        const char *method ));
 
-#if defined( SLAPD_SPASSWD ) && defined( HAVE_CYRUS_SASL )
-       /* cheat to avoid pulling in <sasl.h> */
-LDAP_LUTIL_V( struct sasl_conn * ) lutil_passwd_sasl_conn;
+#ifdef SLAPD_CRYPT
+typedef int (lutil_cryptfunc) LDAP_P((
+       const char *key,
+       const char *salt,
+       char **hash ));
+LDAP_LUTIL_V (lutil_cryptfunc *) lutil_cryptptr;
 #endif
 
 LDAP_LUTIL_F( int )
@@ -118,13 +125,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 +150,38 @@ lutil_progname LDAP_P((
        int argc,
        char *argv[] ));
 
+typedef struct lutil_tm {
+       int tm_sec;     /* seconds 0-60 (1 leap second) */
+       int tm_min;     /* minutes 0-59 */
+       int tm_hour;    /* hours 0-23 */
+       int tm_mday;    /* day 1-31 */
+       int tm_mon;     /* month 0-11 */
+       int tm_year;    /* year - 1900 */
+       int tm_usec;    /* microseconds */
+} lutil_tm;
+
+typedef struct lutil_timet {
+       unsigned int tt_sec;    /* seconds since 1900 */
+       int tt_gsec;            /* seconds since 1900, high 7 bits */
+       unsigned int tt_usec;   /* microseconds */
+} lutil_timet;
+
+LDAP_LUTIL_F( int )
+lutil_parsetime LDAP_P((
+       char *atm, struct lutil_tm * ));
+
+LDAP_LUTIL_F( int )
+lutil_tm2time LDAP_P((
+       struct lutil_tm *, struct lutil_timet * ));
+
+#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 ));