X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foidm.c;h=0e0f6210a34363626f69820fa36f2479ec786c9d;hb=5c3a4e176e9539f58a1ac666ad370b4c204cd44c;hp=15e5ac61c6127972b64f391f11cd601185859ba5;hpb=d611a4b49a00238ed32ae84c68f27c6a0ef2273a;p=openldap
diff --git a/servers/slapd/oidm.c b/servers/slapd/oidm.c
index 15e5ac61c6..0e0f6210a3 100644
--- a/servers/slapd/oidm.c
+++ b/servers/slapd/oidm.c
@@ -2,7 +2,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -23,9 +23,10 @@
#include
#include "slap.h"
+#include "lutil.h"
-static LDAP_SLIST_HEAD(OidMacroList, slap_oid_macro) om_list
- = LDAP_SLIST_HEAD_INITIALIZER(om_list);
+static LDAP_STAILQ_HEAD(OidMacroList, slap_oid_macro) om_list
+ = LDAP_STAILQ_HEAD_INITIALIZER(om_list);
/* Replace an OID Macro invocation with its full numeric OID.
* If the macro is used with "macroname:suffix" append ".suffix"
@@ -41,15 +42,15 @@ oidm_find(char *oid)
return oid;
}
- LDAP_SLIST_FOREACH( om, &om_list, som_next ) {
- char **names = om->som_names;
+ LDAP_STAILQ_FOREACH( om, &om_list, som_next ) {
+ BerVarray names = om->som_names;
if( names == NULL ) {
continue;
}
- for( ; *names != NULL ; names++ ) {
- int pos = dscompare(*names, oid, ':');
+ for( ; !BER_BVISNULL( names ) ; names++ ) {
+ int pos = dscompare(names->bv_val, oid, ':');
if( pos ) {
int suflen = strlen(oid + pos);
@@ -77,11 +78,12 @@ void
oidm_destroy()
{
OidMacro *om;
- while( !LDAP_SLIST_EMPTY( &om_list )) {
- om = LDAP_SLIST_FIRST( &om_list );
- LDAP_SLIST_REMOVE_HEAD( &om_list, som_next );
+ while( !LDAP_STAILQ_EMPTY( &om_list )) {
+ om = LDAP_STAILQ_FIRST( &om_list );
+ LDAP_STAILQ_REMOVE_HEAD( &om_list, som_next );
- ldap_charray_free(om->som_names);
+ ber_bvarray_free(om->som_names);
+ ber_bvarray_free(om->som_subs);
free(om->som_oid.bv_val);
free(om);
@@ -93,10 +95,13 @@ parse_oidm(
const char *fname,
int lineno,
int argc,
- char **argv )
+ char **argv,
+ int user,
+ OidMacro **rom)
{
char *oid;
OidMacro *om;
+ struct berval bv;
if (argc != 3) {
fprintf( stderr, "%s: line %d: too many arguments\n",
@@ -120,9 +125,12 @@ usage: fprintf( stderr, "\tObjectIdentifier \n");
return 1;
}
- LDAP_SLIST_NEXT( om, som_next ) = NULL;
om->som_names = NULL;
- ldap_charray_add( &om->som_names, argv[1] );
+ om->som_subs = NULL;
+ ber_str2bv( argv[1], 0, 1, &bv );
+ ber_bvarray_add( &om->som_names, &bv );
+ ber_str2bv( argv[2], 0, 1, &bv );
+ ber_bvarray_add( &om->som_subs, &bv );
om->som_oid.bv_val = oidm_find( argv[2] );
if (!om->som_oid.bv_val) {
@@ -136,7 +144,58 @@ usage: fprintf( stderr, "\tObjectIdentifier \n");
}
om->som_oid.bv_len = strlen( om->som_oid.bv_val );
+ if ( !user )
+ om->som_flags |= SLAP_OM_HARDCODE;
- LDAP_SLIST_INSERT_HEAD( &om_list, om, som_next );
+ LDAP_STAILQ_INSERT_TAIL( &om_list, om, som_next );
+ if ( rom ) *rom = om;
return 0;
}
+
+void oidm_unparse( BerVarray *res, OidMacro *start, OidMacro *end, int sys )
+{
+ OidMacro *om;
+ int i, j, num;
+ struct berval bv, *bva = NULL, idx;
+ char ibuf[32], *ptr;
+
+ if ( !start )
+ start = LDAP_STAILQ_FIRST( &om_list );
+
+ /* count the result size */
+ i = 0;
+ for ( om=start; om; om=LDAP_STAILQ_NEXT(om, som_next)) {
+ if ( sys && !(om->som_flags & SLAP_OM_HARDCODE)) continue;
+ for ( j=0; !BER_BVISNULL(&om->som_names[j]); j++ );
+ i += j;
+ if ( om == end ) break;
+ }
+ num = i;
+ if (!i) return;
+
+ bva = ch_malloc( (num+1) * sizeof(struct berval) );
+ BER_BVZERO( bva+num );
+ idx.bv_val = ibuf;
+ if ( sys ) {
+ idx.bv_len = 0;
+ ibuf[0] = '\0';
+ }
+ for ( i=0,om=start; om; om=LDAP_STAILQ_NEXT(om, som_next)) {
+ if ( sys && !(om->som_flags & SLAP_OM_HARDCODE)) continue;
+ for ( j=0; !BER_BVISNULL(&om->som_names[j]); i++,j++ ) {
+ if ( !sys ) {
+ idx.bv_len = sprintf(idx.bv_val, "{%02d}", i );
+ }
+ bva[i].bv_len = idx.bv_len + om->som_names[j].bv_len +
+ om->som_subs[j].bv_len + 1;
+ bva[i].bv_val = ch_malloc( bva[i].bv_len + 1 );
+ ptr = lutil_strcopy( bva[i].bv_val, ibuf );
+ ptr = lutil_strcopy( ptr, om->som_names[j].bv_val );
+ *ptr++ = ' ';
+ strcpy( ptr, om->som_subs[j].bv_val );
+ }
+ if ( i>=num ) break;
+ if ( om == end ) break;
+ }
+ *res = bva;
+}