Diff for /include/lutil.h between versions 1.37.2.1 and 1.55

version 1.37.2.1, 2002/07/28 19:03:08 version 1.55, 2004/03/19 07:06:42
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/include/lutil.h,v 1.39 2002/07/27 00:10:02 hyc Exp $ */  /* $OpenLDAP: pkg/ldap/include/lutil.h,v 1.54 2004/03/12 19:07:58 ando Exp $ */
 /*  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  * Copyright 1998-2002 The OpenLDAP Foundation, Redwood City, California, USA   *
    * Copyright 1998-2004 The OpenLDAP Foundation.
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
  * modification, are permitted only as authorized by the OpenLDAP   * modification, are permitted only as authorized by the OpenLDAP
  * Public License.  A copy of this license is available at   * Public License.
  * http://www.OpenLDAP.org/license.html or in file LICENSE in the   *
  * top-level directory of the distribution.   * A copy of this license is available in file LICENSE in the
    * top-level directory of the distribution or, alternatively, at
    * <http://www.OpenLDAP.org/license.html>.
  */   */
   
 #ifndef _LUTIL_H  #ifndef _LUTIL_H
Line 23 Line 26
 LDAP_BEGIN_DECL  LDAP_BEGIN_DECL
   
 /* n octets encode into ceiling(n/3) * 4 bytes */  /* n octets encode into ceiling(n/3) * 4 bytes */
 /* Avoid floating point math by through extra padding */  /* Avoid floating point math through extra padding */
   
 #define LUTIL_BASE64_ENCODE_LEN(n)      ((n)/3 * 4 + 4)  #define LUTIL_BASE64_ENCODE_LEN(n)      (((n)+2)/3 * 4)
 #define LUTIL_BASE64_DECODE_LEN(n)      ((n)/4 * 3)  #define LUTIL_BASE64_DECODE_LEN(n)      ((n)/4*3)
   
 /* ISC Base64 Routines */  /* ISC Base64 Routines */
 /* base64.c */  /* base64.c */
