X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foidm.c;h=3279336e8f819cac2a5f76fa6a59712776e8f00f;hb=dcd5c749144d327a75b031b68a1fca80407551ad;hp=0bc6f53102d32896b7c1c0101d8d258b1fa0a7aa;hpb=acbb5cf689a4336af05c9f259d909d8141055bac;p=openldap

diff --git a/servers/slapd/oidm.c b/servers/slapd/oidm.c
index 0bc6f53102..3279336e8f 100644
--- a/servers/slapd/oidm.c
+++ b/servers/slapd/oidm.c
@@ -24,10 +24,13 @@
 
 #include "slap.h"
 #include "lutil.h"
+#include "config.h"
 
 static LDAP_STAILQ_HEAD(OidMacroList, slap_oid_macro) om_list
 	= LDAP_STAILQ_HEAD_INITIALIZER(om_list);
 
+OidMacro *om_sys_tail;
+
 /* Replace an OID Macro invocation with its full numeric OID.
  * If the macro is used with "macroname:suffix" append ".suffix"
  * to the expansion.
@@ -92,62 +95,68 @@ oidm_destroy()
 
 int
 parse_oidm(
-    const char	*fname,
-    int		lineno,
-    int		argc,
-    char 	**argv,
+	struct config_args_s *c,
 	int		user,
 	OidMacro **rom)
 {
 	char *oid;
-	OidMacro *om;
+	OidMacro *om = NULL, *prev = NULL;
 	struct berval bv;
 
-	if (argc != 3) {
-		fprintf( stderr, "%s: line %d: too many arguments\n",
-			fname, lineno );
-usage:	fprintf( stderr, "\tObjectIdentifier <name> <oid>\n");
-		return 1;
-	}
-
-	oid = oidm_find( argv[1] );
+	oid = oidm_find( c->argv[1] );
 	if( oid != NULL ) {
-		fprintf( stderr,
-			"%s: line %d: "
-			"ObjectIdentifier \"%s\" previously defined \"%s\"",
-			fname, lineno, argv[1], oid );
+		snprintf( c->msg, sizeof( c->msg ),
+			"%s: \"%s\" previously defined \"%s\"",
+			c->argv[0], c->argv[1], oid );
+		Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE,
+			"%s %s\n", c->log, c->msg, 0 );
+		SLAP_FREE( oid );
 		return 1;
 	}
 
 	om = (OidMacro *) SLAP_CALLOC( sizeof(OidMacro), 1 );
 	if( om == NULL ) {
-		Debug( LDAP_DEBUG_ANY, "parse_oidm: SLAP_CALLOC failed", 0, 0, 0 );
+		snprintf( c->msg, sizeof( c->msg ),
+			"%s: SLAP_CALLOC failed", c->argv[0] );
+		Debug( LDAP_DEBUG_ANY,
+			"%s %s\n", c->log, c->msg, 0 );
 		return 1;
 	}
 
 	om->som_names = NULL;
 	om->som_subs = NULL;
-	ber_str2bv( argv[1], 0, 1, &bv );
+	ber_str2bv( c->argv[1], 0, 1, &bv );
 	ber_bvarray_add( &om->som_names, &bv );
-	ber_str2bv( argv[2], 0, 1, &bv );
+	ber_str2bv( c->argv[2], 0, 1, &bv );
 	ber_bvarray_add( &om->som_subs, &bv );
-	om->som_oid.bv_val = oidm_find( argv[2] );
+	om->som_oid.bv_val = oidm_find( c->argv[2] );
 
 	if (!om->som_oid.bv_val) {
-		fprintf( stderr, "%s: line %d: OID %s not recognized\n",
-			fname, lineno, argv[2] );
-		goto usage;
+		snprintf( c->msg, sizeof( c->msg ),
+			"%s: OID %s not recognized",
+			c->argv[0], c->argv[2] );
+		Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE,
+			"%s %s\n", c->log, c->msg, 0 );
+		SLAP_FREE( om );
+		return 1;
 	}
 
-	if (om->som_oid.bv_val == argv[2]) {
-		om->som_oid.bv_val = ch_strdup( argv[2] );
+	if (om->som_oid.bv_val == c->argv[2]) {
+		om->som_oid.bv_val = ch_strdup( c->argv[2] );
 	}
 
 	om->som_oid.bv_len = strlen( om->som_oid.bv_val );
-	if ( !user )
+	if ( !user ) {
 		om->som_flags |= SLAP_OM_HARDCODE;
+		prev = om_sys_tail;
+		om_sys_tail = om;
+	}
 
-	LDAP_STAILQ_INSERT_TAIL( &om_list, om, som_next );
+	if ( prev ) {
+		LDAP_STAILQ_INSERT_AFTER( &om_list, prev, om, som_next );
+	} else {
+		LDAP_STAILQ_INSERT_TAIL( &om_list, om, som_next );
+	}
 	if ( rom ) *rom = om;
 	return 0;
 }
@@ -165,7 +174,7 @@ void oidm_unparse( BerVarray *res, OidMacro *start, OidMacro *end, int sys )
 	/* 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;
+		if ( sys && !(om->som_flags & SLAP_OM_HARDCODE)) break;
 		for ( j=0; !BER_BVISNULL(&om->som_names[j]); j++ );
 		i += j;
 		if ( om == end ) break;
@@ -181,7 +190,7 @@ void oidm_unparse( BerVarray *res, OidMacro *start, OidMacro *end, int sys )
 		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;
+		if ( sys && !(om->som_flags & SLAP_OM_HARDCODE)) break;
 		for ( j=0; !BER_BVISNULL(&om->som_names[j]); i++,j++ ) {
 			if ( !sys ) {
 				idx.bv_len = sprintf(idx.bv_val, "{%d}", i );