-- Thanks, Sean Burford ------=_Part_7327_2415938.1212167698754 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi,<br><br><div class="gmail_quote">On Fri, May 30, 2008 at 2:40 AM, &lt;<a href="mailto:hyc@symas.com">hyc@symas.com</a>&gt; wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"> This is a multi-part message in MIME format.<br> --------------050600010007030200030106<br> Content-Type: text/plain; charset=ISO-8859-1; format=flowed<br> Content-Transfer-Encoding: 7bit<br> <div class="Ih2E3d"><br> <a href="mailto:hyc@symas.com">hyc@symas.com</a> wrote:<br> &gt; We&#39;ll probably need to discuss on the -devel list what steps to take from here.<br> &gt;<br> </div>I wrote the attached patch for the original issue. Unfortunately it asserted<br> right away:<br> <br> [Switching to Thread 1090525504 (LWP 23577)]<br> 0x00002b55e738d535 in raise () from /lib64/libc.so.6<br> (gdb) bt<br> #0 &nbsp;0x00002b55e738d535 in raise () from /lib64/libc.so.6<br> #1 &nbsp;0x00002b55e738e990 in abort () from /lib64/libc.so.6<br> #2 &nbsp;0x00002b55e7386c16 in __assert_fail () from /lib64/libc.so.6<br> #3 &nbsp;0x00000000004410e5 in attr_valadd (a=0xb866c8, vals=0x41000670, nvals=0x0,<br> nn=1) at ../../../r24/servers/slapd/attr.c:394<br> #4 &nbsp;0x0000000000441a06 in attr_merge_one (e=0xb72c08, desc=0x8b3780,<br> val=0x41000670, nval=0x0)<br> &nbsp; &nbsp; at ../../../r24/servers/slapd/attr.c:599<br> #5 &nbsp;0x000000000043ea0f in slap_add_opattrs (op=0x965ec0, text=&lt;value optimized<br> out&gt;, textbuf=&lt;value optimized out&gt;,<br> &nbsp; &nbsp; textlen=&lt;value optimized out&gt;, manage_ctxcsn=&lt;value optimized out&gt;) at<br> ../../../r24/servers/slapd/add.c:664<br> #6 &nbsp;0x00000000004d9c42 in hdb_add (op=0x965ec0, rs=0x41000ca0) at add.c:108<br> #7 &nbsp;0x000000000043f1a6 in fe_op_add (op=0x965ec0, rs=0x41000ca0) at<br> ../../../r24/servers/slapd/add.c:334<br> #8 &nbsp;0x000000000043fa12 in do_add (op=0x965ec0, rs=0x41000ca0) at<br> ../../../r24/servers/slapd/add.c:194<br> #9 &nbsp;0x00000000004383a7 in connection_operation (ctx=0x41000de0,<br> arg_v=0x965ec0) at ../../../r24/servers/slapd/connection.c:1084<br> #10 0x00000000004388cf in connection_read_thread (ctx=0x41000de0, argv=0xc) at<br> ../../../r24/servers/slapd/connection.c:1211<br> #11 0x000000000054b8ca in ldap_int_thread_pool_wrapper (xpool=0x8bf070) at<br> ../../../r24/libraries/libldap_r/tpool.c:663<br> #12 0x00002b55e655e09e in start_thread () from /lib64/libpthread.so.0<br> #13 0x00002b55e741e4cd in clone () from /lib64/libc.so.6<br> #14 0x0000000000000000 in ?? ()<br> <br> It was adding the createTimestamp attribute, without providing normalized<br> values. slap_add_opattrs was written before the generalizedTimeNormalize<br> function was written... I suspect there will be a fair number of cases that<br> need to be cleaned up. I don&#39;t have time at the moment to chase them all down.<br> Anyone else want to jump in here? If not, we may have to push this back a bit.<br> Note that this patch will probably require a fair number of databases to be<br> reloaded.<br> <div class="Ih2E3d"><br> --<br> &nbsp; -- Howard Chu<br> &nbsp; CTO, Symas Corp. &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <a href="http://www.symas.com" target="_blank">http://www.symas.com</a><br> &nbsp; Director, Highland Sun &nbsp; &nbsp; <a href="http://highlandsun.com/hyc/" target="_blank">http://highlandsun.com/hyc/</a><br> &nbsp; Chief Architect, OpenLDAP &nbsp;<a href="http://www.openldap.org/project/" target="_blank">http://www.openldap.org/project/</a><br> <br> </div>--------------050600010007030200030106<br> Content-Type: text/plain;<br> &nbsp;name=&quot;dif.txt&quot;<br> Content-Transfer-Encoding: 7bit<br> Content-Disposition: inline;<br> &nbsp;filename=&quot;dif.txt&quot;<br> <br> Index: attr.c<br> ===================================================================<br> RCS file: /repo/OpenLDAP/pkg/ldap/servers/slapd/attr.c,v<br> retrieving revision <a href="http://1.112.2.7" target="_blank">1.112.2.7</a><br> diff -u -r1.112.2.7 attr.c<br> --- attr.c &nbsp; &nbsp; &nbsp;11 Feb 2008 23:26:43 -0000 &nbsp; &nbsp; &nbsp;<a href="http://1.112.2.7" target="_blank">1.112.2.7</a><br> +++ attr.c &nbsp; &nbsp; &nbsp;30 May 2008 09:33:43 -0000<br> @@ -366,8 +366,39 @@<br> &nbsp; &nbsp; &nbsp; &nbsp;BerVarray nvals,<br> &nbsp; &nbsp; &nbsp; &nbsp;int nn )<br> &nbsp;{<br> - &nbsp; &nbsp; &nbsp; int &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; i;<br> &nbsp; &nbsp; &nbsp; &nbsp;BerVarray &nbsp; &nbsp; &nbsp; v2;<br> + &nbsp; &nbsp; &nbsp; int &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; i;<br> +<br> + &nbsp; &nbsp; &nbsp; {<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; /* FIXME: if the schema has been edited, and an equality matching rule<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;* has been added or removed from the attribute definition, the database<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;* values may no longer be in sync with our expectations. Currently this<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;* means the DB must be reloaded.<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;*/<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; int have_norm, have_nval, new_nval;<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; have_norm = a-&gt;a_desc-&gt;ad_type-&gt;sat_equality-&gt;smr_normalize != NULL;</blockquote><div><br>Not all attributes have an equality matching rule.&nbsp; This causes your patch to segfault since sat_equality is NULL:<br> <blockquote style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex; font-family: courier new,monospace;" class="gmail_quote">have_norm = a-&gt;a_desc-&gt;ad_type-&gt;sat_equality-&gt;smr_normalize != NULL;<br> </blockquote> <br>This seems to be a better way to generate have_norm:<br><blockquote style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;" class="gmail_quote"><span style="font-family: courier new,monospace;">have_norm = a-&gt;a_desc-&gt;ad_type-&gt;sat_equality != NULL &amp;&amp;</span><br style="font-family: courier new,monospace;"> <span style="font-family: courier new,monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; a-&gt;a_desc-&gt;ad_type-&gt;sat_equality-&gt;smr_normalize != NULL;</span><br></blockquote><br>Once that is fixed the config backend causes an assert for me when it attempts to add createTimestamp, which is exactly the problem you describe.<br> <br>I&#39;ll create a patch that addresses any of these normalization issues that I can identify and send it to one of the openldap lists.&nbsp; Would openldap-its or openldap-devel be preferable?<br><br></div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; have_nval = a-&gt;a_nvals != a-&gt;a_vals;<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; new_nval = nvals != NULL;<br> +<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; /* this check is only relevant if any values already exist */<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; if ( a-&gt;a_vals != NULL &amp;&amp; have_norm != have_nval ) {<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; Debug(LDAP_DEBUG_ANY,<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;attr_valadd: database inconsistent with schema definition of %s, reload the DB\n&quot;,<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; a-&gt;a_desc-&gt;ad_cname.bv_val, 0, 0 );<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; return LDAP_OTHER;<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; /* no need to compare have_nval with new_nval; by transitivity they will match if<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;* the above check and the following check succeed.<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;*/<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; }<br> +<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; assert( have_norm == new_nval );<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; if ( have_norm != new_nval ) {<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; Debug(LDAP_DEBUG_ANY,<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &quot;attr_valadd: new values of %s not properly normalized (should never happen!)\n&quot;,<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; a-&gt;a_desc-&gt;ad_cname.bv_val, 0, 0 );<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; return LDAP_OTHER;<br> + &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; }<br> + &nbsp; &nbsp; &nbsp; }<br> <br> &nbsp; &nbsp; &nbsp; &nbsp;v2 = (BerVarray) SLAP_REALLOC( (char *) a-&gt;a_vals,<br> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;(a-&gt;a_numvals + nn + 1) * sizeof(struct berval) );<br> @@ -469,15 +500,6 @@<br> <br> &nbsp; &nbsp; &nbsp; &nbsp;if ( *a == NULL ) {<br> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;*a = attr_alloc( desc );<br> - &nbsp; &nbsp; &nbsp; } else {<br> - &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; /*<br> - &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;* FIXME: if the attribute already exists, the presence<br> - &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;* of nvals and the value of (*a)-&gt;a_nvals must be consistent<br> - &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;*/<br> - &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; assert( ( nvals == NULL &amp;&amp; (*a)-&gt;a_nvals == (*a)-&gt;a_vals )<br> - &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; || ( nvals != NULL &amp;&amp; (<br> - &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; ( (*a)-&gt;a_vals == NULL &amp;&amp; (*a)-&gt;a_nvals == NULL )<br> - &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; || ( (*a)-&gt;a_nvals != (*a)-&gt;a_vals ) ) ) );<br> &nbsp; &nbsp; &nbsp; &nbsp;}<br> <br> &nbsp; &nbsp; &nbsp; &nbsp;if ( vals != NULL ) {<br> <br> --------------050600010007030200030106--<br> <br> <br> </blockquote></div><br><br clear="all"><br>-- <br>Thanks,<br>Sean Burford ------=_Part_7327_2415938.1212167698754--