mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-15 03:01:09 +08:00
dc07e765f2
This commit includes many changes. All changes compile under NT but have not been tested under UNIX. A Summary of changes (likely incomplete): NT changes: Removed lint. Clean up configuration support for "Debug", "Release", "SDebug", and "SRelease" configurations. Share output directories for clients, libraries, and slapd. (maybe they should be combined further and moved to build/{,S}{Debug,Release}). Enable threading when _MT is defined. Enable debuging when _DEBUG is defined. Disable setting of NDEBUG under Release/SRelease. Asserts are disabled in <ac/assert.h> when LDAP_DEBUG is not defined. Added 'build/main.dsp' Master project. Removed non-slapd projects from slapd.dsp (see main.dsp). Removed replaced many uses of _WIN32 macro with feature based macros. ldap_cdefs.h changes #define LDAP_CONST const (see below) #define LDAP_F(type) LDAP_F_PRE type LDAP_F_POST To allow specifiers to be added before and after the type declaration. (For DLL handling) LBER/LDAP changes Namespace changes: s/lber_/ber_/ for here and there. s/NAME_ERROR/LDAP_NAME_ERROR/g Deleted NULLMSG and other NULL* macros for namespace reasons. "const" libraries. Installed headers (ie: lber.h, ldap.h) use LDAP_CONST macro. Normally set to 'const' when __STDC__. Can be set externally to enable/disable 'constification' of external interface. Internal interface always uses 'const'. Did not fix warnings in -lldif (in lieu of new LDIF parser). Added _ext API implementations (excepting search and bind). Need to implement ldap_int_get_controls() for reponses with controls. Added numberous assert() checks. LDAP_R _MT defines HAVE_NT_THREADS Added numberous assert() checks. Changed ldap_pthread_t back to unsigned long. Used cast to HANDLE in _join(). LDBM Replaced _WIN32 with HAVE_SYSLOG ud Added version string if MKVERSION is not defined. (MKVERSION needs to be set under UNIX). slapd Made connection sockbuf field a pointer to a sockbuf. This removed slap.h dependency on lber-int.h. lber-int.h now only included by those files needing to mess with the sockbuf. Used ber_* functions/macros to access sockbuf internals whenever possible. Added version string if MKVERSION is not defined. (MKVERSION needs to be set under UNIX). Removed FD_SET unsigned lint slapd/tools Used EXEEXT to added ".exe" to routines. Need to define EXEEXT under UNIX. ldappasswd Added ldappasswd.dsp. Ported to NT. Used getpid() to seed rand(). nt_debug Minor cleanup. Added "portable.h" include and used <ac/*.h> where appropriate. Added const to char* format argument.
708 lines
15 KiB
C
708 lines
15 KiB
C
/* encode.c - ber output encoding routines */
|
|
/*
|
|
* Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
|
|
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
|
|
*/
|
|
/* Portions
|
|
* Copyright (c) 1990 Regents of the University of Michigan.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms are permitted
|
|
* provided that this notice is preserved and that due credit is given
|
|
* to the University of Michigan at Ann Arbor. The name of the University
|
|
* may not be used to endorse or promote products derived from this
|
|
* software without specific prior written permission. This software
|
|
* is provided ``as is'' without express or implied warranty.
|
|
*/
|
|
|
|
#include "portable.h"
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
#include <ac/stdarg.h>
|
|
#include <ac/socket.h>
|
|
#include <ac/string.h>
|
|
|
|
#include "lber-int.h"
|
|
|
|
static int ber_put_len LDAP_P(( BerElement *ber,
|
|
unsigned long len, int nosos ));
|
|
|
|
static int ber_start_seqorset LDAP_P(( BerElement *ber,
|
|
unsigned long tag ));
|
|
|
|
static int ber_put_seqorset LDAP_P(( BerElement *ber ));
|
|
|
|
static int ber_put_int_or_enum LDAP_P(( BerElement *ber,
|
|
long num, unsigned long tag ));
|
|
|
|
|
|
static int
|
|
ber_calc_taglen( unsigned long tag )
|
|
{
|
|
int i;
|
|
long mask;
|
|
|
|
/* find the first non-all-zero byte in the tag */
|
|
for ( i = sizeof(long) - 1; i > 0; i-- ) {
|
|
mask = (0xffL << (i * 8));
|
|
/* not all zero */
|
|
if ( tag & mask )
|
|
break;
|
|
}
|
|
|
|
return( i + 1 );
|
|
}
|
|
|
|
static int
|
|
ber_put_tag( BerElement *ber, unsigned long tag, int nosos )
|
|
{
|
|
int taglen;
|
|
unsigned long ntag;
|
|
|
|
taglen = ber_calc_taglen( tag );
|
|
|
|
ntag = AC_HTONL( tag );
|
|
|
|
return( ber_write( ber, ((char *) &ntag) + sizeof(long) - taglen,
|
|
taglen, nosos ) );
|
|
}
|
|
|
|
static int
|
|
ber_calc_lenlen( unsigned long len )
|
|
{
|
|
/*
|
|
* short len if it's less than 128 - one byte giving the len,
|
|
* with bit 8 0.
|
|
*/
|
|
|
|
if ( len <= 0x7F )
|
|
return( 1 );
|
|
|
|
/*
|
|
* long len otherwise - one byte with bit 8 set, giving the
|
|
* length of the length, followed by the length itself.
|
|
*/
|
|
|
|
if ( len <= 0xFF )
|
|
return( 2 );
|
|
if ( len <= 0xFFFFL )
|
|
return( 3 );
|
|
if ( len <= 0xFFFFFFL )
|
|
return( 4 );
|
|
|
|
return( 5 );
|
|
}
|
|
|
|
static int
|
|
ber_put_len( BerElement *ber, unsigned long len, int nosos )
|
|
{
|
|
int i;
|
|
char lenlen;
|
|
long mask;
|
|
unsigned long netlen;
|
|
|
|
assert( ber != NULL );
|
|
|
|
/*
|
|
* short len if it's less than 128 - one byte giving the len,
|
|
* with bit 8 0.
|
|
*/
|
|
|
|
if ( len <= 127 ) {
|
|
netlen = AC_HTONL( len );
|
|
return( ber_write( ber, (char *) &netlen + sizeof(long) - 1,
|
|
1, nosos ) );
|
|
}
|
|
|
|
/*
|
|
* long len otherwise - one byte with bit 8 set, giving the
|
|
* length of the length, followed by the length itself.
|
|
*/
|
|
|
|
/* find the first non-all-zero byte */
|
|
for ( i = sizeof(long) - 1; i > 0; i-- ) {
|
|
mask = (0xffL << (i * 8));
|
|
/* not all zero */
|
|
if ( len & mask )
|
|
break;
|
|
}
|
|
lenlen = (unsigned char) ++i;
|
|
if ( lenlen > 4 )
|
|
return( -1 );
|
|
lenlen |= 0x80;
|
|
|
|
/* write the length of the length */
|
|
if ( ber_write( ber, &lenlen, 1, nosos ) != 1 )
|
|
return( -1 );
|
|
|
|
/* write the length itself */
|
|
netlen = AC_HTONL( len );
|
|
if ( ber_write( ber, (char *) &netlen + (sizeof(long) - i), i, nosos )
|
|
!= i )
|
|
return( -1 );
|
|
|
|
return( i + 1 );
|
|
}
|
|
|
|
static int
|
|
ber_put_int_or_enum( BerElement *ber, long num, unsigned long tag )
|
|
{
|
|
int i, sign, taglen;
|
|
int len, lenlen;
|
|
long netnum, mask;
|
|
|
|
assert( ber != NULL );
|
|
|
|
sign = (num < 0);
|
|
|
|
/*
|
|
* high bit is set - look for first non-all-one byte
|
|
* high bit is clear - look for first non-all-zero byte
|
|
*/
|
|
for ( i = sizeof(long) - 1; i > 0; i-- ) {
|
|
mask = (0xffL << (i * 8));
|
|
|
|
if ( sign ) {
|
|
/* not all ones */
|
|
if ( (num & mask) != mask )
|
|
break;
|
|
} else {
|
|
/* not all zero */
|
|
if ( num & mask )
|
|
break;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* we now have the "leading byte". if the high bit on this
|
|
* byte matches the sign bit, we need to "back up" a byte.
|
|
*/
|
|
mask = (num & (0x80L << (i * 8)));
|
|
if ( (mask && !sign) || (sign && !mask) )
|
|
i++;
|
|
|
|
len = i + 1;
|
|
|
|
if ( (taglen = ber_put_tag( ber, tag, 0 )) == -1 )
|
|
return( -1 );
|
|
|
|
if ( (lenlen = ber_put_len( ber, len, 0 )) == -1 )
|
|
return( -1 );
|
|
i++;
|
|
netnum = AC_HTONL( num );
|
|
if ( ber_write( ber, (char *) &netnum + (sizeof(long) - i), i, 0 )
|
|
!= i )
|
|
return( -1 );
|
|
|
|
/* length of tag + length + contents */
|
|
return( taglen + lenlen + i );
|
|
}
|
|
|
|
int
|
|
ber_put_enum( BerElement *ber, long num, unsigned long tag )
|
|
{
|
|
assert( ber != NULL );
|
|
|
|
if ( tag == LBER_DEFAULT )
|
|
tag = LBER_ENUMERATED;
|
|
|
|
return( ber_put_int_or_enum( ber, num, tag ) );
|
|
}
|
|
|
|
int
|
|
ber_put_int( BerElement *ber, long num, unsigned long tag )
|
|
{
|
|
assert( ber != NULL );
|
|
|
|
if ( tag == LBER_DEFAULT )
|
|
tag = LBER_INTEGER;
|
|
|
|
return( ber_put_int_or_enum( ber, num, tag ) );
|
|
}
|
|
|
|
int
|
|
ber_put_ostring(
|
|
BerElement *ber,
|
|
LDAP_CONST char *str,
|
|
unsigned long len,
|
|
unsigned long tag )
|
|
{
|
|
int taglen, lenlen, rc;
|
|
#ifdef STR_TRANSLATION
|
|
int free_str;
|
|
#endif /* STR_TRANSLATION */
|
|
|
|
assert( ber != NULL );
|
|
assert( str != NULL );
|
|
|
|
if ( tag == LBER_DEFAULT )
|
|
tag = LBER_OCTETSTRING;
|
|
|
|
if ( (taglen = ber_put_tag( ber, tag, 0 )) == -1 )
|
|
return( -1 );
|
|
|
|
#ifdef STR_TRANSLATION
|
|
if ( len > 0 && ( ber->ber_options & LBER_TRANSLATE_STRINGS ) != 0 &&
|
|
ber->ber_encode_translate_proc ) {
|
|
if ( (*(ber->ber_encode_translate_proc))( &str, &len, 0 )
|
|
!= 0 ) {
|
|
return( -1 );
|
|
}
|
|
free_str = 1;
|
|
} else {
|
|
free_str = 0;
|
|
}
|
|
#endif /* STR_TRANSLATION */
|
|
|
|
if ( (lenlen = ber_put_len( ber, len, 0 )) == -1 ||
|
|
(unsigned long) ber_write( ber, str, len, 0 ) != len ) {
|
|
rc = -1;
|
|
} else {
|
|
/* return length of tag + length + contents */
|
|
rc = taglen + lenlen + len;
|
|
}
|
|
|
|
#ifdef STR_TRANSLATION
|
|
if ( free_str ) {
|
|
free( str );
|
|
}
|
|
#endif /* STR_TRANSLATION */
|
|
|
|
return( rc );
|
|
}
|
|
int
|
|
ber_put_berval(
|
|
BerElement *ber,
|
|
LDAP_CONST struct berval *bv,
|
|
unsigned long tag )
|
|
{
|
|
assert( ber != NULL );
|
|
assert( bv != NULL );
|
|
|
|
if( bv == NULL ) {
|
|
return -1;
|
|
}
|
|
|
|
return ber_put_ostring( ber, bv->bv_val, bv->bv_len, tag );
|
|
}
|
|
|
|
int
|
|
ber_put_string(
|
|
BerElement *ber,
|
|
LDAP_CONST char *str,
|
|
unsigned long tag )
|
|
{
|
|
assert( ber != NULL );
|
|
assert( str != NULL );
|
|
|
|
return( ber_put_ostring( ber, str, strlen( str ), tag ));
|
|
}
|
|
|
|
int
|
|
ber_put_bitstring(
|
|
BerElement *ber,
|
|
LDAP_CONST char *str,
|
|
unsigned long blen /* in bits */,
|
|
unsigned long tag )
|
|
{
|
|
int taglen, lenlen, len;
|
|
unsigned char unusedbits;
|
|
|
|
assert( ber != NULL );
|
|
assert( str != NULL );
|
|
|
|
if ( tag == LBER_DEFAULT )
|
|
tag = LBER_BITSTRING;
|
|
|
|
if ( (taglen = ber_put_tag( ber, tag, 0 )) == -1 )
|
|
return( -1 );
|
|
|
|
len = ( blen + 7 ) / 8;
|
|
unusedbits = (unsigned char) ((len * 8) - blen);
|
|
if ( (lenlen = ber_put_len( ber, len + 1, 0 )) == -1 )
|
|
return( -1 );
|
|
|
|
if ( ber_write( ber, (char *)&unusedbits, 1, 0 ) != 1 )
|
|
return( -1 );
|
|
|
|
if ( ber_write( ber, str, len, 0 ) != len )
|
|
return( -1 );
|
|
|
|
/* return length of tag + length + unused bit count + contents */
|
|
return( taglen + 1 + lenlen + len );
|
|
}
|
|
|
|
int
|
|
ber_put_null( BerElement *ber, unsigned long tag )
|
|
{
|
|
int taglen;
|
|
|
|
if ( tag == LBER_DEFAULT )
|
|
tag = LBER_NULL;
|
|
|
|
if ( (taglen = ber_put_tag( ber, tag, 0 )) == -1 )
|
|
return( -1 );
|
|
|
|
if ( ber_put_len( ber, 0, 0 ) != 1 )
|
|
return( -1 );
|
|
|
|
return( taglen + 1 );
|
|
}
|
|
|
|
int
|
|
ber_put_boolean( BerElement *ber, int boolval, unsigned long tag )
|
|
{
|
|
int taglen;
|
|
unsigned char trueval = 0xff;
|
|
unsigned char falseval = 0x00;
|
|
|
|
assert( ber != NULL );
|
|
|
|
if ( tag == LBER_DEFAULT )
|
|
tag = LBER_BOOLEAN;
|
|
|
|
if ( (taglen = ber_put_tag( ber, tag, 0 )) == -1 )
|
|
return( -1 );
|
|
|
|
if ( ber_put_len( ber, 1, 0 ) != 1 )
|
|
return( -1 );
|
|
|
|
if ( ber_write( ber, (char *)(boolval ? &trueval : &falseval), 1, 0 )
|
|
!= 1 )
|
|
return( -1 );
|
|
|
|
return( taglen + 2 );
|
|
}
|
|
|
|
#define FOUR_BYTE_LEN 5
|
|
|
|
static int
|
|
ber_start_seqorset( BerElement *ber, unsigned long tag )
|
|
{
|
|
Seqorset *new;
|
|
|
|
assert( ber != NULL );
|
|
|
|
if ( (new = (Seqorset *) calloc( sizeof(Seqorset), 1 ))
|
|
== NULLSEQORSET )
|
|
return( -1 );
|
|
new->sos_ber = ber;
|
|
if ( ber->ber_sos == NULLSEQORSET )
|
|
new->sos_first = ber->ber_ptr;
|
|
else
|
|
new->sos_first = ber->ber_sos->sos_ptr;
|
|
|
|
/* Set aside room for a 4 byte length field */
|
|
new->sos_ptr = new->sos_first + ber_calc_taglen( tag ) + FOUR_BYTE_LEN;
|
|
new->sos_tag = tag;
|
|
|
|
new->sos_next = ber->ber_sos;
|
|
ber->ber_sos = new;
|
|
|
|
return( 0 );
|
|
}
|
|
|
|
int
|
|
ber_start_seq( BerElement *ber, unsigned long tag )
|
|
{
|
|
assert( ber != NULL );
|
|
|
|
if ( tag == LBER_DEFAULT )
|
|
tag = LBER_SEQUENCE;
|
|
|
|
return( ber_start_seqorset( ber, tag ) );
|
|
}
|
|
|
|
int
|
|
ber_start_set( BerElement *ber, unsigned long tag )
|
|
{
|
|
assert( ber != NULL );
|
|
|
|
if ( tag == LBER_DEFAULT )
|
|
tag = LBER_SET;
|
|
|
|
return( ber_start_seqorset( ber, tag ) );
|
|
}
|
|
|
|
static int
|
|
ber_put_seqorset( BerElement *ber )
|
|
{
|
|
unsigned long len, netlen;
|
|
int taglen, lenlen;
|
|
unsigned char ltag = 0x80 + FOUR_BYTE_LEN - 1;
|
|
Seqorset *next;
|
|
Seqorset **sos = &ber->ber_sos;
|
|
|
|
assert( ber != NULL );
|
|
|
|
/*
|
|
* If this is the toplevel sequence or set, we need to actually
|
|
* write the stuff out. Otherwise, it's already been put in
|
|
* the appropriate buffer and will be written when the toplevel
|
|
* one is written. In this case all we need to do is update the
|
|
* length and tag.
|
|
*/
|
|
|
|
len = (*sos)->sos_clen;
|
|
netlen = AC_HTONL( len );
|
|
if ( sizeof(long) > 4 && len > 0xFFFFFFFFL )
|
|
return( -1 );
|
|
|
|
if ( ber->ber_options & LBER_USE_DER ) {
|
|
lenlen = ber_calc_lenlen( len );
|
|
} else {
|
|
lenlen = FOUR_BYTE_LEN;
|
|
}
|
|
|
|
if ( (next = (*sos)->sos_next) == NULLSEQORSET ) {
|
|
/* write the tag */
|
|
if ( (taglen = ber_put_tag( ber, (*sos)->sos_tag, 1 )) == -1 )
|
|
return( -1 );
|
|
|
|
if ( ber->ber_options & LBER_USE_DER ) {
|
|
/* Write the length in the minimum # of octets */
|
|
if ( ber_put_len( ber, len, 1 ) == -1 )
|
|
return( -1 );
|
|
|
|
if (lenlen != FOUR_BYTE_LEN) {
|
|
/*
|
|
* We set aside FOUR_BYTE_LEN bytes for
|
|
* the length field. Move the data if
|
|
* we don't actually need that much
|
|
*/
|
|
SAFEMEMCPY( (*sos)->sos_first + taglen +
|
|
lenlen, (*sos)->sos_first + taglen +
|
|
FOUR_BYTE_LEN, len );
|
|
}
|
|
} else {
|
|
/* Fill FOUR_BYTE_LEN bytes for length field */
|
|
/* one byte of length length */
|
|
if ( ber_write( ber, (char *)<ag, 1, 1 ) != 1 )
|
|
return( -1 );
|
|
|
|
/* the length itself */
|
|
if ( ber_write( ber, (char *) &netlen + sizeof(long)
|
|
- (FOUR_BYTE_LEN - 1), FOUR_BYTE_LEN - 1, 1 )
|
|
!= FOUR_BYTE_LEN - 1 )
|
|
return( -1 );
|
|
}
|
|
/* The ber_ptr is at the set/seq start - move it to the end */
|
|
(*sos)->sos_ber->ber_ptr += len;
|
|
} else {
|
|
unsigned long ntag;
|
|
|
|
/* the tag */
|
|
taglen = ber_calc_taglen( (*sos)->sos_tag );
|
|
ntag = AC_HTONL( (*sos)->sos_tag );
|
|
SAFEMEMCPY( (*sos)->sos_first, (char *) &ntag +
|
|
sizeof(long) - taglen, taglen );
|
|
|
|
if ( ber->ber_options & LBER_USE_DER ) {
|
|
ltag = (lenlen == 1)
|
|
? (unsigned char) len
|
|
: 0x80 + (lenlen - 1);
|
|
}
|
|
|
|
/* one byte of length length */
|
|
SAFEMEMCPY( (*sos)->sos_first + 1, <ag, 1 );
|
|
|
|
if ( ber->ber_options & LBER_USE_DER ) {
|
|
if (lenlen > 1) {
|
|
/* Write the length itself */
|
|
SAFEMEMCPY( (*sos)->sos_first + 2,
|
|
(char *)&netlen + sizeof(unsigned long) -
|
|
(lenlen - 1),
|
|
lenlen - 1 );
|
|
}
|
|
if (lenlen != FOUR_BYTE_LEN) {
|
|
/*
|
|
* We set aside FOUR_BYTE_LEN bytes for
|
|
* the length field. Move the data if
|
|
* we don't actually need that much
|
|
*/
|
|
SAFEMEMCPY( (*sos)->sos_first + taglen +
|
|
lenlen, (*sos)->sos_first + taglen +
|
|
FOUR_BYTE_LEN, len );
|
|
}
|
|
} else {
|
|
/* the length itself */
|
|
SAFEMEMCPY( (*sos)->sos_first + taglen + 1,
|
|
(char *) &netlen + sizeof(long) -
|
|
(FOUR_BYTE_LEN - 1), FOUR_BYTE_LEN - 1 );
|
|
}
|
|
|
|
next->sos_clen += (taglen + lenlen + len);
|
|
next->sos_ptr += (taglen + lenlen + len);
|
|
}
|
|
|
|
/* we're done with this seqorset, so free it up */
|
|
free( (char *) (*sos) );
|
|
*sos = next;
|
|
|
|
return( taglen + lenlen + len );
|
|
}
|
|
|
|
int
|
|
ber_put_seq( BerElement *ber )
|
|
{
|
|
assert( ber != NULL );
|
|
return( ber_put_seqorset( ber ) );
|
|
}
|
|
|
|
int
|
|
ber_put_set( BerElement *ber )
|
|
{
|
|
assert( ber != NULL );
|
|
return( ber_put_seqorset( ber ) );
|
|
}
|
|
|
|
/* VARARGS */
|
|
int
|
|
ber_printf
|
|
#ifdef HAVE_STDARG
|
|
( BerElement *ber,
|
|
LDAP_CONST char *fmt,
|
|
... )
|
|
#else
|
|
( va_alist )
|
|
va_dcl
|
|
#endif
|
|
{
|
|
va_list ap;
|
|
#ifndef HAVE_STDARG
|
|
BerElement *ber;
|
|
char *fmt;
|
|
#endif
|
|
char *s, **ss;
|
|
struct berval *bv, **bvp;
|
|
int rc, i;
|
|
unsigned long len;
|
|
|
|
#ifdef HAVE_STDARG
|
|
va_start( ap, fmt );
|
|
#else
|
|
va_start( ap );
|
|
ber = va_arg( ap, BerElement * );
|
|
fmt = va_arg( ap, char * );
|
|
#endif
|
|
|
|
assert( ber != NULL );
|
|
assert( fmt != NULL );
|
|
|
|
for ( rc = 0; *fmt && rc != -1; fmt++ ) {
|
|
switch ( *fmt ) {
|
|
case '!': { /* hook */
|
|
BEREncodeCallback *f;
|
|
void *p;
|
|
|
|
f = va_arg( ap, BEREncodeCallback * );
|
|
p = va_arg( ap, void * );
|
|
|
|
rc = (*f)( ber, p );
|
|
} break;
|
|
|
|
case 'b': /* boolean */
|
|
i = va_arg( ap, int );
|
|
rc = ber_put_boolean( ber, i, ber->ber_tag );
|
|
break;
|
|
|
|
case 'i': /* int */
|
|
i = va_arg( ap, int );
|
|
rc = ber_put_int( ber, i, ber->ber_tag );
|
|
break;
|
|
|
|
case 'e': /* enumeration */
|
|
i = va_arg( ap, int );
|
|
rc = ber_put_enum( ber, i, ber->ber_tag );
|
|
break;
|
|
|
|
case 'n': /* null */
|
|
rc = ber_put_null( ber, ber->ber_tag );
|
|
break;
|
|
|
|
case 'o': /* octet string (non-null terminated) */
|
|
s = va_arg( ap, char * );
|
|
len = va_arg( ap, int );
|
|
rc = ber_put_ostring( ber, s, len, ber->ber_tag );
|
|
break;
|
|
|
|
case 'O': /* berval octet string */
|
|
bv = va_arg( ap, struct berval * );
|
|
if( bv == NULL ) break;
|
|
rc = ber_put_berval( ber, bv, ber->ber_tag );
|
|
break;
|
|
|
|
case 's': /* string */
|
|
s = va_arg( ap, char * );
|
|
rc = ber_put_string( ber, s, ber->ber_tag );
|
|
break;
|
|
|
|
case 'B': /* bit string */
|
|
s = va_arg( ap, char * );
|
|
len = va_arg( ap, int ); /* in bits */
|
|
rc = ber_put_bitstring( ber, s, len, ber->ber_tag );
|
|
break;
|
|
|
|
case 't': /* tag for the next element */
|
|
ber->ber_tag = va_arg( ap, unsigned long );
|
|
ber->ber_usertag = 1;
|
|
break;
|
|
|
|
case 'v': /* vector of strings */
|
|
if ( (ss = va_arg( ap, char ** )) == NULL )
|
|
break;
|
|
for ( i = 0; ss[i] != NULL; i++ ) {
|
|
if ( (rc = ber_put_string( ber, ss[i],
|
|
ber->ber_tag )) == -1 )
|
|
break;
|
|
}
|
|
break;
|
|
|
|
case 'V': /* sequences of strings + lengths */
|
|
if ( (bvp = va_arg( ap, struct berval ** )) == NULL )
|
|
break;
|
|
for ( i = 0; bvp[i] != NULL; i++ ) {
|
|
if ( (rc = ber_put_ostring( ber, bvp[i]->bv_val,
|
|
bvp[i]->bv_len, ber->ber_tag )) == -1 )
|
|
break;
|
|
}
|
|
break;
|
|
|
|
case '{': /* begin sequence */
|
|
rc = ber_start_seq( ber, ber->ber_tag );
|
|
break;
|
|
|
|
case '}': /* end sequence */
|
|
rc = ber_put_seqorset( ber );
|
|
break;
|
|
|
|
case '[': /* begin set */
|
|
rc = ber_start_set( ber, ber->ber_tag );
|
|
break;
|
|
|
|
case ']': /* end set */
|
|
rc = ber_put_seqorset( ber );
|
|
break;
|
|
|
|
default:
|
|
if( ber->ber_debug ) {
|
|
ber_log_printf( LDAP_DEBUG_ANY, ber->ber_debug,
|
|
"ber_printf: unknown fmt %c\n", *fmt );
|
|
}
|
|
rc = -1;
|
|
break;
|
|
}
|
|
|
|
if ( ber->ber_usertag == 0 )
|
|
ber->ber_tag = LBER_DEFAULT;
|
|
else
|
|
ber->ber_usertag = 0;
|
|
}
|
|
|
|
va_end( ap );
|
|
|
|
return( rc );
|
|
}
|