Suck in latest from HEAD

diff --git a/servers/slapd/back-ldap/modify.c b/servers/slapd/back-ldap/modify.c
index 95247cbeef0d375512aa380e48295ac9726bc708..24b7617d606e54dc474eaa3a39c24f2debab1ac9 100644 (file)
--- a/servers/slapd/back-ldap/modify.c
+++ b/servers/slapd/back-ldap/modify.c
@@ -120,7 +120,7 @@ ldap_back_modify(
                if ( ml->sml_values != NULL ) {
                        if ( is_oc ) {
                                for (j = 0; ml->sml_values[j].bv_val; j++);
-                               mods[i].mod_values = (struct berval **)ch_malloc((j+1) *
+                               mods[i].mod_bvalues = (struct berval **)ch_malloc((j+1) *
                                        sizeof(struct berval *));
                                for (j = 0; ml->sml_values[j].bv_val; j++) {
                                        ldap_back_map(&li->rwmap.rwm_oc,
@@ -129,9 +129,9 @@ ldap_back_modify(
                                        if (mapped.bv_val == NULL || mapped.bv_val[0] == '\0') {
                                                continue;
                                        }
-                                       mods[i].mod_values[j] = &mapped;
+                                       mods[i].mod_bvalues[j] = &mapped;
                                }
-                               mods[i].mod_values[j] = NULL;
+                               mods[i].mod_bvalues[j] = NULL;
 
                        } else {
                                if ( ml->sml_desc->ad_type->sat_syntax ==
@@ -144,15 +144,15 @@ ldap_back_modify(
                                }
 
                                for (j = 0; ml->sml_values[j].bv_val; j++);
-                               mods[i].mod_values = (struct berval **)ch_malloc((j+1) *
+                               mods[i].mod_bvalues = (struct berval **)ch_malloc((j+1) *
                                        sizeof(struct berval *));
                                for (j = 0; ml->sml_values[j].bv_val; j++)
-                                       mods[i].mod_values[j] = &ml->sml_values[j];
-                               mods[i].mod_values[j] = NULL;
+                                       mods[i].mod_bvalues[j] = &ml->sml_values[j];
+                               mods[i].mod_bvalues[j] = NULL;
                        }
 
                } else {
-                       mods[i].mod_values = NULL;
+                       mods[i].mod_bvalues = NULL;
                }
 
                i++;
@@ -186,7 +186,7 @@ cleanup:;
                free( mdn.bv_val );
        }
        for (i=0; modv[i]; i++) {
-               ch_free(modv[i]->mod_values);
+               ch_free(modv[i]->mod_bvalues);
        }
        ch_free( mods );
        ch_free( modv );

diff --git a/servers/slapd/back-meta/modify.c b/servers/slapd/back-meta/modify.c
index 8fbee1407e8021a7db9c6efacc69690af5a115c0..8071a4141c5d1e97fe7b54c0106b503204e098b8 100644 (file)
--- a/servers/slapd/back-meta/modify.c
+++ b/servers/slapd/back-meta/modify.c
@@ -119,14 +119,14 @@ meta_back_modify( Operation *op, SlapReply *rs )
 
                if ( ml->sml_values != NULL ){
                        for (j = 0; ml->sml_values[ j ].bv_val; j++);
-                       mods[ i ].mod_values = (struct berval **)ch_malloc((j+1) *
+                       mods[ i ].mod_bvalues = (struct berval **)ch_malloc((j+1) *
                                sizeof(struct berval *));
                        for (j = 0; ml->sml_values[ j ].bv_val; j++)
-                               mods[ i ].mod_values[ j ] = &ml->sml_values[j];
-                       mods[ i ].mod_values[ j ] = NULL;
+                               mods[ i ].mod_bvalues[ j ] = &ml->sml_values[j];
+                       mods[ i ].mod_bvalues[ j ] = NULL;
 
                } else {
-                       mods[ i ].mod_values = NULL;
+                       mods[ i ].mod_bvalues = NULL;
                }
 
                i++;
@@ -141,7 +141,7 @@ cleanup:;
        }
        if ( modv != NULL ) {
                for ( i = 0; modv[ i ]; i++) {
-                       free( modv[ i ]->mod_values );
+                       free( modv[ i ]->mod_bvalues );
                }
        }
        free( mods );

diff --git a/servers/slapd/schema/README b/servers/slapd/schema/README
index 1ea58731080810e4b3811c2895a16cb493d533d2..5503c687999f765d11ca8e9d353275ed1265fd3d 100644 (file)
--- a/servers/slapd/schema/README
+++ b/servers/slapd/schema/README
@@ -8,7 +8,7 @@ core.schema             OpenLDAP "core"
 cosine.schema           COSINE Pilot
 inetorgperson.schema    InetOrgPerson
 java.schema             Java Object (RFC 2713)
-misc.schema             misc (experimental)
+misc.schema             Miscellaneous Schema (experimental)
 nis.schema              Network Information Service
 openldap.schema         OpenLDAP Project (FYI)
 
@@ -35,7 +35,7 @@ top-level directory of the distribution.
 This notice applies to all schema in this directory which are derived
 from RFCs and other Internet Standards documents.
 
-Portions Copyright 1991-2003, The Internet Society.  All Rights Reserved.
+Portions Copyright 1991-2004, The Internet Society.  All Rights Reserved.
 
 This document and translations of it may be copied and furnished
 to others, and derivative works that comment on or otherwise explain

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index 7f8410373beb69bb6c8fb6011c753682d1939595..9bd1d72df15dadbf1559c861f3eb7ac44b6882ab 100644 (file)
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -570,7 +570,7 @@ attributetype ( 0.9.2342.19200300.100.1.37
        SUBSTR caseIgnoreIA5SubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
-# RFC 2459
+# RFC 2459 -- deprecated in favor of 'mail' (in cosine.schema)
 attributetype ( 1.2.840.113549.1.9.1
        NAME ( 'email' 'emailAddress' 'pkcs9email' )
        DESC 'RFC2459: legacy attribute for email addresses in DNs'

diff --git a/servers/slapd/slapi/slapi_ops.c b/servers/slapd/slapi/slapi_ops.c
index 415e80fb134efa4af9925cc54c3faa737bb5f0e8..c001f0bbc3d2087cdbf7942999521a0375e2eb80 100644 (file)
--- a/servers/slapd/slapi/slapi_ops.c
+++ b/servers/slapd/slapi/slapi_ops.c
@@ -392,7 +392,7 @@ slapi_int_ldapmod_to_entry(
                                 * being passed in may not have been allocated on the
                                 * heap.
                                 */
-                               rc = bvptr2obj_copy( pMod->mod_values, &bv );
+                               rc = bvptr2obj_copy( pMod->mod_bvalues, &bv );
                                if ( rc != LDAP_SUCCESS ) goto cleanup;
                                tmp.sml_type.bv_val = pMod->mod_type;
                                tmp.sml_type.bv_len = strlen( pMod->mod_type );
@@ -954,7 +954,7 @@ slapi_modify_internal(
                         * convert an array of pointers to bervals
                         * to an array of bervals
                         */
-                       rs.sr_err = bvptr2obj_copy( pMod->mod_values, &bv );
+                       rs.sr_err = bvptr2obj_copy( pMod->mod_bvalues, &bv );
                        if ( rs.sr_err != LDAP_SUCCESS )
                                goto cleanup;
                        tmp.sml_type.bv_val = pMod->mod_type;