Sync with HEAD

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 2f27cf5b5fa139ef9932b99308b0f8a233f72125..d6bc21d3118c8f69c9902ac5317b946499accf58 100644 (file)
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -2290,7 +2290,9 @@ acl_check_modlist(
                 * by ACL_WRITE checking as any found here are not provided
                 * by the user
                 */
-               if ( is_at_no_user_mod( mlist->sml_desc->ad_type ) ) {
+               if ( is_at_no_user_mod( mlist->sml_desc->ad_type )
+                               && !mlist->sml_managing )
+               {
                        Debug( LDAP_DEBUG_ACL, "acl: no-user-mod %s:"
                                " modify access granted\n",
                                mlist->sml_desc->ad_cname.bv_val, 0, 0 );

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 5c124830d65478af79fca139662ce35be04e881e..bc372d7e4bb18bcc7819b6327b5a72b13d80bbd9 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -2250,6 +2250,7 @@ access_free( Access *a )
        if ( !BER_BVISNULL( &a->a_group_pat ) ) {
                free( a->a_group_pat.bv_val );
        }
+#ifdef SLAP_DYNACL
        if ( a->a_dynacl != NULL ) {
                slap_dynacl_t   *da;
                for ( da = a->a_dynacl; da; ) {
@@ -2264,6 +2265,7 @@ access_free( Access *a )
                        ch_free( tmp );
                }
        }
+#endif /* SLAP_DYNACL */
        free( a );
 }
 

diff --git a/servers/slapd/back-ldap/add.c b/servers/slapd/back-ldap/add.c
index e27e6a0255b8e9b5b57055f5a7d908f4c87e016d..96a9c3b94d089b216d1810a44f701a9abaf6ef71 100644 (file)
--- a/servers/slapd/back-ldap/add.c
+++ b/servers/slapd/back-ldap/add.c
@@ -69,7 +69,8 @@ ldap_back_add(
 
        isupdate = be_shadow_update( op );
        for ( i = 0, a = op->oq_add.rs_e->e_attrs; a; a = a->a_next ) {
-               if ( !isupdate && a->a_desc->ad_type->sat_no_user_mod  ) {
+               if ( !isupdate && !get_manageDIT( op ) && a->a_desc->ad_type->sat_no_user_mod  )
+               {
                        continue;
                }
 

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index 09b23924d5f11d5313ac508e30c8350be7804559..3765e3bb0a523d41e5c918e981c70716b8b4d1b6 100644 (file)
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -882,7 +882,7 @@ retry:;
                ldap_memfree( text );
        }
        rs->sr_text = NULL;
-       return( ERR_OK( rs->sr_err ) ? 0 : -1 );
+       return( ERR_OK( rs->sr_err ) ? LDAP_SUCCESS : rs->sr_err );
 }
 
 /* return true if bound, false if failed */

diff --git a/servers/slapd/back-ldap/modify.c b/servers/slapd/back-ldap/modify.c
index 6ba89953ea684b3c0216b386dd2ce080ee224707..adc0b649ad67de3d04ad71f290b73b4cde0c04f7 100644 (file)
--- a/servers/slapd/back-ldap/modify.c
+++ b/servers/slapd/back-ldap/modify.c
@@ -64,7 +64,8 @@ ldap_back_modify(
 
        isupdate = be_shadow_update( op );
        for ( i = 0, ml = op->oq_modify.rs_modlist; ml; ml = ml->sml_next ) {
-               if ( !isupdate && ml->sml_desc->ad_type->sat_no_user_mod  ) {
+               if ( !isupdate && !!get_manageDIT( op ) && ml->sml_desc->ad_type->sat_no_user_mod  )
+               {
                        continue;
                }
 

diff --git a/servers/slapd/back-meta/add.c b/servers/slapd/back-meta/add.c
index 9628cdd6ecd4739c1c0c11be478178764f38b8fb..fe383f230cfe99d74f623b10f1fa56a90334c40c 100644 (file)
--- a/servers/slapd/back-meta/add.c
+++ b/servers/slapd/back-meta/add.c
@@ -83,7 +83,8 @@ meta_back_add( Operation *op, SlapReply *rs )
        for ( i = 0, a = op->ora_e->e_attrs; a; a = a->a_next ) {
                int                     j, is_oc = 0;
 
-               if ( !isupdate && a->a_desc->ad_type->sat_no_user_mod  ) {
+               if ( !isupdate && !get_manageDIT( op ) && a->a_desc->ad_type->sat_no_user_mod  )
+               {
                        continue;
                }
 

diff --git a/servers/slapd/back-meta/modify.c b/servers/slapd/back-meta/modify.c
index f2b40d24a409d32e08c1b13eb1160affd41373fd..f6d2e9f428d021e8b5bc339067760fc16a764ac4 100644 (file)
--- a/servers/slapd/back-meta/modify.c
+++ b/servers/slapd/back-meta/modify.c
@@ -89,7 +89,8 @@ meta_back_modify( Operation *op, SlapReply *rs )
        for ( i = 0, ml = op->orm_modlist; ml; ml = ml->sml_next ) {
                int     j, is_oc = 0;
 
-               if ( !isupdate && ml->sml_desc->ad_type->sat_no_user_mod  ) {
+               if ( !isupdate && !get_manageDIT( op ) && ml->sml_desc->ad_type->sat_no_user_mod  )
+               {
                        continue;
                }
 

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 56d6c0bf4aaa23b1ae63ef334851ba9b0bc32a56..9dd1061f7f0f6b045864317c5937d48f2b6fbbed 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -184,8 +184,8 @@ do_modify(
                goto cleanup;
        }
 
-       rs->sr_err = slap_mods_check( modlist, &rs->sr_text,
-               textbuf, textlen, NULL );
+       rs->sr_err = slap_mods_check( modlist,
+               &rs->sr_text, textbuf, textlen, NULL );
 
        if ( rs->sr_err != LDAP_SUCCESS ) {
                send_ldap_result( op, rs );
@@ -499,8 +499,9 @@ slap_mods_no_user_mod_check(
        for ( ; ml != NULL; ml = ml->sml_next ) {
                if ( !is_at_no_user_mod( ml->sml_desc->ad_type ) ) continue;
 
-               if( get_manageDIT( op )) {
+               if ( get_manageDIT( op ) ) {
                        if ( ml->sml_desc->ad_type->sat_flags & SLAP_AT_MANAGEABLE ) {
+                               ml->sml_managing = 1;
                                continue;
                        }
 
@@ -844,7 +845,7 @@ int slap_mods_opattrs(
        assert( modtail != NULL );
        assert( *modtail == NULL );
 
-       if ( SLAP_LASTMOD( op->o_bd )) {
+       if ( SLAP_LASTMOD( op->o_bd ) ) {
                time_t now = slap_get_time();
 
                slap_get_csn( op, csnbuf, sizeof(csnbuf), &csn, manage_ctxcsn );
@@ -854,7 +855,7 @@ int slap_mods_opattrs(
 
                slap_timestamp( &now, &timestamp );
 
-               if( op->o_dn.bv_len == 0 ) {
+               if ( BER_BVISEMPTY( &op->o_dn ) ) {
                        BER_BVSTR( &name, SLAPD_ANONYMOUS );
                        nname = name;
                } else {
@@ -863,10 +864,20 @@ int slap_mods_opattrs(
                }
        }
 
-       if( op->o_tag == LDAP_REQ_ADD ) {
+       if ( op->o_tag == LDAP_REQ_ADD ) {
                struct berval tmpval;
 
-               {
+               mod = *modtail;
+               if ( get_manageDIT( op ) ) {
+                       for ( mod = mods; mod != *modtail; mod = mod->sml_next ) {
+                               if ( mod->sml_desc == slap_schema.si_ad_structuralObjectClass ) {
+                                       break;
+                               }
+                       }
+
+               }
+
+               if ( mod == *modtail ) {
                        int rc = mods_structural_class( mods, &tmpval,
                                text, textbuf, textlen );
                        if( rc != LDAP_SUCCESS ) return rc;
@@ -892,42 +903,136 @@ int slap_mods_opattrs(
                        modtail = &mod->sml_next;
                }
 
-               if ( SLAP_LASTMOD( op->o_bd )) {
-                       char uuidbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
+               if ( SLAP_LASTMOD( op->o_bd ) ) {
+                       mod = *modtail;
+                       if ( get_manageDIT( op ) ) {
+                               for ( mod = mods; mod != *modtail; mod = mod->sml_next ) {
+                                       if ( mod->sml_desc == slap_schema.si_ad_entryUUID ) {
+                                               break;
+                                       }
+                               }
+                       }
 
-                       tmpval.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ) );
-                       tmpval.bv_val = uuidbuf;
-               
-                       mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
-                       mod->sml_op = mop;
-                       mod->sml_flags = SLAP_MOD_INTERNAL;
-                       mod->sml_type.bv_val = NULL;
-                       mod->sml_desc = slap_schema.si_ad_entryUUID;
-                       mod->sml_values =
-                               (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
-                       ber_dupbv( &mod->sml_values[0], &tmpval );
-                       mod->sml_values[1].bv_len = 0;
-                       mod->sml_values[1].bv_val = NULL;
-                       assert( mod->sml_values[0].bv_val != NULL );
-                       mod->sml_nvalues =
-                               (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
-                       (*mod->sml_desc->ad_type->sat_equality->smr_normalize)(
-                                       SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
-                                       mod->sml_desc->ad_type->sat_syntax,
-                                       mod->sml_desc->ad_type->sat_equality,
-                                       mod->sml_values, mod->sml_nvalues, NULL );
-                       mod->sml_nvalues[1].bv_len = 0;
-                       mod->sml_nvalues[1].bv_val = NULL;
-                       *modtail = mod;
-                       modtail = &mod->sml_next;
+                       if ( mod == *modtail ) {
+                               char uuidbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
+
+                               tmpval.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ) );
+                               tmpval.bv_val = uuidbuf;
+                       
+                               mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
+                               mod->sml_op = mop;
+                               mod->sml_flags = SLAP_MOD_INTERNAL;
+                               mod->sml_type.bv_val = NULL;
+                               mod->sml_desc = slap_schema.si_ad_entryUUID;
+                               mod->sml_values =
+                                       (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+                               ber_dupbv( &mod->sml_values[0], &tmpval );
+                               mod->sml_values[1].bv_len = 0;
+                               mod->sml_values[1].bv_val = NULL;
+                               assert( mod->sml_values[0].bv_val != NULL );
+                               mod->sml_nvalues =
+                                       (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+                               (*mod->sml_desc->ad_type->sat_equality->smr_normalize)(
+                                               SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
+                                               mod->sml_desc->ad_type->sat_syntax,
+                                               mod->sml_desc->ad_type->sat_equality,
+                                               mod->sml_values, mod->sml_nvalues, NULL );
+                               mod->sml_nvalues[1].bv_len = 0;
+                               mod->sml_nvalues[1].bv_val = NULL;
+                               *modtail = mod;
+                               modtail = &mod->sml_next;
+                       }
+
+                       mod = *modtail;
+                       if ( get_manageDIT( op ) ) {
+                               for ( mod = mods; mod != *modtail; mod = mod->sml_next ) {
+                                       if ( mod->sml_desc == slap_schema.si_ad_creatorsName ) {
+                                               break;
+                                       }
+                               }
+                       }
+
+                       if ( mod == *modtail ) {
+                               mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
+                               mod->sml_op = mop;
+                               mod->sml_flags = SLAP_MOD_INTERNAL;
+                               mod->sml_type.bv_val = NULL;
+                               mod->sml_desc = slap_schema.si_ad_creatorsName;
+                               mod->sml_values =
+                                       (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+                               ber_dupbv( &mod->sml_values[0], &name );
+                               mod->sml_values[1].bv_len = 0;
+                               mod->sml_values[1].bv_val = NULL;
+                               assert( mod->sml_values[0].bv_val != NULL );
+                               mod->sml_nvalues =
+                                       (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+                               ber_dupbv( &mod->sml_nvalues[0], &nname );
+                               mod->sml_nvalues[1].bv_len = 0;
+                               mod->sml_nvalues[1].bv_val = NULL;
+                               assert( mod->sml_nvalues[0].bv_val != NULL );
+                               *modtail = mod;
+                               modtail = &mod->sml_next;
+                       }
+       
+                       mod = *modtail;
+                       if ( get_manageDIT( op ) ) {
+                               for ( mod = mods; mod != *modtail; mod = mod->sml_next ) {
+                                       if ( mod->sml_desc == slap_schema.si_ad_createTimestamp ) {
+                                               break;
+                                       }
+                               }
+                       }
+
+                       if ( mod == *modtail ) {
+                               mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
+                               mod->sml_op = mop;
+                               mod->sml_flags = SLAP_MOD_INTERNAL;
+                               mod->sml_type.bv_val = NULL;
+                               mod->sml_desc = slap_schema.si_ad_createTimestamp;
+                               mod->sml_values =
+                                       (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+                               ber_dupbv( &mod->sml_values[0], &timestamp );
+                               mod->sml_values[1].bv_len = 0;
+                               mod->sml_values[1].bv_val = NULL;
+                               assert( mod->sml_values[0].bv_val != NULL );
+                               mod->sml_nvalues = NULL;
+                               *modtail = mod;
+                               modtail = &mod->sml_next;
+                       }
+               }
+       }
+
+       if ( SLAP_LASTMOD( op->o_bd ) ) {
+               mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
+               mod->sml_op = mop;
+               mod->sml_flags = SLAP_MOD_INTERNAL;
+               mod->sml_type.bv_val = NULL;
+               mod->sml_desc = slap_schema.si_ad_entryCSN;
+               mod->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+               ber_dupbv( &mod->sml_values[0], &csn );
+               mod->sml_values[1].bv_len = 0;
+               mod->sml_values[1].bv_val = NULL;
+               assert( mod->sml_values[0].bv_val != NULL );
+               mod->sml_nvalues = NULL;
+               *modtail = mod;
+               modtail = &mod->sml_next;
+       
+               mod = *modtail;
+               if ( get_manageDIT( op ) ) {
+                       for ( mod = mods; mod != *modtail; mod = mod->sml_next ) {
+                               if ( mod->sml_desc == slap_schema.si_ad_modifiersName ) {
+                                       break;
+                               }
+                       }
+               }
 
+               if ( mod == *modtail ) {
                        mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
                        mod->sml_op = mop;
                        mod->sml_flags = SLAP_MOD_INTERNAL;
                        mod->sml_type.bv_val = NULL;
-                       mod->sml_desc = slap_schema.si_ad_creatorsName;
-                       mod->sml_values =
-                               (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+                       mod->sml_desc = slap_schema.si_ad_modifiersName;
+                       mod->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
                        ber_dupbv( &mod->sml_values[0], &name );
                        mod->sml_values[1].bv_len = 0;
                        mod->sml_values[1].bv_val = NULL;
@@ -940,14 +1045,24 @@ int slap_mods_opattrs(
                        assert( mod->sml_nvalues[0].bv_val != NULL );
                        *modtail = mod;
                        modtail = &mod->sml_next;
+               }
 
+               mod = *modtail;
+               if ( get_manageDIT( op ) ) {
+                       for ( mod = mods; mod != *modtail; mod = mod->sml_next ) {
+                               if ( mod->sml_desc == slap_schema.si_ad_modifyTimestamp ) {
+                                       break;
+                               }
+                       }
+               }
+
+               if ( mod == *modtail ) {
                        mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
                        mod->sml_op = mop;
                        mod->sml_flags = SLAP_MOD_INTERNAL;
                        mod->sml_type.bv_val = NULL;
-                       mod->sml_desc = slap_schema.si_ad_createTimestamp;
-                       mod->sml_values =
-                               (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
+                       mod->sml_desc = slap_schema.si_ad_modifyTimestamp;
+                       mod->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
                        ber_dupbv( &mod->sml_values[0], &timestamp );
                        mod->sml_values[1].bv_len = 0;
                        mod->sml_values[1].bv_val = NULL;
@@ -958,55 +1073,6 @@ int slap_mods_opattrs(
                }
        }
 
-       if ( SLAP_LASTMOD( op->o_bd )) {
-               mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
-               mod->sml_op = mop;
-               mod->sml_flags = SLAP_MOD_INTERNAL;
-               mod->sml_type.bv_val = NULL;
-               mod->sml_desc = slap_schema.si_ad_entryCSN;
-               mod->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
-               ber_dupbv( &mod->sml_values[0], &csn );
-               mod->sml_values[1].bv_len = 0;
-               mod->sml_values[1].bv_val = NULL;
-               assert( mod->sml_values[0].bv_val != NULL );
-               mod->sml_nvalues = NULL;
-               *modtail = mod;
-               modtail = &mod->sml_next;
-
-               mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
-               mod->sml_op = mop;
-               mod->sml_flags = SLAP_MOD_INTERNAL;
-               mod->sml_type.bv_val = NULL;
-               mod->sml_desc = slap_schema.si_ad_modifiersName;
-               mod->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
-               ber_dupbv( &mod->sml_values[0], &name );
-               mod->sml_values[1].bv_len = 0;
-               mod->sml_values[1].bv_val = NULL;
-               assert( mod->sml_values[0].bv_val != NULL );
-               mod->sml_nvalues =
-                       (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
-               ber_dupbv( &mod->sml_nvalues[0], &nname );
-               mod->sml_nvalues[1].bv_len = 0;
-               mod->sml_nvalues[1].bv_val = NULL;
-               assert( mod->sml_nvalues[0].bv_val != NULL );
-               *modtail = mod;
-               modtail = &mod->sml_next;
-
-               mod = (Modifications *) ch_malloc( sizeof( Modifications ) );
-               mod->sml_op = mop;
-               mod->sml_flags = SLAP_MOD_INTERNAL;
-               mod->sml_type.bv_val = NULL;
-               mod->sml_desc = slap_schema.si_ad_modifyTimestamp;
-               mod->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
-               ber_dupbv( &mod->sml_values[0], &timestamp );
-               mod->sml_values[1].bv_len = 0;
-               mod->sml_values[1].bv_val = NULL;
-               assert( mod->sml_values[0].bv_val != NULL );
-               mod->sml_nvalues = NULL;
-               *modtail = mod;
-               modtail = &mod->sml_next;
-       }
-
        *modtail = NULL;
        return LDAP_SUCCESS;
 }

diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
index ebe9815438794af469b9c0120ba30b9f642120ae..de1f5a830c40a81d53407b99441ab30a7d5c5567 100644 (file)
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -154,7 +154,8 @@ rwm_op_add( Operation *op, SlapReply *rs )
                                }
                        }
 
-               } else if ( !isupdate && (*ap)->a_desc->ad_type->sat_no_user_mod ) {
+               } else if ( !isupdate && !get_manageDIT( op ) && (*ap)->a_desc->ad_type->sat_no_user_mod )
+               {
                        goto next_attr;
 
                } else {
@@ -437,7 +438,8 @@ rwm_op_modify( Operation *op, SlapReply *rs )
                {
                        is_oc = 1;
 
-               } else if ( !isupdate && (*mlp)->sml_desc->ad_type->sat_no_user_mod  ) {
+               } else if ( !isupdate && !get_manageDIT( op ) && (*mlp)->sml_desc->ad_type->sat_no_user_mod  )
+               {
                        goto next_mod;
 
                } else {
@@ -895,6 +897,7 @@ rwm_attrs( Operation *op, SlapReply *rs, Attribute** a_first, int stripEntryDN )
                        }
                        
                } else if ( !isupdate
+                       && !get_manageDIT( op )
                        && (*ap)->a_desc->ad_type->sat_no_user_mod 
                        && (*ap)->a_desc->ad_type != slap_schema.si_at_undefined )
                {

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 2b2d8b1e371a4594d479ee97625eec19b7044052..ac81a92017eff971819befd16e0f8bac21a3ed8c 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -551,7 +551,7 @@ static struct slap_schema_ad_map {
                        "ORDERING UUIDOrderingMatch "
                        "SYNTAX 1.3.6.1.4.1.4203.666.2.6 "
                        "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
-               NULL, SLAP_AT_HIDE,
+               NULL, SLAP_AT_HIDE|SLAP_AT_MANAGEABLE,
                NULL, NULL,
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_entryUUID) },

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 0d9fc9ce9da9365383500db77ba8d213b62651be..5fed372fd32afbd93d6c84847110b76be269b6e4 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1173,6 +1173,7 @@ typedef struct slap_mod_list {
 #define        sml_type        sml_mod.sm_type
 #define sml_values     sml_mod.sm_values
 #define sml_nvalues    sml_mod.sm_nvalues
+       char sml_managing;
        struct slap_mod_list *sml_next;
 } Modifications;
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 05f99d66d7c43fac17a93508bef4bd026ca767b6..2726162a01f56314c4ef16f1e143b78ec9bd321c 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -63,5 +63,5 @@ clean-local:  FORCE
        -$(RM) -r testrun *leak *gmon *core
 
 veryclean-local: FORCE
-       @-$(RM) run data schema ucdata
+       @-$(RM) run testdata schema ucdata
 

diff --git a/tests/data/manage.out b/tests/data/manage.out
index 8e12d5063ec69d198f9882b2e462f10bd81ea820..00b50a84d96b342318f83e3540ff4d31be47af4e 100644 (file)
--- a/tests/data/manage.out
+++ b/tests/data/manage.out
@@ -1,3 +1,10 @@
+dn: cn=All Staff,dc=example,dc=com
+objectClass: groupOfNames
+cn: All Staff
+member:
+creatorsName: cn=Someone
+modifiersName: cn=Someone Else
+
 dn: cn=All Staff,ou=Groups,dc=example,dc=com
 member: cn=Manager,dc=example,dc=com
 member: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=exam
@@ -291,7 +298,8 @@ uniqueMember: cn=James A Jones 2,ou=Information Technology Division,ou=People,
 uniqueMember: cn=John Doe,ou=Information Technology Division,ou=People,dc=exam
  ple,dc=com
 creatorsName: cn=Manager,dc=example,dc=com
-modifiersName: cn=Manager,dc=example,dc=com
+modifiersName: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc
+ =example,dc=com
 
 dn: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com
 objectClass: OpenLDAPperson
@@ -449,3 +457,51 @@ telephoneNumber: +1 313 555 5331
 creatorsName: cn=Manager,dc=example,dc=com
 modifiersName: cn=Manager,dc=example,dc=com
 
+dn: dc=example,dc=com
+objectClass: top
+objectClass: organization
+objectClass: domainRelatedObject
+objectClass: dcObject
+dc: example
+l: Anytown, Michigan
+st: Michigan
+o: Example, Inc.
+o: EX
+o: Ex.
+description: The Example, Inc. at Anytown
+postalAddress: Example, Inc. $ 535 W. William St. $ Anytown, MI 48109 $ US
+telephoneNumber: +1 313 555 1817
+associatedDomain: example.com
+creatorsName: cn=Manager,dc=example,dc=com
+modifyTimestamp: 19700101000000Z
+createTimestamp: 19700101000000Z
+modifiersName: cn=Manager,dc=example,dc=com
+
+dn: cn=All Staff,dc=example,dc=com
+objectClass: groupOfNames
+cn: All Staff
+member:
+entryUUID: badbadef-dbad-1029-92f7-badbadbadbad
+
+dn: cn=All Staff,ou=Groups,dc=example,dc=com
+member: cn=Manager,dc=example,dc=com
+member: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=exam
+ ple,dc=com
+member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com
+member: cn=John Doe,ou=Information Technology Division,ou=People,dc=example,dc
+ =com
+member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com
+member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com
+member: cn=James A Jones 2,ou=Information Technology Division,ou=People,dc=exa
+ mple,dc=com
+member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com
+member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com
+member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com
+member: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=exampl
+ e,dc=com
+owner: cn=Manager,dc=example,dc=com
+cn: All Staff
+description: Everyone in the sample data
+objectClass: groupOfNames
+entryUUID: badbadba-dbad-1029-92f7-badbadbadbad
+

diff --git a/tests/scripts/test037-manage b/tests/scripts/test037-manage
index 11cf238d42ffbe2752427d0956bf044a59cc9d8f..f28ec6ff0f21e316e2007ed4deb8bea7ce322a02 100755 (executable)
--- a/tests/scripts/test037-manage
+++ b/tests/scripts/test037-manage
@@ -111,6 +111,32 @@ changetype: modify
 replace: modifiersName
 modifiersName: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc=com
 
+dn: dc=example,dc=com
+# change timestamps
+changetype: modify
+replace: modifyTimestamp
+modifyTimestamp: 19700101000000Z
+-
+replace: createTimestamp
+createTimestamp: 19700101000000Z
+-
+
+dn: cn=All Staff,ou=Groups,dc=example,dc=com
+# change entryUUID
+changetype: modify
+replace: entryUUID
+entryUUID: badbadba-dbad-1029-92f7-badbadbadbad
+
+dn: cn=All Staff,dc=example,dc=com
+changetype: add
+objectClass: groupOfNames
+cn: All Staff
+member:
+creatorsName: cn=Someone
+createTimestamp: 19700101000000Z
+modifiersName: cn=Someone Else
+modifyTimestamp: 19700101000000Z
+entryUUID: badbadef-dbad-1029-92f7-badbadbadbad
 EOMODS
 
 RC=$?
@@ -161,7 +187,6 @@ delete: structuralObjectClass
 -
 add: structuralObjectClass
 structuralObjectClass: testPerson
-
 EOMODS
 
 RC=$?
@@ -175,6 +200,25 @@ echo "Using ldapsearch to retrieve all the entries..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
     'objectClass=*' '*' creatorsName modifiersName > $SEARCHOUT 2>&1
 RC=$?
+if test $RC != 0 ; then
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       echo "ldapsearch failed ($RC)!"
+       exit $RC
+fi
+
+$LDAPSEARCH -S "" -b "$BASEDN" -s base -h $LOCALHOST -p $PORT1 \
+    'objectClass=*' '*' creatorsName createTimestamp \
+    modifiersName modifyTimestamp >> $SEARCHOUT 2>&1
+RC=$?
+if test $RC != 0 ; then
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
+       echo "ldapsearch failed ($RC)!"
+       exit $RC
+fi
+
+$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
+    '(cn=All Staff)' '*' entryUUID >> $SEARCHOUT 2>&1
+RC=$?
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"