regen master

diff --git a/configure b/configure
index 9f637eeb7bd82ce338391df2e897767abf676b6c..7a53165026dfac2b78eb8f5cb582a63bc3e6cb1c 100755 (executable)
--- a/configure
+++ b/configure
@@ -23535,23 +23535,11 @@ done
                        then
                                use_dlz_mysql=$d
                                mysql_include=$d/include/mysql
-                       if test -d $d/lib/mysql
-                               then
-                               mysql_lib=$d/lib/mysql
-                               else
-                                       mysql_lib=$d/lib
-                               fi
                                break
                        elif test -f $d/include/mysql.h
                        then
                                use_dlz_mysql=$d
                                mysql_include=$d/include
-                               if test -d $d/lib/mysql
-                               then
-                                       mysql_lib=$d/lib/mysql
-                               else
-                                       mysql_lib=$d/lib
-                               fi
                                break
                        fi
                done
@@ -23562,21 +23550,9 @@ then
        if test -f $d/include/mysql/mysql.h
        then
                mysql_include=$d/include/mysql
-               if test -d $d/lib/mysql
-               then
-                       mysql_lib=$d/lib/mysql
-               else
-                       mysql_lib=$d/lib
-               fi
        elif test -f $d/include/mysql.h
        then
                mysql_include=$d/include
-               if test -d $d/lib/mysql
-               then
-                       mysql_lib=$d/lib/mysql
-               else
-                       mysql_lib=$d/lib
-               fi
        fi
 fi
 
@@ -23616,6 +23592,12 @@ $as_echo "no" >&6; }
 $as_echo "using mysql with libs ${mysql_lib} and includes ${mysql_include}" >&6; }
                ;;
        *)
+               if test -d "$use_dlz_mysql/lib/mysql"
+               then
+                       mysql_lib="$use_dlz_mysql/lib/mysql"
+               else
+                       mysql_lib="$use_dlz_mysql/lib"
+               fi
 
        CONTRIB_DLZ="$CONTRIB_DLZ -DDLZ_MYSQL"
        for i in dlz_mysql_driver

diff --git a/doc/arm/Bv9ARM.ch08.html b/doc/arm/Bv9ARM.ch08.html
index 269746e4ae916a77940005064b4a91db89b4e36b..c7fa64c9554d273b2f6c35182e303dacc2c34b5c 100644 (file)
--- a/doc/arm/Bv9ARM.ch08.html
+++ b/doc/arm/Bv9ARM.ch08.html
@@ -129,14 +129,23 @@
   <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_changes"></a>Feature Changes</h3></div></div></div>
-    <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+    <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
        <p>
          Zone types <span class="command"><strong>primary</strong></span> and
          <span class="command"><strong>secondary</strong></span> are now available as synonyms for
          <span class="command"><strong>master</strong></span> and <span class="command"><strong>slave</strong></span>,
          respectively, in <code class="filename">named.conf</code>.
        </p>
-      </li></ul></div>
+      </li>
+<li class="listitem">
+       <p>
+         <span class="command"><strong>named</strong></span> will now log a warning if the old
+         root DNSSEC key is explicitly configured and has not been updated.
+         [RT #43670]
+       </p>
+      </li>
+</ul></div>
   </div>
 
   <div class="section">

diff --git a/doc/arm/notes.html b/doc/arm/notes.html
index 00e4c747cecbbc55c5bdcf8d316759ee5317e9f0..e74dc165d0864c417e9c86bb15bc34c569d01472 100644 (file)
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -91,14 +91,23 @@
   <div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_changes"></a>Feature Changes</h3></div></div></div>
-    <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+    <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
        <p>
          Zone types <span class="command"><strong>primary</strong></span> and
          <span class="command"><strong>secondary</strong></span> are now available as synonyms for
          <span class="command"><strong>master</strong></span> and <span class="command"><strong>slave</strong></span>,
          respectively, in <code class="filename">named.conf</code>.
        </p>
-      </li></ul></div>
+      </li>
+<li class="listitem">
+       <p>
+         <span class="command"><strong>named</strong></span> will now log a warning if the old
+         root DNSSEC key is explicitly configured and has not been updated.
+         [RT #43670]
+       </p>
+      </li>
+</ul></div>
   </div>
 
   <div class="section">