X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Flutil.h;h=1fd11221e93996217baf3bdea16fff94cdbe93a3;hb=5714f8565ff4228270ed2c97f78f5b31ce085b6e;hp=ea2450c4a1264df3ed446301e06a235dff0b63af;hpb=dc0eacd40b625258355eea866d62188e5aa7ce3b;p=openldap
diff --git a/include/lutil.h b/include/lutil.h
index ea2450c4a1..1fd11221e9 100644
--- a/include/lutil.h
+++ b/include/lutil.h
@@ -1,7 +1,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -110,9 +110,12 @@ lutil_authpasswd_hash LDAP_P((
struct berval **salt, /* salt to store */
const char *method ));
-#if defined( SLAPD_SPASSWD ) && defined( HAVE_CYRUS_SASL )
- /* cheat to avoid pulling in */
-LDAP_LUTIL_V( struct sasl_conn * ) lutil_passwd_sasl_conn;
+#ifdef SLAPD_CRYPT
+typedef int (lutil_cryptfunc) LDAP_P((
+ const char *key,
+ const char *salt,
+ char **hash ));
+LDAP_LUTIL_V (lutil_cryptfunc *) lutil_cryptptr;
#endif
LDAP_LUTIL_F( int )
@@ -147,7 +150,7 @@ lutil_progname LDAP_P((
int argc,
char *argv[] ));
-struct lutil_tm {
+typedef struct lutil_tm {
int tm_sec; /* seconds 0-60 (1 leap second) */
int tm_min; /* minutes 0-59 */
int tm_hour; /* hours 0-23 */
@@ -157,7 +160,7 @@ struct lutil_tm {
int tm_usec; /* microseconds */
} lutil_tm;
-struct lutil_timet {
+typedef struct lutil_timet {
unsigned int tt_sec; /* seconds since 1900 */
int tt_gsec; /* seconds since 1900, high 7 bits */
unsigned int tt_usec; /* microseconds */
@@ -270,6 +273,29 @@ lutil_LogStoppedEvent( char *svc );
#define putc(c,fp) do { char x=(c); __atoe_l(&x,1); putc(x,fp); } while(0)
#endif
+LDAP_LUTIL_F (int)
+lutil_atoix( int *v, const char *s, int x );
+
+LDAP_LUTIL_F (int)
+lutil_atoux( unsigned *v, const char *s, int x );
+
+LDAP_LUTIL_F (int)
+lutil_atolx( long *v, const char *s, int x );
+
+LDAP_LUTIL_F (int)
+lutil_atoulx( unsigned long *v, const char *s, int x );
+
+#define lutil_atoi(v, s) lutil_atoix((v), (s), 10)
+#define lutil_atou(v, s) lutil_atoux((v), (s), 10)
+#define lutil_atol(v, s) lutil_atolx((v), (s), 10)
+#define lutil_atoul(v, s) lutil_atoulx((v), (s), 10)
+
+LDAP_LUTIL_F (int)
+lutil_parse_time( const char *in, unsigned long *tp );
+
+LDAP_LUTIL_F (int)
+lutil_unparse_time( char *buf, size_t buflen, unsigned long t );
+
LDAP_END_DECL
#endif /* _LUTIL_H */