Attachment 218131 Details for Bug 268101 – CVS Diffs

[patch] CVS Diffs

diffs.txt (text/plain), 9.31 KB, created by Nathan Kinder on 2007-10-05 22:25:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2007-10-05 22:25:03 UTC

Size: 9.31 KB

patch

obsolete

>Index: modify.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/modify.c,v
>retrieving revision 1.14
>diff -u -5 -t -w -r1.14 modify.c
>--- modify.c	10 Nov 2006 23:45:40 -0000	1.14
>+++ modify.c	5 Oct 2007 22:02:44 -0000
>@@ -534,11 +534,11 @@
>         char *dn;
>         Slapi_DN sdn;
>         LDAPMod **mods, *pw_mod, **tmpmods = NULL;
>         Slapi_Mods smods;
>         Slapi_Mods unhashed_pw_smod;    
>-        int repl_op, internal_op, lastmod;
>+        int repl_op, internal_op, lastmod, skip_modified_attrs;
>         char *unhashed_pw_attr = NULL;
>         Slapi_Operation *operation;
>         char errorbuf[BUFSIZ];
>         int err;
>     LDAPMod *lc_mod = NULL;
>@@ -549,10 +549,11 @@
>         slapi_pblock_get (pb, SLAPI_MODIFY_MODS, &mods);
>         slapi_pblock_get (pb, SLAPI_MODIFY_MODS, &tmpmods);
>         slapi_pblock_get (pb, SLAPI_IS_REPLICATED_OPERATION, &repl_op);
>         slapi_pblock_get (pb, SLAPI_OPERATION, &operation);
>         internal_op= operation_is_flag_set(operation, OP_FLAG_INTERNAL);
>+        slapi_pblock_get (pb, SLAPI_SKIP_MODIFIED_ATTRS, &skip_modified_attrs);
> 
>         if (dn == NULL)
>         {
>                 slapi_sdn_init_dn_byref (&sdn, "");
>         }
>@@ -665,12 +666,13 @@
>         } /* end of if (!repl_op */
> 
>         /* can get lastmod only after backend is selected */    
>         slapi_pblock_get(pb, SLAPI_BE_LASTMOD, &lastmod);
>         
>-        /* if this is replication session - leave mod attributes alone */
>-        if (!repl_op && lastmod)
>+        /* if this is replication session or the operation has been
>+         * flagged - leave mod attributes alone */
>+        if (!repl_op && !skip_modified_attrs && lastmod)
>         {
>                 modify_update_last_modified_attr(pb, &smods);
>         }                       
>                         
>         /*
>Index: pblock.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/pblock.c,v
>retrieving revision 1.10
>diff -u -5 -t -w -r1.10 pblock.c
>--- pblock.c	7 Sep 2007 19:08:45 -0000	1.10
>+++ pblock.c	5 Oct 2007 22:02:45 -0000
>@@ -358,10 +358,20 @@
>                 (*(time_t *)value) = pblock->pb_op->o_time;
>                 break;
>         case SLAPI_REQUESTOR_ISROOT:
>                 (*(int *)value) = pblock->pb_requestor_isroot;
>                 break;
>+        case SLAPI_SKIP_MODIFIED_ATTRS:
>+                if(pblock->pb_op==NULL)
>+                {
>+                        (*(int *)value) = 0; /* No Operation -> No skip */
>+                }
>+                else
>+                {
>+                        (*(int *)value) = (pblock->pb_op->o_flags & OP_FLAG_SKIP_MODIFIED_ATTRS);
>+                }
>+                break;
>         case SLAPI_IS_REPLICATED_OPERATION:
>                 if(pblock->pb_op==NULL)
>                 {
>                         (*(int *)value) = 0; /* No Operation -> Not Replicated */
>                 }
>Index: pw_retry.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/pw_retry.c,v
>retrieving revision 1.6
>diff -u -5 -t -w -r1.6 pw_retry.c
>--- pw_retry.c	10 Nov 2006 23:45:40 -0000	1.6
>+++ pw_retry.c	5 Oct 2007 22:02:45 -0000
>@@ -224,16 +224,18 @@
>         int res;
>         
>         if (mods && (slapi_mods_get_num_mods(mods) > 0)) 
>         {
>                 pblock_init(&pb);
>+                /* We don't want to overwrite the modifiersname, etc. attributes,
>+                 * so we set a flag for this operation */
>                 slapi_modify_internal_set_pb (&pb, dn, 
>                                                                           slapi_mods_get_ldapmods_byref(mods),
>                                                                           NULL, /* Controls */
>                                                                           NULL, /* UniqueID */
>                                                                           pw_get_componentID(), /* PluginID */
>-                                                                          0); /* Flags */
>+                                          OP_FLAG_SKIP_MODIFIED_ATTRS); /* Flags */
>                 slapi_modify_internal_pb (&pb);
>                 
>                 slapi_pblock_get(&pb, SLAPI_PLUGIN_INTOP_RESULT, &res);
>                 if (res != LDAP_SUCCESS){
>                         LDAPDebug(LDAP_DEBUG_ANY, "WARNING: passwordPolicy modify error %d on entry '%s'\n",
>Index: slapi-plugin.h
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-plugin.h,v
>retrieving revision 1.18
>diff -u -5 -t -w -r1.18 slapi-plugin.h
>--- slapi-plugin.h	4 Oct 2007 16:27:47 -0000	1.18
>+++ slapi-plugin.h	5 Oct 2007 22:02:45 -0000
>@@ -1358,10 +1358,11 @@
> #define SLAPI_OPERATION_AUTHTYPE                741
> #define SLAPI_OPERATION_ID                      744
> #define SLAPI_IS_REPLICATED_OPERATION           142
> #define SLAPI_IS_MMR_REPLICATED_OPERATION       153
> #define SLAPI_IS_LEGACY_REPLICATED_OPERATION    154
>+#define SLAPI_SKIP_MODIFIED_ATTRS               155
> 
> /* connection */
> #define SLAPI_CONN_DN                           143
> #define SLAPI_CONN_CLIENTNETADDR        850
> #define SLAPI_CONN_SERVERNETADDR                        851
>Index: slapi-private.h
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/slapi-private.h,v
>retrieving revision 1.16
>diff -u -5 -t -w -r1.16 slapi-private.h
>--- slapi-private.h	7 Sep 2007 19:08:45 -0000	1.16
>+++ slapi-private.h	5 Oct 2007 22:02:45 -0000
>@@ -378,26 +378,31 @@
> int filter_flag_is_set(const Slapi_Filter *f,unsigned char flag);
> char *slapi_filter_to_string(const Slapi_Filter *f, char *buffer, size_t bufsize);
> 
> /* operation.c */
> 
>-#define OP_FLAG_PS                                      0x0001
>-#define OP_FLAG_PS_CHANGESONLY                  0x0002
>-#define OP_FLAG_GET_EFFECTIVE_RIGHTS    0x0004  
>-#define OP_FLAG_REPLICATED              0x0008  /* A Replicated Operation */
>-#define OP_FLAG_REPL_FIXUP              0x0010  /* A Fixup Operation, generated as a consequence of a Replicated Operation. */
>-#define OP_FLAG_INTERNAL                0x0020  /* An operation generated by the core server or a plugin. */ 
>-#define OP_FLAG_ACTION_LOG_ACCESS               0x0040
>-#define OP_FLAG_ACTION_LOG_AUDIT                0x0080
>-#define OP_FLAG_ACTION_SCHEMA_CHECK             0x0100
>-#define OP_FLAG_ACTION_LOG_CHANGES              0x0200
>-#define OP_FLAG_ACTION_INVOKE_FOR_REPLOP        0x0400
>+#define OP_FLAG_PS                              0x00001
>+#define OP_FLAG_PS_CHANGESONLY                  0x00002
>+#define OP_FLAG_GET_EFFECTIVE_RIGHTS            0x00004  
>+#define OP_FLAG_REPLICATED                      0x00008 /* A Replicated Operation */
>+#define OP_FLAG_REPL_FIXUP                      0x00010 /* A Fixup Operation, generated as a
>+                                                         * consequence of a Replicated Operation. */
>+#define OP_FLAG_INTERNAL                        0x00020 /* An operation generated by the core
>+                                                         * server or a plugin. */ 
>+#define OP_FLAG_ACTION_LOG_ACCESS               0x00040
>+#define OP_FLAG_ACTION_LOG_AUDIT                0x00080
>+#define OP_FLAG_ACTION_SCHEMA_CHECK             0x00100
>+#define OP_FLAG_ACTION_LOG_CHANGES              0x00200
>+#define OP_FLAG_ACTION_INVOKE_FOR_REPLOP        0x00400
> #define OP_FLAG_NEVER_CHAIN                     SLAPI_OP_FLAG_NEVER_CHAIN  /* 0x0800 */
>-#define OP_FLAG_TOMBSTONE_ENTRY          0x1000
>-#define OP_FLAG_RESURECT_ENTRY           0x2000
>-#define OP_FLAG_LEGACY_REPLICATION_DN    0x4000 /* Operation done by legacy replication DN */
>-#define OP_FLAG_ACTION_NOLOG                     0x8000 /* Do not log the entry in audit log or change log */
>+#define OP_FLAG_TOMBSTONE_ENTRY                 0x01000
>+#define OP_FLAG_RESURECT_ENTRY                  0x02000
>+#define OP_FLAG_LEGACY_REPLICATION_DN           0x04000 /* Operation done by legacy replication DN */
>+#define OP_FLAG_ACTION_NOLOG                    0x08000 /* Do not log the entry in audit log or
>+                                                         * change log */
>+#define OP_FLAG_SKIP_MODIFIED_ATTRS             0x10000 /* Do not update the modifiersname,
>+                                                         * modifiedtimestamp, etc. attributes */
> 
> CSN *operation_get_csn(Slapi_Operation *op);
> void operation_set_csn(Slapi_Operation *op,CSN *csn);
> void operation_set_flag(Slapi_Operation *op,int flag);
> void operation_clear_flag(Slapi_Operation *op,int flag);
>Index: ssl.c
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/ssl.c,v
>retrieving revision 1.13
>diff -u -5 -t -w -r1.13 ssl.c
>--- ssl.c	29 Jan 2007 23:44:49 -0000	1.13
>+++ ssl.c	5 Oct 2007 22:02:45 -0000
>@@ -882,11 +882,11 @@
> 
>     slapi_log_error(SLAPI_LOG_TRACE,
>                     "slapd_ssl_init2", "tmp dir = %s\n", tmpDir);
> 
>     rv = SSL_ConfigServerSessionIDCache(0, stimeout, stimeout, tmpDir);
>-        slapi_ch_free(&tmpDir);
>+        slapi_ch_free_string(&tmpDir);
>     if (rv) {
>       errorCode = PR_GetError();
>       if (errorCode == ENOSPC) {
>         slapd_SSL_error("Config of server nonce cache failed, "
>             "out of disk space! Make more room in /tmp "

Actions: View | Diff

Attachments on bug 268101: 218131