Diff for /include/lutil.h between versions 1.12.2.4 and 1.49.2.1

version 1.12.2.4, 2000/07/04 17:58:49 version 1.49.2.1, 2003/12/01 00:58:24
Line 1 Line 1
 /* $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.49 2003/05/14 23:18:45 ando Exp $ */
 /*  /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  * Copyright 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA   *
    * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms are permitted only   * Redistribution and use in source and binary forms, with or without
  * as authorized by the OpenLDAP Public License.  A copy of this   * modification, are permitted only as authorized by the OpenLDAP
  * license is available at http://www.OpenLDAP.org/license.html or   * Public License.
  * 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 22 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)+3)/4 * 3)
   
 /* ISC Base64 Routines */  /* ISC Base64 Routines */
 /* base64.c */  /* base64.c */
Line 52  lutil_detach LDAP_P(( Line 56  lutil_detach LDAP_P((
 /* entropy.c */  /* entropy.c */
 LDAP_LUTIL_F( int )  LDAP_LUTIL_F( int )
 lutil_entropy LDAP_P((  lutil_entropy LDAP_P((
         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;
   
   typedef int (LUTIL_PASSWD_CHK_FUNC)(
           const struct berval *scheme,
           const struct berval *passwd,
           const struct berval *cred,
           const char **text );
   
   typedef struct berval * (LUTIL_PASSWD_HASH_FUNC) (
           const struct berval *scheme,
           const struct berval *passwd,
           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 73  lutil_authpasswd_hash LDAP_P(( Line 108  lutil_authpasswd_hash LDAP_P((
   
 #if defined( SLAPD_SPASSWD ) && defined( HAVE_CYRUS_SASL )  #if defined( SLAPD_SPASSWD ) && defined( HAVE_CYRUS_SASL )
         /* cheat to avoid pulling in <sasl.h> */          /* cheat to avoid pulling in <sasl.h> */
 LDAP_LUTIL_F( struct sasl_conn * ) lutil_passwd_sasl_conn;  LDAP_LUTIL_V( struct sasl_conn * ) lutil_passwd_sasl_conn;
 #endif  #endif
   
 LDAP_LUTIL_F( int )  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( struct berval * )
 lutil_passwd_generate LDAP_P(( ber_len_t ));  lutil_passwd_generate LDAP_P(( ber_len_t ));
Line 88  lutil_passwd_generate LDAP_P(( ber_len_t Line 124  lutil_passwd_generate LDAP_P(( ber_len_t
 LDAP_LUTIL_F( struct berval * )  LDAP_LUTIL_F( struct berval * )
 lutil_passwd_hash LDAP_P((  lutil_passwd_hash LDAP_P((
         const struct berval *passwd,          const struct berval *passwd,
         const char *method ));          const char *method,
           const char **text ));
   
 LDAP_LUTIL_F( int )  LDAP_LUTIL_F( int )
 lutil_passwd_scheme LDAP_P((  lutil_passwd_scheme LDAP_P((
         const char *scheme ));          const char *scheme ));
   
   LDAP_LUTIL_F( int )
   lutil_salt_format LDAP_P((
           const char *format ));
   
 /* utils.c */  /* utils.c */
 LDAP_LUTIL_F( char* )  LDAP_LUTIL_F( char* )
 lutil_progname LDAP_P((  lutil_progname LDAP_P((
Line 101  lutil_progname LDAP_P(( Line 142  lutil_progname LDAP_P((
         int argc,          int argc,
         char *argv[] ));          char *argv[] ));
   
   LDAP_LUTIL_F( char* )
   lutil_strcopy LDAP_P(( char *dst, const char *src ));
   
   LDAP_LUTIL_F( char* )
   lutil_strncopy LDAP_P(( char *dst, const char *src, size_t n ));
   
   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 )
   lutil_localtime LDAP_P(( char *s, size_t smax, const struct tm *tm,
                           long delta ));
   
   #ifndef HAVE_MKSTEMP
   LDAP_LUTIL_F( int )
   mkstemp LDAP_P (( char * template ));
   #endif
   
 /* sockpair.c */  /* sockpair.c */
 LDAP_LUTIL_F( int )  LDAP_LUTIL_F( int )
 lutil_pair( LBER_SOCKET_T sd[2] );  lutil_pair( ber_socket_t sd[2] );
   
   /* uuid.c */
   /* use this macro to allocate buffer for lutil_uuidstr */
   #define LDAP_LUTIL_UUIDSTR_BUFSIZE      40
   LDAP_LUTIL_F( size_t )
   lutil_uuidstr( char *buf, size_t len );
   
   /* csn.c */
   /* use this macro to allocate buffer for lutil_csnstr */
   #define LDAP_LUTIL_CSNSTR_BUFSIZE       64
   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) lutil_ServiceStatus;
   LDAP_LUTIL_V (SERVICE_STATUS_HANDLE) hlutil_ServiceStatus;
   #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 */
   
   #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
   /* Generally this has only been used to put '\n' to stdout. We need to
    * make sure it is output in EBCDIC.
    */
   #undef putchar
   #undef putc
   #define putchar(c)     putc((c), stdout)
   #define putc(c,fp)     do { char x=(c); __atoe_l(&x,1); putc(x,fp); } while(0)
   #endif
   
 LDAP_END_DECL  LDAP_END_DECL
   

Removed from v.1.12.2.4  
changed lines
  Added in v.1.49.2.1


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