--- include/lutil.h	2000/07/04 17:58:49	1.12.2.4
+++ include/lutil.h	1999/12/13 03:54:00	1.25
@@ -1,6 +1,6 @@
-/* $OpenLDAP: pkg/ldap/include/lutil.h,v 1.12.2.3 2000/06/13 17:57:15 kurt Exp $ */
+/* $OpenLDAP: pkg/ldap/include/lutil.h,v 1.24 1999/12/10 03:52:32 kdz Exp $ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -30,27 +30,27 @@ LDAP_BEGIN_DECL
 /* ISC Base64 Routines */
 /* base64.c */
 
-LDAP_LUTIL_F( int )
+LIBLUTIL_F( int )
 lutil_b64_ntop LDAP_P((
 	unsigned char const *,
 	size_t,
 	char *,
 	size_t));
 
-LDAP_LUTIL_F( int )
+LIBLUTIL_F( int )
 lutil_b64_pton LDAP_P((
 	char const *,
 	unsigned char *,
 	size_t));
 
 /* detach.c */
-LDAP_LUTIL_F( void )
+LIBLUTIL_F( void )
 lutil_detach LDAP_P((
 	int debug,
 	int do_close));
 
 /* entropy.c */
-LDAP_LUTIL_F( int )
+LIBLUTIL_F( int )
 lutil_entropy LDAP_P((
 	char *buf,
 	ber_len_t nbytes ));
@@ -58,51 +58,33 @@ lutil_entropy LDAP_P((
 /* passwd.c */
 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 )
+LIBLUTIL_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 * )
+LIBLUTIL_F( struct berval * )
 lutil_passwd_generate LDAP_P(( ber_len_t ));
 
-LDAP_LUTIL_F( struct berval * )
+LIBLUTIL_F( struct berval * )
 lutil_passwd_hash LDAP_P((
 	const struct berval *passwd,
 	const char *method ));
 
-LDAP_LUTIL_F( int )
+LIBLUTIL_F( int )
 lutil_passwd_scheme LDAP_P((
 	const char *scheme ));
 
 /* utils.c */
-LDAP_LUTIL_F( char* )
+LIBLUTIL_F( char* )
 lutil_progname LDAP_P((
 	const char* name,
 	int argc,
 	char *argv[] ));
 
 /* sockpair.c */
-LDAP_LUTIL_F( int )
+LIBLUTIL_F( int )
 lutil_pair( LBER_SOCKET_T sd[2] );
 
 LDAP_END_DECL