Adjust HTML presentation for consistency with web site

[openldap] / include / lutil.h

diff --git a/include/lutil.h b/include/lutil.h
index e26374d6b3882b85413f399048cdb85a151ea20e..c6a52d8441ec7b1e376a918217186758b22a30d6 100644 (file)
--- a/include/lutil.h
+++ b/include/lutil.h
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -30,57 +30,79 @@ LDAP_BEGIN_DECL
 /* ISC Base64 Routines */
 /* base64.c */
 
-LIBLUTIL_F( int )
+LDAP_LUTIL_F( int )
 lutil_b64_ntop LDAP_P((
        unsigned char const *,
        size_t,
        char *,
        size_t));
 
-LIBLUTIL_F( int )
+LDAP_LUTIL_F( int )
 lutil_b64_pton LDAP_P((
        char const *,
        unsigned char *,
        size_t));
 
 /* detach.c */
-LIBLUTIL_F( void )
+LDAP_LUTIL_F( void )
 lutil_detach LDAP_P((
        int debug,
        int do_close));
 
 /* entropy.c */
-LIBLUTIL_F( int )
+LDAP_LUTIL_F( int )
 lutil_entropy LDAP_P((
        char *buf,
-       int nbytes ));
+       ber_len_t nbytes ));
 
 /* passwd.c */
-LIBLUTIL_F( int )
-lutil_passwd LDAP_P((
-       const char *passwd,     /* stored password */
-       const char *cred,       /* user supplied value */
+struct berval; /* avoid pulling in lber.h */
+
+LDAP_LUTIL_F( int )
+lutil_authpasswd LDAP_P((
+       const struct berval *passwd,    /* stored password */
+       const struct berval *cred,      /* user supplied value */
        const char **methods ));
 
-LIBLUTIL_F( char * )
-lutil_passwd_generate LDAP_P((
-       const char *passwd,
+LDAP_LUTIL_F( int )
+lutil_authpasswd_hash LDAP_P((
+       const struct berval *cred,
+       struct berval **passwd, /* password to store */
+       struct berval **salt,   /* salt to store */
        const char *method ));
 
-LIBLUTIL_F (const char *) lutil_passwd_schemes[];
+#if defined( SLAPD_SPASSWD ) && defined( HAVE_CYRUS_SASL )
+       /* cheat to avoid pulling in <sasl.h> */
+LDAP_LUTIL_F( struct sasl_conn * ) lutil_passwd_sasl_conn;
+#endif
+
+LDAP_LUTIL_F( int )
+lutil_passwd LDAP_P((
+       const struct berval *passwd,    /* stored password */
+       const struct berval *cred,      /* user supplied value */
+       const char **methods ));
+
+LDAP_LUTIL_F( struct berval * )
+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 ));
 
-LIBLUTIL_F( int )
-lutil_passwd_scheme LDAP_P((char *scheme));
+LDAP_LUTIL_F( int )
+lutil_passwd_scheme LDAP_P((
+       const char *scheme ));
 
 /* utils.c */
-LIBLUTIL_F( char* )
+LDAP_LUTIL_F( char* )
 lutil_progname LDAP_P((
        const char* name,
        int argc,
        char *argv[] ));
 
 /* sockpair.c */
-LIBLUTIL_F( int )
+LDAP_LUTIL_F( int )
 lutil_pair( LBER_SOCKET_T sd[2] );
 
 LDAP_END_DECL