allow backwards compatibility for 'T' option (single char)

[openldap] / servers / slapd / mra.c

diff --git a/servers/slapd/mra.c b/servers/slapd/mra.c
index 7e3a179030db1086830bb2f3ef22e78e7a31f1d9..029be6ce5b0d97064b4ac22ee9a9fd71e7d944a0 100644 (file)
--- a/servers/slapd/mra.c
+++ b/servers/slapd/mra.c
@@ -1,9 +1,18 @@
+/* mra.c - routines for dealing with extensible matching rule assertions */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/* mra.c - routines for dealing with extensible matching rule assertions */
 
 #include "portable.h"
 
@@ -39,9 +48,9 @@ get_mra(
        int rc;
        ber_tag_t tag, rtag;
        ber_len_t length;
-       struct berval type = { 0, NULL };
-       struct berval value = { 0, NULL };
-       struct berval rule_text = { 0, NULL };
+       struct berval type = BER_BVNULL;
+       struct berval value = BER_BVNULL;
+       struct berval rule_text = BER_BVNULL;
        MatchingRuleAssertion ma;
 
        memset( &ma, 0, sizeof ma);
@@ -212,7 +221,7 @@ get_mra(
        rc = asserted_value_validate_normalize( ma.ma_desc,
                ma.ma_rule,
                SLAP_MR_EXT|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
-               &value, &ma.ma_value, text );
+               &value, &ma.ma_value, text, op->o_tmpmemctx );
 
        if( rc != LDAP_SUCCESS ) {
                return rc;