diff --git a/bin/nsupdate/nsupdate.1 b/bin/nsupdate/nsupdate.1
index 2842a77448..058363e20a 100644
--- a/bin/nsupdate/nsupdate.1
+++ b/bin/nsupdate/nsupdate.1
@@ -13,7 +13,7 @@
.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
.\" PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: nsupdate.1,v 1.13 2010/07/10 01:14:19 tbox Exp $
+.\" $Id: nsupdate.1,v 1.14 2011/12/16 00:10:05 marka Exp $
.\"
.hy 0
.ad l
@@ -263,20 +263,20 @@ rather than the default realm in
\fIkrb5.conf\fR. If no realm is specified the saved realm is cleared.
.RE
.PP
-\fBprereq nxdomain\fR {domain\-name}
+\fB[prereq]\fR\fB nxdomain\fR {domain\-name}
.RS 4
Requires that no resource record of any type exists with name
\fIdomain\-name\fR.
.RE
.PP
-\fBprereq yxdomain\fR {domain\-name}
+\fB[prereq]\fR\fB yxdomain\fR {domain\-name}
.RS 4
Requires that
\fIdomain\-name\fR
exists (has as at least one resource record, of any type).
.RE
.PP
-\fBprereq nxrrset\fR {domain\-name} [class] {type}
+\fB[prereq]\fR\fB nxrrset\fR {domain\-name} [class] {type}
.RS 4
Requires that no resource record exists of the specified
\fItype\fR,
@@ -287,7 +287,7 @@ and
is omitted, IN (internet) is assumed.
.RE
.PP
-\fBprereq yxrrset\fR {domain\-name} [class] {type}
+\fB[prereq]\fR\fB yxrrset\fR {domain\-name} [class] {type}
.RS 4
This requires that a resource record of the specified
\fItype\fR,
@@ -299,7 +299,7 @@ must exist. If
is omitted, IN (internet) is assumed.
.RE
.PP
-\fBprereq yxrrset\fR {domain\-name} [class] {type} {data...}
+\fB[prereq]\fR\fB yxrrset\fR {domain\-name} [class] {type} {data...}
.RS 4
The
\fIdata\fR
@@ -315,7 +315,7 @@ are combined to form a set of RRs. This set of RRs must exactly match the set of
are written in the standard text representation of the resource record's RDATA.
.RE
.PP
-\fBupdate delete\fR {domain\-name} [ttl] [class] [type\ [data...]]
+\fB[update]\fR\fB del\fR\fB[ete]\fR {domain\-name} [ttl] [class] [type\ [data...]]
.RS 4
Deletes any resource records named
\fIdomain\-name\fR. If
@@ -329,7 +329,7 @@ is not supplied. The
is ignored, and is only allowed for compatibility.
.RE
.PP
-\fBupdate add\fR {domain\-name} {ttl} [class] {type} {data...}
+\fB[update]\fR\fB add\fR {domain\-name} {ttl} [class] {type} {data...}
.RS 4
Adds a new resource record with the specified
\fIttl\fR,
diff --git a/bin/nsupdate/nsupdate.html b/bin/nsupdate/nsupdate.html
index 3fa505e36f..7341aa0d97 100644
--- a/bin/nsupdate/nsupdate.html
+++ b/bin/nsupdate/nsupdate.html
@@ -14,7 +14,7 @@
- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
-->
-
+
@@ -32,7 +32,7 @@
nsupdate [-d] [-D] [[-g] | [-o] | [-l] | [-y [hmac:]keyname:secret] | [-k keyfile]] [-t timeout] [-u udptimeout] [-r udpretries] [-R randomdev] [-v] [filename]
-
DESCRIPTION
+
DESCRIPTION
nsupdate
is used to submit Dynamic DNS Update requests as defined in RFC 2136
to a name server.
@@ -192,7 +192,7 @@
-
INPUT FORMAT
+
INPUT FORMAT
nsupdate
reads input from
filename
@@ -331,7 +331,7 @@
realm is specified the saved realm is cleared.
- prereq nxdomain
+ [prereq] nxdomain
{domain-name}
@@ -339,7 +339,7 @@
domain-name.
- prereq yxdomain
+ [prereq] yxdomain
{domain-name}
@@ -348,7 +348,7 @@
exists (has as at least one resource record, of any type).
- prereq nxrrset
+ [prereq] nxrrset
{domain-name}
[class]
{type}
@@ -364,7 +364,7 @@
is omitted, IN (internet) is assumed.
- prereq yxrrset
+ [prereq] yxrrset
{domain-name}
[class]
{type}
@@ -381,7 +381,7 @@
is omitted, IN (internet) is assumed.
- prereq yxrrset
+ [prereq] yxrrset
{domain-name}
[class]
{type}
@@ -410,7 +410,7 @@
RDATA.
- update delete
+ [update] del[ete]
{domain-name}
[ttl]
[class]
@@ -431,7 +431,7 @@
is ignored, and is only allowed for compatibility.
- update add
+ [update] add
{domain-name}
{ttl}
[class]
@@ -480,7 +480,7 @@
-
EXAMPLES
+
EXAMPLES
The examples below show how
nsupdate
@@ -534,7 +534,7 @@
-
FILES
+
FILES
/etc/resolv.conf
@@ -557,7 +557,7 @@
-
SEE ALSO
+
SEE ALSO
RFC 2136,
RFC 3007,
@@ -572,7 +572,7 @@
-
BUGS
+
BUGS
The TSIG key is redundantly stored in two separate files.
This is a consequence of nsupdate using the DST library
diff --git a/configure b/configure
index 9a1e25e4ef..7ebec0b270 100755
--- a/configure
+++ b/configure
@@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
#
-# $Id: configure,v 1.514 2011/11/16 00:43:10 tbox Exp $
+# $Id: configure,v 1.515 2011/12/16 00:10:04 marka Exp $
#
# Portions of this code release fall under one or more of the
# following Copyright notices. Please see individual source
@@ -517,7 +517,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
# OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# From configure.in Revision.
+# From configure.in Revision: 1.531 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.67.
#
@@ -22123,8 +22123,9 @@ case $host in
*-*-sysv*OpenUNIX*)
# UnixWare
use_threads=true ;;
-*-netbsd1234.*)
- # NetBSD earlier than NetBSD 5.0 has poor pthreads. Don't use it by default.
+*-netbsd[1234].*)
+ # NetBSD earlier than NetBSD 5.0 has poor pthreads.
+ # Don't use it by default.
use_threads=false ;;
*-netbsd*)
use_threads=true ;;
@@ -22132,11 +22133,14 @@ case $host in
# OpenBSD users have reported that named dumps core on
# startup when built with threads.
use_threads=false ;;
-*-freebsd89.*)
- use_threads=true ;;
-*-freebsd*)
+*-freebsd[1234567].*)
+ # Threads are broken at least up to FreeBSD 4.11.
+ # FreeBSD 5, 6 and 7 we have never officially supported threads
+ # on. YMMV
use_threads=false ;;
-*-bsdi234*)
+*-freebsd*)
+ use_threads=true ;;
+*-bsdi[234]*)
# Thread signals do not work reliably on some versions of BSD/OS.
use_threads=false ;;
*-bsdi5*)