X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Flutil.h;h=534cfe660aec4ca6b886a7060b04936e3c53d8cc;hb=78066c08c0650e5b1e7e205946d409e3dd10e73b;hp=9a385aca3dc36e4d1efae59ea3f4f862b5c06aa4;hpb=5e12c84a6f3ab84bd4d70b55e0ff3e928031d95c;p=openldap

diff --git a/include/lutil.h b/include/lutil.h
index 9a385aca3d..534cfe660a 100644
--- a/include/lutil.h
+++ b/include/lutil.h
@@ -1,12 +1,13 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms 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.
+ * 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.
  */
 
 #ifndef _LUTIL_H
@@ -30,59 +31,84 @@ 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 ));
+	unsigned char *buf,
+	ber_len_t nbytes ));
 
 /* passwd.c */
 struct berval; /* avoid pulling in lber.h */
 
-LIBLUTIL_F( int )
+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 struct berval *passwd,	/* stored password */
 	const struct berval *cred,	/* user supplied value */
 	const char **methods ));
 
-LIBLUTIL_F( struct berval * )
-lutil_passwd_generate LDAP_P((
+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 )
+LDAP_LUTIL_F( int )
 lutil_passwd_scheme LDAP_P((
 	const char *scheme ));
 
+LDAP_LUTIL_F( int )
+lutil_salt_format LDAP_P((
+	const char *format ));
+
 /* 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 )
-lutil_pair( LBER_SOCKET_T sd[2] );
+LDAP_LUTIL_F( int )
+lutil_pair( ber_socket_t sd[2] );
 
 LDAP_END_DECL