X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foidm.c;h=b62f2c67882087799d9a331e1db94dd1e60b3ae7;hb=e841247c9086053d774d66e4fbb058d0ead706b2;hp=6b5c4c61ac5a2e4479a531db859f8a261bc4dfeb;hpb=639d678592afb79eff17313282c3504c9b02638d;p=openldap diff --git a/servers/slapd/oidm.c b/servers/slapd/oidm.c index 6b5c4c61ac..b62f2c6788 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-2007 The OpenLDAP Foundation. + * Copyright 1998-2009 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -105,22 +105,22 @@ parse_oidm( oidv = oidm_find( c->argv[2] ); if( !oidv ) { - snprintf( c->msg, sizeof( c->msg ), + snprintf( c->cr_msg, sizeof( c->cr_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 ); + "%s %s\n", c->log, c->cr_msg, 0 ); return 1; } oid = oidm_find( c->argv[1] ); if( oid != NULL ) { int rc; - snprintf( c->msg, sizeof( c->msg ), + snprintf( c->cr_msg, sizeof( c->cr_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 ); + "%s %s\n", c->log, c->cr_msg, 0 ); /* Allow duplicate if the definition is identical */ rc = strcmp( oid, oidv ) != 0; SLAP_FREE( oid ); @@ -131,10 +131,10 @@ parse_oidm( om = (OidMacro *) SLAP_CALLOC( sizeof(OidMacro), 1 ); if( om == NULL ) { - snprintf( c->msg, sizeof( c->msg ), + snprintf( c->cr_msg, sizeof( c->cr_msg ), "%s: SLAP_CALLOC failed", c->argv[0] ); Debug( LDAP_DEBUG_ANY, - "%s %s\n", c->log, c->msg, 0 ); + "%s %s\n", c->log, c->cr_msg, 0 ); if ( oidv != c->argv[2] ) SLAP_FREE( oidv ); return 1;