X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Flutil.h;h=1ebba1b46685b9ad53347641e7fa6c5d87fd5af4;hb=975a5e9a24e971197baa9ea2d4479100977c9060;hp=39e7d70f2bfd6c3f9c31c08f210ac2080d336657;hpb=0991e22550247e142a5e10dee3c7e29dbb8af7e1;p=openldap

diff --git a/include/lutil.h b/include/lutil.h
index 39e7d70f2b..1ebba1b466 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
@@ -21,15 +22,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,53 +31,119 @@ 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 )
-lutil_entorpy LDAP_P((
-	char *buf,
-	int nbytes ));
+LDAP_LUTIL_F( int )
+lutil_entropy LDAP_P((
+	unsigned char *buf,
+	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_V( 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 ));
+
+LDAP_LUTIL_F( int )
+lutil_salt_format LDAP_P((
+	const char *format ));
 
 /* utils.c */
-LDAP_F( char* )
+LDAP_LUTIL_F( char* )
 lutil_progname LDAP_P((
 	const char* name,
 	int argc,
 	char *argv[] ));
 
+#ifndef HAVE_MKSTEMP
+LDAP_LUTIL_F( int )
+mkstemp LDAP_P (( char * template ));
+#endif
+
 /* sockpair.c */
-LDAP_F( int )
-lutil_pair( LBER_SOCKET_T sd[2] );
+LDAP_LUTIL_F( int )
+lutil_pair( ber_socket_t sd[2] );
+
+/* uuid.c */
+LDAP_LUTIL_F( size_t )
+lutil_uuidstr( char *buf, size_t len );
+
+/* csn.c */
+LDAP_LUTIL_F( size_t )
+lutil_csnstr( char *buf, size_t len, unsigned int replica, unsigned int mod );
+
+/*
+ * Sometimes not all declarations in a header file are needed.
+ * An indicator to this is whether or not the symbol's type has
+ * been defined. Thus, we don't need to include a symbol if
+ * its type has not been defined through another header file.
+ */
+
+#ifdef HAVE_NT_SERVICE_MANAGER
+LDAP_LUTIL_V (int) is_NT_Service;
+
+#ifdef _LDAP_PVT_THREAD_H
+LDAP_LUTIL_V (ldap_pvt_thread_cond_t) started_event;
+#endif /* _LDAP_PVT_THREAD_H */
+
+/* macros are different between Windows and Mingw */
+#if defined(_WINSVC_H) || defined(_WINSVC_)
+LDAP_LUTIL_V (SERVICE_STATUS) SLAPDServiceStatus;
+LDAP_LUTIL_V (SERVICE_STATUS_HANDLE) hSLAPDServiceStatus;
+#endif /* _WINSVC_H */
+
+#endif /* HAVE_NT_SERVICE_MANAGER */
 
 LDAP_END_DECL