Line 56  lutil_entropy LDAP_P(( Line 59  lutil_entropy LDAP_P((
         unsigned char *buf,          unsigned char *buf,
         ber_len_t nbytes ));          ber_len_t nbytes ));
   
   /* passfile.c */
   struct berval;  /* avoid pulling in lber.h */
   
   LDAP_LUTIL_F( int )
   lutil_get_filed_password LDAP_P((
           const char *filename,
           struct berval * ));
   
 /* passwd.c */  /* passwd.c */
 struct berval; /* avoid pulling in lber.h */  struct lutil_pw_scheme;
   
   #define LUTIL_PASSWD_OK         (0)
   #define LUTIL_PASSWD_ERR        (-1)
   
   typedef int (LUTIL_PASSWD_CHK_FUNC)(
           const struct berval *scheme,
           const struct berval *passwd,
           const struct berval *cred,
           const char **text );
   
   typedef int (LUTIL_PASSWD_HASH_FUNC) (
           const struct berval *scheme,
           const struct berval *passwd,
           struct berval *hash, 
           const char **text );
   
   LDAP_LUTIL_F( int )
   lutil_passwd_add LDAP_P((
           struct berval *scheme,
           LUTIL_PASSWD_CHK_FUNC *chk_fn,
           LUTIL_PASSWD_HASH_FUNC *hash_fn ));
   
   LDAP_LUTIL_F( void )
   lutil_passwd_init LDAP_P(( void ));
   
   LDAP_LUTIL_F( void )
   lutil_passwd_destroy LDAP_P(( void ));
   
 LDAP_LUTIL_F( int )  LDAP_LUTIL_F( int )
 lutil_authpasswd LDAP_P((  lutil_authpasswd LDAP_P((
Line 81  LDAP_LUTIL_F( int ) Line 119  LDAP_LUTIL_F( int )
 lutil_passwd LDAP_P((  lutil_passwd LDAP_P((
         const struct berval *passwd,    /* stored password */          const struct berval *passwd,    /* stored password */
         const struct berval *cred,      /* user supplied value */          const struct berval *cred,      /* user supplied value */
         const char **methods ));          const char **methods,
           const char **text ));                   /* error message */
   
 LDAP_LUTIL_F( struct berval * )  LDAP_LUTIL_F( int )
 lutil_passwd_generate LDAP_P(( ber_len_t ));  lutil_passwd_generate LDAP_P(( struct berval *pw, ber_len_t ));
   
 LDAP_LUTIL_F( struct berval * )  LDAP_LUTIL_F( int )
 lutil_passwd_hash LDAP_P((  lutil_passwd_hash LDAP_P((
         const struct berval *passwd,          const struct berval *passwd,
         const char *method ));          const char *method,
           struct berval *hash,
           const char **text ));
   
 LDAP_LUTIL_F( int )  LDAP_LUTIL_F( int )
 lutil_passwd_scheme LDAP_P((  lutil_passwd_scheme LDAP_P((
Line 106  lutil_progname LDAP_P(( Line 147  lutil_progname LDAP_P((
         int argc,          int argc,
         char *argv[] ));          char *argv[] ));
   
   #ifdef _WIN32
   LDAP_LUTIL_F( void )
   lutil_slashpath LDAP_P(( char* path ));
   #define LUTIL_SLASHPATH(p)      lutil_slashpath(p)
   #else
   #define LUTIL_SLASHPATH(p)
   #endif
   
 LDAP_LUTIL_F( char* )  LDAP_LUTIL_F( char* )
 lutil_strcopy LDAP_P(( char *dst, const char *src ));  lutil_strcopy LDAP_P(( char *dst, const char *src ));
   
Line 114  lutil_strncopy LDAP_P(( char *dst, const Line 163  lutil_strncopy LDAP_P(( char *dst, const
   
 struct tm;  struct tm;
   
   /* use this macro to statically allocate buffer for lutil_gentime */
   #define LDAP_LUTIL_GENTIME_BUFSIZE      22
   #define lutil_gentime(s,m,t)    lutil_localtime((s),(m),(t),0)
 LDAP_LUTIL_F( size_t )  LDAP_LUTIL_F( size_t )
 lutil_gentime LDAP_P(( char *s, size_t max, const struct tm *tm ));  lutil_localtime LDAP_P(( char *s, size_t smax, const struct tm *tm,
                           long delta ));
   
 #ifndef HAVE_MKSTEMP  #ifndef HAVE_MKSTEMP
 LDAP_LUTIL_F( int )  LDAP_LUTIL_F( int )
Line 127  LDAP_LUTIL_F( int ) Line 180  LDAP_LUTIL_F( int )
 lutil_pair( ber_socket_t sd[2] );  lutil_pair( ber_socket_t sd[2] );
   
 /* uuid.c */  /* uuid.c */
   /* use this macro to allocate buffer for lutil_uuidstr */
   #define LDAP_LUTIL_UUIDSTR_BUFSIZE      40
 LDAP_LUTIL_F( size_t )  LDAP_LUTIL_F( size_t )
 lutil_uuidstr( char *buf, size_t len );  lutil_uuidstr( char *buf, size_t len );
   
 /* csn.c */  /* csn.c */
   /* use this macro to allocate buffer for lutil_csnstr */
   #define LDAP_LUTIL_CSNSTR_BUFSIZE       64
 LDAP_LUTIL_F( size_t )  LDAP_LUTIL_F( size_t )
 lutil_csnstr( char *buf, size_t len, unsigned int replica, unsigned int mod );  lutil_csnstr( char *buf, size_t len, unsigned int replica, unsigned int mod );
   
Line 150  LDAP_LUTIL_V (ldap_pvt_thread_cond_t) st Line 207  LDAP_LUTIL_V (ldap_pvt_thread_cond_t) st
   
 /* macros are different between Windows and Mingw */  /* macros are different between Windows and Mingw */
 #if defined(_WINSVC_H) || defined(_WINSVC_)  #if defined(_WINSVC_H) || defined(_WINSVC_)
 LDAP_LUTIL_V (SERVICE_STATUS) SLAPDServiceStatus;  LDAP_LUTIL_V (SERVICE_STATUS) lutil_ServiceStatus;
 LDAP_LUTIL_V (SERVICE_STATUS_HANDLE) hSLAPDServiceStatus;  LDAP_LUTIL_V (SERVICE_STATUS_HANDLE) hlutil_ServiceStatus;
 #endif /* _WINSVC_H */  #endif /* _WINSVC_H */
   
   LDAP_LUTIL_F (void)
   lutil_CommenceStartupProcessing( char *serverName, void (*stopper)(int)) ;
   
   LDAP_LUTIL_F (void)
   lutil_ReportShutdownComplete( void );
   
   LDAP_LUTIL_F (void *)
   lutil_getRegParam( char *svc, char *value );
   
   LDAP_LUTIL_F (int)
   lutil_srv_install( char* service, char * displayName, char* filename,
                    int auto_start );
   LDAP_LUTIL_F (int)
   lutil_srv_remove ( char* service, char* filename );
   
 #endif /* HAVE_NT_SERVICE_MANAGER */  #endif /* HAVE_NT_SERVICE_MANAGER */
   
   #ifdef HAVE_NT_EVENT_LOG
   LDAP_LUTIL_F (void)
   lutil_LogStartedEvent( char *svc, int slap_debug, char *configfile, char *urls );
   
   LDAP_LUTIL_F (void)
   lutil_LogStoppedEvent( char *svc );
   #endif
   
 #ifdef HAVE_EBCDIC  #ifdef HAVE_EBCDIC
 /* Generally this has only been used to put '\n' to stdout. We need to  /* Generally this has only been used to put '\n' to stdout. We need to
  * make sure it is output in EBCDIC.   * make sure it is output in EBCDIC.

Removed from v.1.37.2.1  
changed lines
  Added in v.1.55


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org