X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Flutil.h;h=c6a52d8441ec7b1e376a918217186758b22a30d6;hb=f0cd2a13bb9387233fe48dc2e526a72d893b92af;hp=ba9e055ca4c1ee51af1e6fd1e2e789be55fd5936;hpb=8c665d48d66d3950cb18d7b29f818f51575c42d6;p=openldap

diff --git a/include/lutil.h b/include/lutil.h
index ba9e055ca4..c6a52d8441 100644
--- 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
@@ -21,15 +21,6 @@
 
 LDAP_BEGIN_DECL
 
-#ifdef __MINGW32__
-#   undef LDAP_F_PRE
-#   ifdef LIBLUTIL_DECL
-#	define LDAP_F_PRE	extern __declspec(LIBLUTIL_DECL)
-#   else
-#	define LDAP_F_PRE	extern
-#   endif
-#endif
-
 /* n octets encode into ceiling(n/3) * 4 bytes */
 /* Avoid floating point math by through extra padding */
 
@@ -39,52 +30,79 @@ LDAP_BEGIN_DECL
 /* ISC Base64 Routines */
 /* base64.c */
 
-LDAP_F( int )
+LDAP_LUTIL_F( int )
 lutil_b64_ntop LDAP_P((
 	unsigned char const *,
 	size_t,
 	char *,
 	size_t));
 
-LDAP_F( int )
+LDAP_LUTIL_F( int )
 lutil_b64_pton LDAP_P((
 	char const *,
 	unsigned char *,
 	size_t));
 
 /* detach.c */
-LDAP_F( void )
+LDAP_LUTIL_F( void )
 lutil_detach LDAP_P((
 	int debug,
 	int do_close));
 
 /* entropy.c */
-LDAP_F( int )
+LDAP_LUTIL_F( int )
 lutil_entropy LDAP_P((
 	char *buf,
-	int nbytes ));
+	ber_len_t nbytes ));
 
 /* passwd.c */
-LDAP_F( int )
+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 ));
+
+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 ));
+
+#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 char *cred,
-	const char *passwd,
+	const struct berval *passwd,	/* stored password */
+	const struct berval *cred,	/* user supplied value */
 	const char **methods ));
 
-extern const char* lutil_passwd_schemes[];
+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 ));
 
-LDAP_F( int )
-lutil_passwd_scheme LDAP_P((char *scheme));
+LDAP_LUTIL_F( int )
+lutil_passwd_scheme LDAP_P((
+	const char *scheme ));
 
 /* utils.c */
-LDAP_F( char* )
+LDAP_LUTIL_F( char* )
 lutil_progname LDAP_P((
 	const char* name,
 	int argc,
 	char *argv[] ));
 
 /* sockpair.c */
-LDAP_F( int )
+LDAP_LUTIL_F( int )
 lutil_pair( LBER_SOCKET_T sd[2] );
 
 LDAP_END_DECL