Add a little SASL framework and remove old X-DIGEST-MD5 hardcode.

[openldap] / servers / slapd / modify.c

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 2bf8ce5a5c21012a62299c0db94a60e6dc19b185..7f4a34b0deb66b87fa385195c0cb469a013c986a 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -22,6 +22,8 @@
 
 static void    modlist_free(LDAPModList *ml);
 
+static int add_modified_attrs( Operation *op, LDAPModList **modlist );
+
 int
 do_modify(
     Connection *conn,
@@ -172,6 +174,9 @@ do_modify(
                return rc;
        }
 
+       /* deref suffix alias if appropriate */
+       ndn = suffix_alias( be, ndn );
+
        /*
         * do the modify if 1 && (2 || 3)
         * 1) there is a modify function implemented in this backend;
@@ -183,8 +188,23 @@ do_modify(
                if ( be->be_update_ndn == NULL ||
                        strcmp( be->be_update_ndn, op->o_ndn ) == 0 )
                {
+                       if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED &&
+                               global_lastmod == ON)) && be->be_update_ndn == NULL )
+                       {
+                               rc = add_modified_attrs( op, &modlist );
+
+                               if( rc != LDAP_SUCCESS ) {
+                                       free( ndn );
+                                       modlist_free( modlist );
+                                       send_ldap_result( conn, op, rc,
+                                               NULL, "no-user-modification attribute type",
+                                               NULL, NULL );
+                                       return rc;
+                               }
+                       }
+
                        if ( (*be->be_modify)( be, conn, op, ndn, modlist ) == 0 ) {
-                               replog( be, LDAP_REQ_MODIFY, ndn, modlist, 0 );
+                               replog( be, op, ndn, modlist );
                        }
 
                /* send a referral */
@@ -202,6 +222,65 @@ do_modify(
        return rc;
 }
 
+static int
+add_modified_attrs( Operation *op, LDAPModList **modlist )
+{
+       char            buf[22];
+       struct berval   bv;
+       struct berval   *bvals[2];
+       LDAPModList             *m;
+       struct tm       *ltm;
+       time_t          currenttime;
+
+       bvals[0] = &bv;
+       bvals[1] = NULL;
+
+       /* remove any attempts by the user to modify these attrs */
+       for ( m = *modlist; m != NULL; m = m->ml_next ) {
+               if ( oc_check_no_usermod_attr( m->ml_type ) ) {
+                       return LDAP_CONSTRAINT_VIOLATION;
+               }
+       }
+
+       if ( op->o_dn == NULL || op->o_dn[0] == '\0' ) {
+               bv.bv_val = "NULLDN";
+               bv.bv_len = strlen( bv.bv_val );
+       } else {
+               bv.bv_val = op->o_dn;
+               bv.bv_len = strlen( bv.bv_val );
+       }
+       m = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) );
+       m->ml_type = ch_strdup( "modifiersname" );
+       m->ml_op = LDAP_MOD_REPLACE;
+       m->ml_bvalues = (struct berval **) ch_calloc(2, sizeof(struct berval *));
+       m->ml_bvalues[0] = ber_bvdup( &bv );
+       m->ml_next = *modlist;
+       *modlist = m;
+
+       currenttime = slap_get_time();
+       ldap_pvt_thread_mutex_lock( &gmtime_mutex );
+#ifndef LDAP_LOCALTIME
+       ltm = gmtime( &currenttime );
+       strftime( buf, sizeof(buf), "%Y%m%d%H%M%SZ", ltm );
+#else
+       ltm = localtime( &currenttime );
+       strftime( buf, sizeof(buf), "%y%m%d%H%M%SZ", ltm );
+#endif
+       ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+
+       bv.bv_val = buf;
+       bv.bv_len = strlen( bv.bv_val );
+       m = (LDAPModList *) ch_calloc( 1, sizeof(LDAPModList) );
+       m->ml_type = ch_strdup( "modifytimestamp" );
+       m->ml_op = LDAP_MOD_REPLACE;
+       m->ml_bvalues = (struct berval **) ch_calloc(2, sizeof(struct berval *));
+       m->ml_bvalues[0] = ber_bvdup( &bv );
+       m->ml_next = *modlist;
+       *modlist = m;
+
+       return LDAP_SUCCESS;
+}
+
 static void
 modlist_free(
     LDAPModList        *ml