+/* $OpenLDAP$ */
/*
* Copyright (c) 1990 Regents of the University of Michigan.
* All rights reserved.
* is provided ``as is'' without express or implied warranty.
*/
+#include "portable.h"
+
#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
+
+#include <ac/ctype.h>
+#include <ac/socket.h>
+#include <ac/string.h>
+
#include <quipu/commonarg.h>
#include <quipu/attrvalue.h>
#include <quipu/ds_error.h>
#include <quipu/ds_search.h>
#include <quipu/dap2.h>
#include <quipu/dua.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+extern oid_table_attr *name2attr( char * );
+/*extern AttributeValue str_at2AttrV( char *, IF_AttributeType * );*/
+
#include "lber.h"
+#include "../../libraries/liblber/lber-int.h" /* get struct berelement */
#include "ldap.h"
#include "common.h"
static void de_t61( char *s, int t61mark );
static int syntax_is_string( short syntax );
-static get_one_syntax( char *attrib, int required )
+static int
+get_one_syntax( char *attrib, int required )
{
- oid_table_attr *p, *name2attr();
+ oid_table_attr *p;
if ( (p = name2attr( attrib )) != (oid_table_attr *) 0 )
return( p->oa_syntax );
}
void
-get_syntaxes()
+get_syntaxes( void )
{
- oid_table_attr *name2attr();
-
Debug( LDAP_DEBUG_TRACE, "get_syntaxes\n", 0, 0, 0 );
ldap_photo_syntax = get_one_syntax( "photo", 0 );
* notation. (e.g., OID.2.6.53).
*
*/
-static void attr_key_rfc1779 (
+static void
+attr_key_rfc1779(
AttributeType at,
char *key /* return key, caller allocated */
)
if ( x == NULL ) {
x = "?";
- } else if ( isdigit ( *x ) ) {
+ } else if ( isdigit ( (unsigned char) *x ) ) {
sprintf ( key, "OID.%s", x );
return;
} else if (strcasecmp(x,"commonName")==0) {
strcpy ( key, x );
}
-#define SEPARATOR(c) (c == ',' || c == ';')
-#define SPACE(c) (c == ' ' || c == '\n')
+#define SEPARATOR(c) ((c) == ',' || (c) == ';')
+#define SPACE(c) ((c) == ' ' || (c) == '\n')
int
dn_print_real(
int firstrdn;
char *value;
PS rps;
- void ldap_dn_print();
char key[512];
if ( dn == NULLDN )
return( rc );
}
-static put_jpeg_value( BerElement *ber, AttributeValue av )
+static int
+put_jpeg_value( BerElement *ber, AttributeValue av )
{
PE pe;
int len;
return( 0 );
}
-static put_audio_value( BerElement *ber, AttributeValue av )
+static int
+put_audio_value( BerElement *ber, AttributeValue av )
{
struct qbuf *qb, *p;
int rc, len;
return( rc );
}
-static put_photo_value( BerElement *ber, AttributeValue av )
+static int
+put_photo_value( BerElement *ber, AttributeValue av )
{
PE pe;
PS ps;
len = ps_get_abs( pe );
Debug( LDAP_DEBUG_ARGS, "put_photo_val: ber_printf %d bytes\n",
len, 0, 0 );
- if (( phber = der_alloc()) == NULLBER ) {
+ if (( phber = der_alloc()) == NULL ) {
Debug( LDAP_DEBUG_ANY, "der_alloc failed\n", 0, 0, 0 );
return( -1 );
}
return( 0 );
}
-static put_values(
+static int
+put_values(
BerElement *ber,
PS ps,
short syntax,
encode_attrs( BerElement *ber, Attr_Sequence as )
{
PS ps;
-#ifdef COMPAT20
- extern int ldap_compat;
-#endif
Debug( LDAP_DEBUG_TRACE, "encode_attrs\n", 0, 0, 0 );
if ( str_setup( ps, NULLCP, 0, 0 ) == NOTOK )
return( -1 );
-#ifdef COMPAT20
+#ifdef LDAP_COMPAT20
if ( ber_printf( ber, "t{", ldap_compat == 20 ? OLD_LBER_SEQUENCE :
LBER_SEQUENCE ) == -1 ) {
#else
AttrT_print( ps, as->attr_type, EDBOUT );
*ps->ps_ptr = '\0';
-#ifdef COMPAT20
+#ifdef LDAP_COMPAT20
if ( ber_printf( ber, "t{st[", ldap_compat == 20 ?
OLD_LBER_SEQUENCE : LBER_SEQUENCE, ps->ps_base,
ldap_compat == 20 ? OLD_LBER_SET : LBER_SET ) == -1 ) {
}
}
-DN ldap_str2dn( char *str )
+DN
+ldap_str2dn( char *str )
{
DN dn, save;
RDN rdn, newrdn, tmprdn;
#define T61 "{T.61}"
#define T61LEN 6
-static void de_t61( char *s, int t61mark )
+static void
+de_t61( char *s, int t61mark )
{
char *next = s;
- int c, hex;
+ unsigned char c;
+ unsigned int hex;
while ( *s ) {
switch ( *s ) {
ldap_str_at2AttrV( char *str, AttributeType type )
{
char *s, *res, *r;
- AttributeValue str_at2AttrV();
Debug( LDAP_DEBUG_TRACE, "ldap_str_at2AttrV str (%s) type (%s)\n", str,
type->oa_ot.ot_name, 0 );