[Pkg-samba-maint] r4168 - in branches/samba/upstream: . docs/manpages examples/VFS packaging/RHEL packaging/RHEL-CTDB source3 source3/auth source3/client source3/include source3/lib source3/libsmb source3/locking source3/nmbd source3/printing source3/registry source3/rpc_server/srvsvc source3/smbd source3/utils source3/winbindd source4/torture/ndr

Tue Sep 18 03:31:45 UTC 2012

Author: bubulle
Date: 2012-09-18 03:31:43 +0000 (Tue, 18 Sep 2012)
New Revision: 4168

Modified:
   branches/samba/upstream/WHATSNEW.txt
   branches/samba/upstream/docs/manpages/eventlogadm.8
   branches/samba/upstream/docs/manpages/findsmb.1
   branches/samba/upstream/docs/manpages/idmap_ad.8
   branches/samba/upstream/docs/manpages/idmap_adex.8
   branches/samba/upstream/docs/manpages/idmap_autorid.8
   branches/samba/upstream/docs/manpages/idmap_hash.8
   branches/samba/upstream/docs/manpages/idmap_ldap.8
   branches/samba/upstream/docs/manpages/idmap_nss.8
   branches/samba/upstream/docs/manpages/idmap_rid.8
   branches/samba/upstream/docs/manpages/idmap_tdb.8
   branches/samba/upstream/docs/manpages/idmap_tdb2.8
   branches/samba/upstream/docs/manpages/libsmbclient.7
   branches/samba/upstream/docs/manpages/lmhosts.5
   branches/samba/upstream/docs/manpages/log2pcap.1
   branches/samba/upstream/docs/manpages/net.8
   branches/samba/upstream/docs/manpages/nmbd.8
   branches/samba/upstream/docs/manpages/nmblookup.1
   branches/samba/upstream/docs/manpages/ntlm_auth.1
   branches/samba/upstream/docs/manpages/pam_winbind.8
   branches/samba/upstream/docs/manpages/pam_winbind.conf.5
   branches/samba/upstream/docs/manpages/pdbedit.8
   branches/samba/upstream/docs/manpages/profiles.1
   branches/samba/upstream/docs/manpages/rpcclient.1
   branches/samba/upstream/docs/manpages/samba.7
   branches/samba/upstream/docs/manpages/sharesec.1
   branches/samba/upstream/docs/manpages/smb.conf.5
   branches/samba/upstream/docs/manpages/smbcacls.1
   branches/samba/upstream/docs/manpages/smbclient.1
   branches/samba/upstream/docs/manpages/smbcontrol.1
   branches/samba/upstream/docs/manpages/smbcquotas.1
   branches/samba/upstream/docs/manpages/smbd.8
   branches/samba/upstream/docs/manpages/smbget.1
   branches/samba/upstream/docs/manpages/smbgetrc.5
   branches/samba/upstream/docs/manpages/smbpasswd.5
   branches/samba/upstream/docs/manpages/smbpasswd.8
   branches/samba/upstream/docs/manpages/smbspool.8
   branches/samba/upstream/docs/manpages/smbstatus.1
   branches/samba/upstream/docs/manpages/smbta-util.8
   branches/samba/upstream/docs/manpages/smbtar.1
   branches/samba/upstream/docs/manpages/smbtree.1
   branches/samba/upstream/docs/manpages/swat.8
   branches/samba/upstream/docs/manpages/tdbbackup.8
   branches/samba/upstream/docs/manpages/tdbdump.8
   branches/samba/upstream/docs/manpages/tdbtool.8
   branches/samba/upstream/docs/manpages/testparm.1
   branches/samba/upstream/docs/manpages/vfs_acl_tdb.8
   branches/samba/upstream/docs/manpages/vfs_acl_xattr.8
   branches/samba/upstream/docs/manpages/vfs_aio_fork.8
   branches/samba/upstream/docs/manpages/vfs_aio_pthread.8
   branches/samba/upstream/docs/manpages/vfs_audit.8
   branches/samba/upstream/docs/manpages/vfs_cacheprime.8
   branches/samba/upstream/docs/manpages/vfs_cap.8
   branches/samba/upstream/docs/manpages/vfs_catia.8
   branches/samba/upstream/docs/manpages/vfs_commit.8
   branches/samba/upstream/docs/manpages/vfs_crossrename.8
   branches/samba/upstream/docs/manpages/vfs_default_quota.8
   branches/samba/upstream/docs/manpages/vfs_dirsort.8
   branches/samba/upstream/docs/manpages/vfs_extd_audit.8
   branches/samba/upstream/docs/manpages/vfs_fake_perms.8
   branches/samba/upstream/docs/manpages/vfs_fileid.8
   branches/samba/upstream/docs/manpages/vfs_full_audit.8
   branches/samba/upstream/docs/manpages/vfs_gpfs.8
   branches/samba/upstream/docs/manpages/vfs_netatalk.8
   branches/samba/upstream/docs/manpages/vfs_notify_fam.8
   branches/samba/upstream/docs/manpages/vfs_prealloc.8
   branches/samba/upstream/docs/manpages/vfs_preopen.8
   branches/samba/upstream/docs/manpages/vfs_readahead.8
   branches/samba/upstream/docs/manpages/vfs_readonly.8
   branches/samba/upstream/docs/manpages/vfs_recycle.8
   branches/samba/upstream/docs/manpages/vfs_scannedonly.8
   branches/samba/upstream/docs/manpages/vfs_shadow_copy.8
   branches/samba/upstream/docs/manpages/vfs_shadow_copy2.8
   branches/samba/upstream/docs/manpages/vfs_smb_traffic_analyzer.8
   branches/samba/upstream/docs/manpages/vfs_streams_depot.8
   branches/samba/upstream/docs/manpages/vfs_streams_xattr.8
   branches/samba/upstream/docs/manpages/vfs_time_audit.8
   branches/samba/upstream/docs/manpages/vfs_xattr_tdb.8
   branches/samba/upstream/docs/manpages/vfstest.1
   branches/samba/upstream/docs/manpages/wbinfo.1
   branches/samba/upstream/docs/manpages/winbind_krb5_locator.7
   branches/samba/upstream/docs/manpages/winbindd.8
   branches/samba/upstream/examples/VFS/configure
   branches/samba/upstream/packaging/RHEL-CTDB/samba.spec
   branches/samba/upstream/packaging/RHEL/makerpms.sh
   branches/samba/upstream/packaging/RHEL/samba.spec
   branches/samba/upstream/source3/VERSION
   branches/samba/upstream/source3/auth/auth_util.c
   branches/samba/upstream/source3/client/client.c
   branches/samba/upstream/source3/client/clitar.c
   branches/samba/upstream/source3/configure
   branches/samba/upstream/source3/configure.in
   branches/samba/upstream/source3/include/config.h.in
   branches/samba/upstream/source3/include/krb5_protos.h
   branches/samba/upstream/source3/include/ntioctl.h
   branches/samba/upstream/source3/include/version.h
   branches/samba/upstream/source3/lib/secdesc.c
   branches/samba/upstream/source3/lib/sysquotas.c
   branches/samba/upstream/source3/libsmb/clifile.c
   branches/samba/upstream/source3/libsmb/clikrb5.c
   branches/samba/upstream/source3/locking/locking.c
   branches/samba/upstream/source3/nmbd/nmbd_winsserver.c
   branches/samba/upstream/source3/printing/print_generic.c
   branches/samba/upstream/source3/printing/printing.c
   branches/samba/upstream/source3/registry/regfio.c
   branches/samba/upstream/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
   branches/samba/upstream/source3/smbd/blocking.c
   branches/samba/upstream/source3/smbd/nttrans.c
   branches/samba/upstream/source3/smbd/open.c
   branches/samba/upstream/source3/smbd/proto.h
   branches/samba/upstream/source3/smbd/server.c
   branches/samba/upstream/source3/smbd/server_reload.c
   branches/samba/upstream/source3/smbd/smb2_ioctl.c
   branches/samba/upstream/source3/smbd/smb2_setinfo.c
   branches/samba/upstream/source3/utils/net_lookup.c
   branches/samba/upstream/source3/winbindd/winbindd.c
   branches/samba/upstream/source3/winbindd/winbindd_cred_cache.c
   branches/samba/upstream/source3/winbindd/winbindd_group.c
   branches/samba/upstream/source3/winbindd/winbindd_pam.c
   branches/samba/upstream/source3/winbindd/winbindd_proto.h
   branches/samba/upstream/source3/wscript
   branches/samba/upstream/source4/torture/ndr/ndr.h
Log:
Load samba-3.6.8 into branches/samba/upstream.

Modified: branches/samba/upstream/WHATSNEW.txt
===================================================================

--- branches/samba/upstream/WHATSNEW.txt	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/WHATSNEW.txt	2012-09-18 03:31:43 UTC (rev 4168)
@@ -1,4 +1,109 @@
                    =============================
+                   Release Notes for Samba 3.6.8
+                         September 17, 2012
+                   =============================
+
+
+This is is the latest stable release of Samba 3.6.
+
+Major enhancements in Samba 3.6.8 include:
+
+o  Fix crash bug in smbd caused by a blocking lock followed by
+   close (bug #9084).
+o  Fix Winbind panic if we couldn't find the domain (bug #9135).
+
+
+Changes since 3.6.7:
+--------------------
+
+o   Jeremy Allison <jra at samba.org>
+    * BUG 9058: Fix smbstatus code dump when a file entry has delete tokens.
+    * BUG 9098: Fix refreshing of Kerberos tickets in Winbind.
+    * BUG 9124: Fix setting of "inherited" bit on inherited ACE's.
+
+
+o   Christian Ambach <ambi at samba.org>
+    * BUG 9137: Make 'smbclient allinfo' show the snapshot list.
+
+
+o   Andrew Bartlett <abartlet at samba.org>
+    * BUG 9066: "Domain Users" incorrectly added as additional group on domain
+      members.
+    * BUG 9067: Use correct RID for "Domain Guests" primary group.
+
+
+o   David Binderman <dcb314 at hotmail.com>
+    * BUG 9065: Fix bad call to memcpy source3/registry/regfio.c.
+
+
+o   David Disseldorp <ddiss at samba.org>
+    * BUG 9123: Fix lprng job tracking errors.
+
+
+o   Salvador I. Gonzalez <sgonzalez at codejunkie.net>
+    * BUG 9088: Fix smbclient/tarmode panic when connecting to Windows 2000
+      clients.
+
+
+o   Hargagan <shargagan at novell.com>
+    * BUG 9085: Fix NMB registration for a duplicate workstation.
+
+
+o   Björn Jacke <bj at sernet.de>
+    * BUG 9037: Open and netbsd have the md5 symbols in libc.
+    * BUG 9144: Fix nfs quota support with Linux nfs4 mounts.
+
+
+o   Volker Lendecke <vl at samba.org>
+    * BUG 9037: Fix name clash in MD5 causing the "net ads join" to fail on
+      T4 (sun4v) systems on Solaris 10.
+    * BUG 9058: Backport FSCTL codes from master.
+    * BUG 9084: Fix crash bug in smbd caused by a blocking lock followed by
+      close.
+    * BUG 9150: Valid open requests can cause smbd assert due to incorrect
+      oplock handling on delete requests.
+
+
+o   Herb Lewis <hlewis at panasas.com>
+    * BUG 9104: Fix identification of idle clients in Winbind to avoid crashes
+      and NDR parsing errors.
+
+
+o   Stefan Metzmacher <metze at samba.org>
+    * BUG 9058: Fix segfault in smbstatus.
+
+
+o   Andreas Schneider <asn at samba.org>
+    * BUG 9111: Fix compilation with newer MIT Kerberos which hides internal
+      symbols.
+    * BUG 9112: Fix flooding the logs with records we don't find in pcap.
+    * BUG 9122: Initialize the print backend after we setup winreg.
+    * BUG 9135: Fix Winbind panic if we couldn't find the domain.
+
+
+######################################################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored.  All bug reports should
+be filed under the Samba 3.6 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+Release notes for older releases follow:
+----------------------------------------
+
+                   =============================
                    Release Notes for Samba 3.6.7
                            August 6, 2012
                    =============================
@@ -17,8 +122,8 @@
 
 o   Jeremy Allison <jra at samba.org>
     * BUG 8974: Fix kernel oplocks when uid(file) != uid(process).
-    * BUG 8989: Send correct responses to NT Transact Secondary when no data and
-      no params for the Trans2 calls are set.
+    * BUG 8989: Send correct responses to NT Transact Secondary when no data
+      and no params for the Trans2 calls are set.
     * BUG 9034: Fix typo in set_re_uid() call when USE_SETRESUID selected in
       configure.
 
@@ -87,9 +192,10 @@
 == The Samba Team
 ======================================================================
 
-Release notes for older releases follow:
-----------------------------------------
 
+----------------------------------------------------------------------
+
+
                    =============================
                    Release Notes for Samba 3.6.6
                            June 25, 2012

Modified: branches/samba/upstream/docs/manpages/eventlogadm.8
===================================================================
--- branches/samba/upstream/docs/manpages/eventlogadm.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/eventlogadm.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: eventlogadm
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "EVENTLOGADM" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "EVENTLOGADM" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/findsmb.1
===================================================================
--- branches/samba/upstream/docs/manpages/findsmb.1	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/findsmb.1	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: findsmb
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "FINDSMB" "1" "07/30/2012" "Samba 3\&.6" "User Commands"
+.TH "FINDSMB" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/idmap_ad.8
===================================================================
--- branches/samba/upstream/docs/manpages/idmap_ad.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/idmap_ad.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_ad
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_AD" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_AD" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/idmap_adex.8
===================================================================
--- branches/samba/upstream/docs/manpages/idmap_adex.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/idmap_adex.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_adex
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_ADEX" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_ADEX" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/idmap_autorid.8
===================================================================
--- branches/samba/upstream/docs/manpages/idmap_autorid.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/idmap_autorid.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_autorid
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_AUTORID" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_AUTORID" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/idmap_hash.8
===================================================================
--- branches/samba/upstream/docs/manpages/idmap_hash.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/idmap_hash.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_hash
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_HASH" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_HASH" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/idmap_ldap.8
===================================================================
--- branches/samba/upstream/docs/manpages/idmap_ldap.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/idmap_ldap.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_ldap
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_LDAP" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_LDAP" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/idmap_nss.8
===================================================================
--- branches/samba/upstream/docs/manpages/idmap_nss.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/idmap_nss.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_nss
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_NSS" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_NSS" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/idmap_rid.8
===================================================================
--- branches/samba/upstream/docs/manpages/idmap_rid.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/idmap_rid.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_rid
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_RID" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_RID" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/idmap_tdb.8
===================================================================
--- branches/samba/upstream/docs/manpages/idmap_tdb.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/idmap_tdb.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_tdb
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_TDB" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_TDB" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/idmap_tdb2.8
===================================================================
--- branches/samba/upstream/docs/manpages/idmap_tdb2.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/idmap_tdb2.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_tdb2
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_TDB2" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_TDB2" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/libsmbclient.7
===================================================================
--- branches/samba/upstream/docs/manpages/libsmbclient.7	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/libsmbclient.7	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: libsmbclient
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: 7
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "LIBSMBCLIENT" "7" "07/30/2012" "Samba 3\&.6" "7"
+.TH "LIBSMBCLIENT" "7" "09/14/2012" "Samba 3\&.6" "7"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/lmhosts.5
===================================================================
--- branches/samba/upstream/docs/manpages/lmhosts.5	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/lmhosts.5	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: lmhosts
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "LMHOSTS" "5" "07/30/2012" "Samba 3\&.6" "File Formats and Conventions"
+.TH "LMHOSTS" "5" "09/14/2012" "Samba 3\&.6" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/log2pcap.1
===================================================================
--- branches/samba/upstream/docs/manpages/log2pcap.1	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/log2pcap.1	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: log2pcap
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "LOG2PCAP" "1" "07/30/2012" "Samba 3\&.6" "User Commands"
+.TH "LOG2PCAP" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/net.8
===================================================================
--- branches/samba/upstream/docs/manpages/net.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/net.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: net
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "NET" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "NET" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/nmbd.8
===================================================================
--- branches/samba/upstream/docs/manpages/nmbd.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/nmbd.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: nmbd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "NMBD" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "NMBD" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/nmblookup.1
===================================================================
--- branches/samba/upstream/docs/manpages/nmblookup.1	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/nmblookup.1	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: nmblookup
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "NMBLOOKUP" "1" "07/30/2012" "Samba 3\&.6" "User Commands"
+.TH "NMBLOOKUP" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/ntlm_auth.1
===================================================================
--- branches/samba/upstream/docs/manpages/ntlm_auth.1	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/ntlm_auth.1	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: ntlm_auth
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "NTLM_AUTH" "1" "07/30/2012" "Samba 3\&.6" "User Commands"
+.TH "NTLM_AUTH" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/pam_winbind.8
===================================================================
--- branches/samba/upstream/docs/manpages/pam_winbind.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/pam_winbind.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: pam_winbind
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: 8
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PAM_WINBIND" "8" "07/30/2012" "Samba 3\&.6" "8"
+.TH "PAM_WINBIND" "8" "09/14/2012" "Samba 3\&.6" "8"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/pam_winbind.conf.5
===================================================================
--- branches/samba/upstream/docs/manpages/pam_winbind.conf.5	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/pam_winbind.conf.5	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: pam_winbind.conf
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: 5
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PAM_WINBIND\&.CONF" "5" "07/30/2012" "Samba 3\&.6" "5"
+.TH "PAM_WINBIND\&.CONF" "5" "09/14/2012" "Samba 3\&.6" "5"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/pdbedit.8
===================================================================
--- branches/samba/upstream/docs/manpages/pdbedit.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/pdbedit.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: pdbedit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PDBEDIT" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "PDBEDIT" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/profiles.1
===================================================================
--- branches/samba/upstream/docs/manpages/profiles.1	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/profiles.1	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: profiles
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PROFILES" "1" "07/30/2012" "Samba 3\&.6" "User Commands"
+.TH "PROFILES" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/rpcclient.1
===================================================================
--- branches/samba/upstream/docs/manpages/rpcclient.1	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/rpcclient.1	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: rpcclient
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "RPCCLIENT" "1" "07/30/2012" "Samba 3\&.6" "User Commands"
+.TH "RPCCLIENT" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/samba.7
===================================================================
--- branches/samba/upstream/docs/manpages/samba.7	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/samba.7	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: samba
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: Miscellanea
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SAMBA" "7" "07/30/2012" "Samba 3\&.6" "Miscellanea"
+.TH "SAMBA" "7" "09/14/2012" "Samba 3\&.6" "Miscellanea"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/sharesec.1
===================================================================
--- branches/samba/upstream/docs/manpages/sharesec.1	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/sharesec.1	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: sharesec
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SHARESEC" "1" "07/30/2012" "Samba 3\&.6" "User Commands"
+.TH "SHARESEC" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smb.conf.5
===================================================================
--- branches/samba/upstream/docs/manpages/smb.conf.5	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/smb.conf.5	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: smb.conf
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMB\&.CONF" "5" "07/30/2012" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMB\&.CONF" "5" "09/14/2012" "Samba 3\&.6" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbcacls.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbcacls.1	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/smbcacls.1	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: smbcacls
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBCACLS" "1" "07/30/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBCACLS" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbclient.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbclient.1	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/smbclient.1	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: smbclient
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBCLIENT" "1" "07/30/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBCLIENT" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbcontrol.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbcontrol.1	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/smbcontrol.1	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: smbcontrol
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBCONTROL" "1" "07/30/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBCONTROL" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbcquotas.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbcquotas.1	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/smbcquotas.1	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: smbcquotas
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBCQUOTAS" "1" "07/30/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBCQUOTAS" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbd.8
===================================================================
--- branches/samba/upstream/docs/manpages/smbd.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/smbd.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: smbd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBD" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SMBD" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbget.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbget.1	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/smbget.1	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: smbget
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBGET" "1" "07/30/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBGET" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbgetrc.5
===================================================================
--- branches/samba/upstream/docs/manpages/smbgetrc.5	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/smbgetrc.5	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: smbgetrc
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBGETRC" "5" "07/30/2012" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMBGETRC" "5" "09/14/2012" "Samba 3\&.6" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbpasswd.5
===================================================================
--- branches/samba/upstream/docs/manpages/smbpasswd.5	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/smbpasswd.5	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: smbpasswd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBPASSWD" "5" "07/30/2012" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMBPASSWD" "5" "09/14/2012" "Samba 3\&.6" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbpasswd.8
===================================================================
--- branches/samba/upstream/docs/manpages/smbpasswd.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/smbpasswd.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: smbpasswd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBPASSWD" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SMBPASSWD" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbspool.8
===================================================================
--- branches/samba/upstream/docs/manpages/smbspool.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/smbspool.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: smbspool
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBSPOOL" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SMBSPOOL" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbstatus.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbstatus.1	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/smbstatus.1	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: smbstatus
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBSTATUS" "1" "07/30/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBSTATUS" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbta-util.8
===================================================================
--- branches/samba/upstream/docs/manpages/smbta-util.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/smbta-util.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: smbta-util
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBTA\-UTIL" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SMBTA\-UTIL" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbtar.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbtar.1	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/smbtar.1	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: smbtar
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBTAR" "1" "07/30/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBTAR" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbtree.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbtree.1	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/smbtree.1	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: smbtree
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBTREE" "1" "07/30/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBTREE" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/swat.8
===================================================================
--- branches/samba/upstream/docs/manpages/swat.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/swat.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: swat
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SWAT" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SWAT" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/tdbbackup.8
===================================================================
--- branches/samba/upstream/docs/manpages/tdbbackup.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/tdbbackup.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: tdbbackup
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TDBBACKUP" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "TDBBACKUP" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/tdbdump.8
===================================================================
--- branches/samba/upstream/docs/manpages/tdbdump.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/tdbdump.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: tdbdump
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TDBDUMP" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "TDBDUMP" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/tdbtool.8
===================================================================
--- branches/samba/upstream/docs/manpages/tdbtool.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/tdbtool.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: tdbtool
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TDBTOOL" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "TDBTOOL" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/testparm.1
===================================================================
--- branches/samba/upstream/docs/manpages/testparm.1	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/testparm.1	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: testparm
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TESTPARM" "1" "07/30/2012" "Samba 3\&.6" "User Commands"
+.TH "TESTPARM" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_acl_tdb.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_acl_tdb.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_acl_tdb.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_acl_tdb
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_ACL_TDB" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_ACL_TDB" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_acl_xattr.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_acl_xattr.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_acl_xattr.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_acl_xattr
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_ACL_XATTR" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_ACL_XATTR" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_aio_fork.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_aio_fork.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_aio_fork.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_aio_fork
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_AIO_FORK" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_AIO_FORK" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_aio_pthread.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_aio_pthread.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_aio_pthread.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_aio_pthread
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_AIO_PTHREAD" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_AIO_PTHREAD" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_audit.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_audit.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_audit.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_audit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_AUDIT" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_AUDIT" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_cacheprime.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_cacheprime.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_cacheprime.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_cacheprime
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_CACHEPRIME" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CACHEPRIME" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_cap.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_cap.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_cap.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_cap
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_CAP" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CAP" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_catia.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_catia.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_catia.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_catia
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_CATIA" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CATIA" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_commit.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_commit.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_commit.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_commit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_COMMIT" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_COMMIT" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_crossrename.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_crossrename.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_crossrename.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_crossrename
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_CROSSRENAME" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CROSSRENAME" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_default_quota.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_default_quota.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_default_quota.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_default_quota
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_DEFAULT_QUOTA" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_DEFAULT_QUOTA" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_dirsort.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_dirsort.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_dirsort.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_dirsort
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_DIRSORT" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_DIRSORT" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_extd_audit.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_extd_audit.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_extd_audit.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_extd_audit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_EXTD_AUDIT" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_EXTD_AUDIT" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_fake_perms.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_fake_perms.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_fake_perms.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_fake_perms
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_FAKE_PERMS" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FAKE_PERMS" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_fileid.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_fileid.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_fileid.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_fileid
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_FILEID" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FILEID" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_full_audit.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_full_audit.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_full_audit.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_full_audit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_FULL_AUDIT" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FULL_AUDIT" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_gpfs.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_gpfs.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_gpfs.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_gpfs
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_GPFS" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_GPFS" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_netatalk.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_netatalk.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_netatalk.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_netatalk
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_NETATALK" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_NETATALK" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_notify_fam.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_notify_fam.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_notify_fam.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_notify_fam
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_NOTIFY_FAM" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_NOTIFY_FAM" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_prealloc.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_prealloc.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_prealloc.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_prealloc
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_PREALLOC" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_PREALLOC" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_preopen.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_preopen.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_preopen.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_preopen
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_PREOPEN" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_PREOPEN" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_readahead.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_readahead.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_readahead.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_readahead
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_READAHEAD" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_READAHEAD" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_readonly.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_readonly.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_readonly.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_readonly
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_READONLY" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_READONLY" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_recycle.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_recycle.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_recycle.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_recycle
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_RECYCLE" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_RECYCLE" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_scannedonly.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_scannedonly.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_scannedonly.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_scannedonly
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_SCANNEDONLY" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SCANNEDONLY" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_shadow_copy.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_shadow_copy.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_shadow_copy.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_shadow_copy
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_SHADOW_COPY" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SHADOW_COPY" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_shadow_copy2.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_shadow_copy2.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_shadow_copy2.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_shadow_copy2
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_SHADOW_COPY2" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SHADOW_COPY2" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_smb_traffic_analyzer.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_smb_traffic_analyzer.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_smb_traffic_analyzer.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: smb_traffic_analyzer
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMB_TRAFFIC_ANALYZER" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SMB_TRAFFIC_ANALYZER" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_streams_depot.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_streams_depot.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_streams_depot.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_streams_depot
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_STREAMS_DEPOT" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_STREAMS_DEPOT" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_streams_xattr.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_streams_xattr.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_streams_xattr.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_streams_xattr
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_STREAMS_XATTR" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_STREAMS_XATTR" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_time_audit.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_time_audit.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_time_audit.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_time_audit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_TIME_AUDIT" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_TIME_AUDIT" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_xattr_tdb.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_xattr_tdb.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfs_xattr_tdb.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_xattr_tdb
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_XATTR_TDB" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_XATTR_TDB" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfstest.1
===================================================================
--- branches/samba/upstream/docs/manpages/vfstest.1	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/vfstest.1	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: vfstest
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFSTEST" "1" "07/30/2012" "Samba 3\&.6" "User Commands"
+.TH "VFSTEST" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/wbinfo.1
===================================================================
--- branches/samba/upstream/docs/manpages/wbinfo.1	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/wbinfo.1	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: wbinfo
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "WBINFO" "1" "07/30/2012" "Samba 3\&.6" "User Commands"
+.TH "WBINFO" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/winbind_krb5_locator.7
===================================================================
--- branches/samba/upstream/docs/manpages/winbind_krb5_locator.7	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/winbind_krb5_locator.7	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: winbind_krb5_locator
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: 7
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "WINBIND_KRB5_LOCATOR" "7" "07/30/2012" "Samba 3\&.6" "7"
+.TH "WINBIND_KRB5_LOCATOR" "7" "09/14/2012" "Samba 3\&.6" "7"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/winbindd.8
===================================================================
--- branches/samba/upstream/docs/manpages/winbindd.8	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/docs/manpages/winbindd.8	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2,12 +2,12 @@
 .\"     Title: winbindd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 07/30/2012
+.\"      Date: 09/14/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "WINBINDD" "8" "07/30/2012" "Samba 3\&.6" "System Administration tools"
+.TH "WINBINDD" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/examples/VFS/configure
===================================================================
--- branches/samba/upstream/examples/VFS/configure	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/examples/VFS/configure	2012-09-18 03:31:43 UTC (rev 4168)
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65.
+# Generated by GNU Autoconf 2.68.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -89,6 +89,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -214,11 +215,18 @@
   # We cannot yet assume a decent shell, so we have to provide a
 	# neutralization value for shells without unset; and this also
 	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
 	BASH_ENV=/dev/null
 	ENV=/dev/null
 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -316,7 +324,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -356,19 +364,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -530,7 +538,7 @@
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -751,8 +759,9 @@
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -797,7 +806,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -823,7 +832,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1027,7 +1036,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1043,7 +1052,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1073,8 +1082,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1082,7 +1091,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1092,7 +1101,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1100,13 +1109,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1129,7 +1138,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1143,8 +1152,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1159,9 +1168,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1200,11 +1209,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1244,7 +1253,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1388,9 +1397,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.65
+generated by GNU Autoconf 2.68
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1434,7 +1443,7 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1460,7 +1469,7 @@
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
+  test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -1471,7 +1480,7 @@
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -1484,10 +1493,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1523,7 +1532,7 @@
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -1550,7 +1559,7 @@
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -1559,7 +1568,7 @@
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 
@@ -1600,7 +1609,7 @@
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -1614,7 +1623,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1632,7 +1641,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 cat >config.log <<_ACEOF
@@ -1640,7 +1649,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
 
@@ -1750,11 +1759,9 @@
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -1788,11 +1795,9 @@
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -1805,11 +1810,9 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -1823,11 +1826,9 @@
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -1882,7 +1883,12 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -1897,7 +1903,11 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -1973,7 +1983,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2002,7 +2012,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2042,7 +2052,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -2095,7 +2105,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2135,7 +2145,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2194,7 +2204,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2238,7 +2248,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -2292,8 +2302,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -2407,9 +2417,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -2451,8 +2460,8 @@
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -2509,9 +2518,9 @@
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
+as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
@@ -2522,7 +2531,7 @@
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2562,8 +2571,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -2573,7 +2582,7 @@
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2610,7 +2619,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -2688,7 +2697,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -2785,16 +2794,22 @@
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2823,7 +2838,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2901,27 +2916,27 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -2939,14 +2954,14 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -2954,7 +2969,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -3057,7 +3072,7 @@
 set dummy krb5-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_KRB5CONFIG+set}" = set; then :
+if ${ac_cv_path_KRB5CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $KRB5CONFIG in
@@ -3193,7 +3208,7 @@
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -3223,7 +3238,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -3239,11 +3254,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -3282,7 +3297,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -3298,18 +3313,18 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -3321,7 +3336,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -3370,7 +3385,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -3384,7 +3399,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -3436,7 +3451,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -3451,7 +3466,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3568,8 +3583,7 @@
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -3582,7 +3596,7 @@
 for ac_header in krb5.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "krb5.h" "ac_cv_header_krb5_h" "$ac_includes_default"
-if test "x$ac_cv_header_krb5_h" = x""yes; then :
+if test "x$ac_cv_header_krb5_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_KRB5_H 1
 _ACEOF
@@ -3598,8 +3612,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -3747,7 +3760,7 @@
 set dummy groff; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ROFF+set}" = set; then :
+if ${ac_cv_prog_ROFF+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ROFF"; then
@@ -3825,7 +3838,7 @@
 if test $BLDSHARED = true; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether building shared libraries actually works" >&5
 $as_echo_n "checking whether building shared libraries actually works... " >&6; }
-if test "${ac_cv_shlib_works+set}" = set; then :
+if ${ac_cv_shlib_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -3922,10 +3935,21 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -3941,6 +3965,7 @@
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -3956,7 +3981,7 @@
 
 
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -4057,6 +4082,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -4102,19 +4128,19 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -4310,7 +4336,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -4364,7 +4390,7 @@
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -4426,10 +4452,10 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.65,
+configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -4445,11 +4471,16 @@
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -4471,6 +4502,7 @@
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -4483,7 +4515,7 @@
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
+    as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -4492,7 +4524,7 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
+  -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -4544,7 +4576,7 @@
     "module_config.h") CONFIG_HEADERS="$CONFIG_HEADERS module_config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -4566,9 +4598,10 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -4576,12 +4609,13 @@
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -4598,12 +4632,12 @@
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -4612,18 +4646,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -4631,7 +4665,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -4679,7 +4713,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -4711,21 +4745,29 @@
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -4737,7 +4779,7 @@
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -4749,11 +4791,11 @@
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -4838,7 +4880,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -4851,7 +4893,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -4870,7 +4912,7 @@
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -4879,7 +4921,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -4905,8 +4947,8 @@
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -5036,23 +5078,24 @@
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -5061,21 +5104,21 @@
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
 
@@ -5090,7 +5133,7 @@
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -5111,7 +5154,7 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5

Modified: branches/samba/upstream/packaging/RHEL/makerpms.sh
===================================================================
--- branches/samba/upstream/packaging/RHEL/makerpms.sh	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/packaging/RHEL/makerpms.sh	2012-09-18 03:31:43 UTC (rev 4168)
@@ -20,7 +20,7 @@
 
 USERID=`id -u`
 GRPID=`id -g`
-VERSION='3.6.7'
+VERSION='3.6.8'
 REVISION=''
 SPECFILE="samba.spec"
 RPMVER=`rpm --version | awk '{print $3}'`

Modified: branches/samba/upstream/packaging/RHEL/samba.spec
===================================================================
--- branches/samba/upstream/packaging/RHEL/samba.spec	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/packaging/RHEL/samba.spec	2012-09-18 03:31:43 UTC (rev 4168)
@@ -11,7 +11,7 @@
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name:         samba
-Version:      3.6.7
+Version:      3.6.8
 Release:      1
 Epoch:        0
 License: GNU GPL version 3

Modified: branches/samba/upstream/packaging/RHEL-CTDB/samba.spec
===================================================================
--- branches/samba/upstream/packaging/RHEL-CTDB/samba.spec	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/packaging/RHEL-CTDB/samba.spec	2012-09-18 03:31:43 UTC (rev 4168)
@@ -5,7 +5,7 @@
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name:         samba
-Version:      3.6.7
+Version:      3.6.8
 Release:      1GITHASH
 Epoch:        0
 License: GNU GPL version 3

Modified: branches/samba/upstream/source3/VERSION
===================================================================
--- branches/samba/upstream/source3/VERSION	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/VERSION	2012-09-18 03:31:43 UTC (rev 4168)
@@ -25,7 +25,7 @@
 ########################################################
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=6
-SAMBA_VERSION_RELEASE=7
+SAMBA_VERSION_RELEASE=8
 
 ########################################################
 # Bug fix releases use a letter for the patch revision #

Modified: branches/samba/upstream/source3/auth/auth_util.c
===================================================================
--- branches/samba/upstream/source3/auth/auth_util.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/auth/auth_util.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -734,7 +734,7 @@
 	info3->base.rid = DOMAIN_RID_GUEST;
 
 	/* Primary gid */
-	info3->base.primary_gid = BUILTIN_RID_GUESTS;
+	info3->base.primary_gid = DOMAIN_RID_GUESTS;
 
 	TALLOC_FREE(pwd);
 	return NT_STATUS_OK;
@@ -1250,11 +1250,11 @@
 	char *found_username = NULL;
 	const char *nt_domain;
 	const char *nt_username;
+	struct dom_sid user_sid;
+	struct dom_sid group_sid;
 	bool username_was_mapped;
 	struct passwd *pwd;
 	struct auth_serversupplied_info *result;
-	struct dom_sid *group_sid;
-	struct netr_SamInfo3 *i3;
 
 	/* 
 	   Here is where we should check the list of
@@ -1262,6 +1262,15 @@
 	   matches.
 	*/
 
+	if (!sid_compose(&user_sid, info3->base.domain_sid, info3->base.rid)) {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
+	if (!sid_compose(&group_sid, info3->base.domain_sid,
+			 info3->base.primary_gid)) {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
 	nt_username = talloc_strdup(mem_ctx, info3->base.account_name.string);
 	if (!nt_username) {
 		/* If the server didn't give us one, just use the one we sent
@@ -1313,43 +1322,17 @@
 	}
 
 	/* copy in the info3 */
-	result->info3 = i3 = copy_netr_SamInfo3(result, info3);
+	result->info3 = copy_netr_SamInfo3(result, info3);
 	if (result->info3 == NULL) {
 		TALLOC_FREE(result);
 		return NT_STATUS_NO_MEMORY;
 	}
 
 	/* Fill in the unix info we found on the way */
+
 	result->utok.uid = pwd->pw_uid;
 	result->utok.gid = pwd->pw_gid;
 
-	/* We can't just trust that the primary group sid sent us is something
-	 * we can really use. Obtain the useable sid, and store the original
-	 * one as an additional group if it had to be replaced */
-	nt_status = get_primary_group_sid(mem_ctx, found_username,
-					  &pwd, &group_sid);
-	if (!NT_STATUS_IS_OK(nt_status)) {
-		TALLOC_FREE(result);
-		return nt_status;
-	}
-
-	/* store and check if it is the same we got originally */
-	sid_peek_rid(group_sid, &i3->base.primary_gid);
-	if (i3->base.primary_gid != info3->base.primary_gid) {
-		uint32_t n = i3->base.groups.count;
-		/* not the same, store the original as an additional group */
-		i3->base.groups.rids =
-			talloc_realloc(i3, i3->base.groups.rids,
-					struct samr_RidWithAttribute, n + 1);
-		if (i3->base.groups.rids == NULL) {
-			TALLOC_FREE(result);
-			return NT_STATUS_NO_MEMORY;
-		}
-		i3->base.groups.rids[n].rid = info3->base.primary_gid;
-		i3->base.groups.rids[n].attributes = SE_GROUP_ENABLED;
-		i3->base.groups.count = n + 1;
-	}
-
 	/* ensure we are never given NULL session keys */
 
 	if (memcmp(info3->base.key.key, zeros, sizeof(zeros)) == 0) {

Modified: branches/samba/upstream/source3/client/client.c
===================================================================
--- branches/samba/upstream/source3/client/client.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/client/client.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -1717,7 +1717,8 @@
 	}
 
 	status = cli_ntcreate(cli, name, 0,
-			      CREATE_ACCESS_READ, 0,
+			      SEC_FILE_READ_DATA | SEC_FILE_READ_ATTRIBUTE |
+			      SEC_STD_SYNCHRONIZE, 0,
 			      FILE_SHARE_READ|FILE_SHARE_WRITE
 			      |FILE_SHARE_DELETE,
 			      FILE_OPEN, 0x0, 0x0, &fnum);

Modified: branches/samba/upstream/source3/client/clitar.c
===================================================================
--- branches/samba/upstream/source3/client/clitar.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/client/clitar.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -837,8 +837,10 @@
 	TALLOC_CTX *ctx = talloc_stackframe();
 	NTSTATUS status = NT_STATUS_OK;
 
-	if (strequal(finfo->name,"..") || strequal(finfo->name,"."))
-		return NT_STATUS_OK;
+	if (strequal(finfo->name,"..") || strequal(finfo->name,".")) {
+		status = NT_STATUS_OK;
+		goto cleanup;
+	}
 
 	/* Is it on the exclude list ? */
 	if (!tar_excl && clipn) {
@@ -851,7 +853,8 @@
 				client_get_cur_dir(),
 				finfo->name);
 		if (!exclaim) {
-			return NT_STATUS_NO_MEMORY;
+			status = NT_STATUS_NO_MEMORY;
+			goto cleanup;
 		}
 
 		DEBUG(5, ("...tar_re_search: %d\n", tar_re_search));
@@ -860,7 +863,8 @@
 				(tar_re_search && mask_match_list(exclaim, cliplist, clipn, True))) {
 			DEBUG(3,("Skipping file %s\n", exclaim));
 			TALLOC_FREE(exclaim);
-			return NT_STATUS_OK;
+			status = NT_STATUS_OK;
+			goto cleanup;
 		}
 		TALLOC_FREE(exclaim);
 	}
@@ -872,7 +876,8 @@
 
 		saved_curdir = talloc_strdup(ctx, client_get_cur_dir());
 		if (!saved_curdir) {
-			return NT_STATUS_NO_MEMORY;
+			status = NT_STATUS_NO_MEMORY;
+			goto cleanup;
 		}
 
 		DEBUG(5, ("strlen(cur_dir)=%d, \
@@ -885,7 +890,8 @@
 				client_get_cur_dir(),
 				finfo->name);
 		if (!new_cd) {
-			return NT_STATUS_NO_MEMORY;
+			status = NT_STATUS_NO_MEMORY;
+			goto cleanup;
 		}
 		client_set_cur_dir(new_cd);
 
@@ -904,7 +910,8 @@
 				"%s*",
 				client_get_cur_dir());
 		if (!mtar_mask) {
-			return NT_STATUS_NO_MEMORY;
+			status = NT_STATUS_NO_MEMORY;
+			goto cleanup;
 		}
 		DEBUG(5, ("Doing list with mtar_mask: %s\n", mtar_mask));
 		do_list(mtar_mask, attribute, do_tar, False, True);
@@ -918,11 +925,15 @@
 					client_get_cur_dir(),
 					finfo->name);
 		if (!rname) {
-			return NT_STATUS_NO_MEMORY;
+			status = NT_STATUS_NO_MEMORY;
+			goto cleanup;
 		}
 		status = do_atar(rname,finfo->name,finfo);
 		TALLOC_FREE(rname);
 	}
+
+  cleanup:
+	TALLOC_FREE(ctx);
 	return status;
 }
 

Modified: branches/samba/upstream/source3/configure
===================================================================
--- branches/samba/upstream/source3/configure	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/configure	2012-09-18 03:31:43 UTC (rev 4168)
@@ -1,13 +1,13 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for Samba 3.
+# Generated by GNU Autoconf 2.68 for Samba 3.
 #
 # Report bugs to <samba-technical at samba.org>.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -91,6 +91,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -216,11 +217,18 @@
   # We cannot yet assume a decent shell, so we have to provide a
 	# neutralization value for shells without unset; and this also
 	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
 	BASH_ENV=/dev/null
 	ENV=/dev/null
 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -319,7 +327,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -359,19 +367,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -533,7 +541,7 @@
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -1086,8 +1094,9 @@
   fi
 
   case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1132,7 +1141,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1158,7 +1167,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid feature name: $ac_useropt"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1362,7 +1371,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1378,7 +1387,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error "invalid package name: $ac_useropt"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1408,8 +1417,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information."
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1417,7 +1426,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1427,7 +1436,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1435,13 +1444,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error "missing argument to $ac_option"
+  as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1464,7 +1473,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1478,8 +1487,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1494,9 +1503,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error "working directory cannot be determined"
+  as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error "pwd does not report name of working directory"
+  as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1535,11 +1544,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1579,7 +1588,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1862,9 +1871,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 Samba configure 3
-generated by GNU Autoconf 2.65
+generated by GNU Autoconf 2.68
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1908,7 +1917,7 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1934,7 +1943,7 @@
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } >/dev/null && {
+  test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -1945,7 +1954,7 @@
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -1958,10 +1967,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1997,7 +2006,7 @@
 else
   ac_header_preproc=no
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
@@ -2020,17 +2029,15 @@
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( cat <<\_ASBOX
-## ---------------------------------------- ##
+( $as_echo "## ---------------------------------------- ##
 ## Report this to samba-technical at samba.org ##
-## ---------------------------------------- ##
-_ASBOX
+## ---------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -2039,7 +2046,7 @@
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 
@@ -2080,7 +2087,7 @@
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -2094,7 +2101,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2112,7 +2119,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
@@ -2157,7 +2164,7 @@
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -2171,7 +2178,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=no"
@@ -2212,7 +2219,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
 
@@ -2389,7 +2396,7 @@
 rm -f conftest.val
 
   fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
@@ -2402,7 +2409,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2457,7 +2464,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 
@@ -2470,7 +2477,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 $as_echo_n "checking for $2.$3... " >&6; }
-if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$4+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2514,19 +2521,22 @@
 eval ac_res=\$$4
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_member
 
-# ac_fn_c_check_decl LINENO SYMBOL VAR
-# ------------------------------------
-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
 ac_fn_c_check_decl ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
-$as_echo_n "checking whether $2 is declared... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2535,9 +2545,13 @@
 int
 main ()
 {
-#ifndef $2
-  (void) $2;
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
 #endif
+#endif
 
   ;
   return 0;
@@ -2553,7 +2567,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_decl
 cat >config.log <<_ACEOF
@@ -2561,7 +2575,7 @@
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by Samba $as_me 3, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
 
@@ -2671,11 +2685,9 @@
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2709,11 +2721,9 @@
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -2726,11 +2736,9 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##
-_ASBOX
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
@@ -2744,11 +2752,9 @@
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -2803,7 +2809,12 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -2818,7 +2829,11 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -2894,7 +2909,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2949,16 +2964,22 @@
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  for ac_t in install-sh install.sh shtool; do
-    if test -f "$ac_dir/$ac_t"; then
-      ac_aux_dir=$ac_dir
-      ac_install_sh="$ac_aux_dir/$ac_t -c"
-      break 2
-    fi
-  done
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2972,27 +2993,27 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -3010,14 +3031,14 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -3025,7 +3046,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -3043,14 +3064,14 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
 $as_echo_n "checking target system type... " >&6; }
-if test "${ac_cv_target+set}" = set; then :
+if ${ac_cv_target+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$target_alias" = x; then
   ac_cv_target=$ac_cv_host
 else
   ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -3058,7 +3079,7 @@
 $as_echo "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
-*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
 esac
 target=$ac_cv_target
 ac_save_IFS=$IFS; IFS='-'
@@ -3093,7 +3114,7 @@
 	fi
 done
 if test x"$libreplacedir" = "x"; then
-	as_fn_error "cannot find libreplace in $libreplacepaths" "$LINENO" 5
+	as_fn_error $? "cannot find libreplace in $libreplacepaths" "$LINENO" 5
 fi
 LIBREPLACEOBJ="$libreplacedir/replace.o"
 
@@ -3546,12 +3567,12 @@
 if test "${with_smbtorture4_path+set}" = set; then :
   withval=$with_smbtorture4_path;  case "$withval" in
   yes|no)
-    as_fn_error "--with-smbtorture4-path should take a path" "$LINENO" 5
+    as_fn_error $? "--with-smbtorture4-path should take a path" "$LINENO" 5
   ;;
   * )
     smbtorture4_path="$withval"
     if test -z "$smbtorture4_path" -a ! -f $smbtorture4_path; then
-    	as_fn_error "'$smbtorture_path' does not  exist!" "$LINENO" 5
+    	as_fn_error $? "'$smbtorture_path' does not  exist!" "$LINENO" 5
     fi
     smbtorture4_option="-t $withval"
   ;;
@@ -3569,12 +3590,12 @@
 if test "${with_selftest_custom_conf+set}" = set; then :
   withval=$with_selftest_custom_conf;  case "$withval" in
   yes|no)
-    as_fn_error "--with-selftest-custom-conf should take a path" "$LINENO" 5
+    as_fn_error $? "--with-selftest-custom-conf should take a path" "$LINENO" 5
   ;;
   * )
     selftest_custom_conf="$withval"
     if test -z "$selftest_custom_conf" -a ! -f $selftest_custom_conf; then
-	as_fn_error "'$selftest_custom_conf' does not  exist!" "$LINENO" 5
+	as_fn_error $? "'$selftest_custom_conf' does not  exist!" "$LINENO" 5
     fi
     selftest_custom_conf="-c $withval"
   ;;
@@ -3728,7 +3749,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3768,7 +3789,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3821,7 +3842,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3861,7 +3882,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3920,7 +3941,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3964,7 +3985,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4018,8 +4039,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "no acceptable C compiler found in \$PATH
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4133,9 +4154,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "C compiler cannot create executables
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -4177,8 +4197,8 @@
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -4235,9 +4255,9 @@
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
+as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
@@ -4248,7 +4268,7 @@
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4288,8 +4308,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -4299,7 +4319,7 @@
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4336,7 +4356,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -4414,7 +4434,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -4514,7 +4534,7 @@
 if test x"$GCC" != x"yes" ; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
 $as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
-if test "${ac_cv_prog_cc_c99+set}" = set; then :
+if ${ac_cv_prog_cc_c99+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c99=no
@@ -4711,7 +4731,7 @@
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -4741,7 +4761,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -4757,11 +4777,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -4800,7 +4820,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -4816,18 +4836,18 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -4839,7 +4859,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -4888,7 +4908,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -4902,7 +4922,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4954,7 +4974,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -4969,7 +4989,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5086,8 +5106,7 @@
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -5099,7 +5118,7 @@
 
 
   ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = x""yes; then :
+if test "x$ac_cv_header_minix_config_h" = xyes; then :
   MINIX=yes
 else
   MINIX=
@@ -5121,7 +5140,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
+if ${ac_cv_safe_to_define___extensions__+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5160,7 +5179,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then :
+if ${ac_cv_c_bigendian+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_bigendian=unknown
@@ -5378,13 +5397,13 @@
 
      ;; #(
    *)
-     as_fn_error "unknown endianness
+     as_fn_error $? "unknown endianness
  presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
  esac
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then :
+if ${ac_cv_c_inline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
@@ -5595,7 +5614,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5674,7 +5693,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
 $as_echo_n "checking for library containing strerror... " >&6; }
-if test "${ac_cv_search_strerror+set}" = set; then :
+if ${ac_cv_search_strerror+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -5708,11 +5727,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_strerror+set}" = set; then :
+  if ${ac_cv_search_strerror+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_strerror+set}" = set; then :
+if ${ac_cv_search_strerror+:} false; then :
 
 else
   ac_cv_search_strerror=no
@@ -5747,7 +5766,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
 $as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if test "${ac_cv_sys_largefile_CC+set}" = set; then :
+if ${ac_cv_sys_largefile_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_sys_largefile_CC=no
@@ -5798,7 +5817,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
+if ${ac_cv_sys_file_offset_bits+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   while :; do
@@ -5867,7 +5886,7 @@
   if test $ac_cv_sys_file_offset_bits = unknown; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
 $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if test "${ac_cv_sys_large_files+set}" = set; then :
+if ${ac_cv_sys_large_files+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   while :; do
@@ -6022,7 +6041,7 @@
 for ac_header in standards.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "standards.h" "ac_cv_header_standards_h" "$ac_includes_default"
-if test "x$ac_cv_header_standards_h" = x""yes; then :
+if test "x$ac_cv_header_standards_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STANDARDS_H 1
 _ACEOF
@@ -6034,7 +6053,7 @@
 
 # Solaris needs HAVE_LONG_LONG defined
 ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "$ac_includes_default"
-if test "x$ac_cv_type_long_long" = x""yes; then :
+if test "x$ac_cv_type_long_long" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LONG_LONG 1
@@ -6050,7 +6069,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
 $as_echo_n "checking size of int... " >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then :
+if ${ac_cv_sizeof_int+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
@@ -6059,9 +6078,8 @@
   if test "$ac_cv_type_int" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (int)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (int)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_int=0
    fi
@@ -6084,7 +6102,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of char" >&5
 $as_echo_n "checking size of char... " >&6; }
-if test "${ac_cv_sizeof_char+set}" = set; then :
+if ${ac_cv_sizeof_char+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (char))" "ac_cv_sizeof_char"        "$ac_includes_default"; then :
@@ -6093,9 +6111,8 @@
   if test "$ac_cv_type_char" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (char)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (char)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_char=0
    fi
@@ -6118,7 +6135,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
 $as_echo_n "checking size of short... " >&6; }
-if test "${ac_cv_sizeof_short+set}" = set; then :
+if ${ac_cv_sizeof_short+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
@@ -6127,9 +6144,8 @@
   if test "$ac_cv_type_short" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (short)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (short)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_short=0
    fi
@@ -6152,7 +6168,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
 $as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then :
+if ${ac_cv_sizeof_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
@@ -6161,9 +6177,8 @@
   if test "$ac_cv_type_long" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (long)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (long)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
    fi
@@ -6186,7 +6201,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
 $as_echo_n "checking size of long long... " >&6; }
-if test "${ac_cv_sizeof_long_long+set}" = set; then :
+if ${ac_cv_sizeof_long_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
@@ -6195,9 +6210,8 @@
   if test "$ac_cv_type_long_long" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (long long)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (long long)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long_long=0
    fi
@@ -6216,7 +6230,7 @@
 
 
 ac_fn_c_check_type "$LINENO" "int8_t" "ac_cv_type_int8_t" "$ac_includes_default"
-if test "x$ac_cv_type_int8_t" = x""yes; then :
+if test "x$ac_cv_type_int8_t" = xyes; then :
 
 else
 
@@ -6227,7 +6241,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "uint8_t" "ac_cv_type_uint8_t" "$ac_includes_default"
-if test "x$ac_cv_type_uint8_t" = x""yes; then :
+if test "x$ac_cv_type_uint8_t" = xyes; then :
 
 else
 
@@ -6238,7 +6252,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "$ac_includes_default"
-if test "x$ac_cv_type_int16_t" = x""yes; then :
+if test "x$ac_cv_type_int16_t" = xyes; then :
 
 else
 
@@ -6249,7 +6263,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" "$ac_includes_default"
-if test "x$ac_cv_type_uint16_t" = x""yes; then :
+if test "x$ac_cv_type_uint16_t" = xyes; then :
 
 else
 
@@ -6262,7 +6276,7 @@
 
 if test $ac_cv_sizeof_int -eq 4 ; then
 ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default"
-if test "x$ac_cv_type_int32_t" = x""yes; then :
+if test "x$ac_cv_type_int32_t" = xyes; then :
 
 else
 
@@ -6273,7 +6287,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "$ac_includes_default"
-if test "x$ac_cv_type_uint32_t" = x""yes; then :
+if test "x$ac_cv_type_uint32_t" = xyes; then :
 
 else
 
@@ -6285,7 +6299,7 @@
 
 elif test $ac_cv_size_long -eq 4 ; then
 ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default"
-if test "x$ac_cv_type_int32_t" = x""yes; then :
+if test "x$ac_cv_type_int32_t" = xyes; then :
 
 else
 
@@ -6296,7 +6310,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "$ac_includes_default"
-if test "x$ac_cv_type_uint32_t" = x""yes; then :
+if test "x$ac_cv_type_uint32_t" = xyes; then :
 
 else
 
@@ -6307,11 +6321,11 @@
 fi
 
 else
-as_fn_error "LIBREPLACE no 32-bit type found" "$LINENO" 5
+as_fn_error $? "LIBREPLACE no 32-bit type found" "$LINENO" 5
 fi
 
 ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" "$ac_includes_default"
-if test "x$ac_cv_type_int64_t" = x""yes; then :
+if test "x$ac_cv_type_int64_t" = xyes; then :
 
 else
 
@@ -6322,7 +6336,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "$ac_includes_default"
-if test "x$ac_cv_type_uint64_t" = x""yes; then :
+if test "x$ac_cv_type_uint64_t" = xyes; then :
 
 else
 
@@ -6334,7 +6348,7 @@
 
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = x""yes; then :
+if test "x$ac_cv_type_size_t" = xyes; then :
 
 else
 
@@ -6345,7 +6359,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
-if test "x$ac_cv_type_ssize_t" = x""yes; then :
+if test "x$ac_cv_type_ssize_t" = xyes; then :
 
 else
 
@@ -6362,7 +6376,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
 $as_echo_n "checking size of off_t... " >&6; }
-if test "${ac_cv_sizeof_off_t+set}" = set; then :
+if ${ac_cv_sizeof_off_t+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t"        "$ac_includes_default"; then :
@@ -6371,9 +6385,8 @@
   if test "$ac_cv_type_off_t" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (off_t)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (off_t)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_off_t=0
    fi
@@ -6396,7 +6409,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
 $as_echo_n "checking size of size_t... " >&6; }
-if test "${ac_cv_sizeof_size_t+set}" = set; then :
+if ${ac_cv_sizeof_size_t+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
@@ -6405,9 +6418,8 @@
   if test "$ac_cv_type_size_t" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (size_t)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (size_t)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_size_t=0
    fi
@@ -6430,7 +6442,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5
 $as_echo_n "checking size of ssize_t... " >&6; }
-if test "${ac_cv_sizeof_ssize_t+set}" = set; then :
+if ${ac_cv_sizeof_ssize_t+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (ssize_t))" "ac_cv_sizeof_ssize_t"        "$ac_includes_default"; then :
@@ -6439,9 +6451,8 @@
   if test "$ac_cv_type_ssize_t" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (ssize_t)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (ssize_t)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_ssize_t=0
    fi
@@ -6460,7 +6471,7 @@
 
 
 ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
-if test "x$ac_cv_type_intptr_t" = x""yes; then :
+if test "x$ac_cv_type_intptr_t" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_INTPTR_T 1
@@ -6469,7 +6480,7 @@
 
 fi
 ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default"
-if test "x$ac_cv_type_uintptr_t" = x""yes; then :
+if test "x$ac_cv_type_uintptr_t" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_UINTPTR_T 1
@@ -6478,7 +6489,7 @@
 
 fi
 ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
-if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :
+if test "x$ac_cv_type_ptrdiff_t" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_PTRDIFF_T 1
@@ -6489,10 +6500,10 @@
 
 
 if test x"$ac_cv_type_long_long" != x"yes";then
-	as_fn_error "LIBREPLACE needs type 'long long'" "$LINENO" 5
+	as_fn_error $? "LIBREPLACE needs type 'long long'" "$LINENO" 5
 fi
 if test $ac_cv_sizeof_long_long -lt 8;then
-	as_fn_error "LIBREPLACE needs sizeof(long long) >= 8" "$LINENO" 5
+	as_fn_error $? "LIBREPLACE needs sizeof(long long) >= 8" "$LINENO" 5
 fi
 
 ############################################
@@ -6500,7 +6511,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for immediate structures" >&5
 $as_echo_n "checking for immediate structures... " >&6; }
-if test "${libreplace_cv_immediate_structures+set}" = set; then :
+if ${libreplace_cv_immediate_structures+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -6595,7 +6606,7 @@
 		fi
 	done
 	if test x"$teventdir" = "x"; then
-	   as_fn_error "cannot find libtevent source in $teventpaths" "$LINENO" 5
+	   as_fn_error $? "cannot find libtevent source in $teventpaths" "$LINENO" 5
 	fi
 fi
 
@@ -6617,7 +6628,7 @@
 for ac_header in sys/epoll.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_epoll_h" = x""yes; then :
+if test "x$ac_cv_header_sys_epoll_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_EPOLL_H 1
 _ACEOF
@@ -6629,7 +6640,7 @@
 for ac_func in epoll_create
 do :
   ac_fn_c_check_func "$LINENO" "epoll_create" "ac_cv_func_epoll_create"
-if test "x$ac_cv_func_epoll_create" = x""yes; then :
+if test "x$ac_cv_func_epoll_create" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_EPOLL_CREATE 1
 _ACEOF
@@ -6831,7 +6842,7 @@
 	# Add -Wdeclaration-after-statement if compiler supports it
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Wdeclaration-after-statement" >&5
 $as_echo_n "checking that the C compiler understands -Wdeclaration-after-statement... " >&6; }
-if test "${samba_cv_HAVE_Wdeclaration_after_statement+set}" = set; then :
+if ${samba_cv_HAVE_Wdeclaration_after_statement+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -6887,7 +6898,7 @@
 	#-Werror-implicit-function-declaration
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Werror-implicit-function-declaration" >&5
 $as_echo_n "checking that the C compiler understands -Werror-implicit-function-declaration... " >&6; }
-if test "${samba_cv_HAVE_Werror_implicit_function_declaration+set}" = set; then :
+if ${samba_cv_HAVE_Werror_implicit_function_declaration+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -6998,7 +7009,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -7047,7 +7058,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MAKE+set}" = set; then :
+if ${ac_cv_path_MAKE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAKE in
@@ -7089,7 +7100,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have GNU make" >&5
 $as_echo_n "checking whether we have GNU make... " >&6; }
-if test "${samba_cv_gnu_make+set}" = set; then :
+if ${samba_cv_gnu_make+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -7124,7 +7135,7 @@
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PERL+set}" = set; then :
+if ${ac_cv_path_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PERL in
@@ -7168,7 +7179,7 @@
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PERL+set}" = set; then :
+if ${ac_cv_path_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PERL in
@@ -7237,7 +7248,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PYTHON+set}" = set; then :
+if ${ac_cv_path_PYTHON+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PYTHON in
@@ -7281,7 +7292,7 @@
 set dummy python$PYTHON_VER; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PYTHON+set}" = set; then :
+if ${ac_cv_path_PYTHON+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PYTHON in
@@ -7333,7 +7344,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PYTHON_CONFIG+set}" = set; then :
+if ${ac_cv_path_PYTHON_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PYTHON_CONFIG in
@@ -7377,7 +7388,7 @@
 set dummy python$PYTHON_VER-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PYTHON_CONFIG+set}" = set; then :
+if ${ac_cv_path_PYTHON_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PYTHON_CONFIG in
@@ -7652,7 +7663,7 @@
 set dummy ${ac_tool_prefix}ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
+if ${ac_cv_prog_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
@@ -7692,7 +7703,7 @@
 set dummy ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
@@ -7742,7 +7753,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker used by compiler is GNU ld" >&5
 $as_echo_n "checking if the linker used by compiler is GNU ld... " >&6; }
-if test "${ac_cv_prog_gnu_ld+set}" = set; then :
+if ${ac_cv_prog_gnu_ld+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
@@ -7806,7 +7817,7 @@
 fi
 set dummy $CC; ac_cc=`$as_echo "$2" |
 		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7917,7 +7928,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -Werror" >&5
 $as_echo_n "checking that the C compiler understands -Werror... " >&6; }
-if test "${samba_cv_HAVE_Werror+set}" = set; then :
+if ${samba_cv_HAVE_Werror+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -7969,7 +7980,7 @@
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -w2" >&5
 $as_echo_n "checking that the C compiler understands -w2... " >&6; }
-if test "${samba_cv_HAVE_w2+set}" = set; then :
+if ${samba_cv_HAVE_w2+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -8021,7 +8032,7 @@
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -errwarn" >&5
 $as_echo_n "checking that the C compiler understands -errwarn... " >&6; }
-if test "${samba_cv_HAVE_errwarn+set}" = set; then :
+if ${samba_cv_HAVE_errwarn+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -8073,7 +8084,7 @@
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands -qhalt" >&5
 $as_echo_n "checking that the C compiler understands -qhalt... " >&6; }
-if test "${samba_cv_HAVE_qhalt+set}" = set; then :
+if ${samba_cv_HAVE_qhalt+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -8134,15 +8145,15 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands negative enum values" >&5
 $as_echo_n "checking that the C compiler understands negative enum values... " >&6; }
-if test "${samba_cv_CC_NEGATIVE_ENUM_VALUES+set}" = set; then :
+if ${samba_cv_CC_NEGATIVE_ENUM_VALUES+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
     if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8334,7 +8345,7 @@
 else
     CFLAGS="$saved_CFLAGS"
     saved_CFLAGS=""
-    as_fn_error "c99 structure initializer are not supported" "$LINENO" 5
+    as_fn_error $? "c99 structure initializer are not supported" "$LINENO" 5
 fi
 
 
@@ -8803,7 +8814,7 @@
 	fi
 done
 if test x"$libreplacedir" = "x"; then
-	as_fn_error "cannot find libreplace in $libreplacepaths" "$LINENO" 5
+	as_fn_error $? "cannot find libreplace in $libreplacepaths" "$LINENO" 5
 fi
 
 LIBREPLACEOBJ="$libreplacedir/replace.o"
@@ -8813,7 +8824,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
 $as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-if test "${ac_cv_type_uid_t+set}" = set; then :
+if ${ac_cv_type_uid_t+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8842,7 +8853,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-if test "x$ac_cv_type_mode_t" = x""yes; then :
+if test "x$ac_cv_type_mode_t" = xyes; then :
 
 else
 
@@ -8853,7 +8864,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-if test "x$ac_cv_type_off_t" = x""yes; then :
+if test "x$ac_cv_type_off_t" = xyes; then :
 
 else
 
@@ -8864,7 +8875,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = x""yes; then :
+if test "x$ac_cv_type_size_t" = xyes; then :
 
 else
 
@@ -8875,7 +8886,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = x""yes; then :
+if test "x$ac_cv_type_pid_t" = xyes; then :
 
 else
 
@@ -8886,7 +8897,7 @@
 fi
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
+if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_RDEV 1
@@ -8899,7 +8910,7 @@
 
 
 ac_fn_c_check_type "$LINENO" "ino_t" "ac_cv_type_ino_t" "$ac_includes_default"
-if test "x$ac_cv_type_ino_t" = x""yes; then :
+if test "x$ac_cv_type_ino_t" = xyes; then :
 
 else
 
@@ -8910,7 +8921,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "loff_t" "ac_cv_type_loff_t" "$ac_includes_default"
-if test "x$ac_cv_type_loff_t" = x""yes; then :
+if test "x$ac_cv_type_loff_t" = xyes; then :
 
 else
 
@@ -8921,7 +8932,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "offset_t" "ac_cv_type_offset_t" "$ac_includes_default"
-if test "x$ac_cv_type_offset_t" = x""yes; then :
+if test "x$ac_cv_type_offset_t" = xyes; then :
 
 else
 
@@ -8934,7 +8945,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
 $as_echo_n "checking for working memcmp... " >&6; }
-if test "${ac_cv_func_memcmp_working+set}" = set; then :
+if ${ac_cv_func_memcmp_working+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -8999,8 +9010,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -9013,8 +9023,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -9027,8 +9036,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -9039,7 +9047,7 @@
 
 
 ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdint_h" = x""yes; then :
+if test "x$ac_cv_header_stdint_h" = xyes; then :
    ac_config_commands="$ac_config_commands rm-stdint.h"
 
 else
@@ -9051,7 +9059,7 @@
 
 
 ac_fn_c_check_header_mongrel "$LINENO" "stdbool.h" "ac_cv_header_stdbool_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdbool_h" = x""yes; then :
+if test "x$ac_cv_header_stdbool_h" = xyes; then :
    ac_config_commands="$ac_config_commands rm-stdbool.h"
 
 else
@@ -9070,7 +9078,7 @@
 #endif
 
 "
-if test "x$ac_cv_type_bool" = x""yes; then :
+if test "x$ac_cv_type_bool" = xyes; then :
 
 $as_echo "#define HAVE_BOOL 1" >>confdefs.h
 
@@ -9084,7 +9092,7 @@
 #endif
 
 "
-if test "x$ac_cv_type__Bool" = x""yes; then :
+if test "x$ac_cv_type__Bool" = xyes; then :
 
 $as_echo "#define HAVE__Bool 1" >>confdefs.h
 
@@ -9094,7 +9102,7 @@
 for ac_header in linux/types.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "linux/types.h" "ac_cv_header_linux_types_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_types_h" = x""yes; then :
+if test "x$ac_cv_header_linux_types_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LINUX_TYPES_H 1
 _ACEOF
@@ -9106,7 +9114,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
 $as_echo_n "checking for working mmap... " >&6; }
-if test "${libreplace_cv_HAVE_MMAP+set}" = set; then :
+if ${libreplace_cv_HAVE_MMAP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -9140,8 +9148,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -9154,8 +9161,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -9168,8 +9174,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -9182,8 +9187,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -9195,7 +9199,7 @@
 for ac_header in stropts.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "stropts.h" "ac_cv_header_stropts_h" "$ac_includes_default"
-if test "x$ac_cv_header_stropts_h" = x""yes; then :
+if test "x$ac_cv_header_stropts_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STROPTS_H 1
 _ACEOF
@@ -9207,7 +9211,7 @@
 for ac_header in unix.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "unix.h" "ac_cv_header_unix_h" "$ac_includes_default"
-if test "x$ac_cv_header_unix_h" = x""yes; then :
+if test "x$ac_cv_header_unix_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_UNIX_H 1
 _ACEOF
@@ -9221,8 +9225,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -9234,8 +9237,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -9247,8 +9249,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -9260,8 +9261,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -9273,8 +9273,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -9285,7 +9284,7 @@
 for ac_func in fdatasync
 do :
   ac_fn_c_check_func "$LINENO" "fdatasync" "ac_cv_func_fdatasync"
-if test "x$ac_cv_func_fdatasync" = x""yes; then :
+if test "x$ac_cv_func_fdatasync" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FDATASYNC 1
 _ACEOF
@@ -9295,7 +9294,7 @@
 	# if we didn't find it, look in librt (Solaris hides it there...)
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdatasync in -lrt" >&5
 $as_echo_n "checking for fdatasync in -lrt... " >&6; }
-if test "${ac_cv_lib_rt_fdatasync+set}" = set; then :
+if ${ac_cv_lib_rt_fdatasync+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -9329,7 +9328,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_fdatasync" >&5
 $as_echo "$ac_cv_lib_rt_fdatasync" >&6; }
-if test "x$ac_cv_lib_rt_fdatasync" = x""yes; then :
+if test "x$ac_cv_lib_rt_fdatasync" = xyes; then :
   libreplace_cv_HAVE_FDATASYNC_IN_LIBRT=yes
 
 $as_echo "#define HAVE_FDATASYNC 1" >>confdefs.h
@@ -9343,7 +9342,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdatasync declaration" >&5
 $as_echo_n "checking for fdatasync declaration... " >&6; }
-if test "${ac_cv_have_fdatasync_decl+set}" = set; then :
+if ${ac_cv_have_fdatasync_decl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -9376,7 +9375,7 @@
 for ac_func in clock_gettime
 do :
   ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime"
-if test "x$ac_cv_func_clock_gettime" = x""yes; then :
+if test "x$ac_cv_func_clock_gettime" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CLOCK_GETTIME 1
 _ACEOF
@@ -9385,7 +9384,7 @@
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
 $as_echo_n "checking for clock_gettime in -lrt... " >&6; }
-if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
+if ${ac_cv_lib_rt_clock_gettime+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -9419,7 +9418,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
 $as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
-if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
+if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then :
   libreplace_cv_HAVE_CLOCK_GETTIME_IN_LIBRT=yes
 		libreplace_cv_have_clock_gettime=yes
 
@@ -9434,7 +9433,7 @@
 for ac_func in get_current_dir_name
 do :
   ac_fn_c_check_func "$LINENO" "get_current_dir_name" "ac_cv_func_get_current_dir_name"
-if test "x$ac_cv_func_get_current_dir_name" = x""yes; then :
+if test "x$ac_cv_func_get_current_dir_name" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GET_CURRENT_DIR_NAME 1
 _ACEOF
@@ -9445,7 +9444,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setresuid declaration" >&5
 $as_echo_n "checking for setresuid declaration... " >&6; }
-if test "${ac_cv_have_setresuid_decl+set}" = set; then :
+if ${ac_cv_have_setresuid_decl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -9478,7 +9477,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setresgid declaration" >&5
 $as_echo_n "checking for setresgid declaration... " >&6; }
-if test "${ac_cv_have_setresgid_decl+set}" = set; then :
+if ${ac_cv_have_setresgid_decl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -9511,7 +9510,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for errno declaration" >&5
 $as_echo_n "checking for errno declaration... " >&6; }
-if test "${ac_cv_have_errno_decl+set}" = set; then :
+if ${ac_cv_have_errno_decl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -9544,7 +9543,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for secure mkstemp" >&5
 $as_echo_n "checking for secure mkstemp... " >&6; }
-if test "${libreplace_cv_HAVE_SECURE_MKSTEMP+set}" = set; then :
+if ${libreplace_cv_HAVE_SECURE_MKSTEMP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -9590,8 +9589,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -9601,7 +9599,7 @@
 done
 
 ac_fn_c_check_decl "$LINENO" "snprintf" "ac_cv_have_decl_snprintf" "$ac_includes_default"
-if test "x$ac_cv_have_decl_snprintf" = x""yes; then :
+if test "x$ac_cv_have_decl_snprintf" = xyes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -9611,7 +9609,7 @@
 #define HAVE_DECL_SNPRINTF $ac_have_decl
 _ACEOF
 ac_fn_c_check_decl "$LINENO" "vsnprintf" "ac_cv_have_decl_vsnprintf" "$ac_includes_default"
-if test "x$ac_cv_have_decl_vsnprintf" = x""yes; then :
+if test "x$ac_cv_have_decl_vsnprintf" = xyes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -9621,7 +9619,7 @@
 #define HAVE_DECL_VSNPRINTF $ac_have_decl
 _ACEOF
 ac_fn_c_check_decl "$LINENO" "asprintf" "ac_cv_have_decl_asprintf" "$ac_includes_default"
-if test "x$ac_cv_have_decl_asprintf" = x""yes; then :
+if test "x$ac_cv_have_decl_asprintf" = xyes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -9631,7 +9629,7 @@
 #define HAVE_DECL_ASPRINTF $ac_have_decl
 _ACEOF
 ac_fn_c_check_decl "$LINENO" "vasprintf" "ac_cv_have_decl_vasprintf" "$ac_includes_default"
-if test "x$ac_cv_have_decl_vasprintf" = x""yes; then :
+if test "x$ac_cv_have_decl_vasprintf" = xyes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -9645,8 +9643,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -9657,7 +9654,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 vsnprintf" >&5
 $as_echo_n "checking for C99 vsnprintf... " >&6; }
-if test "${libreplace_cv_HAVE_C99_VSNPRINTF+set}" = set; then :
+if ${libreplace_cv_HAVE_C99_VSNPRINTF+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -9721,7 +9718,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5
 $as_echo_n "checking for va_copy... " >&6; }
-if test "${libreplace_cv_HAVE_VA_COPY+set}" = set; then :
+if ${libreplace_cv_HAVE_VA_COPY+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -9756,7 +9753,7 @@
 if test x"$libreplace_cv_HAVE_VA_COPY" != x"yes"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __va_copy" >&5
 $as_echo_n "checking for __va_copy... " >&6; }
-if test "${libreplace_cv_HAVE___VA_COPY+set}" = set; then :
+if ${libreplace_cv_HAVE___VA_COPY+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -9791,7 +9788,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __FUNCTION__ macro" >&5
 $as_echo_n "checking for __FUNCTION__ macro... " >&6; }
-if test "${libreplace_cv_HAVE_FUNCTION_MACRO+set}" = set; then :
+if ${libreplace_cv_HAVE_FUNCTION_MACRO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -9822,7 +9819,7 @@
 else
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __func__ macro" >&5
 $as_echo_n "checking for __func__ macro... " >&6; }
-if test "${libreplace_cv_HAVE_func_MACRO+set}" = set; then :
+if ${libreplace_cv_HAVE_func_MACRO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -9857,8 +9854,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -9869,7 +9865,7 @@
 
 
 ac_fn_c_check_type "$LINENO" "comparison_fn_t" "ac_cv_type_comparison_fn_t" "$ac_includes_default"
-if test "x$ac_cv_type_comparison_fn_t" = x""yes; then :
+if test "x$ac_cv_type_comparison_fn_t" = xyes; then :
 
 $as_echo "#define HAVE_COMPARISON_FN_T 1" >>confdefs.h
 
@@ -9879,7 +9875,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setenv declaration" >&5
 $as_echo_n "checking for setenv declaration... " >&6; }
-if test "${ac_cv_have_setenv_decl+set}" = set; then :
+if ${ac_cv_have_setenv_decl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -9913,8 +9909,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -9925,7 +9920,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for environ declaration" >&5
 $as_echo_n "checking for environ declaration... " >&6; }
-if test "${ac_cv_have_environ_decl+set}" = set; then :
+if ${ac_cv_have_environ_decl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -9959,7 +9954,7 @@
 for ac_func in strnlen
 do :
   ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
-if test "x$ac_cv_func_strnlen" = x""yes; then :
+if test "x$ac_cv_func_strnlen" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRNLEN 1
 _ACEOF
@@ -9971,8 +9966,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -9984,7 +9978,7 @@
 for ac_func in memmem
 do :
   ac_fn_c_check_func "$LINENO" "memmem" "ac_cv_func_memmem"
-if test "x$ac_cv_func_memmem" = x""yes; then :
+if test "x$ac_cv_func_memmem" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MEMMEM 1
 _ACEOF
@@ -10006,12 +10000,12 @@
 $as_echo "#define HAVE__VA_ARGS__MACRO 1" >>confdefs.h
 
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sig_atomic_t type" >&5
 $as_echo_n "checking for sig_atomic_t type... " >&6; }
-if test "${libreplace_cv_sig_atomic_t+set}" = set; then :
+if ${libreplace_cv_sig_atomic_t+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -10050,7 +10044,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for O_DIRECT flag to open(2)" >&5
 $as_echo_n "checking for O_DIRECT flag to open(2)... " >&6; }
-if test "${libreplace_cv_HAVE_OPEN_O_DIRECT+set}" = set; then :
+if ${libreplace_cv_HAVE_OPEN_O_DIRECT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -10087,7 +10081,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands volatile" >&5
 $as_echo_n "checking that the C compiler understands volatile... " >&6; }
-if test "${libreplace_cv_volatile+set}" = set; then :
+if ${libreplace_cv_volatile+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -10123,7 +10117,7 @@
   as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
 $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$as_ac_Header+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10150,8 +10144,7 @@
 eval ac_res=\$$as_ac_Header
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
 _ACEOF
@@ -10164,7 +10157,7 @@
 if test $ac_header_dirent = dirent.h; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
 $as_echo_n "checking for library containing opendir... " >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then :
+if ${ac_cv_search_opendir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -10198,11 +10191,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_opendir+set}" = set; then :
+  if ${ac_cv_search_opendir+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_opendir+set}" = set; then :
+if ${ac_cv_search_opendir+:} false; then :
 
 else
   ac_cv_search_opendir=no
@@ -10221,7 +10214,7 @@
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
 $as_echo_n "checking for library containing opendir... " >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then :
+if ${ac_cv_search_opendir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -10255,11 +10248,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_opendir+set}" = set; then :
+  if ${ac_cv_search_opendir+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_opendir+set}" = set; then :
+if ${ac_cv_search_opendir+:} false; then :
 
 else
   ac_cv_search_opendir=no
@@ -10281,8 +10274,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -10295,8 +10287,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -10310,7 +10301,7 @@
 for ac_header in sys/select.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_select_h" = x""yes; then :
+if test "x$ac_cv_header_sys_select_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_SELECT_H 1
 _ACEOF
@@ -10324,7 +10315,7 @@
 for ac_header in poll.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "poll.h" "ac_cv_header_poll_h" "$ac_includes_default"
-if test "x$ac_cv_header_poll_h" = x""yes; then :
+if test "x$ac_cv_header_poll_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_POLL_H 1
 _ACEOF
@@ -10336,7 +10327,7 @@
 for ac_func in poll
 do :
   ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll"
-if test "x$ac_cv_func_poll" = x""yes; then :
+if test "x$ac_cv_func_poll" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_POLL 1
 _ACEOF
@@ -10352,8 +10343,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -10364,7 +10354,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
 $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if test "${ac_cv_header_time+set}" = set; then :
+if ${ac_cv_header_time+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10401,8 +10391,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -10413,7 +10402,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gettimeofday takes TZ argument" >&5
 $as_echo_n "checking if gettimeofday takes TZ argument... " >&6; }
-if test "${libreplace_cv_HAVE_GETTIMEOFDAY_TZ+set}" = set; then :
+if ${libreplace_cv_HAVE_GETTIMEOFDAY_TZ+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -10448,7 +10437,7 @@
 # wait
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
 $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
-if test "${ac_cv_header_sys_wait_h+set}" = set; then :
+if ${ac_cv_header_sys_wait_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10492,7 +10481,7 @@
 for ac_header in sys/capability.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_capability_h" = x""yes; then :
+if test "x$ac_cv_header_sys_capability_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_CAPABILITY_H 1
 _ACEOF
@@ -10506,7 +10495,7 @@
 *linux*)
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken RedHat 7.2 system header files" >&5
 $as_echo_n "checking for broken RedHat 7.2 system header files... " >&6; }
-if test "${libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS+set}" = set; then :
+if ${libreplace_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -10548,7 +10537,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken RHEL5 sys/capability.h" >&5
 $as_echo_n "checking for broken RHEL5 sys/capability.h... " >&6; }
-if test "${libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER+set}" = set; then :
+if ${libreplace_cv_BROKEN_RHEL5_SYS_CAP_HEADER+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -10593,8 +10582,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -10607,8 +10595,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -10619,7 +10606,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpwent_r declaration" >&5
 $as_echo_n "checking for getpwent_r declaration... " >&6; }
-if test "${ac_cv_have_getpwent_r_decl+set}" = set; then :
+if ${ac_cv_have_getpwent_r_decl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -10654,7 +10641,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)" >&5
 $as_echo_n "checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)... " >&6; }
-if test "${ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_+set}" = set; then :
+if { as_var=`$as_echo "ac_cv_c_prototype_struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10678,19 +10665,20 @@
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
-		eval ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=yes
+		eval `$as_echo "ac_cv_c_prototype_struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)" | $as_tr_sh`=yes
 
 else
 
-		eval ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_=no
+		eval `$as_echo "ac_cv_c_prototype_struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)" | $as_tr_sh`=no
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_" >&5
-$as_echo "$ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_" >&6; }
-if test $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__int_buflen_ = yes; then :
+eval ac_res=\$`$as_echo "ac_cv_c_prototype_struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)" | $as_tr_sh`
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test $`$as_echo "ac_cv_c_prototype_struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)" | $as_tr_sh` = yes; then :
 
 
 $as_echo "#define SOLARIS_GETPWENT_R 1" >>confdefs.h
@@ -10700,7 +10688,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)" >&5
 $as_echo_n "checking for prototype struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)... " >&6; }
-if test "${ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_+set}" = set; then :
+if { as_var=`$as_echo "ac_cv_c_prototype_struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10724,19 +10712,20 @@
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
-		eval ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_=yes
+		eval `$as_echo "ac_cv_c_prototype_struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)" | $as_tr_sh`=yes
 
 else
 
-		eval ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_=no
+		eval `$as_echo "ac_cv_c_prototype_struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)" | $as_tr_sh`=no
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_" >&5
-$as_echo "$ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_" >&6; }
-if test $ac_cv_c_prototype_struct_passwd_pgetpwent_r_struct_passwd_psrc__char_pbuf__size_t_buflen_ = yes; then :
+eval ac_res=\$`$as_echo "ac_cv_c_prototype_struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)" | $as_tr_sh`
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test $`$as_echo "ac_cv_c_prototype_struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)" | $as_tr_sh` = yes; then :
 
 
 $as_echo "#define SOLARIS_GETPWENT_R 1" >>confdefs.h
@@ -10748,8 +10737,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -10760,7 +10748,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getgrent_r declaration" >&5
 $as_echo_n "checking for getgrent_r declaration... " >&6; }
-if test "${ac_cv_have_getgrent_r_decl+set}" = set; then :
+if ${ac_cv_have_getgrent_r_decl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -10795,7 +10783,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct group *getgrent_r(struct group *src, char *buf, int buflen)" >&5
 $as_echo_n "checking for prototype struct group *getgrent_r(struct group *src, char *buf, int buflen)... " >&6; }
-if test "${ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_+set}" = set; then :
+if { as_var=`$as_echo "ac_cv_c_prototype_struct group *getgrent_r(struct group *src, char *buf, int buflen)" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10819,19 +10807,20 @@
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
-		eval ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=yes
+		eval `$as_echo "ac_cv_c_prototype_struct group *getgrent_r(struct group *src, char *buf, int buflen)" | $as_tr_sh`=yes
 
 else
 
-		eval ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_=no
+		eval `$as_echo "ac_cv_c_prototype_struct group *getgrent_r(struct group *src, char *buf, int buflen)" | $as_tr_sh`=no
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_" >&5
-$as_echo "$ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_" >&6; }
-if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__int_buflen_ = yes; then :
+eval ac_res=\$`$as_echo "ac_cv_c_prototype_struct group *getgrent_r(struct group *src, char *buf, int buflen)" | $as_tr_sh`
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test $`$as_echo "ac_cv_c_prototype_struct group *getgrent_r(struct group *src, char *buf, int buflen)" | $as_tr_sh` = yes; then :
 
 
 $as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h
@@ -10842,7 +10831,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype struct group *getgrent_r(struct group *src, char *buf, size_t buflen)" >&5
 $as_echo_n "checking for prototype struct group *getgrent_r(struct group *src, char *buf, size_t buflen)... " >&6; }
-if test "${ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_+set}" = set; then :
+if { as_var=`$as_echo "ac_cv_c_prototype_struct group *getgrent_r(struct group *src, char *buf, size_t buflen)" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10866,19 +10855,20 @@
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
-		eval ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_=yes
+		eval `$as_echo "ac_cv_c_prototype_struct group *getgrent_r(struct group *src, char *buf, size_t buflen)" | $as_tr_sh`=yes
 
 else
 
-		eval ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_=no
+		eval `$as_echo "ac_cv_c_prototype_struct group *getgrent_r(struct group *src, char *buf, size_t buflen)" | $as_tr_sh`=no
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_" >&5
-$as_echo "$ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_" >&6; }
-if test $ac_cv_c_prototype_struct_group_pgetgrent_r_struct_group_psrc__char_pbuf__size_t_buflen_ = yes; then :
+eval ac_res=\$`$as_echo "ac_cv_c_prototype_struct group *getgrent_r(struct group *src, char *buf, size_t buflen)" | $as_tr_sh`
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test $`$as_echo "ac_cv_c_prototype_struct group *getgrent_r(struct group *src, char *buf, size_t buflen)" | $as_tr_sh` = yes; then :
 
 
 $as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h
@@ -10889,7 +10879,7 @@
 for ac_func in getgrouplist
 do :
   ac_fn_c_check_func "$LINENO" "getgrouplist" "ac_cv_func_getgrouplist"
-if test "x$ac_cv_func_getgrouplist" = x""yes; then :
+if test "x$ac_cv_func_getgrouplist" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETGROUPLIST 1
 _ACEOF
@@ -10903,8 +10893,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -10918,7 +10907,7 @@
 for ac_header in fnmatch.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "fnmatch.h" "ac_cv_header_fnmatch_h" "$ac_includes_default"
-if test "x$ac_cv_header_fnmatch_h" = x""yes; then :
+if test "x$ac_cv_header_fnmatch_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FNMATCH_H 1
 _ACEOF
@@ -10933,8 +10922,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -10949,8 +10937,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -10967,7 +10954,7 @@
 libreplace_cv_dlfcn=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
 $as_echo_n "checking for library containing dlopen... " >&6; }
-if test "${ac_cv_search_dlopen+set}" = set; then :
+if ${ac_cv_search_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -11001,11 +10988,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_dlopen+set}" = set; then :
+  if ${ac_cv_search_dlopen+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_dlopen+set}" = set; then :
+if ${ac_cv_search_dlopen+:} false; then :
 
 else
   ac_cv_search_dlopen=no
@@ -11025,7 +11012,7 @@
 for ac_header in dlfcn.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DLFCN_H 1
 _ACEOF
@@ -11038,8 +11025,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -11053,7 +11039,7 @@
 libreplace_cv_shl=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shl_load" >&5
 $as_echo_n "checking for library containing shl_load... " >&6; }
-if test "${ac_cv_search_shl_load+set}" = set; then :
+if ${ac_cv_search_shl_load+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -11087,11 +11073,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_shl_load+set}" = set; then :
+  if ${ac_cv_search_shl_load+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_shl_load+set}" = set; then :
+if ${ac_cv_search_shl_load+:} false; then :
 
 else
   ac_cv_search_shl_load=no
@@ -11110,7 +11096,7 @@
 for ac_header in dl.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default"
-if test "x$ac_cv_header_dl_h" = x""yes; then :
+if test "x$ac_cv_header_dl_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DL_H 1
 _ACEOF
@@ -11123,8 +11109,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -11137,7 +11122,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype void *dlopen(const char* filename, unsigned int flags)" >&5
 $as_echo_n "checking for prototype void *dlopen(const char* filename, unsigned int flags)... " >&6; }
-if test "${ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_+set}" = set; then :
+if { as_var=`$as_echo "ac_cv_c_prototype_void *dlopen(const char* filename, unsigned int flags)" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11157,19 +11142,20 @@
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
-		eval ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_=yes
+		eval `$as_echo "ac_cv_c_prototype_void *dlopen(const char* filename, unsigned int flags)" | $as_tr_sh`=yes
 
 else
 
-		eval ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_=no
+		eval `$as_echo "ac_cv_c_prototype_void *dlopen(const char* filename, unsigned int flags)" | $as_tr_sh`=no
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_" >&5
-$as_echo "$ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_" >&6; }
-if test $ac_cv_c_prototype_void_pdlopen_const_charp_filename__unsigned_int_flags_ = yes; then :
+eval ac_res=\$`$as_echo "ac_cv_c_prototype_void *dlopen(const char* filename, unsigned int flags)" | $as_tr_sh`
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test $`$as_echo "ac_cv_c_prototype_void *dlopen(const char* filename, unsigned int flags)" | $as_tr_sh` = yes; then :
 
 
 $as_echo "#define DLOPEN_TAKES_UNSIGNED_FLAGS 1" >>confdefs.h
@@ -11187,12 +11173,12 @@
 LIBS="$save_LIBS"
 
 ac_fn_c_check_func "$LINENO" "getpass" "ac_cv_func_getpass"
-if test "x$ac_cv_func_getpass" = x""yes; then :
+if test "x$ac_cv_func_getpass" = xyes; then :
   libreplace_cv_HAVE_GETPASS=yes
 fi
 
 ac_fn_c_check_func "$LINENO" "getpassphrase" "ac_cv_func_getpassphrase"
-if test "x$ac_cv_func_getpassphrase" = x""yes; then :
+if test "x$ac_cv_func_getpassphrase" = xyes; then :
   libreplace_cv_HAVE_GETPASSPHRASE=yes
 fi
 
@@ -11208,7 +11194,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpass should be replaced" >&5
 $as_echo_n "checking whether getpass should be replaced... " >&6; }
-if test "${libreplace_cv_REPLACE_GETPASS+set}" = set; then :
+if ${libreplace_cv_REPLACE_GETPASS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -11251,7 +11237,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strptime is available and works" >&5
 $as_echo_n "checking whether strptime is available and works... " >&6; }
-if test "${libreplace_cv_STRPTIME_OK+set}" = set; then :
+if ${libreplace_cv_STRPTIME_OK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -11289,8 +11275,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -11304,7 +11289,7 @@
 # Check for mkdir mode
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mkdir supports mode" >&5
 $as_echo_n "checking whether mkdir supports mode... " >&6; }
-if test "${libreplace_cv_mkdir_has_mode+set}" = set; then :
+if ${libreplace_cv_mkdir_has_mode+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11345,7 +11330,7 @@
 for ac_func in timegm
 do :
   ac_fn_c_check_func "$LINENO" "timegm" "ac_cv_func_timegm"
-if test "x$ac_cv_func_timegm" = x""yes; then :
+if test "x$ac_cv_func_timegm" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_TIMEGM 1
 _ACEOF
@@ -11358,7 +11343,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken readdir" >&5
 $as_echo_n "checking for broken readdir... " >&6; }
-if test "${libreplace_cv_READDIR_NEEDED+set}" = set; then :
+if ${libreplace_cv_READDIR_NEEDED+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -11388,7 +11373,7 @@
 for ac_func in dirfd
 do :
   ac_fn_c_check_func "$LINENO" "dirfd" "ac_cv_func_dirfd"
-if test "x$ac_cv_func_dirfd" = x""yes; then :
+if test "x$ac_cv_func_dirfd" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DIRFD 1
 _ACEOF
@@ -11399,7 +11384,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dirfd declaration" >&5
 $as_echo_n "checking for dirfd declaration... " >&6; }
-if test "${ac_cv_have_dirfd_decl+set}" = set; then :
+if ${ac_cv_have_dirfd_decl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -11437,7 +11422,7 @@
 for ac_func in getdirentries
 do :
   ac_fn_c_check_func "$LINENO" "getdirentries" "ac_cv_func_getdirentries"
-if test "x$ac_cv_func_getdirentries" = x""yes; then :
+if test "x$ac_cv_func_getdirentries" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETDIRENTRIES 1
 _ACEOF
@@ -11447,7 +11432,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype long telldir(const DIR *dir)" >&5
 $as_echo_n "checking for prototype long telldir(const DIR *dir)... " >&6; }
-if test "${ac_cv_c_prototype_long_telldir_const_DIR_pdir_+set}" = set; then :
+if { as_var=`$as_echo "ac_cv_c_prototype_long telldir(const DIR *dir)" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11467,19 +11452,20 @@
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
-		eval ac_cv_c_prototype_long_telldir_const_DIR_pdir_=yes
+		eval `$as_echo "ac_cv_c_prototype_long telldir(const DIR *dir)" | $as_tr_sh`=yes
 
 else
 
-		eval ac_cv_c_prototype_long_telldir_const_DIR_pdir_=no
+		eval `$as_echo "ac_cv_c_prototype_long telldir(const DIR *dir)" | $as_tr_sh`=no
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_long_telldir_const_DIR_pdir_" >&5
-$as_echo "$ac_cv_c_prototype_long_telldir_const_DIR_pdir_" >&6; }
-if test $ac_cv_c_prototype_long_telldir_const_DIR_pdir_ = yes; then :
+eval ac_res=\$`$as_echo "ac_cv_c_prototype_long telldir(const DIR *dir)" | $as_tr_sh`
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test $`$as_echo "ac_cv_c_prototype_long telldir(const DIR *dir)" | $as_tr_sh` = yes; then :
 
 
 $as_echo "#define TELLDIR_TAKES_CONST_DIR 1" >>confdefs.h
@@ -11490,7 +11476,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prototype int seekdir(DIR *dir, long ofs)" >&5
 $as_echo_n "checking for prototype int seekdir(DIR *dir, long ofs)... " >&6; }
-if test "${ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_+set}" = set; then :
+if { as_var=`$as_echo "ac_cv_c_prototype_int seekdir(DIR *dir, long ofs)" | $as_tr_sh`; eval \${$as_var+:} false; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11510,19 +11496,20 @@
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
-		eval ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_=yes
+		eval `$as_echo "ac_cv_c_prototype_int seekdir(DIR *dir, long ofs)" | $as_tr_sh`=yes
 
 else
 
-		eval ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_=no
+		eval `$as_echo "ac_cv_c_prototype_int seekdir(DIR *dir, long ofs)" | $as_tr_sh`=no
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_" >&5
-$as_echo "$ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_" >&6; }
-if test $ac_cv_c_prototype_int_seekdir_DIR_pdir__long_ofs_ = yes; then :
+eval ac_res=\$`$as_echo "ac_cv_c_prototype_int seekdir(DIR *dir, long ofs)" | $as_tr_sh`
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test $`$as_echo "ac_cv_c_prototype_int seekdir(DIR *dir, long ofs)" | $as_tr_sh` = yes; then :
 
 
 $as_echo "#define SEEKDIR_RETURNS_INT 1" >>confdefs.h
@@ -11532,15 +11519,15 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for replacing readdir using getdirentries()" >&5
 $as_echo_n "checking for replacing readdir using getdirentries()... " >&6; }
-if test "${libreplace_cv_READDIR_GETDIRENTRIES+set}" = set; then :
+if ${libreplace_cv_READDIR_GETDIRENTRIES+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 	if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -11582,7 +11569,7 @@
 for ac_func in getdents
 do :
   ac_fn_c_check_func "$LINENO" "getdents" "ac_cv_func_getdents"
-if test "x$ac_cv_func_getdents" = x""yes; then :
+if test "x$ac_cv_func_getdents" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETDENTS 1
 _ACEOF
@@ -11592,15 +11579,15 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for replacing readdir using getdents()" >&5
 $as_echo_n "checking for replacing readdir using getdents()... " >&6; }
-if test "${libreplace_cv_READDIR_GETDENTS+set}" = set; then :
+if ${libreplace_cv_READDIR_GETDENTS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 	if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -11653,7 +11640,7 @@
 for ac_header in crypt.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default"
-if test "x$ac_cv_header_crypt_h" = x""yes; then :
+if test "x$ac_cv_header_crypt_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CRYPT_H 1
 _ACEOF
@@ -11664,7 +11651,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
 $as_echo_n "checking for library containing crypt... " >&6; }
-if test "${ac_cv_search_ext_crypt+set}" = set; then :
+if ${ac_cv_search_ext_crypt+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -11873,7 +11860,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec type" >&5
 $as_echo_n "checking for struct timespec type... " >&6; }
-if test "${libreplace_cv_struct_timespec+set}" = set; then :
+if ${libreplace_cv_struct_timespec+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -11923,14 +11910,13 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 else
-  as_fn_error "Required function not found" "$LINENO" 5
+  as_fn_error $? "Required function not found" "$LINENO" 5
 fi
 done
 
@@ -11940,13 +11926,13 @@
 for ac_func in syslog
 do :
   ac_fn_c_check_func "$LINENO" "syslog" "ac_cv_func_syslog"
-if test "x$ac_cv_func_syslog" = x""yes; then :
+if test "x$ac_cv_func_syslog" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYSLOG 1
 _ACEOF
 
 else
-  as_fn_error "Required function not found" "$LINENO" 5
+  as_fn_error $? "Required function not found" "$LINENO" 5
 fi
 done
 
@@ -11963,8 +11949,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -11976,7 +11961,7 @@
 for ac_header in netinet/in_systm.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "netinet/in_systm.h" "ac_cv_header_netinet_in_systm_h" "$ac_includes_default"
-if test "x$ac_cv_header_netinet_in_systm_h" = x""yes; then :
+if test "x$ac_cv_header_netinet_in_systm_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_NETINET_IN_SYSTM_H 1
 _ACEOF
@@ -11997,7 +11982,7 @@
 	#endif
 
 "
-if test "x$ac_cv_header_netinet_ip_h" = x""yes; then :
+if test "x$ac_cv_header_netinet_ip_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_NETINET_IP_H 1
 _ACEOF
@@ -12010,8 +11995,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -12024,8 +12008,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -12037,7 +12020,7 @@
 for ac_header in sys/uio.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/uio.h" "ac_cv_header_sys_uio_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_uio_h" = x""yes; then :
+if test "x$ac_cv_header_sys_uio_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_UIO_H 1
 _ACEOF
@@ -12049,7 +12032,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable net/if.h" >&5
 $as_echo_n "checking for usable net/if.h... " >&6; }
-if test "${libreplace_cv_USABLE_NET_IF_H+set}" = set; then :
+if ${libreplace_cv_USABLE_NET_IF_H+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -12085,7 +12068,7 @@
 cv=`echo "socklen_t" | sed 'y%./+- %__p__%'`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socklen_t" >&5
 $as_echo_n "checking for socklen_t... " >&6; }
-if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${ac_cv_type_$cv+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12115,7 +12098,7 @@
   ac_tr_hdr=HAVE_`echo socklen_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 if false; then
 	ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "$ac_includes_default"
-if test "x$ac_cv_type_socklen_t" = x""yes; then :
+if test "x$ac_cv_type_socklen_t" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SOCKLEN_T 1
@@ -12137,7 +12120,7 @@
 cv=`echo "sa_family_t" | sed 'y%./+- %__p__%'`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sa_family_t" >&5
 $as_echo_n "checking for sa_family_t... " >&6; }
-if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${ac_cv_type_$cv+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12167,7 +12150,7 @@
   ac_tr_hdr=HAVE_`echo sa_family_t | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 if false; then
 	ac_fn_c_check_type "$LINENO" "sa_family_t" "ac_cv_type_sa_family_t" "$ac_includes_default"
-if test "x$ac_cv_type_sa_family_t" = x""yes; then :
+if test "x$ac_cv_type_sa_family_t" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SA_FAMILY_T 1
@@ -12189,7 +12172,7 @@
 cv=`echo "struct addrinfo" | sed 'y%./+- %__p__%'`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct addrinfo" >&5
 $as_echo_n "checking for struct addrinfo... " >&6; }
-if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${ac_cv_type_$cv+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12219,7 +12202,7 @@
   ac_tr_hdr=HAVE_`echo struct addrinfo | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 if false; then
 	ac_fn_c_check_type "$LINENO" "struct addrinfo" "ac_cv_type_struct_addrinfo" "$ac_includes_default"
-if test "x$ac_cv_type_struct_addrinfo" = x""yes; then :
+if test "x$ac_cv_type_struct_addrinfo" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_ADDRINFO 1
@@ -12241,7 +12224,7 @@
 cv=`echo "struct sockaddr" | sed 'y%./+- %__p__%'`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr" >&5
 $as_echo_n "checking for struct sockaddr... " >&6; }
-if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${ac_cv_type_$cv+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12271,7 +12254,7 @@
   ac_tr_hdr=HAVE_`echo struct sockaddr | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 if false; then
 	ac_fn_c_check_type "$LINENO" "struct sockaddr" "ac_cv_type_struct_sockaddr" "$ac_includes_default"
-if test "x$ac_cv_type_struct_sockaddr" = x""yes; then :
+if test "x$ac_cv_type_struct_sockaddr" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SOCKADDR 1
@@ -12293,7 +12276,7 @@
 cv=`echo "struct sockaddr_storage" | sed 'y%./+- %__p__%'`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5
 $as_echo_n "checking for struct sockaddr_storage... " >&6; }
-if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${ac_cv_type_$cv+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12327,7 +12310,7 @@
   ac_tr_hdr=HAVE_`echo struct sockaddr_storage | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 if false; then
 	ac_fn_c_check_type "$LINENO" "struct sockaddr_storage" "ac_cv_type_struct_sockaddr_storage" "$ac_includes_default"
-if test "x$ac_cv_type_struct_sockaddr_storage" = x""yes; then :
+if test "x$ac_cv_type_struct_sockaddr_storage" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SOCKADDR_STORAGE 1
@@ -12349,7 +12332,7 @@
 cv=`echo "struct sockaddr_in6" | sed 'y%./+- %__p__%'`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_in6" >&5
 $as_echo_n "checking for struct sockaddr_in6... " >&6; }
-if { as_var=ac_cv_type_$cv; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${ac_cv_type_$cv+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12383,7 +12366,7 @@
   ac_tr_hdr=HAVE_`echo struct sockaddr_in6 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
 if false; then
 	ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "$ac_includes_default"
-if test "x$ac_cv_type_struct_sockaddr_in6" = x""yes; then :
+if test "x$ac_cv_type_struct_sockaddr_in6" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SOCKADDR_IN6 1
@@ -12408,7 +12391,7 @@
 #include <netinet/in.h>
 
 "
-if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = x""yes; then :
+if test "x$ac_cv_member_struct_sockaddr_storage_ss_family" = xyes; then :
 
 $as_echo "#define HAVE_SS_FAMILY 1" >>confdefs.h
 
@@ -12422,7 +12405,7 @@
 #include <netinet/in.h>
 
 "
-if test "x$ac_cv_member_struct_sockaddr_storage___ss_family" = x""yes; then :
+if test "x$ac_cv_member_struct_sockaddr_storage___ss_family" = xyes; then :
 
 $as_echo "#define HAVE___SS_FAMILY 1" >>confdefs.h
 
@@ -12433,7 +12416,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin_len in sock" >&5
 $as_echo_n "checking for sin_len in sock... " >&6; }
-if test "${libreplace_cv_HAVE_SOCK_SIN_LEN+set}" = set; then :
+if ${libreplace_cv_HAVE_SOCK_SIN_LEN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -12478,7 +12461,7 @@
 # check for unix domain sockets
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unix domain sockets" >&5
 $as_echo_n "checking for unix domain sockets... " >&6; }
-if test "${libreplace_cv_HAVE_UNIXSOCKET+set}" = set; then :
+if ${libreplace_cv_HAVE_UNIXSOCKET+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -12525,7 +12508,7 @@
 for ac_func in connect
 do :
   ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
-if test "x$ac_cv_func_connect" = x""yes; then :
+if test "x$ac_cv_func_connect" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CONNECT 1
 _ACEOF
@@ -12543,7 +12526,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lnsl_s" >&5
 $as_echo_n "checking for connect in -lnsl_s... " >&6; }
-if test "${ac_cv_lib_ext_nsl_s_connect+set}" = set; then :
+if ${ac_cv_lib_ext_nsl_s_connect+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12609,7 +12592,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lnsl" >&5
 $as_echo_n "checking for connect in -lnsl... " >&6; }
-if test "${ac_cv_lib_ext_nsl_connect+set}" = set; then :
+if ${ac_cv_lib_ext_nsl_connect+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12675,7 +12658,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
 $as_echo_n "checking for connect in -lsocket... " >&6; }
-if test "${ac_cv_lib_ext_socket_connect+set}" = set; then :
+if ${ac_cv_lib_ext_socket_connect+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12741,7 +12724,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -linet" >&5
 $as_echo_n "checking for connect in -linet... " >&6; }
-if test "${ac_cv_lib_ext_inet_connect+set}" = set; then :
+if ${ac_cv_lib_ext_inet_connect+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12812,7 +12795,7 @@
 for ac_func in gethostbyname
 do :
   ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-if test "x$ac_cv_func_gethostbyname" = x""yes; then :
+if test "x$ac_cv_func_gethostbyname" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETHOSTBYNAME 1
 _ACEOF
@@ -12830,7 +12813,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl_s" >&5
 $as_echo_n "checking for gethostbyname in -lnsl_s... " >&6; }
-if test "${ac_cv_lib_ext_nsl_s_gethostbyname+set}" = set; then :
+if ${ac_cv_lib_ext_nsl_s_gethostbyname+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12896,7 +12879,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if test "${ac_cv_lib_ext_nsl_gethostbyname+set}" = set; then :
+if ${ac_cv_lib_ext_nsl_gethostbyname+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12962,7 +12945,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lsocket" >&5
 $as_echo_n "checking for gethostbyname in -lsocket... " >&6; }
-if test "${ac_cv_lib_ext_socket_gethostbyname+set}" = set; then :
+if ${ac_cv_lib_ext_socket_gethostbyname+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13032,7 +13015,7 @@
 for ac_func in if_nametoindex
 do :
   ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex"
-if test "x$ac_cv_func_if_nametoindex" = x""yes; then :
+if test "x$ac_cv_func_if_nametoindex" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_IF_NAMETOINDEX 1
 _ACEOF
@@ -13050,7 +13033,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nametoindex in -lipv6" >&5
 $as_echo_n "checking for if_nametoindex in -lipv6... " >&6; }
-if test "${ac_cv_lib_ext_ipv6_if_nametoindex+set}" = set; then :
+if ${ac_cv_lib_ext_ipv6_if_nametoindex+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13124,7 +13107,7 @@
 for ac_func in socketpair
 do :
   ac_fn_c_check_func "$LINENO" "socketpair" "ac_cv_func_socketpair"
-if test "x$ac_cv_func_socketpair" = x""yes; then :
+if test "x$ac_cv_func_socketpair" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SOCKETPAIR 1
 _ACEOF
@@ -13137,7 +13120,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken inet_ntoa" >&5
 $as_echo_n "checking for broken inet_ntoa... " >&6; }
-if test "${libreplace_cv_REPLACE_INET_NTOA+set}" = set; then :
+if ${libreplace_cv_REPLACE_INET_NTOA+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -13175,7 +13158,7 @@
 for ac_func in inet_ntoa
 do :
   ac_fn_c_check_func "$LINENO" "inet_ntoa" "ac_cv_func_inet_ntoa"
-if test "x$ac_cv_func_inet_ntoa" = x""yes; then :
+if test "x$ac_cv_func_inet_ntoa" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_INET_NTOA 1
 _ACEOF
@@ -13195,7 +13178,7 @@
 for ac_func in inet_aton
 do :
   ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
-if test "x$ac_cv_func_inet_aton" = x""yes; then :
+if test "x$ac_cv_func_inet_aton" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_INET_ATON 1
 _ACEOF
@@ -13209,7 +13192,7 @@
 for ac_func in inet_ntop
 do :
   ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop"
-if test "x$ac_cv_func_inet_ntop" = x""yes; then :
+if test "x$ac_cv_func_inet_ntop" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_INET_NTOP 1
 _ACEOF
@@ -13223,7 +13206,7 @@
 for ac_func in inet_pton
 do :
   ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton"
-if test "x$ac_cv_func_inet_pton" = x""yes; then :
+if test "x$ac_cv_func_inet_pton" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_INET_PTON 1
 _ACEOF
@@ -13236,7 +13219,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
 $as_echo_n "checking for getaddrinfo... " >&6; }
-if test "${libreplace_cv_HAVE_GETADDRINFO+set}" = set; then :
+if ${libreplace_cv_HAVE_GETADDRINFO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -13288,8 +13271,8 @@
 	if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -13354,7 +13337,7 @@
 for ac_header in ifaddrs.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "ifaddrs.h" "ac_cv_header_ifaddrs_h" "$ac_includes_default"
-if test "x$ac_cv_header_ifaddrs_h" = x""yes; then :
+if test "x$ac_cv_header_ifaddrs_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_IFADDRS_H 1
 _ACEOF
@@ -13366,7 +13349,7 @@
 
 ac_fn_c_check_member "$LINENO" "struct sockaddr" "sa_len" "ac_cv_member_struct_sockaddr_sa_len" "#include <sys/socket.h>
 "
-if test "x$ac_cv_member_struct_sockaddr_sa_len" = x""yes; then :
+if test "x$ac_cv_member_struct_sockaddr_sa_len" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SOCKADDR_SA_LEN 1
@@ -13380,7 +13363,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs and freeifaddrs" >&5
 $as_echo_n "checking for getifaddrs and freeifaddrs... " >&6; }
-if test "${libreplace_cv_HAVE_GETIFADDRS+set}" = set; then :
+if ${libreplace_cv_HAVE_GETIFADDRS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -13436,7 +13419,7 @@
 iface=no;
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface getifaddrs" >&5
 $as_echo_n "checking for iface getifaddrs... " >&6; }
-if test "${libreplace_cv_HAVE_IFACE_GETIFADDRS+set}" = set; then :
+if ${libreplace_cv_HAVE_IFACE_GETIFADDRS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -13481,7 +13464,7 @@
 if test $iface = no; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface AIX" >&5
 $as_echo_n "checking for iface AIX... " >&6; }
-if test "${libreplace_cv_HAVE_IFACE_AIX+set}" = set; then :
+if ${libreplace_cv_HAVE_IFACE_AIX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -13526,7 +13509,7 @@
 if test $iface = no; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface ifconf" >&5
 $as_echo_n "checking for iface ifconf... " >&6; }
-if test "${libreplace_cv_HAVE_IFACE_IFCONF+set}" = set; then :
+if ${libreplace_cv_HAVE_IFACE_IFCONF+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -13569,7 +13552,7 @@
 if test $iface = no; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iface ifreq" >&5
 $as_echo_n "checking for iface ifreq... " >&6; }
-if test "${libreplace_cv_HAVE_IFACE_IFREQ+set}" = set; then :
+if ${libreplace_cv_HAVE_IFACE_IFREQ+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -13611,7 +13594,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPV6_V6ONLY support" >&5
 $as_echo_n "checking for IPV6_V6ONLY support... " >&6; }
-if test "${libreplace_cv_HAVE_IPV6_V6ONLY+set}" = set; then :
+if ${libreplace_cv_HAVE_IPV6_V6ONLY+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -13653,7 +13636,7 @@
 if test x"$libreplace_cv_HAVE_IPV6_V6ONLY" != x"yes"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPV6_V6ONLY in linux/in6.h" >&5
 $as_echo_n "checking for IPV6_V6ONLY in linux/in6.h... " >&6; }
-if test "${libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26+set}" = set; then :
+if ${libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -13697,7 +13680,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ipv6 support" >&5
 $as_echo_n "checking for ipv6 support... " >&6; }
-if test "${libreplace_cv_HAVE_IPV6+set}" = set; then :
+if ${libreplace_cv_HAVE_IPV6+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -13786,8 +13769,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -13800,8 +13782,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -13814,8 +13795,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -13828,8 +13808,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -13842,8 +13821,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -13856,8 +13834,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -13870,8 +13847,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -13884,8 +13860,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -13897,7 +13872,7 @@
 for ac_header in sys/sysmacros.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sysmacros_h" = x""yes; then :
+if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_SYSMACROS_H 1
 _ACEOF
@@ -13910,8 +13885,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -13924,8 +13898,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -13937,7 +13910,7 @@
 for ac_header in xfs/libxfs.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "xfs/libxfs.h" "ac_cv_header_xfs_libxfs_h" "$ac_includes_default"
-if test "x$ac_cv_header_xfs_libxfs_h" = x""yes; then :
+if test "x$ac_cv_header_xfs_libxfs_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_XFS_LIBXFS_H 1
 _ACEOF
@@ -13949,7 +13922,7 @@
 for ac_header in netgroup.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "netgroup.h" "ac_cv_header_netgroup_h" "$ac_includes_default"
-if test "x$ac_cv_header_netgroup_h" = x""yes; then :
+if test "x$ac_cv_header_netgroup_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_NETGROUP_H 1
 _ACEOF
@@ -13961,7 +13934,7 @@
 for ac_header in linux/falloc.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "linux/falloc.h" "ac_cv_header_linux_falloc_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_falloc_h" = x""yes; then :
+if test "x$ac_cv_header_linux_falloc_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LINUX_FALLOC_H 1
 _ACEOF
@@ -13974,7 +13947,7 @@
 for ac_header in md5.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "md5.h" "ac_cv_header_md5_h" "$ac_includes_default"
-if test "x$ac_cv_header_md5_h" = x""yes; then :
+if test "x$ac_cv_header_md5_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MD5_H 1
 _ACEOF
@@ -13983,13 +13956,16 @@
 
 done
 
+
+samba_cv_md5lib=none
+
 if test x"$ac_cv_header_md5_h" = x"yes"; then
 
 $as_echo "#define HAVE_MD5_H 1" >>confdefs.h
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5Update in -lmd5" >&5
 $as_echo_n "checking for MD5Update in -lmd5... " >&6; }
-if test "${ac_cv_lib_md5_MD5Update+set}" = set; then :
+if ${ac_cv_lib_md5_MD5Update+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -14023,24 +13999,115 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_md5_MD5Update" >&5
 $as_echo "$ac_cv_lib_md5_MD5Update" >&6; }
-if test "x$ac_cv_lib_md5_MD5Update" = x""yes; then :
+if test "x$ac_cv_lib_md5_MD5Update" = xyes; then :
+  samba_cv_md5lib=md5
+fi
 
-		LIBS="${LIBS} -lmd5"
-		CRYPTO_MD5_OBJ=
+fi
 
-$as_echo "#define HAVE_LIBMD5 1" >>confdefs.h
+if test x"$ac_cv_header_md5_h" = x"yes" -a \
+        x"$samba_cv_md5lib" = x"none" ; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5Update in -lmd" >&5
+$as_echo_n "checking for MD5Update in -lmd... " >&6; }
+if ${ac_cv_lib_md_MD5Update+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmd  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char MD5Update ();
+int
+main ()
+{
+return MD5Update ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_md_MD5Update=yes
 else
+  ac_cv_lib_md_MD5Update=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_md_MD5Update" >&5
+$as_echo "$ac_cv_lib_md_MD5Update" >&6; }
+if test "x$ac_cv_lib_md_MD5Update" = xyes; then :
+  samba_cv_md5lib=md
+fi
 
-		CRYPTO_MD5_OBJ="../lib/crypto/md5.o"
 fi
 
+if test x"$ac_cv_header_md5_h" = x"yes" -a \
+        x"$samba_cv_md5lib" = x"none" ; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5Update in -lc" >&5
+$as_echo_n "checking for MD5Update in -lc... " >&6; }
+if ${ac_cv_lib_c_MD5Update+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lc  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char MD5Update ();
+int
+main ()
+{
+return MD5Update ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_c_MD5Update=yes
+else
+  ac_cv_lib_c_MD5Update=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_MD5Update" >&5
+$as_echo "$ac_cv_lib_c_MD5Update" >&6; }
+if test "x$ac_cv_lib_c_MD5Update" = xyes; then :
+  samba_cv_md5lib=""
+fi
+
+fi
+
+if test x"$samba_cv_md5lib" != x"none" ; then
+	if test x"$samba_cv_md5lib" != x ; then
+		LIBS="${LIBS} -l${samba_cv_md5lib}"
+	fi
+	CRYPTO_MD5_OBJ=
+
+$as_echo "#define HAVE_LIBMD5 1" >>confdefs.h
+
+else
 	CRYPTO_MD5_OBJ="../lib/crypto/md5.o"
 fi
 
 
 
+
 for ac_header in rpcsvc/yp_prot.h
 do :
   ac_fn_c_check_header_compile "$LINENO" "rpcsvc/yp_prot.h" "ac_cv_header_rpcsvc_yp_prot_h" "
@@ -14049,7 +14116,7 @@
 #endif
 
 "
-if test "x$ac_cv_header_rpcsvc_yp_prot_h" = x""yes; then :
+if test "x$ac_cv_header_rpcsvc_yp_prot_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_RPCSVC_YP_PROT_H 1
 _ACEOF
@@ -14063,7 +14130,7 @@
 for ac_header in sys/mode.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/mode.h" "ac_cv_header_sys_mode_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_mode_h" = x""yes; then :
+if test "x$ac_cv_header_sys_mode_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_MODE_H 1
 _ACEOF
@@ -14079,7 +14146,7 @@
 for ac_header in CoreFoundation/CFStringEncodingConverter.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "CoreFoundation/CFStringEncodingConverter.h" "ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" "$ac_includes_default"
-if test "x$ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" = x""yes; then :
+if test "x$ac_cv_header_CoreFoundation_CFStringEncodingConverter_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_COREFOUNDATION_CFSTRINGENCODINGCONVERTER_H 1
 _ACEOF
@@ -14088,7 +14155,7 @@
   for ac_header in CFStringEncodingConverter.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "CFStringEncodingConverter.h" "ac_cv_header_CFStringEncodingConverter_h" "$ac_includes_default"
-if test "x$ac_cv_header_CFStringEncodingConverter_h" = x""yes; then :
+if test "x$ac_cv_header_CFStringEncodingConverter_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CFSTRINGENCODINGCONVERTER_H 1
 _ACEOF
@@ -14109,8 +14176,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -14162,7 +14228,7 @@
 for ac_header in shadow.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "shadow.h" "ac_cv_header_shadow_h" "$ac_includes_default"
-if test "x$ac_cv_header_shadow_h" = x""yes; then :
+if test "x$ac_cv_header_shadow_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SHADOW_H 1
 _ACEOF
@@ -14175,8 +14241,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -14189,8 +14254,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -14204,8 +14268,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -14218,8 +14281,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -14233,8 +14295,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -14249,8 +14310,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -14266,7 +14326,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
 $as_echo_n "checking size of int... " >&6; }
-if test "${ac_cv_sizeof_int+set}" = set; then :
+if ${ac_cv_sizeof_int+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
@@ -14275,9 +14335,8 @@
   if test "$ac_cv_type_int" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (int)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (int)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_int=0
    fi
@@ -14300,7 +14359,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
 $as_echo_n "checking size of long... " >&6; }
-if test "${ac_cv_sizeof_long+set}" = set; then :
+if ${ac_cv_sizeof_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
@@ -14309,9 +14368,8 @@
   if test "$ac_cv_type_long" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (long)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (long)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
    fi
@@ -14334,7 +14392,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
 $as_echo_n "checking size of long long... " >&6; }
-if test "${ac_cv_sizeof_long_long+set}" = set; then :
+if ${ac_cv_sizeof_long_long+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
@@ -14343,9 +14401,8 @@
   if test "$ac_cv_type_long_long" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (long long)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (long long)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long_long=0
    fi
@@ -14368,7 +14425,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
 $as_echo_n "checking size of short... " >&6; }
-if test "${ac_cv_sizeof_short+set}" = set; then :
+if ${ac_cv_sizeof_short+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
@@ -14377,9 +14434,8 @@
   if test "$ac_cv_type_short" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (short)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (short)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_short=0
    fi
@@ -14399,7 +14455,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if test "${ac_cv_c_const+set}" = set; then :
+if ${ac_cv_c_const+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14479,7 +14535,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then :
+if ${ac_cv_c_inline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
@@ -14521,7 +14577,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then :
+if ${ac_cv_c_bigendian+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_bigendian=unknown
@@ -14739,13 +14795,13 @@
 
      ;; #(
    *)
-     as_fn_error "unknown endianness
+     as_fn_error $? "unknown endianness
  presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
  esac
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5
 $as_echo_n "checking whether char is unsigned... " >&6; }
-if test "${ac_cv_c_char_unsigned+set}" = set; then :
+if ${ac_cv_c_char_unsigned+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14778,7 +14834,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
 $as_echo_n "checking return type of signal handlers... " >&6; }
-if test "${ac_cv_type_signal+set}" = set; then :
+if ${ac_cv_type_signal+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14811,7 +14867,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
 $as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-if test "${ac_cv_type_uid_t+set}" = set; then :
+if ${ac_cv_type_uid_t+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14840,7 +14896,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-if test "x$ac_cv_type_mode_t" = x""yes; then :
+if test "x$ac_cv_type_mode_t" = xyes; then :
 
 else
 
@@ -14851,7 +14907,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
-if test "x$ac_cv_type_off_t" = x""yes; then :
+if test "x$ac_cv_type_off_t" = xyes; then :
 
 else
 
@@ -14862,7 +14918,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = x""yes; then :
+if test "x$ac_cv_type_size_t" = xyes; then :
 
 else
 
@@ -14873,7 +14929,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = x""yes; then :
+if test "x$ac_cv_type_pid_t" = xyes; then :
 
 else
 
@@ -14884,7 +14940,7 @@
 fi
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_rdev" = x""yes; then :
+if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_RDEV 1
@@ -14898,7 +14954,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for d_off in dirent" >&5
 $as_echo_n "checking for d_off in dirent... " >&6; }
-if test "${ac_cv_dirent_d_off+set}" = set; then :
+if ${ac_cv_dirent_d_off+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14931,7 +14987,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
-if test "x$ac_cv_type_ssize_t" = x""yes; then :
+if test "x$ac_cv_type_ssize_t" = xyes; then :
 
 else
 
@@ -14942,7 +14998,7 @@
 fi
 
 ac_fn_c_check_type "$LINENO" "wchar_t" "ac_cv_type_wchar_t" "$ac_includes_default"
-if test "x$ac_cv_type_wchar_t" = x""yes; then :
+if test "x$ac_cv_type_wchar_t" = xyes; then :
 
 else
 
@@ -14967,7 +15023,7 @@
 set dummy cups-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CUPS_CONFIG+set}" = set; then :
+if ${ac_cv_path_CUPS_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $CUPS_CONFIG in
@@ -15012,8 +15068,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -15038,7 +15093,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for httpConnect in -lcups" >&5
 $as_echo_n "checking for httpConnect in -lcups... " >&6; }
-if test "${ac_cv_lib_ext_cups_httpConnect+set}" = set; then :
+if ${ac_cv_lib_ext_cups_httpConnect+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15103,7 +15158,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for httpConnectEncrypt in -lcups" >&5
 $as_echo_n "checking for httpConnectEncrypt in -lcups... " >&6; }
-if test "${ac_cv_lib_ext_cups_httpConnectEncrypt+set}" = set; then :
+if ${ac_cv_lib_ext_cups_httpConnectEncrypt+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15169,7 +15224,7 @@
 		fi
 
 	elif test x"$enable_cups" = x"yes"; then
-		as_fn_error "Cups support required but cups-config not located.  Make sure cups-devel related files are installed." "$LINENO" 5
+		as_fn_error $? "Cups support required but cups-config not located.  Make sure cups-devel related files are installed." "$LINENO" 5
         fi
 fi
 
@@ -15185,7 +15240,7 @@
 $as_echo "#define HAVE_IPRINT 1" >>confdefs.h
 
 	elif test x"$enable_iprint" = x"yes"; then
-		as_fn_error "iPrint support required but cups not enabled.  Make sure cups-devel related files are installed and that cups is enabled." "$LINENO" 5
+		as_fn_error $? "iPrint support required but cups not enabled.  Make sure cups-devel related files are installed and that cups is enabled." "$LINENO" 5
         fi
 fi
 
@@ -15193,7 +15248,7 @@
 # check if the compiler will optimize out function calls
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler will optimize out function calls" >&5
 $as_echo_n "checking if the compiler will optimize out function calls... " >&6; }
-if test "${samba_cv_optimize_out_funcation_calls+set}" = set; then :
+if ${samba_cv_optimize_out_funcation_calls+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -15236,7 +15291,7 @@
 # check for fd passing struct via msg_control
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd passing via msg_control" >&5
 $as_echo_n "checking for fd passing via msg_control... " >&6; }
-if test "${samba_cv_msghdr_msg_control+set}" = set; then :
+if ${samba_cv_msghdr_msg_control+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -15283,7 +15338,7 @@
 # check for fd passing struct via msg_acctrights
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd passing via msg_acctrights" >&5
 $as_echo_n "checking for fd passing via msg_acctrights... " >&6; }
-if test "${samba_cv_msghdr_msg_acctrights+set}" = set; then :
+if ${samba_cv_msghdr_msg_acctrights+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -15326,7 +15381,7 @@
 for ac_func in dirfd
 do :
   ac_fn_c_check_func "$LINENO" "dirfd" "ac_cv_func_dirfd"
-if test "x$ac_cv_func_dirfd" = x""yes; then :
+if test "x$ac_cv_func_dirfd" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DIRFD 1
 _ACEOF
@@ -15340,7 +15395,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sigevent type" >&5
 $as_echo_n "checking for struct sigevent type... " >&6; }
-if test "${samba_cv_struct_sigevent+set}" = set; then :
+if ${samba_cv_struct_sigevent+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -15376,7 +15431,7 @@
 
    ac_fn_c_check_member "$LINENO" "struct sigevent" "sigev_value.sival_ptr" "ac_cv_member_struct_sigevent_sigev_value_sival_ptr" "#include <signal.h>
 "
-if test "x$ac_cv_member_struct_sigevent_sigev_value_sival_ptr" = x""yes; then :
+if test "x$ac_cv_member_struct_sigevent_sigev_value_sival_ptr" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIVAL_PTR 1
@@ -15386,7 +15441,7 @@
 fi
 ac_fn_c_check_member "$LINENO" "struct sigevent" "sigev_value.sigval_ptr" "ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" "#include <signal.h>
 "
-if test "x$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" = x""yes; then :
+if test "x$ac_cv_member_struct_sigevent_sigev_value_sigval_ptr" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR 1
@@ -15401,7 +15456,7 @@
 # nothing until kernel 2.1.44! very dumb.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real setresuid" >&5
 $as_echo_n "checking for real setresuid... " >&6; }
-if test "${samba_cv_have_setresuid+set}" = set; then :
+if ${samba_cv_have_setresuid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -15435,7 +15490,7 @@
 #
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real setresgid" >&5
 $as_echo_n "checking for real setresgid... " >&6; }
-if test "${samba_cv_have_setresgid+set}" = set; then :
+if ${samba_cv_have_setresgid+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -15468,7 +15523,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
 $as_echo_n "checking for working memcmp... " >&6; }
-if test "${ac_cv_func_memcmp_working+set}" = set; then :
+if ${ac_cv_func_memcmp_working+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -15548,8 +15603,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -15561,7 +15615,7 @@
     for ac_header in readline/history.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default"
-if test "x$ac_cv_header_readline_history_h" = x""yes; then :
+if test "x$ac_cv_header_readline_history_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_READLINE_HISTORY_H 1
 _ACEOF
@@ -15575,8 +15629,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -15585,7 +15638,7 @@
        as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l${termlib}" >&5
 $as_echo_n "checking for tgetent in -l${termlib}... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15620,15 +15673,14 @@
 eval ac_res=\$$as_ac_Lib
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Lib
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
   TERMLIBS="-l${termlib}"; break
 fi
 
       done
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_handler_install in -lreadline" >&5
 $as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; }
-if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then :
+if ${ac_cv_lib_readline_rl_callback_handler_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15662,7 +15714,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
 $as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
-if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then :
+if test "x$ac_cv_lib_readline_rl_callback_handler_install" = xyes; then :
   TERMLIBS="-lreadline $TERMLIBS"
 
 $as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
@@ -15698,8 +15750,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -15711,7 +15762,7 @@
     for ac_header in readline/history.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default"
-if test "x$ac_cv_header_readline_history_h" = x""yes; then :
+if test "x$ac_cv_header_readline_history_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_READLINE_HISTORY_H 1
 _ACEOF
@@ -15725,8 +15776,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -15735,7 +15785,7 @@
        as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l${termlib}" >&5
 $as_echo_n "checking for tgetent in -l${termlib}... " >&6; }
-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$as_ac_Lib+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15770,15 +15820,14 @@
 eval ac_res=\$$as_ac_Lib
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-eval as_val=\$$as_ac_Lib
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
   TERMLIBS="-l${termlib}"; break
 fi
 
       done
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_handler_install in -lreadline" >&5
 $as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; }
-if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then :
+if ${ac_cv_lib_readline_rl_callback_handler_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15812,7 +15861,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_handler_install" >&5
 $as_echo "$ac_cv_lib_readline_rl_callback_handler_install" >&6; }
-if test "x$ac_cv_lib_readline_rl_callback_handler_install" = x""yes; then :
+if test "x$ac_cv_lib_readline_rl_callback_handler_install" = xyes; then :
   TERMLDFLAGS="-L$with_readline/lib"
        TERMCPPFLAGS="-I$with_readline/include"
        CPPFLAGS="-I$with_readline/include $CPPFLAGS"
@@ -15847,7 +15896,7 @@
 # special cases.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5
 $as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; }
-if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then :
+if ${ac_cv_lib_readline_rl_completion_matches+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15881,7 +15930,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5
 $as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; }
-if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then :
+if test "x$ac_cv_lib_readline_rl_completion_matches" = xyes; then :
 
 $as_echo "#define HAVE_NEW_LIBREADLINE 1" >>confdefs.h
 
@@ -15891,7 +15940,7 @@
 # not all readline libs have rl_event_hook or history_list
 ac_fn_c_check_decl "$LINENO" "rl_event_hook" "ac_cv_have_decl_rl_event_hook" "#include <readline/readline.h>
 "
-if test "x$ac_cv_have_decl_rl_event_hook" = x""yes; then :
+if test "x$ac_cv_have_decl_rl_event_hook" = xyes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -15903,7 +15952,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for history_list in -lreadline" >&5
 $as_echo_n "checking for history_list in -lreadline... " >&6; }
-if test "${ac_cv_lib_readline_history_list+set}" = set; then :
+if ${ac_cv_lib_readline_history_list+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15937,7 +15986,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_history_list" >&5
 $as_echo "$ac_cv_lib_readline_history_list" >&6; }
-if test "x$ac_cv_lib_readline_history_list" = x""yes; then :
+if test "x$ac_cv_lib_readline_history_list" = xyes; then :
 
 $as_echo "#define HAVE_HISTORY_LIST 1" >>confdefs.h
 
@@ -15948,7 +15997,7 @@
 # test for where we get yp_get_default_domain() from
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing yp_get_default_domain" >&5
 $as_echo_n "checking for library containing yp_get_default_domain... " >&6; }
-if test "${ac_cv_search_yp_get_default_domain+set}" = set; then :
+if ${ac_cv_search_yp_get_default_domain+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -15982,11 +16031,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_yp_get_default_domain+set}" = set; then :
+  if ${ac_cv_search_yp_get_default_domain+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_yp_get_default_domain+set}" = set; then :
+if ${ac_cv_search_yp_get_default_domain+:} false; then :
 
 else
   ac_cv_search_yp_get_default_domain=no
@@ -16005,7 +16054,7 @@
 for ac_func in yp_get_default_domain
 do :
   ac_fn_c_check_func "$LINENO" "yp_get_default_domain" "ac_cv_func_yp_get_default_domain"
-if test "x$ac_cv_func_yp_get_default_domain" = x""yes; then :
+if test "x$ac_cv_func_yp_get_default_domain" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_YP_GET_DEFAULT_DOMAIN 1
 _ACEOF
@@ -16018,7 +16067,7 @@
 for ac_func in execl
 do :
   ac_fn_c_check_func "$LINENO" "execl" "ac_cv_func_execl"
-if test "x$ac_cv_func_execl" = x""yes; then :
+if test "x$ac_cv_func_execl" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_EXECL 1
 _ACEOF
@@ -16034,8 +16083,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16046,7 +16094,7 @@
 for ac_func in strtol
 do :
   ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol"
-if test "x$ac_cv_func_strtol" = x""yes; then :
+if test "x$ac_cv_func_strtol" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRTOL 1
 _ACEOF
@@ -16058,8 +16106,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16071,8 +16118,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16083,7 +16129,7 @@
 for ac_func in fdatasync
 do :
   ac_fn_c_check_func "$LINENO" "fdatasync" "ac_cv_func_fdatasync"
-if test "x$ac_cv_func_fdatasync" = x""yes; then :
+if test "x$ac_cv_func_fdatasync" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FDATASYNC 1
 _ACEOF
@@ -16098,7 +16144,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdatasync in -lrt" >&5
 $as_echo_n "checking for fdatasync in -lrt... " >&6; }
-if test "${ac_cv_lib_ext_rt_fdatasync+set}" = set; then :
+if ${ac_cv_lib_ext_rt_fdatasync+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16162,8 +16208,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16175,8 +16220,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16188,8 +16232,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16200,7 +16243,7 @@
 for ac_func in getgrset
 do :
   ac_fn_c_check_func "$LINENO" "getgrset" "ac_cv_func_getgrset"
-if test "x$ac_cv_func_getgrset" = x""yes; then :
+if test "x$ac_cv_func_getgrset" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETGRSET 1
 _ACEOF
@@ -16212,8 +16255,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16225,8 +16267,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16238,8 +16279,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16251,8 +16291,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16264,8 +16303,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16277,8 +16315,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16289,7 +16326,7 @@
 for ac_func in getpwent_r
 do :
   ac_fn_c_check_func "$LINENO" "getpwent_r" "ac_cv_func_getpwent_r"
-if test "x$ac_cv_func_getpwent_r" = x""yes; then :
+if test "x$ac_cv_func_getpwent_r" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETPWENT_R 1
 _ACEOF
@@ -16300,7 +16337,7 @@
 for ac_func in getdents64
 do :
   ac_fn_c_check_func "$LINENO" "getdents64" "ac_cv_func_getdents64"
-if test "x$ac_cv_func_getdents64" = x""yes; then :
+if test "x$ac_cv_func_getdents64" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETDENTS64 1
 _ACEOF
@@ -16312,8 +16349,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16325,8 +16361,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16338,8 +16373,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16350,7 +16384,7 @@
 for ac_func in nanosleep
 do :
   ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep"
-if test "x$ac_cv_func_nanosleep" = x""yes; then :
+if test "x$ac_cv_func_nanosleep" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_NANOSLEEP 1
 _ACEOF
@@ -16365,7 +16399,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5
 $as_echo_n "checking for nanosleep in -lrt... " >&6; }
-if test "${ac_cv_lib_ext_rt_nanosleep+set}" = set; then :
+if ${ac_cv_lib_ext_rt_nanosleep+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16429,8 +16463,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16442,8 +16475,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16455,8 +16487,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16467,7 +16498,7 @@
 for ac_header in sys/mman.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_mman_h" = x""yes; then :
+if test "x$ac_cv_header_sys_mman_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_MMAN_H 1
 _ACEOF
@@ -16481,8 +16512,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16494,8 +16524,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16507,8 +16536,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16519,7 +16547,7 @@
 for ac_func in strupr
 do :
   ac_fn_c_check_func "$LINENO" "strupr" "ac_cv_func_strupr"
-if test "x$ac_cv_func_strupr" = x""yes; then :
+if test "x$ac_cv_func_strupr" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUPR 1
 _ACEOF
@@ -16533,8 +16561,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -16546,7 +16573,7 @@
 # libexecinfo provides backtrace_symbols on FreeBSD
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace_symbols" >&5
 $as_echo_n "checking for library containing backtrace_symbols... " >&6; }
-if test "${ac_cv_search_backtrace_symbols+set}" = set; then :
+if ${ac_cv_search_backtrace_symbols+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -16580,11 +16607,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_backtrace_symbols+set}" = set; then :
+  if ${ac_cv_search_backtrace_symbols+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_backtrace_symbols+set}" = set; then :
+if ${ac_cv_search_backtrace_symbols+:} false; then :
 
 else
   ac_cv_search_backtrace_symbols=no
@@ -16603,7 +16630,7 @@
 for ac_func in backtrace_symbols
 do :
   ac_fn_c_check_func "$LINENO" "backtrace_symbols" "ac_cv_func_backtrace_symbols"
-if test "x$ac_cv_func_backtrace_symbols" = x""yes; then :
+if test "x$ac_cv_func_backtrace_symbols" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_BACKTRACE_SYMBOLS 1
 _ACEOF
@@ -16613,7 +16640,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for trace_back_stack in -lexc" >&5
 $as_echo_n "checking for trace_back_stack in -lexc... " >&6; }
-if test "${ac_cv_lib_exc_trace_back_stack+set}" = set; then :
+if ${ac_cv_lib_exc_trace_back_stack+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16647,7 +16674,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_exc_trace_back_stack" >&5
 $as_echo "$ac_cv_lib_exc_trace_back_stack" >&6; }
-if test "x$ac_cv_lib_exc_trace_back_stack" = x""yes; then :
+if test "x$ac_cv_lib_exc_trace_back_stack" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBEXC 1
 _ACEOF
@@ -16661,7 +16688,7 @@
 for ac_func in sysctlbyname
 do :
   ac_fn_c_check_func "$LINENO" "sysctlbyname" "ac_cv_func_sysctlbyname"
-if test "x$ac_cv_func_sysctlbyname" = x""yes; then :
+if test "x$ac_cv_func_sysctlbyname" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYSCTLBYNAME 1
 _ACEOF
@@ -16676,11 +16703,11 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /proc/sys/kernel/core_pattern" >&5
 $as_echo_n "checking for /proc/sys/kernel/core_pattern... " >&6; }
-if test "${ac_cv_file__proc_sys_kernel_core_pattern+set}" = set; then :
+if ${ac_cv_file__proc_sys_kernel_core_pattern+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   test "$cross_compiling" = yes &&
-  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+  as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
 if test -r "/proc/sys/kernel/core_pattern"; then
   ac_cv_file__proc_sys_kernel_core_pattern=yes
 else
@@ -16689,7 +16716,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__proc_sys_kernel_core_pattern" >&5
 $as_echo "$ac_cv_file__proc_sys_kernel_core_pattern" >&6; }
-if test "x$ac_cv_file__proc_sys_kernel_core_pattern" = x""yes; then :
+if test "x$ac_cv_file__proc_sys_kernel_core_pattern" = xyes; then :
 
 $as_echo "#define HAVE_SYS_KERNEL_PROC_CORE_PATTERN 1" >>confdefs.h
 
@@ -16701,7 +16728,7 @@
 for ac_header in gpfs_gpl.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "gpfs_gpl.h" "ac_cv_header_gpfs_gpl_h" "$ac_includes_default"
-if test "x$ac_cv_header_gpfs_gpl_h" = x""yes; then :
+if test "x$ac_cv_header_gpfs_gpl_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GPFS_GPL_H 1
 _ACEOF
@@ -16822,7 +16849,7 @@
 	for ac_header in libunwind-ptrace.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "libunwind-ptrace.h" "ac_cv_header_libunwind_ptrace_h" "$ac_includes_default"
-if test "x$ac_cv_header_libunwind_ptrace_h" = x""yes; then :
+if test "x$ac_cv_header_libunwind_ptrace_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBUNWIND_PTRACE_H 1
 _ACEOF
@@ -16833,7 +16860,7 @@
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _UPT_create in -lunwind-ptrace" >&5
 $as_echo_n "checking for _UPT_create in -lunwind-ptrace... " >&6; }
-if test "${ac_cv_lib_unwind_ptrace__UPT_create+set}" = set; then :
+if ${ac_cv_lib_unwind_ptrace__UPT_create+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16867,7 +16894,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_unwind_ptrace__UPT_create" >&5
 $as_echo "$ac_cv_lib_unwind_ptrace__UPT_create" >&6; }
-if test "x$ac_cv_lib_unwind_ptrace__UPT_create" = x""yes; then :
+if test "x$ac_cv_lib_unwind_ptrace__UPT_create" = xyes; then :
 
 		LIBUNWIND_PTRACE="-lunwind-ptrace";
 
@@ -16896,7 +16923,7 @@
     for ac_header in sys/ptrace.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/ptrace.h" "ac_cv_header_sys_ptrace_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_ptrace_h" = x""yes; then :
+if test "x$ac_cv_header_sys_ptrace_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_PTRACE_H 1
 _ACEOF
@@ -16955,8 +16982,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16968,8 +16994,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16981,8 +17006,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -16994,8 +17018,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -17007,8 +17030,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -17020,8 +17042,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -17033,8 +17054,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -17046,8 +17066,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -17059,8 +17078,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -17072,8 +17090,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -17085,8 +17102,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -17098,8 +17114,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -17111,8 +17126,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -17124,8 +17138,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -17136,7 +17149,7 @@
 for ac_func in prctl
 do :
   ac_fn_c_check_func "$LINENO" "prctl" "ac_cv_func_prctl"
-if test "x$ac_cv_func_prctl" = x""yes; then :
+if test "x$ac_cv_func_prctl" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PRCTL 1
 _ACEOF
@@ -17175,7 +17188,7 @@
        # glibc <= 2.3.2 has a broken getgrouplist
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for good getgrouplist" >&5
 $as_echo_n "checking for good getgrouplist... " >&6; }
-if test "${samba_cv_linux_getgrouplist_ok+set}" = set; then :
+if ${samba_cv_linux_getgrouplist_ok+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -17223,7 +17236,7 @@
        for ac_func in getgrouplist
 do :
   ac_fn_c_check_func "$LINENO" "getgrouplist" "ac_cv_func_getgrouplist"
-if test "x$ac_cv_func_getgrouplist" = x""yes; then :
+if test "x$ac_cv_func_getgrouplist" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETGROUPLIST 1
 _ACEOF
@@ -17342,7 +17355,7 @@
 
 samba_cv_stat_hires=no
 ac_fn_c_check_member "$LINENO" "struct stat" "st_mtim.tv_nsec" "ac_cv_member_struct_stat_st_mtim_tv_nsec" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_mtim_tv_nsec" = x""yes; then :
+if test "x$ac_cv_member_struct_stat_st_mtim_tv_nsec" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
@@ -17353,7 +17366,7 @@
 fi
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_mtimensec" "ac_cv_member_struct_stat_st_mtimensec" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_mtimensec" = x""yes; then :
+if test "x$ac_cv_member_struct_stat_st_mtimensec" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
@@ -17364,7 +17377,7 @@
 fi
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_mtimespec.tv_nsec" "ac_cv_member_struct_stat_st_mtimespec_tv_nsec" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" = x""yes; then :
+if test "x$ac_cv_member_struct_stat_st_mtimespec_tv_nsec" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
@@ -17375,7 +17388,7 @@
 fi
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_mtime_n" "ac_cv_member_struct_stat_st_mtime_n" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_mtime_n" = x""yes; then :
+if test "x$ac_cv_member_struct_stat_st_mtime_n" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_MTIME_N 1
@@ -17386,7 +17399,7 @@
 fi
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_umtime" "ac_cv_member_struct_stat_st_umtime" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_umtime" = x""yes; then :
+if test "x$ac_cv_member_struct_stat_st_umtime" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_UMTIME 1
@@ -17405,7 +17418,7 @@
 
 # recent FreeBSD, NetBSD have creation timestamps called birthtime:
 ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimespec.tv_nsec" "ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = x""yes; then :
+if test "x$ac_cv_member_struct_stat_st_birthtimespec_tv_nsec" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC 1
@@ -17415,14 +17428,14 @@
 fi
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtime" "ac_cv_member_struct_stat_st_birthtime" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_birthtime" = x""yes; then :
+if test "x$ac_cv_member_struct_stat_st_birthtime" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
 _ACEOF
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_birthtimensec" "ac_cv_member_struct_stat_st_birthtimensec" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_birthtimensec" = x""yes; then :
+if test "x$ac_cv_member_struct_stat_st_birthtimensec" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC 1
@@ -17437,7 +17450,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether there is DOS flags support in the stat struct" >&5
 $as_echo_n "checking whether there is DOS flags support in the stat struct... " >&6; }
-if test "${samba_cv_stat_dos_flags+set}" = set; then :
+if ${samba_cv_stat_dos_flags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -17478,7 +17491,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can compile with __attribute__((destructor))" >&5
 $as_echo_n "checking whether we can compile with __attribute__((destructor))... " >&6; }
-if test "${samba_cv_function_attribute_destructor+set}" = set; then :
+if ${samba_cv_function_attribute_destructor+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -17508,7 +17521,7 @@
 # needed for SRV lookups
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lresolv" >&5
 $as_echo_n "checking for dn_expand in -lresolv... " >&6; }
-if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then :
+if ${ac_cv_lib_resolv_dn_expand+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17542,7 +17555,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_expand" >&5
 $as_echo "$ac_cv_lib_resolv_dn_expand" >&6; }
-if test "x$ac_cv_lib_resolv_dn_expand" = x""yes; then :
+if test "x$ac_cv_lib_resolv_dn_expand" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBRESOLV 1
 _ACEOF
@@ -17553,7 +17566,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _dn_expand in -lresolv" >&5
 $as_echo_n "checking for _dn_expand in -lresolv... " >&6; }
-if test "${ac_cv_lib_resolv__dn_expand+set}" = set; then :
+if ${ac_cv_lib_resolv__dn_expand+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17587,7 +17600,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv__dn_expand" >&5
 $as_echo "$ac_cv_lib_resolv__dn_expand" >&6; }
-if test "x$ac_cv_lib_resolv__dn_expand" = x""yes; then :
+if test "x$ac_cv_lib_resolv__dn_expand" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBRESOLV 1
 _ACEOF
@@ -17598,7 +17611,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lresolv" >&5
 $as_echo_n "checking for __dn_expand in -lresolv... " >&6; }
-if test "${ac_cv_lib_resolv___dn_expand+set}" = set; then :
+if ${ac_cv_lib_resolv___dn_expand+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17632,7 +17645,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_expand" >&5
 $as_echo "$ac_cv_lib_resolv___dn_expand" >&6; }
-if test "x$ac_cv_lib_resolv___dn_expand" = x""yes; then :
+if test "x$ac_cv_lib_resolv___dn_expand" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBRESOLV 1
 _ACEOF
@@ -17652,7 +17665,7 @@
   for ac_func in putprpwnam
 do :
   ac_fn_c_check_func "$LINENO" "putprpwnam" "ac_cv_func_putprpwnam"
-if test "x$ac_cv_func_putprpwnam" = x""yes; then :
+if test "x$ac_cv_func_putprpwnam" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PUTPRPWNAM 1
 _ACEOF
@@ -17679,7 +17692,7 @@
 	    # putprpwnam was not found, try adding libsecurity
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for putprpwnam in -lsecurity" >&5
 $as_echo_n "checking for putprpwnam in -lsecurity... " >&6; }
-if test "${ac_cv_lib_security_putprpwnam+set}" = set; then :
+if ${ac_cv_lib_security_putprpwnam+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17713,7 +17726,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_security_putprpwnam" >&5
 $as_echo "$ac_cv_lib_security_putprpwnam" >&6; }
-if test "x$ac_cv_lib_security_putprpwnam" = x""yes; then :
+if test "x$ac_cv_lib_security_putprpwnam" = xyes; then :
 
 		LIBS="-lsecurity $LIBS"
 
@@ -17743,7 +17756,7 @@
   for ac_func in putprpwnam
 do :
   ac_fn_c_check_func "$LINENO" "putprpwnam" "ac_cv_func_putprpwnam"
-if test "x$ac_cv_func_putprpwnam" = x""yes; then :
+if test "x$ac_cv_func_putprpwnam" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PUTPRPWNAM 1
 _ACEOF
@@ -17770,7 +17783,7 @@
 	    # putprpwnam was not found, try adding libsec
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for putprpwnam in -lsec" >&5
 $as_echo_n "checking for putprpwnam in -lsec... " >&6; }
-if test "${ac_cv_lib_sec_putprpwnam+set}" = set; then :
+if ${ac_cv_lib_sec_putprpwnam+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17804,7 +17817,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_putprpwnam" >&5
 $as_echo "$ac_cv_lib_sec_putprpwnam" >&6; }
-if test "x$ac_cv_lib_sec_putprpwnam" = x""yes; then :
+if test "x$ac_cv_lib_sec_putprpwnam" = xyes; then :
 
 		LIBS="-lsec $LIBS"
 
@@ -17835,7 +17848,7 @@
   for ac_func in set_auth_parameters
 do :
   ac_fn_c_check_func "$LINENO" "set_auth_parameters" "ac_cv_func_set_auth_parameters"
-if test "x$ac_cv_func_set_auth_parameters" = x""yes; then :
+if test "x$ac_cv_func_set_auth_parameters" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SET_AUTH_PARAMETERS 1
 _ACEOF
@@ -17862,7 +17875,7 @@
 	    # set_auth_parameters was not found, try adding libsecurity
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for set_auth_parameters in -lsecurity" >&5
 $as_echo_n "checking for set_auth_parameters in -lsecurity... " >&6; }
-if test "${ac_cv_lib_security_set_auth_parameters+set}" = set; then :
+if ${ac_cv_lib_security_set_auth_parameters+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17896,7 +17909,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_security_set_auth_parameters" >&5
 $as_echo "$ac_cv_lib_security_set_auth_parameters" >&6; }
-if test "x$ac_cv_lib_security_set_auth_parameters" = x""yes; then :
+if test "x$ac_cv_lib_security_set_auth_parameters" = xyes; then :
 
 		LIBS="-lsecurity $LIBS"
 
@@ -17926,7 +17939,7 @@
   for ac_func in set_auth_parameters
 do :
   ac_fn_c_check_func "$LINENO" "set_auth_parameters" "ac_cv_func_set_auth_parameters"
-if test "x$ac_cv_func_set_auth_parameters" = x""yes; then :
+if test "x$ac_cv_func_set_auth_parameters" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SET_AUTH_PARAMETERS 1
 _ACEOF
@@ -17953,7 +17966,7 @@
 	    # set_auth_parameters was not found, try adding libsec
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for set_auth_parameters in -lsec" >&5
 $as_echo_n "checking for set_auth_parameters in -lsec... " >&6; }
-if test "${ac_cv_lib_sec_set_auth_parameters+set}" = set; then :
+if ${ac_cv_lib_sec_set_auth_parameters+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17987,7 +18000,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_set_auth_parameters" >&5
 $as_echo "$ac_cv_lib_sec_set_auth_parameters" >&6; }
-if test "x$ac_cv_lib_sec_set_auth_parameters" = x""yes; then :
+if test "x$ac_cv_lib_sec_set_auth_parameters" = xyes; then :
 
 		LIBS="-lsec $LIBS"
 
@@ -18019,7 +18032,7 @@
   for ac_func in getspnam
 do :
   ac_fn_c_check_func "$LINENO" "getspnam" "ac_cv_func_getspnam"
-if test "x$ac_cv_func_getspnam" = x""yes; then :
+if test "x$ac_cv_func_getspnam" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETSPNAM 1
 _ACEOF
@@ -18046,7 +18059,7 @@
 	    # getspnam was not found, try adding libgen
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lgen" >&5
 $as_echo_n "checking for getspnam in -lgen... " >&6; }
-if test "${ac_cv_lib_gen_getspnam+set}" = set; then :
+if ${ac_cv_lib_gen_getspnam+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -18080,7 +18093,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gen_getspnam" >&5
 $as_echo "$ac_cv_lib_gen_getspnam" >&6; }
-if test "x$ac_cv_lib_gen_getspnam" = x""yes; then :
+if test "x$ac_cv_lib_gen_getspnam" = xyes; then :
 
 		LIBS="-lgen $LIBS"
 
@@ -18111,7 +18124,7 @@
   for ac_func in getspnam
 do :
   ac_fn_c_check_func "$LINENO" "getspnam" "ac_cv_func_getspnam"
-if test "x$ac_cv_func_getspnam" = x""yes; then :
+if test "x$ac_cv_func_getspnam" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETSPNAM 1
 _ACEOF
@@ -18138,7 +18151,7 @@
 	    # getspnam was not found, try adding libsecurity
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lsecurity" >&5
 $as_echo_n "checking for getspnam in -lsecurity... " >&6; }
-if test "${ac_cv_lib_security_getspnam+set}" = set; then :
+if ${ac_cv_lib_security_getspnam+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -18172,7 +18185,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_security_getspnam" >&5
 $as_echo "$ac_cv_lib_security_getspnam" >&6; }
-if test "x$ac_cv_lib_security_getspnam" = x""yes; then :
+if test "x$ac_cv_lib_security_getspnam" = xyes; then :
 
 		LIBS="-lsecurity $LIBS"
 
@@ -18202,7 +18215,7 @@
   for ac_func in getspnam
 do :
   ac_fn_c_check_func "$LINENO" "getspnam" "ac_cv_func_getspnam"
-if test "x$ac_cv_func_getspnam" = x""yes; then :
+if test "x$ac_cv_func_getspnam" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETSPNAM 1
 _ACEOF
@@ -18229,7 +18242,7 @@
 	    # getspnam was not found, try adding libsec
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getspnam in -lsec" >&5
 $as_echo_n "checking for getspnam in -lsec... " >&6; }
-if test "${ac_cv_lib_sec_getspnam+set}" = set; then :
+if ${ac_cv_lib_sec_getspnam+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -18263,7 +18276,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_getspnam" >&5
 $as_echo "$ac_cv_lib_sec_getspnam" >&6; }
-if test "x$ac_cv_lib_sec_getspnam" = x""yes; then :
+if test "x$ac_cv_lib_sec_getspnam" = xyes; then :
 
 		LIBS="-lsec $LIBS"
 
@@ -18294,7 +18307,7 @@
   for ac_func in bigcrypt
 do :
   ac_fn_c_check_func "$LINENO" "bigcrypt" "ac_cv_func_bigcrypt"
-if test "x$ac_cv_func_bigcrypt" = x""yes; then :
+if test "x$ac_cv_func_bigcrypt" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_BIGCRYPT 1
 _ACEOF
@@ -18321,7 +18334,7 @@
 	    # bigcrypt was not found, try adding libsecurity
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bigcrypt in -lsecurity" >&5
 $as_echo_n "checking for bigcrypt in -lsecurity... " >&6; }
-if test "${ac_cv_lib_security_bigcrypt+set}" = set; then :
+if ${ac_cv_lib_security_bigcrypt+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -18355,7 +18368,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_security_bigcrypt" >&5
 $as_echo "$ac_cv_lib_security_bigcrypt" >&6; }
-if test "x$ac_cv_lib_security_bigcrypt" = x""yes; then :
+if test "x$ac_cv_lib_security_bigcrypt" = xyes; then :
 
 		LIBS="-lsecurity $LIBS"
 
@@ -18385,7 +18398,7 @@
   for ac_func in bigcrypt
 do :
   ac_fn_c_check_func "$LINENO" "bigcrypt" "ac_cv_func_bigcrypt"
-if test "x$ac_cv_func_bigcrypt" = x""yes; then :
+if test "x$ac_cv_func_bigcrypt" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_BIGCRYPT 1
 _ACEOF
@@ -18412,7 +18425,7 @@
 	    # bigcrypt was not found, try adding libsec
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bigcrypt in -lsec" >&5
 $as_echo_n "checking for bigcrypt in -lsec... " >&6; }
-if test "${ac_cv_lib_sec_bigcrypt+set}" = set; then :
+if ${ac_cv_lib_sec_bigcrypt+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -18446,7 +18459,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_bigcrypt" >&5
 $as_echo "$ac_cv_lib_sec_bigcrypt" >&6; }
-if test "x$ac_cv_lib_sec_bigcrypt" = x""yes; then :
+if test "x$ac_cv_lib_sec_bigcrypt" = xyes; then :
 
 		LIBS="-lsec $LIBS"
 
@@ -18477,7 +18490,7 @@
   for ac_func in getprpwnam
 do :
   ac_fn_c_check_func "$LINENO" "getprpwnam" "ac_cv_func_getprpwnam"
-if test "x$ac_cv_func_getprpwnam" = x""yes; then :
+if test "x$ac_cv_func_getprpwnam" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETPRPWNAM 1
 _ACEOF
@@ -18504,7 +18517,7 @@
 	    # getprpwnam was not found, try adding libsecurity
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getprpwnam in -lsecurity" >&5
 $as_echo_n "checking for getprpwnam in -lsecurity... " >&6; }
-if test "${ac_cv_lib_security_getprpwnam+set}" = set; then :
+if ${ac_cv_lib_security_getprpwnam+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -18538,7 +18551,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_security_getprpwnam" >&5
 $as_echo "$ac_cv_lib_security_getprpwnam" >&6; }
-if test "x$ac_cv_lib_security_getprpwnam" = x""yes; then :
+if test "x$ac_cv_lib_security_getprpwnam" = xyes; then :
 
 		LIBS="-lsecurity $LIBS"
 
@@ -18568,7 +18581,7 @@
   for ac_func in getprpwnam
 do :
   ac_fn_c_check_func "$LINENO" "getprpwnam" "ac_cv_func_getprpwnam"
-if test "x$ac_cv_func_getprpwnam" = x""yes; then :
+if test "x$ac_cv_func_getprpwnam" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETPRPWNAM 1
 _ACEOF
@@ -18595,7 +18608,7 @@
 	    # getprpwnam was not found, try adding libsec
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getprpwnam in -lsec" >&5
 $as_echo_n "checking for getprpwnam in -lsec... " >&6; }
-if test "${ac_cv_lib_sec_getprpwnam+set}" = set; then :
+if ${ac_cv_lib_sec_getprpwnam+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -18629,7 +18642,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_getprpwnam" >&5
 $as_echo "$ac_cv_lib_sec_getprpwnam" >&6; }
-if test "x$ac_cv_lib_sec_getprpwnam" = x""yes; then :
+if test "x$ac_cv_lib_sec_getprpwnam" = xyes; then :
 
 		LIBS="-lsec $LIBS"
 
@@ -18659,7 +18672,7 @@
 for ac_func in strsignal
 do :
   ac_fn_c_check_func "$LINENO" "strsignal" "ac_cv_func_strsignal"
-if test "x$ac_cv_func_strsignal" = x""yes; then :
+if test "x$ac_cv_func_strsignal" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRSIGNAL 1
 _ACEOF
@@ -18674,7 +18687,7 @@
   *osf*)
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getproplist" >&5
 $as_echo_n "checking for library containing getproplist... " >&6; }
-if test "${ac_cv_search_getproplist+set}" = set; then :
+if ${ac_cv_search_getproplist+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -18708,11 +18721,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_getproplist+set}" = set; then :
+  if ${ac_cv_search_getproplist+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_getproplist+set}" = set; then :
+if ${ac_cv_search_getproplist+:} false; then :
 
 else
   ac_cv_search_getproplist=no
@@ -18732,8 +18745,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -18745,8 +18757,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -18757,7 +18768,7 @@
 	for ac_func in sizeof_proplist_entry
 do :
   ac_fn_c_check_func "$LINENO" "sizeof_proplist_entry" "ac_cv_func_sizeof_proplist_entry"
-if test "x$ac_cv_func_sizeof_proplist_entry" = x""yes; then :
+if test "x$ac_cv_func_sizeof_proplist_entry" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SIZEOF_PROPLIST_ENTRY 1
 _ACEOF
@@ -18775,7 +18786,7 @@
 	for ac_func in attropen
 do :
   ac_fn_c_check_func "$LINENO" "attropen" "ac_cv_func_attropen"
-if test "x$ac_cv_func_attropen" = x""yes; then :
+if test "x$ac_cv_func_attropen" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ATTROPEN 1
 _ACEOF
@@ -18787,7 +18798,7 @@
   *)
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getxattr" >&5
 $as_echo_n "checking for library containing getxattr... " >&6; }
-if test "${ac_cv_search_getxattr+set}" = set; then :
+if ${ac_cv_search_getxattr+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -18821,11 +18832,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_getxattr+set}" = set; then :
+  if ${ac_cv_search_getxattr+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_getxattr+set}" = set; then :
+if ${ac_cv_search_getxattr+:} false; then :
 
 else
   ac_cv_search_getxattr=no
@@ -18844,7 +18855,7 @@
 	for ac_func in getxattr
 do :
   ac_fn_c_check_func "$LINENO" "getxattr" "ac_cv_func_getxattr"
-if test "x$ac_cv_func_getxattr" = x""yes; then :
+if test "x$ac_cv_func_getxattr" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETXATTR 1
 _ACEOF
@@ -18853,8 +18864,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -18869,7 +18879,7 @@
 	for ac_func in getea
 do :
   ac_fn_c_check_func "$LINENO" "getea" "ac_cv_func_getea"
-if test "x$ac_cv_func_getea" = x""yes; then :
+if test "x$ac_cv_func_getea" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETEA 1
 _ACEOF
@@ -18878,8 +18888,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -18894,7 +18903,7 @@
 	for ac_func in attr_get
 do :
   ac_fn_c_check_func "$LINENO" "attr_get" "ac_cv_func_attr_get"
-if test "x$ac_cv_func_attr_get" = x""yes; then :
+if test "x$ac_cv_func_attr_get" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ATTR_GET 1
 _ACEOF
@@ -18903,8 +18912,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -18919,7 +18927,7 @@
 	for ac_func in extattr_delete_file
 do :
   ac_fn_c_check_func "$LINENO" "extattr_delete_file" "ac_cv_func_extattr_delete_file"
-if test "x$ac_cv_func_extattr_delete_file" = x""yes; then :
+if test "x$ac_cv_func_extattr_delete_file" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_EXTATTR_DELETE_FILE 1
 _ACEOF
@@ -18928,8 +18936,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -18949,7 +18956,7 @@
 if test x"$ac_cv_func_getxattr" = x"yes" ; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether xattr interface takes additional options" >&5
 $as_echo_n "checking whether xattr interface takes additional options... " >&6; }
-if test "${smb_attr_cv_xattr_add_opt+set}" = set; then :
+if ${smb_attr_cv_xattr_add_opt+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -19051,7 +19058,7 @@
 then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -pie and -fPIE" >&5
 $as_echo_n "checking for -pie and -fPIE... " >&6; }
-if test "${samba_cv_fpie+set}" = set; then :
+if ${samba_cv_fpie+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -19098,7 +19105,7 @@
 then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wl,-z,relro" >&5
 $as_echo_n "checking for -Wl,-z,relro... " >&6; }
-if test "${samba_cv_relro+set}" = set; then :
+if ${samba_cv_relro+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -19405,7 +19412,7 @@
 set dummy groff; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ROFF+set}" = set; then :
+if ${ac_cv_prog_ROFF+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ROFF"; then
@@ -19759,7 +19766,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether building shared libraries actually works" >&5
 $as_echo_n "checking whether building shared libraries actually works... " >&6; }
-if test "${ac_cv_shlib_works+set}" = set; then :
+if ${ac_cv_shlib_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -19939,7 +19946,7 @@
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -19982,7 +19989,7 @@
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
@@ -20109,14 +20116,14 @@
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
                  if test x$enable_external_libtalloc = xyes; then
-			as_fn_error "Unable to find libtalloc" "$LINENO" 5
+			as_fn_error $? "Unable to find libtalloc" "$LINENO" 5
 		  else
 			enable_external_libtalloc=no
 		  fi
 
 elif test $pkg_failed = untried; then
 	 if test x$enable_external_libtalloc = xyes; then
-			as_fn_error "Unable to find libtalloc" "$LINENO" 5
+			as_fn_error $? "Unable to find libtalloc" "$LINENO" 5
 		  else
 			enable_external_libtalloc=no
 		  fi
@@ -20142,7 +20149,7 @@
 	fi
 done
 if test x"$tallocdir" = "x"; then
-   as_fn_error "cannot find talloc source in $tallocpaths" "$LINENO" 5
+   as_fn_error $? "cannot find talloc source in $tallocpaths" "$LINENO" 5
 fi
 TALLOC_OBJ="talloc.o"
 
@@ -20159,7 +20166,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
 $as_echo_n "checking size of size_t... " >&6; }
-if test "${ac_cv_sizeof_size_t+set}" = set; then :
+if ${ac_cv_sizeof_size_t+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
@@ -20168,9 +20175,8 @@
   if test "$ac_cv_type_size_t" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (size_t)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (size_t)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_size_t=0
    fi
@@ -20193,7 +20199,7 @@
 # This bug is HP SR number 8606223364.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
 $as_echo_n "checking size of void *... " >&6; }
-if test "${ac_cv_sizeof_void_p+set}" = set; then :
+if ${ac_cv_sizeof_void_p+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p"        "$ac_includes_default"; then :
@@ -20202,9 +20208,8 @@
   if test "$ac_cv_type_void_p" = yes; then
      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ as_fn_set_status 77
-as_fn_error "cannot compute sizeof (void *)
-See \`config.log' for more details." "$LINENO" 5; }; }
+as_fn_error 77 "cannot compute sizeof (void *)
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_void_p=0
    fi
@@ -20231,7 +20236,7 @@
 $as_echo "$as_me: WARNING: sizeof(size_t) = $ac_cv_sizeof_size_t" >&2;}
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&5
 $as_echo "$as_me: WARNING: sizeof(void *) = $ac_cv_sizeof_void_p" >&2;}
-	as_fn_error "sizeof(size_t) < sizeof(void *)" "$LINENO" 5
+	as_fn_error $? "sizeof(size_t) < sizeof(void *)" "$LINENO" 5
 fi
 
 if test x"$VERSIONSCRIPT" != "x"; then
@@ -20428,7 +20433,7 @@
 $as_echo "no" >&6; }
 
 		if test x$enable_external_libtdb = xyes; then
-			as_fn_error "Unable to find libtdb" "$LINENO" 5
+			as_fn_error $? "Unable to find libtdb" "$LINENO" 5
 		else
 			enable_external_libtdb=no
 		fi
@@ -20436,7 +20441,7 @@
 elif test $pkg_failed = untried; then
 
 		if test x$enable_external_libtdb = xyes; then
-			as_fn_error "Unable to find libtdb" "$LINENO" 5
+			as_fn_error $? "Unable to find libtdb" "$LINENO" 5
 		else
 			enable_external_libtdb=no
 		fi
@@ -20463,7 +20468,7 @@
 	fi
 done
 if test x"$tdbdir" = "x"; then
-   as_fn_error "cannot find tdb source in $tdbpaths" "$LINENO" 5
+   as_fn_error $? "cannot find tdb source in $tdbpaths" "$LINENO" 5
 fi
 TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o"
 TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o common/check.o common/hash.o common/summary.o"
@@ -20486,8 +20491,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -20499,8 +20503,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -20513,7 +20516,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pread declaration" >&5
 $as_echo_n "checking for pread declaration... " >&6; }
-if test "${ac_cv_have_pread_decl+set}" = set; then :
+if ${ac_cv_have_pread_decl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -20546,7 +20549,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pwrite declaration" >&5
 $as_echo_n "checking for pwrite declaration... " >&6; }
-if test "${ac_cv_have_pwrite_decl+set}" = set; then :
+if ${ac_cv_have_pwrite_decl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21136,7 +21139,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long" >&5
 $as_echo_n "checking for long long... " >&6; }
-if test "${samba_cv_have_longlong+set}" = set; then :
+if ${samba_cv_have_longlong+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21165,7 +21168,7 @@
 $as_echo "#define HAVE_LONGLONG 1" >>confdefs.h
 
     ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
-if test "x$ac_cv_type_intptr_t" = x""yes; then :
+if test "x$ac_cv_type_intptr_t" = xyes; then :
 
 else
 
@@ -21177,7 +21180,7 @@
 
 else
     ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
-if test "x$ac_cv_type_intptr_t" = x""yes; then :
+if test "x$ac_cv_type_intptr_t" = xyes; then :
 
 else
 
@@ -21195,7 +21198,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LL suffix on long long integers" >&5
 $as_echo_n "checking for LL suffix on long long integers... " >&6; }
-if test "${samba_cv_compiler_supports_ll+set}" = set; then :
+if ${samba_cv_compiler_supports_ll+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21228,7 +21231,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64 bit time_t" >&5
 $as_echo_n "checking for 64 bit time_t... " >&6; }
-if test "${samba_cv_SIZEOF_TIME_T+set}" = set; then :
+if ${samba_cv_SIZEOF_TIME_T+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21260,7 +21263,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIME_T_MAX" >&5
 $as_echo_n "checking for TIME_T_MAX... " >&6; }
-if test "${samba_cv_TIME_T_MAX+set}" = set; then :
+if ${samba_cv_TIME_T_MAX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21309,7 +21312,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64 bit off_t" >&5
 $as_echo_n "checking for 64 bit off_t... " >&6; }
-if test "${samba_cv_SIZEOF_OFF_T+set}" = set; then :
+if ${samba_cv_SIZEOF_OFF_T+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21342,7 +21345,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for off64_t" >&5
 $as_echo_n "checking for off64_t... " >&6; }
-if test "${samba_cv_HAVE_OFF64_T+set}" = set; then :
+if ${samba_cv_HAVE_OFF64_T+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21379,7 +21382,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64 bit ino_t" >&5
 $as_echo_n "checking for 64 bit ino_t... " >&6; }
-if test "${samba_cv_SIZEOF_INO_T+set}" = set; then :
+if ${samba_cv_SIZEOF_INO_T+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21416,7 +21419,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ino64_t" >&5
 $as_echo_n "checking for ino64_t... " >&6; }
-if test "${samba_cv_HAVE_INO64_T+set}" = set; then :
+if ${samba_cv_HAVE_INO64_T+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21453,7 +21456,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64 bit dev_t" >&5
 $as_echo_n "checking for 64 bit dev_t... " >&6; }
-if test "${samba_cv_SIZEOF_DEV_T+set}" = set; then :
+if ${samba_cv_SIZEOF_DEV_T+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21490,7 +21493,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dev64_t" >&5
 $as_echo_n "checking for dev64_t... " >&6; }
-if test "${samba_cv_HAVE_DEV64_T+set}" = set; then :
+if ${samba_cv_HAVE_DEV64_T+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21527,7 +21530,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct dirent64" >&5
 $as_echo_n "checking for struct dirent64... " >&6; }
-if test "${samba_cv_HAVE_STRUCT_DIR64+set}" = set; then :
+if ${samba_cv_HAVE_STRUCT_DIR64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21564,7 +21567,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct dirent64" >&5
 $as_echo_n "checking for struct dirent64... " >&6; }
-if test "${samba_cv_HAVE_STRUCT_DIRENT64+set}" = set; then :
+if ${samba_cv_HAVE_STRUCT_DIRENT64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21601,7 +21604,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for major macro" >&5
 $as_echo_n "checking for major macro... " >&6; }
-if test "${samba_cv_HAVE_DEVICE_MAJOR_FN+set}" = set; then :
+if ${samba_cv_HAVE_DEVICE_MAJOR_FN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21637,7 +21640,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for minor macro" >&5
 $as_echo_n "checking for minor macro... " >&6; }
-if test "${samba_cv_HAVE_DEVICE_MINOR_FN+set}" = set; then :
+if ${samba_cv_HAVE_DEVICE_MINOR_FN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21673,7 +21676,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for makedev macro" >&5
 $as_echo_n "checking for makedev macro... " >&6; }
-if test "${samba_cv_HAVE_MAKEDEV+set}" = set; then :
+if ${samba_cv_HAVE_MAKEDEV+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21709,7 +21712,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned char" >&5
 $as_echo_n "checking for unsigned char... " >&6; }
-if test "${samba_cv_HAVE_UNSIGNED_CHAR+set}" = set; then :
+if ${samba_cv_HAVE_UNSIGNED_CHAR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21741,7 +21744,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether seekdir returns void" >&5
 $as_echo_n "checking whether seekdir returns void... " >&6; }
-if test "${samba_cv_SEEKDIR_RETURNS_VOID+set}" = set; then :
+if ${samba_cv_SEEKDIR_RETURNS_VOID+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21775,7 +21778,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __FUNCTION__ macro" >&5
 $as_echo_n "checking for __FUNCTION__ macro... " >&6; }
-if test "${samba_cv_HAVE_FUNCTION_MACRO+set}" = set; then :
+if ${samba_cv_HAVE_FUNCTION_MACRO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21811,7 +21814,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken readdir name" >&5
 $as_echo_n "checking for broken readdir name... " >&6; }
-if test "${samba_cv_HAVE_BROKEN_READDIR_NAME+set}" = set; then :
+if ${samba_cv_HAVE_BROKEN_READDIR_NAME+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21846,7 +21849,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utimbuf" >&5
 $as_echo_n "checking for utimbuf... " >&6; }
-if test "${samba_cv_HAVE_UTIMBUF+set}" = set; then :
+if ${samba_cv_HAVE_UTIMBUF+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21885,8 +21888,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -21897,7 +21899,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_name in utmp" >&5
 $as_echo_n "checking for ut_name in utmp... " >&6; }
-if test "${samba_cv_HAVE_UT_UT_NAME+set}" = set; then :
+if ${samba_cv_HAVE_UT_UT_NAME+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21930,7 +21932,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_user in utmp" >&5
 $as_echo_n "checking for ut_user in utmp... " >&6; }
-if test "${samba_cv_HAVE_UT_UT_USER+set}" = set; then :
+if ${samba_cv_HAVE_UT_UT_USER+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21963,7 +21965,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_id in utmp" >&5
 $as_echo_n "checking for ut_id in utmp... " >&6; }
-if test "${samba_cv_HAVE_UT_UT_ID+set}" = set; then :
+if ${samba_cv_HAVE_UT_UT_ID+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21996,7 +21998,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_host in utmp" >&5
 $as_echo_n "checking for ut_host in utmp... " >&6; }
-if test "${samba_cv_HAVE_UT_UT_HOST+set}" = set; then :
+if ${samba_cv_HAVE_UT_UT_HOST+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -22029,7 +22031,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_time in utmp" >&5
 $as_echo_n "checking for ut_time in utmp... " >&6; }
-if test "${samba_cv_HAVE_UT_UT_TIME+set}" = set; then :
+if ${samba_cv_HAVE_UT_UT_TIME+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -22062,7 +22064,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_tv in utmp" >&5
 $as_echo_n "checking for ut_tv in utmp... " >&6; }
-if test "${samba_cv_HAVE_UT_UT_TV+set}" = set; then :
+if ${samba_cv_HAVE_UT_UT_TV+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -22095,7 +22097,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_type in utmp" >&5
 $as_echo_n "checking for ut_type in utmp... " >&6; }
-if test "${samba_cv_HAVE_UT_UT_TYPE+set}" = set; then :
+if ${samba_cv_HAVE_UT_UT_TYPE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -22128,7 +22130,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_pid in utmp" >&5
 $as_echo_n "checking for ut_pid in utmp... " >&6; }
-if test "${samba_cv_HAVE_UT_UT_PID+set}" = set; then :
+if ${samba_cv_HAVE_UT_UT_PID+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -22161,7 +22163,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_exit in utmp" >&5
 $as_echo_n "checking for ut_exit in utmp... " >&6; }
-if test "${samba_cv_HAVE_UT_UT_EXIT+set}" = set; then :
+if ${samba_cv_HAVE_UT_UT_EXIT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -22194,7 +22196,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_addr_v6 in utmp" >&5
 $as_echo_n "checking for ut_addr_v6 in utmp... " >&6; }
-if test "${samba_cv_HAVE_UT_UT_ADDR_V6+set}" = set; then :
+if ${samba_cv_HAVE_UT_UT_ADDR_V6+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -22227,7 +22229,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_addr in utmp" >&5
 $as_echo_n "checking for ut_addr in utmp... " >&6; }
-if test "${samba_cv_HAVE_UT_UT_ADDR+set}" = set; then :
+if ${samba_cv_HAVE_UT_UT_ADDR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -22261,7 +22263,7 @@
 if test x$ac_cv_func_pututline = xyes ; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pututline returns pointer" >&5
 $as_echo_n "checking whether pututline returns pointer... " >&6; }
-if test "${samba_cv_PUTUTLINE_RETURNS_UTMP+set}" = set; then :
+if ${samba_cv_PUTUTLINE_RETURNS_UTMP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -22295,7 +22297,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_syslen in utmpx" >&5
 $as_echo_n "checking for ut_syslen in utmpx... " >&6; }
-if test "${samba_cv_HAVE_UX_UT_SYSLEN+set}" = set; then :
+if ${samba_cv_HAVE_UX_UT_SYSLEN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -22331,7 +22333,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linux fallocate" >&5
 $as_echo_n "checking for linux fallocate... " >&6; }
-if test "${samba_cv_HAVE_LINUX_FALLOCATE+set}" = set; then :
+if ${samba_cv_HAVE_LINUX_FALLOCATE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -22372,7 +22374,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linux fallocate64" >&5
 $as_echo_n "checking for linux fallocate64... " >&6; }
-if test "${samba_cv_HAVE_LINUX_FALLOCATE64+set}" = set; then :
+if ${samba_cv_HAVE_LINUX_FALLOCATE64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -22417,7 +22419,7 @@
 if test "${with_libiconv+set}" = set; then :
   withval=$with_libiconv;
   if test "$withval" = "no" ; then
-    as_fn_error "argument to --with-libiconv must be a directory" "$LINENO" 5
+    as_fn_error $? "argument to --with-libiconv must be a directory" "$LINENO" 5
   else
      if test "$withval" != "yes" ; then
 	ICONV_PATH_SPEC=yes
@@ -22897,7 +22899,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux kernel oplocks" >&5
 $as_echo_n "checking for Linux kernel oplocks... " >&6; }
-if test "${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX+set}" = set; then :
+if ${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -22938,7 +22940,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kernel change notify support" >&5
 $as_echo_n "checking for kernel change notify support... " >&6; }
-if test "${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY+set}" = set; then :
+if ${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -22979,7 +22981,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inotify support" >&5
 $as_echo_n "checking for inotify support... " >&6; }
-if test "${samba_cv_HAVE_INOTIFY+set}" = set; then :
+if ${samba_cv_HAVE_INOTIFY+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -22987,8 +22989,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -23000,7 +23001,7 @@
 for ac_func in inotify_init
 do :
   ac_fn_c_check_func "$LINENO" "inotify_init" "ac_cv_func_inotify_init"
-if test "x$ac_cv_func_inotify_init" = x""yes; then :
+if test "x$ac_cv_func_inotify_init" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_INOTIFY_INIT 1
 _ACEOF
@@ -23011,7 +23012,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __NR_inotify_init declaration" >&5
 $as_echo_n "checking for __NR_inotify_init declaration... " >&6; }
-if test "${ac_cv_have___NR_inotify_init_decl+set}" = set; then :
+if ${ac_cv_have___NR_inotify_init_decl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -23068,7 +23069,7 @@
     for ac_header in fam.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "fam.h" "ac_cv_header_fam_h" "$ac_includes_default"
-if test "x$ac_cv_header_fam_h" = x""yes; then :
+if test "x$ac_cv_header_fam_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FAM_H 1
 _ACEOF
@@ -23084,7 +23085,7 @@
 	# might not need it.
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FAMOpen2 in -lfam" >&5
 $as_echo_n "checking for FAMOpen2 in -lfam... " >&6; }
-if test "${ac_cv_lib_fam_FAMOpen2+set}" = set; then :
+if ${ac_cv_lib_fam_FAMOpen2+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -23118,7 +23119,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fam_FAMOpen2" >&5
 $as_echo "$ac_cv_lib_fam_FAMOpen2" >&6; }
-if test "x$ac_cv_lib_fam_FAMOpen2" = x""yes; then :
+if test "x$ac_cv_lib_fam_FAMOpen2" = xyes; then :
   samba_cv_HAVE_LIBFAM=yes; SMB_FAM_LIBS="-lfam";
 
 $as_echo "#define HAVE_FAMOPEN2 1" >>confdefs.h
@@ -23139,7 +23140,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FAMOpen2 in -lfam" >&5
 $as_echo_n "checking for FAMOpen2 in -lfam... " >&6; }
-if test "${ac_cv_lib_ext_fam_FAMOpen2+set}" = set; then :
+if ${ac_cv_lib_ext_fam_FAMOpen2+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -23218,7 +23219,7 @@
     if test x"$samba_cv_HAVE_LIBFAM" = x"yes" ; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FAMNoExists in -lfam" >&5
 $as_echo_n "checking for FAMNoExists in -lfam... " >&6; }
-if test "${ac_cv_lib_fam_FAMNoExists+set}" = set; then :
+if ${ac_cv_lib_fam_FAMNoExists+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -23252,7 +23253,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fam_FAMNoExists" >&5
 $as_echo "$ac_cv_lib_fam_FAMNoExists" >&6; }
-if test "x$ac_cv_lib_fam_FAMNoExists" = x""yes; then :
+if test "x$ac_cv_lib_fam_FAMNoExists" = xyes; then :
 
 $as_echo "#define HAVE_FAMNOEXISTS 1" >>confdefs.h
 
@@ -23261,7 +23262,7 @@
     fi
 
     if test x$enable_fam = xyes && test x"$samba_cv_HAVE_LIBFAM" != xyes ; then
-        as_fn_error "FAM support requested but FAM library not available " "$LINENO" 5
+        as_fn_error $? "FAM support requested but FAM library not available " "$LINENO" 5
     fi
 fi
 
@@ -23295,7 +23296,7 @@
     if test x"$samba_dmapi_libs" = x"" ; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dm_get_eventlist in -ldm" >&5
 $as_echo_n "checking for dm_get_eventlist in -ldm... " >&6; }
-if test "${ac_cv_lib_dm_dm_get_eventlist+set}" = set; then :
+if ${ac_cv_lib_dm_dm_get_eventlist+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -23329,7 +23330,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dm_dm_get_eventlist" >&5
 $as_echo "$ac_cv_lib_dm_dm_get_eventlist" >&6; }
-if test "x$ac_cv_lib_dm_dm_get_eventlist" = x""yes; then :
+if test "x$ac_cv_lib_dm_dm_get_eventlist" = xyes; then :
    samba_dmapi_libs="-ldm"
 fi
 
@@ -23338,7 +23339,7 @@
     if test x"$samba_dmapi_libs" = x"" ; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dm_get_eventlist in -ljfsdm" >&5
 $as_echo_n "checking for dm_get_eventlist in -ljfsdm... " >&6; }
-if test "${ac_cv_lib_jfsdm_dm_get_eventlist+set}" = set; then :
+if ${ac_cv_lib_jfsdm_dm_get_eventlist+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -23372,7 +23373,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jfsdm_dm_get_eventlist" >&5
 $as_echo "$ac_cv_lib_jfsdm_dm_get_eventlist" >&6; }
-if test "x$ac_cv_lib_jfsdm_dm_get_eventlist" = x""yes; then :
+if test "x$ac_cv_lib_jfsdm_dm_get_eventlist" = xyes; then :
   samba_dmapi_libs="-ljfsdm"
 fi
 
@@ -23381,7 +23382,7 @@
     if test x"$samba_dmapi_libs" = x"" ; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dm_get_eventlist in -ldmapi" >&5
 $as_echo_n "checking for dm_get_eventlist in -ldmapi... " >&6; }
-if test "${ac_cv_lib_dmapi_dm_get_eventlist+set}" = set; then :
+if ${ac_cv_lib_dmapi_dm_get_eventlist+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -23415,7 +23416,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dmapi_dm_get_eventlist" >&5
 $as_echo "$ac_cv_lib_dmapi_dm_get_eventlist" >&6; }
-if test "x$ac_cv_lib_dmapi_dm_get_eventlist" = x""yes; then :
+if test "x$ac_cv_lib_dmapi_dm_get_eventlist" = xyes; then :
   samba_dmapi_libs="-ldmapi"
 fi
 
@@ -23424,7 +23425,7 @@
     if test x"$samba_dmapi_libs" = x"" ; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dm_get_eventlist in -lxdsm" >&5
 $as_echo_n "checking for dm_get_eventlist in -lxdsm... " >&6; }
-if test "${ac_cv_lib_xdsm_dm_get_eventlist+set}" = set; then :
+if ${ac_cv_lib_xdsm_dm_get_eventlist+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -23458,7 +23459,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xdsm_dm_get_eventlist" >&5
 $as_echo "$ac_cv_lib_xdsm_dm_get_eventlist" >&6; }
-if test "x$ac_cv_lib_xdsm_dm_get_eventlist" = x""yes; then :
+if test "x$ac_cv_lib_xdsm_dm_get_eventlist" = xyes; then :
   samba_dmapi_libs="-lxdsm"
 fi
 
@@ -23471,8 +23472,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -23543,7 +23543,7 @@
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: DMAPI support not present" >&5
 $as_echo "$as_me: DMAPI support not present" >&6;}
 		if test x"$with_dmapi_support" = xyes ; then
-			as_fn_error "no DMAPI support found but requested!" "$LINENO" 5
+			as_fn_error $? "no DMAPI support found but requested!" "$LINENO" 5
 		fi
 
 
@@ -23572,7 +23572,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kernel share modes" >&5
 $as_echo_n "checking for kernel share modes... " >&6; }
-if test "${samba_cv_HAVE_KERNEL_SHARE_MODES+set}" = set; then :
+if ${samba_cv_HAVE_KERNEL_SHARE_MODES+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -23616,7 +23616,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IRIX kernel oplock type definitions" >&5
 $as_echo_n "checking for IRIX kernel oplock type definitions... " >&6; }
-if test "${samba_cv_HAVE_KERNEL_OPLOCKS_IRIX+set}" = set; then :
+if ${samba_cv_HAVE_KERNEL_OPLOCKS_IRIX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -23651,7 +23651,7 @@
 # Check for POSIX capability support
 
 ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_capability_h" = x""yes; then :
+if test "x$ac_cv_header_sys_capability_h" = xyes; then :
   samba_cv_HAVE_SYS_CAPABILITY_H=yes;
 
 $as_echo "#define HAVE_SYS_CAPABILITY_H 1" >>confdefs.h
@@ -23667,7 +23667,7 @@
   for ac_func in cap_get_proc
 do :
   ac_fn_c_check_func "$LINENO" "cap_get_proc" "ac_cv_func_cap_get_proc"
-if test "x$ac_cv_func_cap_get_proc" = x""yes; then :
+if test "x$ac_cv_func_cap_get_proc" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CAP_GET_PROC 1
 _ACEOF
@@ -23694,7 +23694,7 @@
 	    # cap_get_proc was not found, try adding libcap
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cap_get_proc in -lcap" >&5
 $as_echo_n "checking for cap_get_proc in -lcap... " >&6; }
-if test "${ac_cv_lib_cap_cap_get_proc+set}" = set; then :
+if ${ac_cv_lib_cap_cap_get_proc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -23728,7 +23728,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cap_cap_get_proc" >&5
 $as_echo "$ac_cv_lib_cap_cap_get_proc" >&6; }
-if test "x$ac_cv_lib_cap_cap_get_proc" = x""yes; then :
+if test "x$ac_cv_lib_cap_cap_get_proc" = xyes; then :
 
 		LIBS="-lcap $LIBS"
 
@@ -23757,7 +23757,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX capabilities" >&5
 $as_echo_n "checking for POSIX capabilities... " >&6; }
-if test "${samba_cv_HAVE_POSIX_CAPABILITIES+set}" = set; then :
+if ${samba_cv_HAVE_POSIX_CAPABILITIES+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -23811,7 +23811,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int16 typedef included by rpc/rpc.h" >&5
 $as_echo_n "checking for int16 typedef included by rpc/rpc.h... " >&6; }
-if test "${samba_cv_HAVE_INT16_FROM_RPC_RPC_H+set}" = set; then :
+if ${samba_cv_HAVE_INT16_FROM_RPC_RPC_H+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -23846,7 +23846,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint16 typedef included by rpc/rpc.h" >&5
 $as_echo_n "checking for uint16 typedef included by rpc/rpc.h... " >&6; }
-if test "${samba_cv_HAVE_UINT16_FROM_RPC_RPC_H+set}" = set; then :
+if ${samba_cv_HAVE_UINT16_FROM_RPC_RPC_H+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -23881,7 +23881,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int32 typedef included by rpc/rpc.h" >&5
 $as_echo_n "checking for int32 typedef included by rpc/rpc.h... " >&6; }
-if test "${samba_cv_HAVE_INT32_FROM_RPC_RPC_H+set}" = set; then :
+if ${samba_cv_HAVE_INT32_FROM_RPC_RPC_H+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -23916,7 +23916,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint32 typedef included by rpc/rpc.h" >&5
 $as_echo_n "checking for uint32 typedef included by rpc/rpc.h... " >&6; }
-if test "${samba_cv_HAVE_UINT32_FROM_RPC_RPC_H+set}" = set; then :
+if ${samba_cv_HAVE_UINT32_FROM_RPC_RPC_H+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -23952,7 +23952,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for conflicting AUTH_ERROR define in rpc/rpc.h" >&5
 $as_echo_n "checking for conflicting AUTH_ERROR define in rpc/rpc.h... " >&6; }
-if test "${samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT+set}" = set; then :
+if ${samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -24003,7 +24003,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  as_fn_error "cant find test code. Aborting config" "$LINENO" 5
+  as_fn_error $? "cant find test code. Aborting config" "$LINENO" 5
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -24012,7 +24012,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ftruncate extend" >&5
 $as_echo_n "checking for ftruncate extend... " >&6; }
-if test "${samba_cv_HAVE_FTRUNCATE_EXTEND+set}" = set; then :
+if ${samba_cv_HAVE_FTRUNCATE_EXTEND+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -24043,7 +24043,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken getgroups" >&5
 $as_echo_n "checking for broken getgroups... " >&6; }
-if test "${samba_cv_HAVE_BROKEN_GETGROUPS+set}" = set; then :
+if ${samba_cv_HAVE_BROKEN_GETGROUPS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -24075,7 +24075,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysconf(_SC_NGROUPS_MAX)" >&5
 $as_echo_n "checking for sysconf(_SC_NGROUPS_MAX)... " >&6; }
-if test "${samba_cv_SYSCONF_SC_NGROUPS_MAX+set}" = set; then :
+if ${samba_cv_SYSCONF_SC_NGROUPS_MAX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -24111,7 +24111,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysconf(_SC_NPROC_ONLN)" >&5
 $as_echo_n "checking for sysconf(_SC_NPROC_ONLN)... " >&6; }
-if test "${samba_cv_SYSCONF_SC_NPROC_ONLN+set}" = set; then :
+if ${samba_cv_SYSCONF_SC_NPROC_ONLN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -24147,7 +24147,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysconf(_SC_NPROCESSORS_ONLN)" >&5
 $as_echo_n "checking for sysconf(_SC_NPROCESSORS_ONLN)... " >&6; }
-if test "${samba_cv_SYSCONF_SC_NPROCESSORS_ONLN+set}" = set; then :
+if ${samba_cv_SYSCONF_SC_NPROCESSORS_ONLN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -24183,7 +24183,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysconf(_SC_PAGESIZE)" >&5
 $as_echo_n "checking for sysconf(_SC_PAGESIZE)... " >&6; }
-if test "${samba_cv_SYSCONF_SC_PAGESIZE+set}" = set; then :
+if ${samba_cv_SYSCONF_SC_PAGESIZE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -24219,7 +24219,7 @@
 for ac_func in getpagesize
 do :
   ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
-if test "x$ac_cv_func_getpagesize" = x""yes; then :
+if test "x$ac_cv_func_getpagesize" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETPAGESIZE 1
 _ACEOF
@@ -24235,7 +24235,7 @@
 if test $seteuid = no; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setreuid" >&5
 $as_echo_n "checking for setreuid... " >&6; }
-if test "${samba_cv_USE_SETREUID+set}" = set; then :
+if ${samba_cv_USE_SETREUID+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -24274,7 +24274,7 @@
 if test $seteuid = no; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setresuid" >&5
 $as_echo_n "checking for setresuid... " >&6; }
-if test "${samba_cv_USE_SETRESUID+set}" = set; then :
+if ${samba_cv_USE_SETRESUID+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -24311,7 +24311,7 @@
 if test $seteuid = no; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for seteuid" >&5
 $as_echo_n "checking for seteuid... " >&6; }
-if test "${samba_cv_USE_SETEUID+set}" = set; then :
+if ${samba_cv_USE_SETEUID+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -24348,7 +24348,7 @@
 if test $seteuid = no; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setuidx" >&5
 $as_echo_n "checking for setuidx... " >&6; }
-if test "${samba_cv_USE_SETUIDX+set}" = set; then :
+if ${samba_cv_USE_SETUIDX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -24384,7 +24384,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Darwin initgroups system call" >&5
 $as_echo_n "checking for the Darwin initgroups system call... " >&6; }
-if test "${samba_cv_DARWIN_INITGROUPS+set}" = set; then :
+if ${samba_cv_DARWIN_INITGROUPS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -24421,7 +24421,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fcntl locking" >&5
 $as_echo_n "checking for fcntl locking... " >&6; }
-if test "${samba_cv_HAVE_FCNTL_LOCK+set}" = set; then :
+if ${samba_cv_HAVE_FCNTL_LOCK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -24452,7 +24452,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken (glibc2.1/x86) 64 bit fcntl locking" >&5
 $as_echo_n "checking for broken (glibc2.1/x86) 64 bit fcntl locking... " >&6; }
-if test "${samba_cv_HAVE_BROKEN_FCNTL64_LOCKS+set}" = set; then :
+if ${samba_cv_HAVE_BROKEN_FCNTL64_LOCKS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -24485,7 +24485,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64 bit fcntl locking" >&5
 $as_echo_n "checking for 64 bit fcntl locking... " >&6; }
-if test "${samba_cv_HAVE_STRUCT_FLOCK64+set}" = set; then :
+if ${samba_cv_HAVE_STRUCT_FLOCK64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -24539,7 +24539,7 @@
 # glibc up to 2.3.6 had dangerously broken posix_fallocate(). DON'T USE IT.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken posix_fallocate" >&5
 $as_echo_n "checking for broken posix_fallocate... " >&6; }
-if test "${samba_cv_HAVE_BROKEN_POSIX_FALLOCATE+set}" = set; then :
+if ${samba_cv_HAVE_BROKEN_POSIX_FALLOCATE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -24579,7 +24579,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_blocks in struct stat" >&5
 $as_echo_n "checking for st_blocks in struct stat... " >&6; }
-if test "${samba_cv_HAVE_STAT_ST_BLOCKS+set}" = set; then :
+if ${samba_cv_HAVE_STAT_ST_BLOCKS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -24613,7 +24613,7 @@
 
 ac_fn_c_check_type "$LINENO" "blksize_t" "ac_cv_type_blksize_t" "#include <sys/stat.h>
 "
-if test "x$ac_cv_type_blksize_t" = x""yes; then :
+if test "x$ac_cv_type_blksize_t" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_BLKSIZE_T 1
@@ -24623,7 +24623,7 @@
 fi
 ac_fn_c_check_type "$LINENO" "blkcnt_t" "ac_cv_type_blkcnt_t" "#include <sys/stat.h>
 "
-if test "x$ac_cv_type_blkcnt_t" = x""yes; then :
+if test "x$ac_cv_type_blkcnt_t" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_BLKCNT_T 1
@@ -24635,7 +24635,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_blksize in struct stat" >&5
 $as_echo_n "checking for st_blksize in struct stat... " >&6; }
-if test "${samba_cv_HAVE_STAT_ST_BLKSIZE+set}" = set; then :
+if ${samba_cv_HAVE_STAT_ST_BLKSIZE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -24669,7 +24669,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_flags in struct stat" >&5
 $as_echo_n "checking for st_flags in struct stat... " >&6; }
-if test "${samba_cv_HAVE_STAT_ST_FLAGS+set}" = set; then :
+if ${samba_cv_HAVE_STAT_ST_FLAGS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -24705,7 +24705,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken nisplus include files" >&5
 $as_echo_n "checking for broken nisplus include files... " >&6; }
-if test "${samba_cv_BROKEN_NISPLUS_INCLUDE_FILES+set}" = set; then :
+if ${samba_cv_BROKEN_NISPLUS_INCLUDE_FILES+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -24742,7 +24742,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the realpath function allows a NULL argument" >&5
 $as_echo_n "checking if the realpath function allows a NULL argument... " >&6; }
-if test "${samba_cv_REALPATH_TAKES_NULL+set}" = set; then :
+if ${samba_cv_REALPATH_TAKES_NULL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -24846,7 +24846,7 @@
     # see if this box has the OpenSSL DES libraries
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DES_pcbc_encrypt in -lcrypto" >&5
 $as_echo_n "checking for DES_pcbc_encrypt in -lcrypto... " >&6; }
-if test "${ac_cv_lib_crypto_DES_pcbc_encrypt+set}" = set; then :
+if ${ac_cv_lib_crypto_DES_pcbc_encrypt+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -24880,10 +24880,10 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_DES_pcbc_encrypt" >&5
 $as_echo "$ac_cv_lib_crypto_DES_pcbc_encrypt" >&6; }
-if test "x$ac_cv_lib_crypto_DES_pcbc_encrypt" = x""yes; then :
+if test "x$ac_cv_lib_crypto_DES_pcbc_encrypt" = xyes; then :
   LIBS="$LIBS -lcrypto"
 else
-  as_fn_error "OpenSSL library: libcrypto ot found!" "$LINENO" 5
+  as_fn_error $? "OpenSSL library: libcrypto ot found!" "$LINENO" 5
 fi
 
 
@@ -24904,8 +24904,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -24920,7 +24919,7 @@
 	    	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: AFS cannot be supported without afs.h" >&5
 $as_echo "$as_me: WARNING: AFS cannot be supported without afs.h" >&2;}
 	else
-	    	as_fn_error "AFS cannot be supported without afs.h" "$LINENO" 5
+	    	as_fn_error $? "AFS cannot be supported without afs.h" "$LINENO" 5
 	fi
     else
     	have_afs_headers=yes
@@ -25034,8 +25033,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -25047,7 +25045,7 @@
 
   if test x"$ac_cv_header_ldap_h" != x"yes"; then
 	if test x"$with_ldap_support" = x"yes"; then
-	 as_fn_error "ldap.h is needed for LDAP support" "$LINENO" 5
+	 as_fn_error $? "ldap.h is needed for LDAP support" "$LINENO" 5
 	else
 	 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ldap.h is needed for LDAP support" >&5
 $as_echo "$as_me: WARNING: ldap.h is needed for LDAP support" >&2;}
@@ -25070,13 +25068,13 @@
 	*)
   	ac_fn_c_check_type "$LINENO" "ber_tag_t" "ac_cv_type_ber_tag_t" "#include <lber.h>
 "
-if test "x$ac_cv_type_ber_tag_t" = x""yes; then :
+if test "x$ac_cv_type_ber_tag_t" = xyes; then :
 
 fi
 
   	if test x"$ac_cv_type_ber_tag_t" != x"yes"; then
 		if test x"$with_ldap_support" = x"yes"; then
-	 	as_fn_error "ber_tag_t is needed for LDAP support" "$LINENO" 5
+	 	as_fn_error $? "ber_tag_t is needed for LDAP support" "$LINENO" 5
 		else
 	 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ber_tag_t is needed for LDAP support" >&5
 $as_echo "$as_me: WARNING: ber_tag_t is needed for LDAP support" >&2;}
@@ -25102,7 +25100,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_scanf in -llber" >&5
 $as_echo_n "checking for ber_scanf in -llber... " >&6; }
-if test "${ac_cv_lib_ext_lber_ber_scanf+set}" = set; then :
+if ${ac_cv_lib_ext_lber_ber_scanf+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -25169,7 +25167,7 @@
     LIBS="$LDAP_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_sockbuf_add_io" >&5
 $as_echo_n "checking for ber_sockbuf_add_io... " >&6; }
-if test "${ac_cv_func_ext_ber_sockbuf_add_io+set}" = set; then :
+if ${ac_cv_func_ext_ber_sockbuf_add_io+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -25233,7 +25231,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LDAP_OPT_SOCKBUF" >&5
 $as_echo_n "checking for LDAP_OPT_SOCKBUF... " >&6; }
-if test "${samba_cv_HAVE_LDAP_OPT_SOCKBUF+set}" = set; then :
+if ${samba_cv_HAVE_LDAP_OPT_SOCKBUF+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -25270,7 +25268,7 @@
   # ldap logging and print it out in the samba logs
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LBER_OPT_LOG_PRINT_FN" >&5
 $as_echo_n "checking for LBER_OPT_LOG_PRINT_FN... " >&6; }
-if test "${samba_cv_HAVE_LBER_OPT_LOG_PRINT_FN+set}" = set; then :
+if ${samba_cv_HAVE_LBER_OPT_LOG_PRINT_FN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -25311,7 +25309,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_init in -lldap" >&5
 $as_echo_n "checking for ldap_init in -lldap... " >&6; }
-if test "${ac_cv_lib_ext_ldap_ldap_init+set}" = set; then :
+if ${ac_cv_lib_ext_ldap_ldap_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -25378,7 +25376,7 @@
     LIBS="$LDAP_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_set_rebind_proc" >&5
 $as_echo_n "checking for ldap_set_rebind_proc... " >&6; }
-if test "${ac_cv_func_ext_ldap_set_rebind_proc+set}" = set; then :
+if ${ac_cv_func_ext_ldap_set_rebind_proc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -25443,7 +25441,7 @@
   LIBS="$LIBS $LDAP_LIBS"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ldap_set_rebind_proc takes 3 arguments" >&5
 $as_echo_n "checking whether ldap_set_rebind_proc takes 3 arguments... " >&6; }
-if test "${smb_ldap_cv_ldap_set_rebind_proc+set}" = set; then :
+if ${smb_ldap_cv_ldap_set_rebind_proc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -25484,7 +25482,7 @@
     LIBS="$LDAP_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_initialize" >&5
 $as_echo_n "checking for ldap_initialize... " >&6; }
-if test "${ac_cv_func_ext_ldap_initialize+set}" = set; then :
+if ${ac_cv_func_ext_ldap_initialize+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -25562,7 +25560,7 @@
 $as_echo "yes" >&6; }
   else
     if test x"$with_ldap_support" = x"yes"; then
-	as_fn_error "libldap is needed for LDAP support" "$LINENO" 5
+	as_fn_error $? "libldap is needed for LDAP support" "$LINENO" 5
     else
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libldap is needed for LDAP support" >&5
 $as_echo "$as_me: WARNING: libldap is needed for LDAP support" >&2;}
@@ -25602,7 +25600,7 @@
 if test x"$with_ldap_support" != x"yes"; then
 
     if test x"$with_ads_support" = x"yes"; then
-	as_fn_error "Active Directory Support requires LDAP support" "$LINENO" 5
+	as_fn_error $? "Active Directory Support requires LDAP support" "$LINENO" 5
     elif test x"$with_ads_support" = x"auto"; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling Active Directory support (requires LDAP support)" >&5
 $as_echo "$as_me: WARNING: Disabling Active Directory support (requires LDAP support)" >&2;}
@@ -25623,7 +25621,7 @@
     LIBS="$LDAP_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_init" >&5
 $as_echo_n "checking for ldap_init... " >&6; }
-if test "${ac_cv_func_ext_ldap_init+set}" = set; then :
+if ${ac_cv_func_ext_ldap_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -25687,7 +25685,7 @@
 
     if test x"$ac_cv_func_ext_ldap_init" != x"yes"; then
 	if test x"$with_ads_support" = x"yes"; then
-	    as_fn_error "Active Directory support on HPUX requires ldap_init" "$LINENO" 5
+	    as_fn_error $? "Active Directory support on HPUX requires ldap_init" "$LINENO" 5
 	elif test x"$with_ads_support" = x"auto"; then
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling Active Directory support (requires ldap_init on HPUX)" >&5
 $as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_init on HPUX)" >&2;}
@@ -25702,7 +25700,7 @@
     LIBS="$LDAP_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_initialize" >&5
 $as_echo_n "checking for ldap_initialize... " >&6; }
-if test "${ac_cv_func_ext_ldap_initialize+set}" = set; then :
+if ${ac_cv_func_ext_ldap_initialize+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -25766,7 +25764,7 @@
 
     if test x"$ac_cv_func_ext_ldap_initialize" != x"yes"; then
 	if test x"$with_ads_support" = x"yes"; then
-	    as_fn_error "Active Directory support requires ldap_initialize" "$LINENO" 5
+	    as_fn_error $? "Active Directory support requires ldap_initialize" "$LINENO" 5
 	elif test x"$with_ads_support" = x"auto"; then
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling Active Directory support (requires ldap_initialize)" >&5
 $as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_initialize)" >&2;}
@@ -25783,7 +25781,7 @@
     LIBS="$LDAP_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_add_result_entry" >&5
 $as_echo_n "checking for ldap_add_result_entry... " >&6; }
-if test "${ac_cv_func_ext_ldap_add_result_entry+set}" = set; then :
+if ${ac_cv_func_ext_ldap_add_result_entry+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -25847,7 +25845,7 @@
 
     if test x"$ac_cv_func_ext_ldap_add_result_entry" != x"yes"; then
 	if test x"$with_ads_support" = x"yes"; then
-	    as_fn_error "Active Directory support requires ldap_add_result_entry" "$LINENO" 5
+	    as_fn_error $? "Active Directory support requires ldap_add_result_entry" "$LINENO" 5
 	elif test x"$with_ads_support" = x"auto"; then
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling Active Directory support (requires ldap_add_result_entry)" >&5
 $as_echo "$as_me: WARNING: Disabling Active Directory support (requires ldap_add_result_entry)" >&2;}
@@ -25906,7 +25904,7 @@
 set dummy krb5-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_KRB5CONFIG+set}" = set; then :
+if ${ac_cv_path_KRB5CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $KRB5CONFIG in
@@ -26109,7 +26107,7 @@
   for ac_header in krb5.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "krb5.h" "ac_cv_header_krb5_h" "$ac_includes_default"
-if test "x$ac_cv_header_krb5_h" = x""yes; then :
+if test "x$ac_cv_header_krb5_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_KRB5_H 1
 _ACEOF
@@ -26125,7 +26123,7 @@
     # i.e with_ads_support = auto, otherwise die with an error.
 
     if test x"$with_ads_support" = x"yes"; then
-      as_fn_error "Active Directory cannot be supported without krb5.h" "$LINENO" 5
+      as_fn_error $? "Active Directory cannot be supported without krb5.h" "$LINENO" 5
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Active Directory cannot be supported without krb5.h" >&5
 $as_echo "$as_me: WARNING: Active Directory cannot be supported without krb5.h" >&2;}
@@ -26144,7 +26142,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KRB5_DEPRECATED define taking an identifier" >&5
 $as_echo_n "checking for KRB5_DEPRECATED define taking an identifier... " >&6; }
-if test "${samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER+set}" = set; then :
+if ${samba_cv_HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -26190,8 +26188,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -26212,7 +26209,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _et_list in -lcom_err" >&5
 $as_echo_n "checking for _et_list in -lcom_err... " >&6; }
-if test "${ac_cv_lib_ext_com_err__et_list+set}" = set; then :
+if ${ac_cv_lib_ext_com_err__et_list+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26278,7 +26275,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_encrypt_data in -lk5crypto" >&5
 $as_echo_n "checking for krb5_encrypt_data in -lk5crypto... " >&6; }
-if test "${ac_cv_lib_ext_k5crypto_krb5_encrypt_data+set}" = set; then :
+if ${ac_cv_lib_ext_k5crypto_krb5_encrypt_data+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26346,7 +26343,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_set_key in -lcrypto" >&5
 $as_echo_n "checking for des_set_key in -lcrypto... " >&6; }
-if test "${ac_cv_lib_ext_crypto_des_set_key+set}" = set; then :
+if ${ac_cv_lib_ext_crypto_des_set_key+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26412,7 +26409,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for copy_Authenticator in -lasn1" >&5
 $as_echo_n "checking for copy_Authenticator in -lasn1... " >&6; }
-if test "${ac_cv_lib_ext_asn1_copy_Authenticator+set}" = set; then :
+if ${ac_cv_lib_ext_asn1_copy_Authenticator+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26478,7 +26475,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for roken_getaddrinfo_hostspec in -lroken" >&5
 $as_echo_n "checking for roken_getaddrinfo_hostspec in -lroken... " >&6; }
-if test "${ac_cv_lib_ext_roken_roken_getaddrinfo_hostspec+set}" = set; then :
+if ${ac_cv_lib_ext_roken_roken_getaddrinfo_hostspec+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26546,7 +26543,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_display_status in -lgssapi" >&5
 $as_echo_n "checking for gss_display_status in -lgssapi... " >&6; }
-if test "${ac_cv_lib_ext_gssapi_gss_display_status+set}" = set; then :
+if ${ac_cv_lib_ext_gssapi_gss_display_status+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26616,7 +26613,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_mk_req_extended in -lkrb5" >&5
 $as_echo_n "checking for krb5_mk_req_extended in -lkrb5... " >&6; }
-if test "${ac_cv_lib_ext_krb5_krb5_mk_req_extended+set}" = set; then :
+if ${ac_cv_lib_ext_krb5_krb5_mk_req_extended+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26682,7 +26679,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_kt_compare in -lkrb5" >&5
 $as_echo_n "checking for krb5_kt_compare in -lkrb5... " >&6; }
-if test "${ac_cv_lib_ext_krb5_krb5_kt_compare+set}" = set; then :
+if ${ac_cv_lib_ext_krb5_krb5_kt_compare+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26752,7 +26749,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_display_status in -lgssapi_krb5" >&5
 $as_echo_n "checking for gss_display_status in -lgssapi_krb5... " >&6; }
-if test "${ac_cv_lib_ext_gssapi_krb5_gss_display_status+set}" = set; then :
+if ${ac_cv_lib_ext_gssapi_krb5_gss_display_status+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26815,7 +26812,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_wrap_iov" >&5
 $as_echo_n "checking for gss_wrap_iov... " >&6; }
-if test "${ac_cv_func_ext_gss_wrap_iov+set}" = set; then :
+if ${ac_cv_func_ext_gss_wrap_iov+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26884,7 +26881,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_set_real_time" >&5
 $as_echo_n "checking for krb5_set_real_time... " >&6; }
-if test "${ac_cv_func_ext_krb5_set_real_time+set}" = set; then :
+if ${ac_cv_func_ext_krb5_set_real_time+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -26951,7 +26948,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_set_default_in_tkt_etypes" >&5
 $as_echo_n "checking for krb5_set_default_in_tkt_etypes... " >&6; }
-if test "${ac_cv_func_ext_krb5_set_default_in_tkt_etypes+set}" = set; then :
+if ${ac_cv_func_ext_krb5_set_default_in_tkt_etypes+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27018,7 +27015,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_set_default_tgs_enctypes" >&5
 $as_echo_n "checking for krb5_set_default_tgs_enctypes... " >&6; }
-if test "${ac_cv_func_ext_krb5_set_default_tgs_enctypes+set}" = set; then :
+if ${ac_cv_func_ext_krb5_set_default_tgs_enctypes+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27085,7 +27082,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_set_default_tgs_ktypes" >&5
 $as_echo_n "checking for krb5_set_default_tgs_ktypes... " >&6; }
-if test "${ac_cv_func_ext_krb5_set_default_tgs_ktypes+set}" = set; then :
+if ${ac_cv_func_ext_krb5_set_default_tgs_ktypes+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27152,7 +27149,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_principal2salt" >&5
 $as_echo_n "checking for krb5_principal2salt... " >&6; }
-if test "${ac_cv_func_ext_krb5_principal2salt+set}" = set; then :
+if ${ac_cv_func_ext_krb5_principal2salt+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27219,7 +27216,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_use_enctype" >&5
 $as_echo_n "checking for krb5_use_enctype... " >&6; }
-if test "${ac_cv_func_ext_krb5_use_enctype+set}" = set; then :
+if ${ac_cv_func_ext_krb5_use_enctype+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27286,7 +27283,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_string_to_key" >&5
 $as_echo_n "checking for krb5_string_to_key... " >&6; }
-if test "${ac_cv_func_ext_krb5_string_to_key+set}" = set; then :
+if ${ac_cv_func_ext_krb5_string_to_key+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27353,7 +27350,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_pw_salt" >&5
 $as_echo_n "checking for krb5_get_pw_salt... " >&6; }
-if test "${ac_cv_func_ext_krb5_get_pw_salt+set}" = set; then :
+if ${ac_cv_func_ext_krb5_get_pw_salt+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27420,7 +27417,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_string_to_key_salt" >&5
 $as_echo_n "checking for krb5_string_to_key_salt... " >&6; }
-if test "${ac_cv_func_ext_krb5_string_to_key_salt+set}" = set; then :
+if ${ac_cv_func_ext_krb5_string_to_key_salt+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27487,7 +27484,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_auth_con_setkey" >&5
 $as_echo_n "checking for krb5_auth_con_setkey... " >&6; }
-if test "${ac_cv_func_ext_krb5_auth_con_setkey+set}" = set; then :
+if ${ac_cv_func_ext_krb5_auth_con_setkey+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27554,7 +27551,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_auth_con_setuseruserkey" >&5
 $as_echo_n "checking for krb5_auth_con_setuseruserkey... " >&6; }
-if test "${ac_cv_func_ext_krb5_auth_con_setuseruserkey+set}" = set; then :
+if ${ac_cv_func_ext_krb5_auth_con_setuseruserkey+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27619,76 +27616,9 @@
 
     ac_check_func_ext_save_LIBS=$LIBS
     LIBS="$KRB5_LIBS $LIBS"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_locate_kdc" >&5
-$as_echo_n "checking for krb5_locate_kdc... " >&6; }
-if test "${ac_cv_func_ext_krb5_locate_kdc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define krb5_locate_kdc to an innocuous variant, in case <limits.h> declares krb5_locate_kdc.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define krb5_locate_kdc innocuous_krb5_locate_kdc
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char krb5_locate_kdc (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef krb5_locate_kdc
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char krb5_locate_kdc ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_krb5_locate_kdc || defined __stub___krb5_locate_kdc
-choke me
-#endif
-
-int
-main ()
-{
-return krb5_locate_kdc ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_func_ext_krb5_locate_kdc=yes
-else
-  ac_cv_func_ext_krb5_locate_kdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_ext_krb5_locate_kdc" >&5
-$as_echo "$ac_cv_func_ext_krb5_locate_kdc" >&6; }
-    LIBS=$ac_check_func_ext_save_LIBS
-    if test $ac_cv_func_ext_krb5_locate_kdc = yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_KRB5_LOCATE_KDC 1
-_ACEOF
-
-fi
-
-
-    ac_check_func_ext_save_LIBS=$LIBS
-    LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_permitted_enctypes" >&5
 $as_echo_n "checking for krb5_get_permitted_enctypes... " >&6; }
-if test "${ac_cv_func_ext_krb5_get_permitted_enctypes+set}" = set; then :
+if ${ac_cv_func_ext_krb5_get_permitted_enctypes+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27755,7 +27685,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_default_in_tkt_etypes" >&5
 $as_echo_n "checking for krb5_get_default_in_tkt_etypes... " >&6; }
-if test "${ac_cv_func_ext_krb5_get_default_in_tkt_etypes+set}" = set; then :
+if ${ac_cv_func_ext_krb5_get_default_in_tkt_etypes+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27822,7 +27752,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_free_data_contents" >&5
 $as_echo_n "checking for krb5_free_data_contents... " >&6; }
-if test "${ac_cv_func_ext_krb5_free_data_contents+set}" = set; then :
+if ${ac_cv_func_ext_krb5_free_data_contents+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27889,7 +27819,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_principal_get_comp_string" >&5
 $as_echo_n "checking for krb5_principal_get_comp_string... " >&6; }
-if test "${ac_cv_func_ext_krb5_principal_get_comp_string+set}" = set; then :
+if ${ac_cv_func_ext_krb5_principal_get_comp_string+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -27956,7 +27886,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_free_unparsed_name" >&5
 $as_echo_n "checking for krb5_free_unparsed_name... " >&6; }
-if test "${ac_cv_func_ext_krb5_free_unparsed_name+set}" = set; then :
+if ${ac_cv_func_ext_krb5_free_unparsed_name+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28023,7 +27953,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_free_keytab_entry_contents" >&5
 $as_echo_n "checking for krb5_free_keytab_entry_contents... " >&6; }
-if test "${ac_cv_func_ext_krb5_free_keytab_entry_contents+set}" = set; then :
+if ${ac_cv_func_ext_krb5_free_keytab_entry_contents+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28090,7 +28020,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_kt_free_entry" >&5
 $as_echo_n "checking for krb5_kt_free_entry... " >&6; }
-if test "${ac_cv_func_ext_krb5_kt_free_entry+set}" = set; then :
+if ${ac_cv_func_ext_krb5_kt_free_entry+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28157,7 +28087,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_krbhst_init" >&5
 $as_echo_n "checking for krb5_krbhst_init... " >&6; }
-if test "${ac_cv_func_ext_krb5_krbhst_init+set}" = set; then :
+if ${ac_cv_func_ext_krb5_krbhst_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28224,7 +28154,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_krbhst_get_addrinfo" >&5
 $as_echo_n "checking for krb5_krbhst_get_addrinfo... " >&6; }
-if test "${ac_cv_func_ext_krb5_krbhst_get_addrinfo+set}" = set; then :
+if ${ac_cv_func_ext_krb5_krbhst_get_addrinfo+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28291,7 +28221,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_c_enctype_compare" >&5
 $as_echo_n "checking for krb5_c_enctype_compare... " >&6; }
-if test "${ac_cv_func_ext_krb5_c_enctype_compare+set}" = set; then :
+if ${ac_cv_func_ext_krb5_c_enctype_compare+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28358,7 +28288,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_enctypes_compatible_keys" >&5
 $as_echo_n "checking for krb5_enctypes_compatible_keys... " >&6; }
-if test "${ac_cv_func_ext_krb5_enctypes_compatible_keys+set}" = set; then :
+if ${ac_cv_func_ext_krb5_enctypes_compatible_keys+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28425,7 +28355,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_crypto_init" >&5
 $as_echo_n "checking for krb5_crypto_init... " >&6; }
-if test "${ac_cv_func_ext_krb5_crypto_init+set}" = set; then :
+if ${ac_cv_func_ext_krb5_crypto_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28492,7 +28422,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_crypto_destroy" >&5
 $as_echo_n "checking for krb5_crypto_destroy... " >&6; }
-if test "${ac_cv_func_ext_krb5_crypto_destroy+set}" = set; then :
+if ${ac_cv_func_ext_krb5_crypto_destroy+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28559,7 +28489,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_decode_ap_req" >&5
 $as_echo_n "checking for krb5_decode_ap_req... " >&6; }
-if test "${ac_cv_func_ext_krb5_decode_ap_req+set}" = set; then :
+if ${ac_cv_func_ext_krb5_decode_ap_req+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28626,7 +28556,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for free_AP_REQ" >&5
 $as_echo_n "checking for free_AP_REQ... " >&6; }
-if test "${ac_cv_func_ext_free_AP_REQ+set}" = set; then :
+if ${ac_cv_func_ext_free_AP_REQ+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28693,7 +28623,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_verify_checksum" >&5
 $as_echo_n "checking for krb5_verify_checksum... " >&6; }
-if test "${ac_cv_func_ext_krb5_verify_checksum+set}" = set; then :
+if ${ac_cv_func_ext_krb5_verify_checksum+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28760,7 +28690,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_c_verify_checksum" >&5
 $as_echo_n "checking for krb5_c_verify_checksum... " >&6; }
-if test "${ac_cv_func_ext_krb5_c_verify_checksum+set}" = set; then :
+if ${ac_cv_func_ext_krb5_c_verify_checksum+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28827,7 +28757,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_principal_compare_any_realm" >&5
 $as_echo_n "checking for krb5_principal_compare_any_realm... " >&6; }
-if test "${ac_cv_func_ext_krb5_principal_compare_any_realm+set}" = set; then :
+if ${ac_cv_func_ext_krb5_principal_compare_any_realm+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28894,7 +28824,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_parse_name_norealm" >&5
 $as_echo_n "checking for krb5_parse_name_norealm... " >&6; }
-if test "${ac_cv_func_ext_krb5_parse_name_norealm+set}" = set; then :
+if ${ac_cv_func_ext_krb5_parse_name_norealm+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -28961,7 +28891,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_princ_size" >&5
 $as_echo_n "checking for krb5_princ_size... " >&6; }
-if test "${ac_cv_func_ext_krb5_princ_size+set}" = set; then :
+if ${ac_cv_func_ext_krb5_princ_size+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29028,7 +28958,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_init_creds_opt_set_pac_request" >&5
 $as_echo_n "checking for krb5_get_init_creds_opt_set_pac_request... " >&6; }
-if test "${ac_cv_func_ext_krb5_get_init_creds_opt_set_pac_request+set}" = set; then :
+if ${ac_cv_func_ext_krb5_get_init_creds_opt_set_pac_request+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29095,7 +29025,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_renewed_creds" >&5
 $as_echo_n "checking for krb5_get_renewed_creds... " >&6; }
-if test "${ac_cv_func_ext_krb5_get_renewed_creds+set}" = set; then :
+if ${ac_cv_func_ext_krb5_get_renewed_creds+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29162,7 +29092,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_kdc_cred" >&5
 $as_echo_n "checking for krb5_get_kdc_cred... " >&6; }
-if test "${ac_cv_func_ext_krb5_get_kdc_cred+set}" = set; then :
+if ${ac_cv_func_ext_krb5_get_kdc_cred+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29229,7 +29159,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_free_error_contents" >&5
 $as_echo_n "checking for krb5_free_error_contents... " >&6; }
-if test "${ac_cv_func_ext_krb5_free_error_contents+set}" = set; then :
+if ${ac_cv_func_ext_krb5_free_error_contents+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29296,7 +29226,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initialize_krb5_error_table" >&5
 $as_echo_n "checking for initialize_krb5_error_table... " >&6; }
-if test "${ac_cv_func_ext_initialize_krb5_error_table+set}" = set; then :
+if ${ac_cv_func_ext_initialize_krb5_error_table+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29363,7 +29293,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_init_creds_opt_alloc" >&5
 $as_echo_n "checking for krb5_get_init_creds_opt_alloc... " >&6; }
-if test "${ac_cv_func_ext_krb5_get_init_creds_opt_alloc+set}" = set; then :
+if ${ac_cv_func_ext_krb5_get_init_creds_opt_alloc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29430,7 +29360,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_init_creds_opt_free" >&5
 $as_echo_n "checking for krb5_get_init_creds_opt_free... " >&6; }
-if test "${ac_cv_func_ext_krb5_get_init_creds_opt_free+set}" = set; then :
+if ${ac_cv_func_ext_krb5_get_init_creds_opt_free+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29497,7 +29427,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_init_creds_opt_get_error" >&5
 $as_echo_n "checking for krb5_get_init_creds_opt_get_error... " >&6; }
-if test "${ac_cv_func_ext_krb5_get_init_creds_opt_get_error+set}" = set; then :
+if ${ac_cv_func_ext_krb5_get_init_creds_opt_get_error+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29564,7 +29494,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_enctype_to_string" >&5
 $as_echo_n "checking for krb5_enctype_to_string... " >&6; }
-if test "${ac_cv_func_ext_krb5_enctype_to_string+set}" = set; then :
+if ${ac_cv_func_ext_krb5_enctype_to_string+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29631,7 +29561,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_fwd_tgt_creds" >&5
 $as_echo_n "checking for krb5_fwd_tgt_creds... " >&6; }
-if test "${ac_cv_func_ext_krb5_fwd_tgt_creds+set}" = set; then :
+if ${ac_cv_func_ext_krb5_fwd_tgt_creds+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29698,7 +29628,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_auth_con_set_req_cksumtype" >&5
 $as_echo_n "checking for krb5_auth_con_set_req_cksumtype... " >&6; }
-if test "${ac_cv_func_ext_krb5_auth_con_set_req_cksumtype+set}" = set; then :
+if ${ac_cv_func_ext_krb5_auth_con_set_req_cksumtype+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29765,7 +29695,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_creds_opt_alloc" >&5
 $as_echo_n "checking for krb5_get_creds_opt_alloc... " >&6; }
-if test "${ac_cv_func_ext_krb5_get_creds_opt_alloc+set}" = set; then :
+if ${ac_cv_func_ext_krb5_get_creds_opt_alloc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29832,7 +29762,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_creds_opt_set_impersonate" >&5
 $as_echo_n "checking for krb5_get_creds_opt_set_impersonate... " >&6; }
-if test "${ac_cv_func_ext_krb5_get_creds_opt_set_impersonate+set}" = set; then :
+if ${ac_cv_func_ext_krb5_get_creds_opt_set_impersonate+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29899,7 +29829,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_creds" >&5
 $as_echo_n "checking for krb5_get_creds... " >&6; }
-if test "${ac_cv_func_ext_krb5_get_creds+set}" = set; then :
+if ${ac_cv_func_ext_krb5_get_creds+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -29966,7 +29896,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_credentials_for_user" >&5
 $as_echo_n "checking for krb5_get_credentials_for_user... " >&6; }
-if test "${ac_cv_func_ext_krb5_get_credentials_for_user+set}" = set; then :
+if ${ac_cv_func_ext_krb5_get_credentials_for_user+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -30033,7 +29963,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_get_host_realm" >&5
 $as_echo_n "checking for krb5_get_host_realm... " >&6; }
-if test "${ac_cv_func_ext_krb5_get_host_realm+set}" = set; then :
+if ${ac_cv_func_ext_krb5_get_host_realm+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -30100,7 +30030,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_free_host_realm" >&5
 $as_echo_n "checking for krb5_free_host_realm... " >&6; }
-if test "${ac_cv_func_ext_krb5_free_host_realm+set}" = set; then :
+if ${ac_cv_func_ext_krb5_free_host_realm+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -30167,7 +30097,7 @@
     LIBS="$KRB5_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss_get_name_attribute" >&5
 $as_echo_n "checking for gss_get_name_attribute... " >&6; }
-if test "${ac_cv_func_ext_gss_get_name_attribute+set}" = set; then :
+if ${ac_cv_func_ext_gss_get_name_attribute+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -30232,7 +30162,7 @@
   # MIT krb5 1.8 does not expose this call (yet)
   ac_fn_c_check_decl "$LINENO" "krb5_get_credentials_for_user" "ac_cv_have_decl_krb5_get_credentials_for_user" "#include <krb5.h>
 "
-if test "x$ac_cv_have_decl_krb5_get_credentials_for_user" = x""yes; then :
+if test "x$ac_cv_have_decl_krb5_get_credentials_for_user" = xyes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -30247,7 +30177,7 @@
   # but does have the symbol
   ac_fn_c_check_decl "$LINENO" "krb5_auth_con_set_req_cksumtype" "ac_cv_have_decl_krb5_auth_con_set_req_cksumtype" "#include <krb5.h>
 "
-if test "x$ac_cv_have_decl_krb5_auth_con_set_req_cksumtype" = x""yes; then :
+if test "x$ac_cv_have_decl_krb5_auth_con_set_req_cksumtype" = xyes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -30262,7 +30192,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether krb5_ticket contains kvno and enctype" >&5
 $as_echo_n "checking whether krb5_ticket contains kvno and enctype... " >&6; }
-if test "${smb_krb5_cv_ticket_has_keyinfo+set}" = set; then :
+if ${smb_krb5_cv_ticket_has_keyinfo+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30305,7 +30235,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether krb5_get_init_creds_opt_free takes a context argument" >&5
 $as_echo_n "checking whether krb5_get_init_creds_opt_free takes a context argument... " >&6; }
-if test "${smb_krb5_cv_creds_opt_free_context+set}" = set; then :
+if ${smb_krb5_cv_creds_opt_free_context+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30345,7 +30275,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether krb5_verify_checksum takes 7 arguments" >&5
 $as_echo_n "checking whether krb5_verify_checksum takes 7 arguments... " >&6; }
-if test "${smb_krb5_cv_verify_checksum+set}" = set; then :
+if ${smb_krb5_cv_verify_checksum+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30379,7 +30309,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for checksum in krb5_checksum" >&5
 $as_echo_n "checking for checksum in krb5_checksum... " >&6; }
-if test "${samba_cv_HAVE_CHECKSUM_IN_KRB5_CHECKSUM+set}" = set; then :
+if ${samba_cv_HAVE_CHECKSUM_IN_KRB5_CHECKSUM+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30412,7 +30342,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for etype in EncryptedData" >&5
 $as_echo_n "checking for etype in EncryptedData... " >&6; }
-if test "${samba_cv_HAVE_ETYPE_IN_ENCRYPTEDDATA+set}" = set; then :
+if ${samba_cv_HAVE_ETYPE_IN_ENCRYPTEDDATA+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30445,7 +30375,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ticket pointer in krb5_ap_req" >&5
 $as_echo_n "checking for ticket pointer in krb5_ap_req... " >&6; }
-if test "${samba_cv_HAVE_TICKET_POINTER_IN_KRB5_AP_REQ+set}" = set; then :
+if ${samba_cv_HAVE_TICKET_POINTER_IN_KRB5_AP_REQ+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30478,7 +30408,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for e_data pointer in krb5_error" >&5
 $as_echo_n "checking for e_data pointer in krb5_error... " >&6; }
-if test "${samba_cv_HAVE_E_DATA_POINTER_IN_KRB5_ERROR+set}" = set; then :
+if ${samba_cv_HAVE_E_DATA_POINTER_IN_KRB5_ERROR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30511,7 +30441,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_crypto type" >&5
 $as_echo_n "checking for krb5_crypto type... " >&6; }
-if test "${samba_cv_HAVE_KRB5_CRYPTO+set}" = set; then :
+if ${samba_cv_HAVE_KRB5_CRYPTO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30544,7 +30474,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_encrypt_block type" >&5
 $as_echo_n "checking for krb5_encrypt_block type... " >&6; }
-if test "${samba_cv_HAVE_KRB5_ENCRYPT_BLOCK+set}" = set; then :
+if ${samba_cv_HAVE_KRB5_ENCRYPT_BLOCK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30577,7 +30507,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for addrtype in krb5_address" >&5
 $as_echo_n "checking for addrtype in krb5_address... " >&6; }
-if test "${samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS+set}" = set; then :
+if ${samba_cv_HAVE_ADDRTYPE_IN_KRB5_ADDRESS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30610,7 +30540,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for addr_type in krb5_address" >&5
 $as_echo_n "checking for addr_type in krb5_address... " >&6; }
-if test "${samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS+set}" = set; then :
+if ${samba_cv_HAVE_ADDR_TYPE_IN_KRB5_ADDRESS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30643,7 +30573,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for enc_part2 in krb5_ticket" >&5
 $as_echo_n "checking for enc_part2 in krb5_ticket... " >&6; }
-if test "${samba_cv_HAVE_KRB5_TKT_ENC_PART2+set}" = set; then :
+if ${samba_cv_HAVE_KRB5_TKT_ENC_PART2+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -30675,7 +30605,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for keyblock in krb5_creds" >&5
 $as_echo_n "checking for keyblock in krb5_creds... " >&6; }
-if test "${samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS+set}" = set; then :
+if ${samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30708,7 +30638,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for session in krb5_creds" >&5
 $as_echo_n "checking for session in krb5_creds... " >&6; }
-if test "${samba_cv_HAVE_KRB5_SESSION_IN_CREDS+set}" = set; then :
+if ${samba_cv_HAVE_KRB5_SESSION_IN_CREDS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30741,7 +30671,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for keyvalue in krb5_keyblock" >&5
 $as_echo_n "checking for keyvalue in krb5_keyblock... " >&6; }
-if test "${samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE+set}" = set; then :
+if ${samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30775,7 +30705,7 @@
   found_arcfour_hmac=no
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENCTYPE_ARCFOUR_HMAC_MD5" >&5
 $as_echo_n "checking for ENCTYPE_ARCFOUR_HMAC_MD5... " >&6; }
-if test "${samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5+set}" = set; then :
+if ${samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30801,7 +30731,7 @@
 $as_echo "$samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5" >&6; }
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KEYTYPE_ARCFOUR_56" >&5
 $as_echo_n "checking for KEYTYPE_ARCFOUR_56... " >&6; }
-if test "${samba_cv_HAVE_KEYTYPE_ARCFOUR_56+set}" = set; then :
+if ${samba_cv_HAVE_KEYTYPE_ARCFOUR_56+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30836,7 +30766,7 @@
   fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENCTYPE_ARCFOUR_HMAC" >&5
 $as_echo_n "checking for ENCTYPE_ARCFOUR_HMAC... " >&6; }
-if test "${samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC+set}" = set; then :
+if ${samba_cv_HAVE_ENCTYPE_ARCFOUR_HMAC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30869,7 +30799,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AP_OPTS_USE_SUBKEY" >&5
 $as_echo_n "checking for AP_OPTS_USE_SUBKEY... " >&6; }
-if test "${samba_cv_HAVE_AP_OPTS_USE_SUBKEY+set}" = set; then :
+if ${samba_cv_HAVE_AP_OPTS_USE_SUBKEY+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30902,7 +30832,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KV5M_KEYTAB" >&5
 $as_echo_n "checking for KV5M_KEYTAB... " >&6; }
-if test "${samba_cv_HAVE_KV5M_KEYTAB+set}" = set; then :
+if ${samba_cv_HAVE_KV5M_KEYTAB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30935,7 +30865,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KRB5_KU_OTHER_CKSUM" >&5
 $as_echo_n "checking for KRB5_KU_OTHER_CKSUM... " >&6; }
-if test "${samba_cv_HAVE_KRB5_KU_OTHER_CKSUM+set}" = set; then :
+if ${samba_cv_HAVE_KRB5_KU_OTHER_CKSUM+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -30968,7 +30898,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KRB5_KEYUSAGE_APP_DATA_CKSUM" >&5
 $as_echo_n "checking for KRB5_KEYUSAGE_APP_DATA_CKSUM... " >&6; }
-if test "${samba_cv_HAVE_KRB5_KEYUSAGE_APP_DATA_CKSUM+set}" = set; then :
+if ${samba_cv_HAVE_KRB5_KEYUSAGE_APP_DATA_CKSUM+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -31001,7 +30931,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the krb5_princ_component macro" >&5
 $as_echo_n "checking for the krb5_princ_component macro... " >&6; }
-if test "${samba_cv_HAVE_KRB5_PRINC_COMPONENT+set}" = set; then :
+if ${samba_cv_HAVE_KRB5_PRINC_COMPONENT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -31035,7 +30965,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for key in krb5_keytab_entry" >&5
 $as_echo_n "checking for key in krb5_keytab_entry... " >&6; }
-if test "${samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY+set}" = set; then :
+if ${samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEY+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -31068,7 +30998,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for keyblock in krb5_keytab_entry" >&5
 $as_echo_n "checking for keyblock in krb5_keytab_entry... " >&6; }
-if test "${samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK+set}" = set; then :
+if ${samba_cv_HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -31101,7 +31031,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for magic in krb5_address" >&5
 $as_echo_n "checking for magic in krb5_address... " >&6; }
-if test "${samba_cv_HAVE_MAGIC_IN_KRB5_ADDRESS+set}" = set; then :
+if ${samba_cv_HAVE_MAGIC_IN_KRB5_ADDRESS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -31134,15 +31064,15 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WRFILE: keytab support" >&5
 $as_echo_n "checking for WRFILE: keytab support... " >&6; }
-if test "${samba_cv_HAVE_WRFILE_KEYTAB+set}" = set; then :
+if ${samba_cv_HAVE_WRFILE_KEYTAB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
     if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -31178,7 +31108,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_realm type" >&5
 $as_echo_n "checking for krb5_realm type... " >&6; }
-if test "${samba_cv_HAVE_KRB5_REALM_TYPE+set}" = set; then :
+if ${samba_cv_HAVE_KRB5_REALM_TYPE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -31211,7 +31141,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_princ_realm returns krb5_realm or krb5_data" >&5
 $as_echo_n "checking for krb5_princ_realm returns krb5_realm or krb5_data... " >&6; }
-if test "${samba_cv_KRB5_PRINC_REALM_RETURNS_REALM+set}" = set; then :
+if ${samba_cv_KRB5_PRINC_REALM_RETURNS_REALM+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -31247,7 +31177,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_addresses type" >&5
 $as_echo_n "checking for krb5_addresses type... " >&6; }
-if test "${samba_cv_HAVE_KRB5_ADDRESSES+set}" = set; then :
+if ${samba_cv_HAVE_KRB5_ADDRESSES+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -31280,7 +31210,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether krb5_mk_error takes 3 arguments MIT or 9 Heimdal" >&5
 $as_echo_n "checking whether krb5_mk_error takes 3 arguments MIT or 9 Heimdal... " >&6; }
-if test "${samba_cv_HAVE_SHORT_KRB5_MK_ERROR_INTERFACE+set}" = set; then :
+if ${samba_cv_HAVE_SHORT_KRB5_MK_ERROR_INTERFACE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -31315,7 +31245,7 @@
   if test x"$ac_cv_func_ext_krb5_enctype_to_string" = x"yes"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_error_code krb5_enctype_to_string(krb5_context context, krb5_enctype enctype, char **str)" >&5
 $as_echo_n "checking for krb5_error_code krb5_enctype_to_string(krb5_context context, krb5_enctype enctype, char **str)... " >&6; }
-if test "${smb_krb5_cv_enctype_to_string_takes_krb5_context_arg+set}" = set; then :
+if ${smb_krb5_cv_enctype_to_string_takes_krb5_context_arg+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -31332,8 +31262,8 @@
 	if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -31380,7 +31310,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_error_code krb5_enctype_to_string(krb5_enctype enctype, char *str, size_t len)" >&5
 $as_echo_n "checking for krb5_error_code krb5_enctype_to_string(krb5_enctype enctype, char *str, size_t len)... " >&6; }
-if test "${smb_krb5_cv_enctype_to_string_takes_size_t_arg+set}" = set; then :
+if ${smb_krb5_cv_enctype_to_string_takes_size_t_arg+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -31397,8 +31327,8 @@
 	if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -31443,7 +31373,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_principal_get_realm" >&5
 $as_echo_n "checking for krb5_principal_get_realm... " >&6; }
-if test "${samba_cv_HAVE_KRB5_PRINCIPAL_GET_REALM+set}" = set; then :
+if ${samba_cv_HAVE_KRB5_PRINCIPAL_GET_REALM+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -31477,7 +31407,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_princ_realm" >&5
 $as_echo_n "checking for krb5_princ_realm... " >&6; }
-if test "${samba_cv_HAVE_KRB5_PRINC_REALM+set}" = set; then :
+if ${samba_cv_HAVE_KRB5_PRINC_REALM+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -31595,7 +31525,7 @@
     fi
   else
     if test x"$with_ads_support" = x"yes"; then
-	as_fn_error "krb5 libs don't have all features required for Active Directory support" "$LINENO" 5
+	as_fn_error $? "krb5 libs don't have all features required for Active Directory support" "$LINENO" 5
     else
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: krb5 libs don't have all features required for Active Directory support" >&5
 $as_echo "$as_me: WARNING: krb5 libs don't have all features required for Active Directory support" >&2;}
@@ -31644,7 +31574,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nscd_flush_cache in -lnscd" >&5
 $as_echo_n "checking for nscd_flush_cache in -lnscd... " >&6; }
-if test "${ac_cv_lib_ext_nscd_nscd_flush_cache+set}" = set; then :
+if ${ac_cv_lib_ext_nscd_nscd_flush_cache+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -31731,7 +31661,7 @@
   # first test for AD / GSSAPI support being enabled
 	if test x"$have_gssapi" != xyes ; then
 		if test x"$with_dnsupdate_support" = x"yes" ; then
-			as_fn_error "DNS Updates support only possible with AD and GSSAPI support" "$LINENO" 5
+			as_fn_error $? "DNS Updates support only possible with AD and GSSAPI support" "$LINENO" 5
 		else
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: DNS Updates support only possible with AD and GSSAPI support" >&5
 $as_echo "$as_me: DNS Updates support only possible with AD and GSSAPI support" >&6;}
@@ -31744,7 +31674,7 @@
 	for ac_header in uuid/uuid.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "uuid/uuid.h" "ac_cv_header_uuid_uuid_h" "$ac_includes_default"
-if test "x$ac_cv_header_uuid_uuid_h" = x""yes; then :
+if test "x$ac_cv_header_uuid_uuid_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_UUID_UUID_H 1
 _ACEOF
@@ -31757,7 +31687,7 @@
 
 	if test x"$ac_cv_header_uuid_uuid_h" != x"yes"; then
 		if test x"$with_dnsupdate_support" = x"yes"; then
-			as_fn_error "uuid.h is needed to enable DNS Updates support" "$LINENO" 5
+			as_fn_error $? "uuid.h is needed to enable DNS Updates support" "$LINENO" 5
 		else
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: uuid.h is needed to enable DNS Updates support" >&5
 $as_echo "$as_me: uuid.h is needed to enable DNS Updates support" >&6;}
@@ -31778,7 +31708,7 @@
   for ac_func in uuid_generate
 do :
   ac_fn_c_check_func "$LINENO" "uuid_generate" "ac_cv_func_uuid_generate"
-if test "x$ac_cv_func_uuid_generate" = x""yes; then :
+if test "x$ac_cv_func_uuid_generate" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_UUID_GENERATE 1
 _ACEOF
@@ -31810,7 +31740,7 @@
 
 
 	    if test x"$with_dnsupdate_support" = x"yes"; then
-		as_fn_error "libuuid is needed to enable DNS Updates support" "$LINENO" 5
+		as_fn_error $? "libuuid is needed to enable DNS Updates support" "$LINENO" 5
 	    else
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libuuid is needed to enable DNS Updates support" >&5
 $as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
@@ -31823,7 +31753,7 @@
 	    # uuid_generate was not found, try adding libuuid
 	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uuid_generate in -luuid" >&5
 $as_echo_n "checking for uuid_generate in -luuid... " >&6; }
-if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then :
+if ${ac_cv_lib_uuid_uuid_generate+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -31857,7 +31787,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_uuid_uuid_generate" >&5
 $as_echo "$ac_cv_lib_uuid_uuid_generate" >&6; }
-if test "x$ac_cv_lib_uuid_uuid_generate" = x""yes; then :
+if test "x$ac_cv_lib_uuid_uuid_generate" = xyes; then :
 
 		LIBS="-luuid $LIBS"
 
@@ -31883,7 +31813,7 @@
 
 
 	    if test x"$with_dnsupdate_support" = x"yes"; then
-		as_fn_error "libuuid is needed to enable DNS Updates support" "$LINENO" 5
+		as_fn_error $? "libuuid is needed to enable DNS Updates support" "$LINENO" 5
 	    else
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libuuid is needed to enable DNS Updates support" >&5
 $as_echo "$as_me: WARNING: libuuid is needed to enable DNS Updates support" >&2;}
@@ -31972,8 +31902,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -31985,7 +31914,7 @@
 	if test x"$ac_cv_header_security_pam_appl_h" != x"yes" -a \
 		x"$ac_cv_header_pam_pam_appl_h" != x"yes"; then
 		if test x"${try_pam}" = x"yes";then
-			as_fn_error "--with-pam=yes but pam_appl.h not found" "$LINENO" 5
+			as_fn_error $? "--with-pam=yes but pam_appl.h not found" "$LINENO" 5
 		fi
 		use_pam=no
 		create_pam_modules=no
@@ -32000,7 +31929,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_get_data in -lpam" >&5
 $as_echo_n "checking for pam_get_data in -lpam... " >&6; }
-if test "${ac_cv_lib_ext_pam_pam_get_data+set}" = set; then :
+if ${ac_cv_lib_ext_pam_pam_get_data+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -32059,7 +31988,7 @@
 fi
 	if test x"$ac_cv_lib_ext_pam_pam_get_data" != x"yes"; then
 		if test x"${try_pam}" = x"yes";then
-			as_fn_error "--with-pam=yes but libpam not found" "$LINENO" 5
+			as_fn_error $? "--with-pam=yes but libpam not found" "$LINENO" 5
 		fi
 		use_pam=no
 		create_pam_modules=no
@@ -32077,8 +32006,7 @@
 		#endif
 
 "
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -32090,7 +32018,7 @@
 	if test x"$ac_cv_header_security_pam_modules_h" = x"no" -a \
 		x"$ac_cv_header_pam_pam_modules_h" = x"no" ; then
 		if test x"${try_pam}" = x"yes";then
-			as_fn_error "--with-pam=yes but pam_modules.h not found" "$LINENO" 5
+			as_fn_error $? "--with-pam=yes but pam_modules.h not found" "$LINENO" 5
        fi
 		create_pam_modules=no
     fi
@@ -32115,8 +32043,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -32129,8 +32056,7 @@
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -32145,7 +32071,7 @@
     LIBS="$PAM_LIBS $LIBS"
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_vsyslog" >&5
 $as_echo_n "checking for pam_vsyslog... " >&6; }
-if test "${ac_cv_func_ext_pam_vsyslog+set}" = set; then :
+if ${ac_cv_func_ext_pam_vsyslog+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -32337,7 +32263,7 @@
     try_pam_smbpass=$withval
   ;;
   *)
-    as_fn_error "valid options are yes,no,auto" "$LINENO" 5
+    as_fn_error $? "valid options are yes,no,auto" "$LINENO" 5
   ;;
   esac
 
@@ -32351,12 +32277,12 @@
 	# Conditions under which pam_smbpass can't be built.
 	if test x"$BLDSHARED" != xtrue ; then
 		if test x"${try_pam_smbpass}" = xyes ; then
-			as_fn_error "No support for shared modules" "$LINENO" 5
+			as_fn_error $? "No support for shared modules" "$LINENO" 5
 		fi
 		use_pam_smbpass=no
 	elif test x"$create_pam_modules" != xyes ; then
 		if test x"${try_pam_smbpass}" = xyes ; then
-			as_fn_error "No support for PAM MODULES" "$LINENO" 5
+			as_fn_error $? "No support for PAM MODULES" "$LINENO" 5
 		fi
 		use_pam_smbpass=no
 	fi
@@ -32380,7 +32306,7 @@
 if test $with_pam_for_crypt = no; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a crypt that needs truncated salt" >&5
 $as_echo_n "checking for a crypt that needs truncated salt... " >&6; }
-if test "${samba_cv_HAVE_TRUNCATED_SALT+set}" = set; then :
+if ${samba_cv_HAVE_TRUNCATED_SALT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -32476,7 +32402,7 @@
 if test "${with_syslog_facility+set}" = set; then :
   withval=$with_syslog_facility;
   if test "$withval" = "no" ; then
-    as_fn_error "argument to --with-syslog-facility must be a string" "$LINENO" 5
+    as_fn_error $? "argument to --with-syslog-facility must be a string" "$LINENO" 5
   else
      if test "$withval" != "yes" ; then
         syslog_facility="$withval"
@@ -32636,7 +32562,7 @@
 
 # some broken header files need this
 ac_fn_c_check_header_mongrel "$LINENO" "asm/types.h" "ac_cv_header_asm_types_h" "$ac_includes_default"
-if test "x$ac_cv_header_asm_types_h" = x""yes; then :
+if test "x$ac_cv_header_asm_types_h" = xyes; then :
 
 
 $as_echo "#define HAVE_ASM_TYPES_H 1" >>confdefs.h
@@ -32654,7 +32580,7 @@
 for ac_header in sys/fs/vx_quota.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/fs/vx_quota.h" "ac_cv_header_sys_fs_vx_quota_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_fs_vx_quota_h" = x""yes; then :
+if test "x$ac_cv_header_sys_fs_vx_quota_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_FS_VX_QUOTA_H 1
 _ACEOF
@@ -32668,7 +32594,7 @@
 for ac_header in linux/dqblk_xfs.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "linux/dqblk_xfs.h" "ac_cv_header_linux_dqblk_xfs_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_dqblk_xfs_h" = x""yes; then :
+if test "x$ac_cv_header_linux_dqblk_xfs_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LINUX_DQBLK_XFS_H 1
 _ACEOF
@@ -32682,7 +32608,7 @@
 for ac_header in sys/quota.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/quota.h" "ac_cv_header_sys_quota_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_quota_h" = x""yes; then :
+if test "x$ac_cv_header_sys_quota_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_QUOTA_H 1
 _ACEOF
@@ -32696,7 +32622,7 @@
 # if we have xfs quota support <sys/quota.h> (IRIX) we should use it
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XFS QUOTA in <sys/quota.h>" >&5
 $as_echo_n "checking for XFS QUOTA in <sys/quota.h>... " >&6; }
-if test "${samba_cv_HAVE_SYS_QUOTA_XFS+set}" = set; then :
+if ${samba_cv_HAVE_SYS_QUOTA_XFS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -32737,7 +32663,7 @@
 # if we have struct dqblk .dqb_fsoftlimit instead of .dqb_isoftlimit on IRIX
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if struct dqblk has .dqb_fsoftlimit" >&5
 $as_echo_n "checking if struct dqblk has .dqb_fsoftlimit... " >&6; }
-if test "${samba_cv_HAVE_DQB_FSOFTLIMIT+set}" = set; then :
+if ${samba_cv_HAVE_DQB_FSOFTLIMIT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -32780,7 +32706,7 @@
 if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long quotactl(int cmd, char *special, qid_t id, caddr_t addr)" >&5
 $as_echo_n "checking for long quotactl(int cmd, char *special, qid_t id, caddr_t addr)... " >&6; }
-if test "${samba_cv_HAVE_QUOTACTL_4A+set}" = set; then :
+if ${samba_cv_HAVE_QUOTACTL_4A+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -32839,7 +32765,7 @@
 if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int quotactl(const char *path, int cmd, int id, char *addr)" >&5
 $as_echo_n "checking for int quotactl(const char *path, int cmd, int id, char *addr)... " >&6; }
-if test "${samba_cv_HAVE_QUOTACTL_4B+set}" = set; then :
+if ${samba_cv_HAVE_QUOTACTL_4B+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -32899,7 +32825,7 @@
 if test x"$samba_cv_SYSQUOTA_FOUND" != x"yes"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CRAY int quotactl (char *spec, int request, char *arg)" >&5
 $as_echo_n "checking for CRAY int quotactl (char *spec, int request, char *arg)... " >&6; }
-if test "${samba_cv_HAVE_QUOTACTL_3+set}" = set; then :
+if ${samba_cv_HAVE_QUOTACTL_3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -32961,7 +32887,7 @@
 for ac_header in mntent.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "mntent.h" "ac_cv_header_mntent_h" "$ac_includes_default"
-if test "x$ac_cv_header_mntent_h" = x""yes; then :
+if test "x$ac_cv_header_mntent_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MNTENT_H 1
 _ACEOF
@@ -32976,8 +32902,7 @@
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-eval as_val=\$$as_ac_var
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@@ -32991,7 +32916,7 @@
 for ac_header in devnm.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "devnm.h" "ac_cv_header_devnm_h" "$ac_includes_default"
-if test "x$ac_cv_header_devnm_h" = x""yes; then :
+if test "x$ac_cv_header_devnm_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DEVNM_H 1
 _ACEOF
@@ -33005,7 +32930,7 @@
 for ac_func in devnm
 do :
   ac_fn_c_check_func "$LINENO" "devnm" "ac_cv_func_devnm"
-if test "x$ac_cv_func_devnm" = x""yes; then :
+if test "x$ac_cv_func_devnm" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DEVNM 1
 _ACEOF
@@ -33032,7 +32957,7 @@
 if test x"$samba_cv_SYSQUOTA_FOUND" != x"no"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the sys_quota interface works" >&5
 $as_echo_n "checking whether the sys_quota interface works... " >&6; }
-if test "${samba_cv_SYSQUOTA_WORKS+set}" = set; then :
+if ${samba_cv_SYSQUOTA_WORKS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -33090,7 +33015,7 @@
 if test x"$samba_cv_SYSQUOTA_FOUND" != x"no"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the sys_quota interface works with NFS" >&5
 $as_echo_n "checking whether the sys_quota interface works with NFS... " >&6; }
-if test "${samba_cv_SYSQUOTA_WORKS_NFS+set}" = set; then :
+if ${samba_cv_SYSQUOTA_WORKS_NFS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -33137,7 +33062,7 @@
 if test x"$samba_cv_SYSQUOTA_FOUND" != x"no" -a x"$samba_cv_found_xfs_header" = x"yes"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the sys_quota interface works with XFS" >&5
 $as_echo_n "checking whether the sys_quota interface works with XFS... " >&6; }
-if test "${samba_cv_SYSQUOTA_WORKS_XFS+set}" = set; then :
+if ${samba_cv_SYSQUOTA_WORKS_XFS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -33183,7 +33108,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the old quota support works" >&5
 $as_echo_n "checking whether the old quota support works... " >&6; }
-if test "${samba_cv_QUOTA_WORKS+set}" = set; then :
+if ${samba_cv_QUOTA_WORKS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -33293,7 +33218,7 @@
   # SVR4
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking statvfs64 function (SVR4)" >&5
 $as_echo_n "checking statvfs64 function (SVR4)... " >&6; }
-if test "${fu_cv_sys_stat_statvfs64+set}" = set; then :
+if ${fu_cv_sys_stat_statvfs64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -33343,7 +33268,7 @@
   # SVR4
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking statvfs function (SVR4)" >&5
 $as_echo_n "checking statvfs function (SVR4)... " >&6; }
-if test "${fu_cv_sys_stat_statvfs+set}" = set; then :
+if ${fu_cv_sys_stat_statvfs+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -33381,7 +33306,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking that statvfs.f_fsid is an integer" >&5
 $as_echo_n "checking that statvfs.f_fsid is an integer... " >&6; }
-if test "${samba_cv_fsid_int+set}" = set; then :
+if ${samba_cv_fsid_int+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -33416,7 +33341,7 @@
 # systems use f_bsize.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking that statvfs.f_frsize works" >&5
 $as_echo_n "checking that statvfs.f_frsize works... " >&6; }
-if test "${samba_cv_frsize+set}" = set; then :
+if ${samba_cv_frsize+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -33450,7 +33375,7 @@
 # Some systems use f_flag in struct statvfs while others use f_flags
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking that statvfs.statvfs_f_flag works" >&5
 $as_echo_n "checking that statvfs.statvfs_f_flag works... " >&6; }
-if test "${samba_cv_statvfs_f_flag+set}" = set; then :
+if ${samba_cv_statvfs_f_flag+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -33483,7 +33408,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking that statvfs.statvfs_f_flags works" >&5
 $as_echo_n "checking that statvfs.statvfs_f_flags works... " >&6; }
-if test "${samba_cv_statvfs_f_flags+set}" = set; then :
+if ${samba_cv_statvfs_f_flags+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -33518,7 +33443,7 @@
   # DEC Alpha running OSF/1
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 3-argument statfs function (DEC OSF/1)" >&5
 $as_echo_n "checking for 3-argument statfs function (DEC OSF/1)... " >&6; }
-  if test "${fu_cv_sys_stat_statfs3_osf1+set}" = set; then :
+  if ${fu_cv_sys_stat_statfs3_osf1+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -33562,7 +33487,7 @@
 # AIX
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
 $as_echo_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)... " >&6; }
-  if test "${fu_cv_sys_stat_statfs2_bsize+set}" = set; then :
+  if ${fu_cv_sys_stat_statfs2_bsize+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -33612,7 +33537,7 @@
 # SVR3
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
 $as_echo_n "checking for four-argument statfs (AIX-3.2.5, SVR3)... " >&6; }
-  if test "${fu_cv_sys_stat_statfs4+set}" = set; then :
+  if ${fu_cv_sys_stat_statfs4+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -33653,7 +33578,7 @@
 # 4.4BSD and NetBSD
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
 $as_echo_n "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)... " >&6; }
-  if test "${fu_cv_sys_stat_statfs2_fsize+set}" = set; then :
+  if ${fu_cv_sys_stat_statfs2_fsize+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -33700,7 +33625,7 @@
   # Ultrix
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
 $as_echo_n "checking for two-argument statfs with struct fs_data (Ultrix)... " >&6; }
-  if test "${fu_cv_sys_stat_fs_data+set}" = set; then :
+  if ${fu_cv_sys_stat_fs_data+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -33858,8 +33783,7 @@
 #include <ctdb.h>
 
 "
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -33888,7 +33812,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CTDB_CONTROL_TRANS3_COMMIT declaration" >&5
 $as_echo_n "checking for CTDB_CONTROL_TRANS3_COMMIT declaration... " >&6; }
-if test "${ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl+set}" = set; then :
+if ${ac_cv_have_CTDB_CONTROL_TRANS3_COMMIT_decl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -33938,7 +33862,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CTDB_CONTROL_SCHEDULE_FOR_DELETION declaration" >&5
 $as_echo_n "checking for CTDB_CONTROL_SCHEDULE_FOR_DELETION declaration... " >&6; }
-if test "${ac_cv_have_CTDB_CONTROL_SCHEDULE_FOR_DELETION_decl+set}" = set; then :
+if ${ac_cv_have_CTDB_CONTROL_SCHEDULE_FOR_DELETION_decl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -34005,7 +33929,7 @@
 	#include <ctdb_private.h>
 
 "
-if test "x$ac_cv_type_struct_ctdb_tcp_client" = x""yes; then :
+if test "x$ac_cv_type_struct_ctdb_tcp_client" = xyes; then :
 
 
 $as_echo "#define ctdb_control_tcp ctdb_tcp_client" >>confdefs.h
@@ -34028,7 +33952,7 @@
 	#include <ctdb_private.h>
 
 "
-if test "x$ac_cv_type_struct_ctdb_control_tcp" = x""yes; then :
+if test "x$ac_cv_type_struct_ctdb_control_tcp" = xyes; then :
 
 
 $as_echo "#define HAVE_STRUCT_CTDB_CONTROL_TCP 1" >>confdefs.h
@@ -34057,7 +33981,7 @@
 	#include <ctdb_private.h>
 
 "
-if test "x$ac_cv_type_struct_ctdb_control_tcp_addr" = x""yes; then :
+if test "x$ac_cv_type_struct_ctdb_control_tcp_addr" = xyes; then :
 
 
 $as_echo "#define HAVE_STRUCT_CTDB_CONTROL_TCP_ADDR 1" >>confdefs.h
@@ -34074,7 +33998,7 @@
 if test x"$have_cluster_support" = "xno" ; then
 	case "$with_cluster_support" in
 	yes)
-		as_fn_error "\"cluster support not available: $ctdb_broken\"" "$LINENO" 5
+		as_fn_error $? "\"cluster support not available: $ctdb_broken\"" "$LINENO" 5
 		;;
 	auto)
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"cluster support not available: $ctdb_broken\"" >&5
@@ -34104,7 +34028,7 @@
 do :
   ac_fn_c_check_header_compile "$LINENO" "linux/netlink.h" "ac_cv_header_linux_netlink_h" "#include <bits/sockaddr.h>
 "
-if test "x$ac_cv_header_linux_netlink_h" = x""yes; then :
+if test "x$ac_cv_header_linux_netlink_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LINUX_NETLINK_H 1
 _ACEOF
@@ -34113,7 +34037,7 @@
   ac_fn_c_check_header_compile "$LINENO" "linux/rtnetlink.h" "ac_cv_header_linux_rtnetlink_h" "#include <bits/sockaddr.h>
                     #include <linux/netlink.h>
 "
-if test "x$ac_cv_header_linux_rtnetlink_h" = x""yes; then :
+if test "x$ac_cv_header_linux_rtnetlink_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LINUX_RTNETLINK_H 1
 _ACEOF
@@ -34220,7 +34144,7 @@
 	*)
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lacl" >&5
 $as_echo_n "checking for acl_get_file in -lacl... " >&6; }
-if test "${ac_cv_lib_acl_acl_get_file+set}" = set; then :
+if ${ac_cv_lib_acl_acl_get_file+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -34254,7 +34178,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_get_file" >&5
 $as_echo "$ac_cv_lib_acl_acl_get_file" >&6; }
-if test "x$ac_cv_lib_acl_acl_get_file" = x""yes; then :
+if test "x$ac_cv_lib_acl_acl_get_file" = xyes; then :
   ACL_LIBS="$ACL_LIBS -lacl"
 fi
 
@@ -34262,7 +34186,7 @@
 		*linux*)
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getxattr in -lattr" >&5
 $as_echo_n "checking for getxattr in -lattr... " >&6; }
-if test "${ac_cv_lib_attr_getxattr+set}" = set; then :
+if ${ac_cv_lib_attr_getxattr+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -34296,7 +34220,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_getxattr" >&5
 $as_echo "$ac_cv_lib_attr_getxattr" >&6; }
-if test "x$ac_cv_lib_attr_getxattr" = x""yes; then :
+if test "x$ac_cv_lib_attr_getxattr" = xyes; then :
   ACL_LIBS="$ACL_LIBS -lattr"
 fi
 
@@ -34304,7 +34228,7 @@
 		esac
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX ACL support" >&5
 $as_echo_n "checking for POSIX ACL support... " >&6; }
-if test "${samba_cv_HAVE_POSIX_ACLS+set}" = set; then :
+if ${samba_cv_HAVE_POSIX_ACLS+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -34349,7 +34273,7 @@
 
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_perm_np" >&5
 $as_echo_n "checking for acl_get_perm_np... " >&6; }
-if test "${samba_cv_HAVE_ACL_GET_PERM_NP+set}" = set; then :
+if ${samba_cv_HAVE_ACL_GET_PERM_NP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -34407,7 +34331,7 @@
 case "$host_os" in
 *freebsd*)
     ac_fn_c_check_header_mongrel "$LINENO" "sunacl.h" "ac_cv_header_sunacl_h" "$ac_includes_default"
-if test "x$ac_cv_header_sunacl_h" = x""yes; then :
+if test "x$ac_cv_header_sunacl_h" = xyes; then :
 
 fi
 
@@ -34442,7 +34366,7 @@
 		no_rt_LIBS=$LIBS
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for aio_read in -lrt" >&5
 $as_echo_n "checking for aio_read in -lrt... " >&6; }
-if test "${ac_cv_lib_rt_aio_read+set}" = set; then :
+if ${ac_cv_lib_rt_aio_read+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -34476,14 +34400,14 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_aio_read" >&5
 $as_echo "$ac_cv_lib_rt_aio_read" >&6; }
-if test "x$ac_cv_lib_rt_aio_read" = x""yes; then :
+if test "x$ac_cv_lib_rt_aio_read" = xyes; then :
   AIO_LIBS="$LIBS -lrt"
 fi
 
 		LIBS=$no_rt_LIBS
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for aio_read in -laio" >&5
 $as_echo_n "checking for aio_read in -laio... " >&6; }
-if test "${ac_cv_lib_aio_aio_read+set}" = set; then :
+if ${ac_cv_lib_aio_aio_read+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -34517,13 +34441,13 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aio_aio_read" >&5
 $as_echo "$ac_cv_lib_aio_aio_read" >&6; }
-if test "x$ac_cv_lib_aio_aio_read" = x""yes; then :
+if test "x$ac_cv_lib_aio_aio_read" = xyes; then :
   AIO_LIBS="$LIBS -laio"
 fi
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for asynchronous io support" >&5
 $as_echo_n "checking for asynchronous io support... " >&6; }
-if test "${samba_cv_HAVE_AIO+set}" = set; then :
+if ${samba_cv_HAVE_AIO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -34554,7 +34478,7 @@
 $as_echo "$samba_cv_HAVE_AIO" >&6; }
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit asynchronous io support" >&5
 $as_echo_n "checking for 64-bit asynchronous io support... " >&6; }
-if test "${samba_cv_HAVE_AIO64+set}" = set; then :
+if ${samba_cv_HAVE_AIO64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -34914,7 +34838,7 @@
 	*linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for linux sendfile64 support" >&5
 $as_echo_n "checking for linux sendfile64 support... " >&6; }
-if test "${samba_cv_HAVE_SENDFILE64+set}" = set; then :
+if ${samba_cv_HAVE_SENDFILE64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -34947,7 +34871,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for linux sendfile support" >&5
 $as_echo_n "checking for linux sendfile support... " >&6; }
-if test "${samba_cv_HAVE_SENDFILE+set}" = set; then :
+if ${samba_cv_HAVE_SENDFILE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -34981,7 +34905,7 @@
 # Try and cope with broken Linux sendfile....
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken linux sendfile support" >&5
 $as_echo_n "checking for broken linux sendfile support... " >&6; }
-if test "${samba_cv_HAVE_BROKEN_LINUX_SENDFILE+set}" = set; then :
+if ${samba_cv_HAVE_BROKEN_LINUX_SENDFILE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -35052,7 +34976,7 @@
 	*freebsd* | *dragonfly* )
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for freebsd sendfile support" >&5
 $as_echo_n "checking for freebsd sendfile support... " >&6; }
-if test "${samba_cv_HAVE_SENDFILE+set}" = set; then :
+if ${samba_cv_HAVE_SENDFILE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -35113,7 +35037,7 @@
 	*hpux*)
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hpux sendfile64 support" >&5
 $as_echo_n "checking for hpux sendfile64 support... " >&6; }
-if test "${samba_cv_HAVE_SENDFILE64+set}" = set; then :
+if ${samba_cv_HAVE_SENDFILE64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -35168,7 +35092,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hpux sendfile support" >&5
 $as_echo_n "checking for hpux sendfile support... " >&6; }
-if test "${samba_cv_HAVE_SENDFILE+set}" = set; then :
+if ${samba_cv_HAVE_SENDFILE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -35225,7 +35149,7 @@
 	*solaris*)
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sendfilev in -lsendfile" >&5
 $as_echo_n "checking for sendfilev in -lsendfile... " >&6; }
-if test "${ac_cv_lib_sendfile_sendfilev+set}" = set; then :
+if ${ac_cv_lib_sendfile_sendfilev+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -35259,7 +35183,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sendfile_sendfilev" >&5
 $as_echo "$ac_cv_lib_sendfile_sendfilev" >&6; }
-if test "x$ac_cv_lib_sendfile_sendfilev" = x""yes; then :
+if test "x$ac_cv_lib_sendfile_sendfilev" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSENDFILE 1
 _ACEOF
@@ -35270,7 +35194,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for solaris sendfilev64 support" >&5
 $as_echo_n "checking for solaris sendfilev64 support... " >&6; }
-if test "${samba_cv_HAVE_SENDFILEV64+set}" = set; then :
+if ${samba_cv_HAVE_SENDFILEV64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -35333,7 +35257,7 @@
 
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for solaris sendfilev support" >&5
 $as_echo_n "checking for solaris sendfilev support... " >&6; }
-if test "${samba_cv_HAVE_SENDFILEV+set}" = set; then :
+if ${samba_cv_HAVE_SENDFILEV+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -35397,7 +35321,7 @@
 	*aix*)
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AIX send_file support" >&5
 $as_echo_n "checking for AIX send_file support... " >&6; }
-if test "${samba_cv_HAVE_SENDFILE+set}" = set; then :
+if ${samba_cv_HAVE_SENDFILE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -35475,7 +35399,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux readahead" >&5
 $as_echo_n "checking for Linux readahead... " >&6; }
-if test "${samba_cv_HAVE_LINUX_READAHEAD+set}" = set; then :
+if ${samba_cv_HAVE_LINUX_READAHEAD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -35514,7 +35438,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readahead declaration" >&5
 $as_echo_n "checking for readahead declaration... " >&6; }
-if test "${ac_cv_have_readahead_decl+set}" = set; then :
+if ${ac_cv_have_readahead_decl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -35550,7 +35474,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for posix_fadvise" >&5
 $as_echo_n "checking for posix_fadvise... " >&6; }
-if test "${samba_cv_HAVE_POSIX_FADVISE+set}" = set; then :
+if ${samba_cv_HAVE_POSIX_FADVISE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -35593,7 +35517,7 @@
 *linux*)
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Linux splice" >&5
 $as_echo_n "checking for Linux splice... " >&6; }
-if test "${samba_cv_HAVE_LINUX_SPLICE+set}" = set; then :
+if ${samba_cv_HAVE_LINUX_SPLICE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -35637,7 +35561,7 @@
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for splice declaration" >&5
 $as_echo_n "checking for splice declaration... " >&6; }
-if test "${ac_cv_have_splice_decl+set}" = set; then :
+if ${ac_cv_have_splice_decl+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -35673,7 +35597,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a broken readlink syscall" >&5
 $as_echo_n "checking for a broken readlink syscall... " >&6; }
-if test "${samba_cv_HAVE_BROKEN_READLINK+set}" = set; then :
+if ${samba_cv_HAVE_BROKEN_READLINK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -35850,7 +35774,7 @@
 if test x"$HAVE_WBCLIENT" = x"yes"; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wbcInterfaceDetails in -lwbclient" >&5
 $as_echo_n "checking for wbcInterfaceDetails in -lwbclient... " >&6; }
-if test "${ac_cv_lib_wbclient_wbcInterfaceDetails+set}" = set; then :
+if ${ac_cv_lib_wbclient_wbcInterfaceDetails+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -35884,10 +35808,10 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wbclient_wbcInterfaceDetails" >&5
 $as_echo "$ac_cv_lib_wbclient_wbcInterfaceDetails" >&6; }
-if test "x$ac_cv_lib_wbclient_wbcInterfaceDetails" = x""yes; then :
+if test "x$ac_cv_lib_wbclient_wbcInterfaceDetails" = xyes; then :
   LIBWBCLIENT_LIBS="-lwbclient"
 else
-  as_fn_error "Could not find wbclient" "$LINENO" 5
+  as_fn_error $? "Could not find wbclient" "$LINENO" 5
 fi
 
 	LIBWBCLIENT_LIBS="$LIBWBCLIENT_LIBS $WBCLIENT_LDFLAGS"
@@ -35948,7 +35872,7 @@
 		 #endif
 
 "
-if test "x$ac_cv_header_krb5_locate_plugin_h" = x""yes; then :
+if test "x$ac_cv_header_krb5_locate_plugin_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_KRB5_LOCATE_PLUGIN_H 1
 _ACEOF
@@ -35980,7 +35904,7 @@
 # Solaris 10 does have new member in nss_XbyY_key
 ac_fn_c_check_member "$LINENO" "union nss_XbyY_key" "ipnode.af_family" "ac_cv_member_union_nss_XbyY_key_ipnode_af_family" "#include <nss_dbdefs.h>
 "
-if test "x$ac_cv_member_union_nss_XbyY_key_ipnode_af_family" = x""yes; then :
+if test "x$ac_cv_member_union_nss_XbyY_key_ipnode_af_family" = xyes; then :
 
 $as_echo "#define HAVE_NSS_XBYY_KEY_IPNODE 1" >>confdefs.h
 
@@ -35992,7 +35916,7 @@
 
 ac_fn_c_check_member "$LINENO" "struct passwd" "pw_comment" "ac_cv_member_struct_passwd_pw_comment" "#include <pwd.h>
 "
-if test "x$ac_cv_member_struct_passwd_pw_comment" = x""yes; then :
+if test "x$ac_cv_member_struct_passwd_pw_comment" = xyes; then :
 
 $as_echo "#define HAVE_PASSWD_PW_COMMENT 1" >>confdefs.h
 
@@ -36001,7 +35925,7 @@
 
 ac_fn_c_check_member "$LINENO" "struct passwd" "pw_age" "ac_cv_member_struct_passwd_pw_age" "#include <pwd.h>
 "
-if test "x$ac_cv_member_struct_passwd_pw_age" = x""yes; then :
+if test "x$ac_cv_member_struct_passwd_pw_age" = xyes; then :
 
 $as_echo "#define HAVE_PASSWD_PW_AGE 1" >>confdefs.h
 
@@ -36012,7 +35936,7 @@
 # struct secmethod_table as AIX 5.2
 ac_fn_c_check_member "$LINENO" "struct secmethod_table" "method_attrlist" "ac_cv_member_struct_secmethod_table_method_attrlist" "#include <usersec.h>
 "
-if test "x$ac_cv_member_struct_secmethod_table_method_attrlist" = x""yes; then :
+if test "x$ac_cv_member_struct_secmethod_table_method_attrlist" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_ATTRLIST 1
@@ -36023,7 +35947,7 @@
 
 ac_fn_c_check_member "$LINENO" "struct secmethod_table" "method_version" "ac_cv_member_struct_secmethod_table_method_version" "#include <usersec.h>
 "
-if test "x$ac_cv_member_struct_secmethod_table_method_version" = x""yes; then :
+if test "x$ac_cv_member_struct_secmethod_table_method_version" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SECMETHOD_TABLE_METHOD_VERSION 1
@@ -36035,7 +35959,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SO_PEERCRED" >&5
 $as_echo_n "checking for SO_PEERCRED... " >&6; }
-if test "${samba_cv_HAVE_PEERCRED+set}" = set; then :
+if ${samba_cv_HAVE_PEERCRED+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -36071,7 +35995,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpeereid" >&5
 $as_echo_n "checking for getpeereid... " >&6; }
-if test "${samba_cv_HAVE_GETPEEREID+set}" = set; then :
+if ${samba_cv_HAVE_GETPEEREID+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -36126,7 +36050,7 @@
 if test x"$INCLUDED_POPT" != x"yes"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poptGetContext in -lpopt" >&5
 $as_echo_n "checking for poptGetContext in -lpopt... " >&6; }
-if test "${ac_cv_lib_popt_poptGetContext+set}" = set; then :
+if ${ac_cv_lib_popt_poptGetContext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -36160,7 +36084,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_popt_poptGetContext" >&5
 $as_echo "$ac_cv_lib_popt_poptGetContext" >&6; }
-if test "x$ac_cv_lib_popt_poptGetContext" = x""yes; then :
+if test "x$ac_cv_lib_popt_poptGetContext" = xyes; then :
   INCLUDED_POPT=no
 else
   INCLUDED_POPT=yes
@@ -36202,7 +36126,7 @@
     for ac_header in dns_sd.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "dns_sd.h" "ac_cv_header_dns_sd_h" "$ac_includes_default"
-if test "x$ac_cv_header_dns_sd_h" = x""yes; then :
+if test "x$ac_cv_header_dns_sd_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DNS_SD_H 1
 _ACEOF
@@ -36220,7 +36144,7 @@
     for ac_func in DNSServiceRegister
 do :
   ac_fn_c_check_func "$LINENO" "DNSServiceRegister" "ac_cv_func_DNSServiceRegister"
-if test "x$ac_cv_func_DNSServiceRegister" = x""yes; then :
+if test "x$ac_cv_func_DNSServiceRegister" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DNSSERVICEREGISTER 1
 _ACEOF
@@ -36237,7 +36161,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DNSServiceRegister in -ldns_sd" >&5
 $as_echo_n "checking for DNSServiceRegister in -ldns_sd... " >&6; }
-if test "${ac_cv_lib_ext_dns_sd_DNSServiceRegister+set}" = set; then :
+if ${ac_cv_lib_ext_dns_sd_DNSServiceRegister+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -36305,7 +36229,7 @@
 
     else
     	if test x"$enable_dnssd" = x"yes"; then
-	    as_fn_error "DNS service discovery support not available" "$LINENO" 5
+	    as_fn_error $? "DNS service discovery support not available" "$LINENO" 5
 	fi
     fi
 
@@ -36326,7 +36250,7 @@
     for ac_header in avahi-common/watch.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "avahi-common/watch.h" "ac_cv_header_avahi_common_watch_h" "$ac_includes_default"
-if test "x$ac_cv_header_avahi_common_watch_h" = x""yes; then :
+if test "x$ac_cv_header_avahi_common_watch_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_AVAHI_COMMON_WATCH_H 1
 _ACEOF
@@ -36342,7 +36266,7 @@
     for ac_header in avahi-client/client.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "avahi-client/client.h" "ac_cv_header_avahi_client_client_h" "$ac_includes_default"
-if test "x$ac_cv_header_avahi_client_client_h" = x""yes; then :
+if test "x$ac_cv_header_avahi_client_client_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_AVAHI_CLIENT_CLIENT_H 1
 _ACEOF
@@ -36358,7 +36282,7 @@
     save_LIBS="$LIBS"
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avahi_client_new in -lavahi-client" >&5
 $as_echo_n "checking for avahi_client_new in -lavahi-client... " >&6; }
-if test "${ac_cv_lib_avahi_client_avahi_client_new+set}" = set; then :
+if ${ac_cv_lib_avahi_client_avahi_client_new+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -36392,13 +36316,13 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avahi_client_avahi_client_new" >&5
 $as_echo "$ac_cv_lib_avahi_client_avahi_client_new" >&6; }
-if test "x$ac_cv_lib_avahi_client_avahi_client_new" = x""yes; then :
+if test "x$ac_cv_lib_avahi_client_avahi_client_new" = xyes; then :
   have_avahi_client_new=yes
 fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avahi_strerror in -lavahi-common" >&5
 $as_echo_n "checking for avahi_strerror in -lavahi-common... " >&6; }
-if test "${ac_cv_lib_avahi_common_avahi_strerror+set}" = set; then :
+if ${ac_cv_lib_avahi_common_avahi_strerror+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -36432,7 +36356,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avahi_common_avahi_strerror" >&5
 $as_echo "$ac_cv_lib_avahi_common_avahi_strerror" >&6; }
-if test "x$ac_cv_lib_avahi_common_avahi_strerror" = x""yes; then :
+if test "x$ac_cv_lib_avahi_common_avahi_strerror" = xyes; then :
   have_avahi_strerror=yes
 fi
 
@@ -36453,7 +36377,7 @@
 
     else
 	if test x"$enable_avahi" = x"yes"; then
-	    as_fn_error "avahi support not available" "$LINENO" 5
+	    as_fn_error $? "avahi support not available" "$LINENO" 5
 	fi
     fi
 fi
@@ -36470,7 +36394,7 @@
 if test "x$PTHREAD_LDFLAGS" = xerror; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in -lpthread" >&5
 $as_echo_n "checking for pthread_attr_init in -lpthread... " >&6; }
-if test "${ac_cv_lib_pthread_pthread_attr_init+set}" = set; then :
+if ${ac_cv_lib_pthread_pthread_attr_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -36504,7 +36428,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_attr_init" >&5
 $as_echo "$ac_cv_lib_pthread_pthread_attr_init" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_attr_init" = x""yes; then :
+if test "x$ac_cv_lib_pthread_pthread_attr_init" = xyes; then :
 
 	     PTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
 	     PTHREAD_LDFLAGS="-lpthread"
@@ -36515,7 +36439,7 @@
 if test "x$PTHREAD_LDFLAGS" = xerror; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in -lpthreads" >&5
 $as_echo_n "checking for pthread_attr_init in -lpthreads... " >&6; }
-if test "${ac_cv_lib_pthreads_pthread_attr_init+set}" = set; then :
+if ${ac_cv_lib_pthreads_pthread_attr_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -36549,7 +36473,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_pthread_attr_init" >&5
 $as_echo "$ac_cv_lib_pthreads_pthread_attr_init" >&6; }
-if test "x$ac_cv_lib_pthreads_pthread_attr_init" = x""yes; then :
+if test "x$ac_cv_lib_pthreads_pthread_attr_init" = xyes; then :
 
 	     PTHREAD_CFLAGS="-D_THREAD_SAFE"
 	     PTHREAD_LDFLAGS="-lpthreads"
@@ -36560,7 +36484,7 @@
 if test "x$PTHREAD_LDFLAGS" = xerror; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_attr_init in -lc_r" >&5
 $as_echo_n "checking for pthread_attr_init in -lc_r... " >&6; }
-if test "${ac_cv_lib_c_r_pthread_attr_init+set}" = set; then :
+if ${ac_cv_lib_c_r_pthread_attr_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -36594,7 +36518,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_attr_init" >&5
 $as_echo "$ac_cv_lib_c_r_pthread_attr_init" >&6; }
-if test "x$ac_cv_lib_c_r_pthread_attr_init" = x""yes; then :
+if test "x$ac_cv_lib_c_r_pthread_attr_init" = xyes; then :
 
 		PTHREAD_CFLAGS="-D_THREAD_SAFE -pthread"
 		PTHREAD_LDFLAGS="-pthread"
@@ -36604,7 +36528,7 @@
 
 if test "x$PTHREAD_LDFLAGS" = xerror; then
    ac_fn_c_check_func "$LINENO" "pthread_attr_init" "ac_cv_func_pthread_attr_init"
-if test "x$ac_cv_func_pthread_attr_init" = x""yes; then :
+if test "x$ac_cv_func_pthread_attr_init" = xyes; then :
 
 		 PTHREAD_CFLAGS="-D_REENTRANT"
 		 PTHREAD_LDFLAGS="-lpthread"
@@ -36617,7 +36541,7 @@
 if test "x$PTHREAD_LDFLAGS" = xerror; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_lock in -lpthread" >&5
 $as_echo_n "checking for pthread_mutex_lock in -lpthread... " >&6; }
-if test "${ac_cv_lib_pthread_pthread_mutex_lock+set}" = set; then :
+if ${ac_cv_lib_pthread_pthread_mutex_lock+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -36651,7 +36575,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_mutex_lock" >&5
 $as_echo "$ac_cv_lib_pthread_pthread_mutex_lock" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_mutex_lock" = x""yes; then :
+if test "x$ac_cv_lib_pthread_pthread_mutex_lock" = xyes; then :
 
 		PTHREAD_CFLAGS="-D_REENTRANT"
 		PTHREAD_LDFLAGS="-lpthread"
@@ -36673,7 +36597,7 @@
 	for ac_header in pthread.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
-if test "x$ac_cv_header_pthread_h" = x""yes; then :
+if test "x$ac_cv_header_pthread_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PTHREAD_H 1
 _ACEOF
@@ -36699,7 +36623,7 @@
 
 
 if test x"$enable_pthreadpool" = xyes -a x"$samba_cv_HAVE_PTHREAD" != x"yes"; then
-	as_fn_error "pthreadpool support cannot be enabled when pthread support was not found" "$LINENO" 5
+	as_fn_error $? "pthreadpool support cannot be enabled when pthread support was not found" "$LINENO" 5
 fi
 
 if test x"$enable_pthreadpool" = x"yes" -a x"$samba_cv_HAVE_PTHREAD" = x"yes"; then
@@ -36737,7 +36661,7 @@
 if test x"$INCLUDED_INIPARSER" != x"yes"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iniparser_load in -liniparser" >&5
 $as_echo_n "checking for iniparser_load in -liniparser... " >&6; }
-if test "${ac_cv_lib_iniparser_iniparser_load+set}" = set; then :
+if ${ac_cv_lib_iniparser_iniparser_load+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -36771,7 +36695,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iniparser_iniparser_load" >&5
 $as_echo "$ac_cv_lib_iniparser_iniparser_load" >&6; }
-if test "x$ac_cv_lib_iniparser_iniparser_load" = x""yes; then :
+if test "x$ac_cv_lib_iniparser_iniparser_load" = xyes; then :
   INCLUDED_INIPARSER=no
 else
   INCLUDED_INIPARSER=yes
@@ -36805,7 +36729,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setnetgrent prototype" >&5
 $as_echo_n "checking for setnetgrent prototype... " >&6; }
-if test "${samba_cv_setnetgrent_prototype+set}" = set; then :
+if ${samba_cv_setnetgrent_prototype+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -36839,7 +36763,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getnetgrent prototype" >&5
 $as_echo_n "checking for getnetgrent prototype... " >&6; }
-if test "${samba_cv_getnetgrent_prototype+set}" = set; then :
+if ${samba_cv_getnetgrent_prototype+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -36873,7 +36797,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for endnetgrent prototype" >&5
 $as_echo_n "checking for endnetgrent prototype... " >&6; }
-if test "${samba_cv_endnetgrent_prototype+set}" = set; then :
+if ${samba_cv_endnetgrent_prototype+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -36911,7 +36835,7 @@
 # Checks for the vfs_fileid module
 # Start
 ac_fn_c_check_func "$LINENO" "getmntent" "ac_cv_func_getmntent"
-if test "x$ac_cv_func_getmntent" = x""yes; then :
+if test "x$ac_cv_func_getmntent" = xyes; then :
 
 fi
 
@@ -36919,7 +36843,7 @@
 for ac_header in sys/statfs.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/statfs.h" "ac_cv_header_sys_statfs_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_statfs_h" = x""yes; then :
+if test "x$ac_cv_header_sys_statfs_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_STATFS_H 1
 _ACEOF
@@ -36931,7 +36855,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking vfs_fileid: checking for statfs() and struct statfs.f_fsid)" >&5
 $as_echo_n "checking vfs_fileid: checking for statfs() and struct statfs.f_fsid)... " >&6; }
-if test "${vfsfileid_cv_statfs+set}" = set; then :
+if ${vfsfileid_cv_statfs+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -40296,7 +40220,7 @@
 for ac_header in zlib.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = x""yes; then :
+if test "x$ac_cv_header_zlib_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ZLIB_H 1
 _ACEOF
@@ -40315,7 +40239,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlibVersion in -lz" >&5
 $as_echo_n "checking for zlibVersion in -lz... " >&6; }
-if test "${ac_cv_lib_ext_z_zlibVersion+set}" = set; then :
+if ${ac_cv_lib_ext_z_zlibVersion+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -40375,7 +40299,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib >= 1.2.3" >&5
 $as_echo_n "checking for zlib >= 1.2.3... " >&6; }
-if test "${samba_cv_zlib_1_2_3+set}" = set; then :
+if ${samba_cv_zlib_1_2_3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -40580,7 +40504,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  as_fn_error "summary failure. Aborting config" "$LINENO" 5; exit 1;
+  as_fn_error $? "summary failure. Aborting config" "$LINENO" 5; exit 1;
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
@@ -40670,10 +40594,21 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -40689,6 +40624,7 @@
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -40706,7 +40642,7 @@
 
 
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -40807,6 +40743,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -40852,19 +40789,19 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error ERROR [LINENO LOG_FD]
-# ---------------------------------
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with status $?, using 1 if that was 0.
+# script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$?; test $as_status -eq 0 && as_status=1
-  if test "$3"; then
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  $as_echo "$as_me: error: $1" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -41060,7 +40997,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -41114,7 +41051,7 @@
 # values after options handling.
 ac_log="
 This file was extended by Samba $as_me 3, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -41180,10 +41117,10 @@
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 Samba config.status 3
-configured by $0, generated by GNU Autoconf 2.65,
+configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -41200,11 +41137,16 @@
 while test $# != 0
 do
   case $1 in
-  --*=*)
+  --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -41226,6 +41168,7 @@
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -41238,7 +41181,7 @@
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error "ambiguous option: \`$1'
+    as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -41247,7 +41190,7 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error "unrecognized option: \`$1'
+  -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -41325,7 +41268,7 @@
     "pkgconfig/smbsharemodes.pc") CONFIG_FILES="$CONFIG_FILES pkgconfig/smbsharemodes.pc" ;;
     "../examples/libsmbclient/Makefile.internal") CONFIG_FILES="$CONFIG_FILES ../examples/libsmbclient/Makefile.internal" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -41348,9 +41291,10 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -41358,12 +41302,13 @@
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -41380,12 +41325,12 @@
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\r'
+  ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -41394,18 +41339,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -41413,7 +41358,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -41461,7 +41406,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -41493,21 +41438,29 @@
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
 s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -41519,7 +41472,7 @@
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -41531,11 +41484,11 @@
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -41620,7 +41573,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -41633,7 +41586,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -41652,7 +41605,7 @@
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -41661,7 +41614,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -41687,8 +41640,8 @@
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -41818,23 +41771,24 @@
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
+which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
+which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
-  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -41843,21 +41797,21 @@
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error "could not create -" "$LINENO" 5
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
 
@@ -41887,7 +41841,7 @@
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -41908,7 +41862,7 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit $?
+  $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5

Modified: branches/samba/upstream/source3/configure.in
===================================================================
--- branches/samba/upstream/source3/configure.in	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/configure.in	2012-09-18 03:31:43 UTC (rev 4168)
@@ -753,20 +753,36 @@
 
 dnl check for OS implementation of md5 conformant to rfc1321
 AC_CHECK_HEADERS(md5.h)
+
+samba_cv_md5lib=none
+
 if test x"$ac_cv_header_md5_h" = x"yes"; then
 	AC_DEFINE(HAVE_MD5_H, 1,
 		[Whether md5.h is available.])
-	AC_CHECK_LIB(md5, MD5Update,
-	    [
-		LIBS="${LIBS} -lmd5"
-		CRYPTO_MD5_OBJ=
-		AC_DEFINE(HAVE_LIBMD5, 1,
-		    [Whether libmd5 conformant to rfc1321 is available.])],
-	    [
-		CRYPTO_MD5_OBJ="../lib/crypto/md5.o"])
+	AC_CHECK_LIB(md5, MD5Update, [samba_cv_md5lib=md5])
+fi
+
+if test x"$ac_cv_header_md5_h" = x"yes" -a \
+        x"$samba_cv_md5lib" = x"none" ; then
+	AC_CHECK_LIB(md, MD5Update, [samba_cv_md5lib=md])
+fi
+
+if test x"$ac_cv_header_md5_h" = x"yes" -a \
+        x"$samba_cv_md5lib" = x"none" ; then
+	AC_CHECK_LIB(c, MD5Update, [samba_cv_md5lib=""])
+fi
+
+if test x"$samba_cv_md5lib" != x"none" ; then
+	if test x"$samba_cv_md5lib" != x ; then
+		LIBS="${LIBS} -l${samba_cv_md5lib}"
+	fi
+	CRYPTO_MD5_OBJ=
+	AC_DEFINE(HAVE_LIBMD5, 1,
+	    [Whether libmd5 conformant to rfc1321 is available.])
 else
 	CRYPTO_MD5_OBJ="../lib/crypto/md5.o"
 fi
+
 AC_SUBST(CRYPTO_MD5_OBJ)
 
 
@@ -3862,7 +3878,6 @@
   AC_CHECK_FUNC_EXT(krb5_string_to_key_salt, $KRB5_LIBS)
   AC_CHECK_FUNC_EXT(krb5_auth_con_setkey, $KRB5_LIBS)
   AC_CHECK_FUNC_EXT(krb5_auth_con_setuseruserkey, $KRB5_LIBS)
-  AC_CHECK_FUNC_EXT(krb5_locate_kdc, $KRB5_LIBS)
   AC_CHECK_FUNC_EXT(krb5_get_permitted_enctypes, $KRB5_LIBS)
   AC_CHECK_FUNC_EXT(krb5_get_default_in_tkt_etypes, $KRB5_LIBS)
   AC_CHECK_FUNC_EXT(krb5_free_data_contents, $KRB5_LIBS)

Modified: branches/samba/upstream/source3/include/config.h.in
===================================================================
--- branches/samba/upstream/source3/include/config.h.in	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/include/config.h.in	2012-09-18 03:31:43 UTC (rev 4168)
@@ -1113,9 +1113,6 @@
 /* Whether KRB5_KU_OTHER_CKSUM is available */
 #undef HAVE_KRB5_KU_OTHER_CKSUM
 
-/* Define to 1 if you have the `krb5_locate_kdc' function. */
-#undef HAVE_KRB5_LOCATE_KDC
-
 /* Define to 1 if you have the <krb5/locate_plugin.h> header file. */
 #undef HAVE_KRB5_LOCATE_PLUGIN_H
 

Modified: branches/samba/upstream/source3/include/krb5_protos.h
===================================================================
--- branches/samba/upstream/source3/include/krb5_protos.h	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/include/krb5_protos.h	2012-09-18 03:31:43 UTC (rev 4168)
@@ -71,10 +71,6 @@
 int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype, bool no_salt);
 bool get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_ticket *tkt);
 krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt);
-krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters);
-#if defined(HAVE_KRB5_LOCATE_KDC)
-krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters);
-#endif
 krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes);
 bool get_krb5_smb_session_key(TALLOC_CTX *mem_ctx,
 			      krb5_context context,

Modified: branches/samba/upstream/source3/include/ntioctl.h
===================================================================
--- branches/samba/upstream/source3/include/ntioctl.h	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/include/ntioctl.h	2012-09-18 03:31:43 UTC (rev 4168)
@@ -31,35 +31,85 @@
 /* Some of the following such as the encryption/compression ones would be                */
 /* invoked from tools via a specialized hook into the VFS rather than via the            */
 /* standard vfs entry points */
-#define FSCTL_REQUEST_OPLOCK_LEVEL_1 0x00090000
-#define FSCTL_REQUEST_OPLOCK_LEVEL_2 0x00090004
-#define FSCTL_REQUEST_BATCH_OPLOCK   0x00090008
 #define FSCTL_LOCK_VOLUME            0x00090018
 #define FSCTL_UNLOCK_VOLUME          0x0009001C
 #define FSCTL_GET_COMPRESSION        0x0009003C
 #define FSCTL_SET_COMPRESSION        0x0009C040
-#define FSCTL_IS_VOLUME_DIRTY	     0x00090078
 #define FSCTL_REQUEST_FILTER_OPLOCK  0x0009008C
-#define FSCTL_FIND_FILES_BY_SID	     0x0009008F
-#define FSCTL_FILESYS_GET_STATISTICS 0x00090090
-#define FSCTL_SET_OBJECT_ID          0x00090098
-#define FSCTL_GET_OBJECT_ID          0x0009009C
-#define FSCTL_SET_REPARSE_POINT      0x000900A4
-#define FSCTL_GET_REPARSE_POINT      0x000900A8
-#define FSCTL_DELETE_REPARSE_POINT   0x000900AC
-#define FSCTL_CREATE_OR_GET_OBJECT_ID 0x000900C0
-#define FSCTL_SET_SPARSE             0x000900C4
 #define FSCTL_SET_ZERO_DATA          0x000900C8
 #define FSCTL_SET_ENCRYPTION         0x000900D7
 #define FSCTL_ENCRYPTION_FSCTL_IO    0x000900DB
 #define FSCTL_WRITE_RAW_ENCRYPTED    0x000900DF
 #define FSCTL_READ_RAW_ENCRYPTED     0x000900E3
 #define FSCTL_SIS_COPYFILE           0x00090100
-#define FSCTL_QUERY_ALLOCATED_RANGES 0x000940CF
 #define FSCTL_SIS_LINK_FILES         0x0009C104
 
-#define FSCTL_GET_SHADOW_COPY_DATA   0x00144064   /* KJC -- Shadow Copy information */
+/* filesystem control codes */
+#define FSCTL_METHOD_BUFFERED	0x00000000
+#define FSCTL_METHOD_IN_DIRECT	0x00000001
+#define FSCTL_METHOD_OUT_DIRECT	0x00000002
+#define FSCTL_METHOD_NEITHER	0x00000003
 
+#define FSCTL_ACCESS_ANY	0x00000000
+#define FSCTL_ACCESS_READ	0x00004000
+#define FSCTL_ACCESS_WRITE	0x00008000
+
+#define FSCTL_DFS			0x00060000
+#define FSCTL_DFS_GET_REFERRALS		(FSCTL_DFS | FSCTL_ACCESS_ANY | 0x0194 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_DFS_GET_REFERRALS_EX	(FSCTL_DFS | FSCTL_ACCESS_ANY | 0x01B0 | FSCTL_METHOD_BUFFERED)
+
+#define FSCTL_FILESYSTEM		0x00090000
+#define FSCTL_REQUEST_OPLOCK_LEVEL_1    (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0000 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_REQUEST_OPLOCK_LEVEL_2    (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0004 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_REQUEST_BATCH_OPLOCK      (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0008 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_OPLOCK_BREAK_ACKNOWLEDGE  (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x000C | FSCTL_METHOD_BUFFERED)
+#define FSCTL_OPBATCH_ACK_CLOSE_PENDING (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0010 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_OPLOCK_BREAK_NOTIFY       (FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0014 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_FILESYS_GET_STATISTICS	(FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0060 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_GET_NTFS_VOLUME_DATA	(FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0064 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_IS_VOLUME_DIRTY		(FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0078 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_FIND_FILES_BY_SID		(FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x008C | FSCTL_METHOD_NEITHER)
+#define FSCTL_SET_OBJECT_ID		(FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0098 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_GET_OBJECT_ID		(FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x009C | FSCTL_METHOD_BUFFERED)
+#define FSCTL_DELETE_OBJECT_ID		(FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00A0 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_SET_REPARSE_POINT		(FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00A4 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_GET_REPARSE_POINT		(FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00A8 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_DELETE_REPARSE_POINT	(FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00AC | FSCTL_METHOD_BUFFERED)
+#define FSCTL_CREATE_OR_GET_OBJECT_ID	(FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00C0 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_SET_SPARSE		(FSCTL_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00C4 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_QUERY_ALLOCATED_RANGES	(FSCTL_FILESYSTEM | FSCTL_ACCESS_READ | 0x00CC | FSCTL_METHOD_NEITHER)
+#define FSCTL_FILE_LEVEL_TRIM		(FSCTL_FILESYSTEM | FSCTL_ACCESS_WRITE | 0x0208 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_OFFLOAD_READ		(FSCTL_FILESYSTEM | FSCTL_ACCESS_READ | 0x0264 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_OFFLOAD_WRITE		(FSCTL_FILESYSTEM | FSCTL_ACCESS_WRITE | 0x0268 | FSCTL_METHOD_BUFFERED)
+
+#define FSCTL_NAMED_PIPE		0x00110000
+#define FSCTL_PIPE_PEEK			(FSCTL_NAMED_PIPE | FSCTL_ACCESS_READ | 0x000C | FSCTL_METHOD_BUFFERED)
+#define FSCTL_NAMED_PIPE_READ_WRITE	(FSCTL_NAMED_PIPE | FSCTL_ACCESS_READ \
+							  | FSCTL_ACCESS_WRITE | 0x0014 | FSCTL_METHOD_NEITHER)
+#define FSCTL_PIPE_TRANSCEIVE		FSCTL_NAMED_PIPE_READ_WRITE	/* SMB2 function name */
+#define FSCTL_PIPE_WAIT			(FSCTL_NAMED_PIPE | FSCTL_ACCESS_ANY | 0x0018 | FSCTL_METHOD_BUFFERED)
+
+#define FSCTL_NETWORK_FILESYSTEM	0x00140000
+#define FSCTL_GET_SHADOW_COPY_DATA	(FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_READ | 0x0064 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_SRV_ENUM_SNAPS		FSCTL_GET_SHADOW_COPY_DATA	/* SMB2 function name */
+#define FSCTL_SRV_REQUEST_RESUME_KEY	(FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0078 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_SRV_COPYCHUNK		(FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_READ | 0x00F0 | FSCTL_METHOD_OUT_DIRECT)
+#define FSCTL_SRV_COPYCHUNK_WRITE	(FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_WRITE | 0x00F0 | FSCTL_METHOD_OUT_DIRECT)
+#define FSCTL_SRV_READ_HASH		(FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_READ| 0x01B8 | FSCTL_METHOD_NEITHER)
+#define FSCTL_LMR_REQ_RESILIENCY	(FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_ANY | 0x01D4 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_LMR_SET_LINK_TRACKING_INFORMATION \
+	(FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_ANY | 0x00EC | FSCTL_METHOD_BUFFERED)
+#define FSCTL_QUERY_NETWORK_INTERFACE_INFO \
+	(FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_ANY | 0x01FC | FSCTL_METHOD_BUFFERED)
+
+/*
+ * FSCTL_VALIDATE_NEGOTIATE_INFO_224 was used used in
+ * Windows 8 server beta with SMB 2.24
+ */
+#define FSCTL_VALIDATE_NEGOTIATE_INFO_224 \
+	(FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0200 | FSCTL_METHOD_BUFFERED)
+#define FSCTL_VALIDATE_NEGOTIATE_INFO	(FSCTL_NETWORK_FILESYSTEM | FSCTL_ACCESS_ANY | 0x0204 | FSCTL_METHOD_BUFFERED)
+
 #if 0
 #define FSCTL_SECURITY_ID_CHECK
 #define FSCTL_DISMOUNT_VOLUME

Modified: branches/samba/upstream/source3/include/version.h
===================================================================
--- branches/samba/upstream/source3/include/version.h	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/include/version.h	2012-09-18 03:31:43 UTC (rev 4168)
@@ -1,8 +1,8 @@
 /* Autogenerated by script/mkversion.sh */
 #define SAMBA_VERSION_MAJOR 3
 #define SAMBA_VERSION_MINOR 6
-#define SAMBA_VERSION_RELEASE 7
-#define SAMBA_VERSION_OFFICIAL_STRING "3.6.7"
+#define SAMBA_VERSION_RELEASE 8
+#define SAMBA_VERSION_OFFICIAL_STRING "3.6.8"
 #ifdef SAMBA_VERSION_VENDOR_FUNCTION
 #  define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION
 #else /* SAMBA_VERSION_VENDOR_FUNCTION */

Modified: branches/samba/upstream/source3/lib/secdesc.c
===================================================================
--- branches/samba/upstream/source3/lib/secdesc.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/lib/secdesc.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -563,6 +563,7 @@
 	struct security_acl *new_dacl = NULL, *the_acl = NULL;
 	struct security_ace *new_ace_list = NULL;
 	unsigned int new_ace_list_ndx = 0, i;
+	bool set_inherited_flags = (parent_ctr->type & SEC_DESC_DACL_AUTO_INHERITED);
 
 	*ppsd = NULL;
 	*psize = 0;
@@ -625,7 +626,8 @@
 
 			/* First add the regular ACE entry. */
 			init_sec_ace(new_ace, ptrustee, ace->type,
-			     	ace->access_mask, 0);
+				ace->access_mask,
+				set_inherited_flags ? SEC_ACE_FLAG_INHERITED_ACE : 0);
 
 			DEBUG(5,("se_create_child_secdesc(): %s:%d/0x%02x/0x%08x"
 				" inherited as %s:%d/0x%02x/0x%08x\n",
@@ -648,7 +650,8 @@
 		}
 
 		init_sec_ace(new_ace, ptrustee, ace->type,
-			     ace->access_mask, new_flags);
+				ace->access_mask, new_flags |
+				(set_inherited_flags ? SEC_ACE_FLAG_INHERITED_ACE : 0));
 
 		DEBUG(5, ("se_create_child_secdesc(): %s:%d/0x%02x/0x%08x "
 			  " inherited as %s:%d/0x%02x/0x%08x\n",
@@ -675,7 +678,8 @@
 
 	*ppsd = make_sec_desc(ctx,
 			SECURITY_DESCRIPTOR_REVISION_1,
-			SEC_DESC_SELF_RELATIVE|SEC_DESC_DACL_PRESENT,
+			SEC_DESC_SELF_RELATIVE|SEC_DESC_DACL_PRESENT|
+			(set_inherited_flags ? SEC_DESC_DACL_AUTO_INHERITED : 0),
 			owner_sid,
 			group_sid,
 			NULL,

Modified: branches/samba/upstream/source3/lib/sysquotas.c
===================================================================
--- branches/samba/upstream/source3/lib/sysquotas.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/lib/sysquotas.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -179,6 +179,7 @@
 #endif /* HAVE_XFS_QUOTAS */
 #ifdef HAVE_NFS_QUOTAS
 	{"nfs", sys_get_nfs_quota,	sys_set_nfs_quota},
+	{"nfs4", sys_get_nfs_quota,	sys_set_nfs_quota},
 #endif /* HAVE_NFS_QUOTAS */
 	{NULL, 	NULL, 			NULL}
 };

Modified: branches/samba/upstream/source3/libsmb/clifile.c
===================================================================
--- branches/samba/upstream/source3/libsmb/clifile.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/libsmb/clifile.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -5256,7 +5256,7 @@
 
 	SIVAL(state->setup + 0, 0, FSCTL_GET_SHADOW_COPY_DATA);
 	SSVAL(state->setup + 2, 0, fnum);
-	SCVAL(state->setup + 3, 0, 0); /* isFsctl */
+	SCVAL(state->setup + 3, 0, 1); /* isFsctl */
 	SCVAL(state->setup + 3, 1, 0); /* compfilter, isFlags (WSSP) */
 
 	subreq = cli_trans_send(

Modified: branches/samba/upstream/source3/libsmb/clikrb5.c
===================================================================
--- branches/samba/upstream/source3/libsmb/clikrb5.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/libsmb/clikrb5.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -488,95 +488,6 @@
 #endif
 }
 
-#if !defined(HAVE_KRB5_LOCATE_KDC)
-
-/* krb5_locate_kdc is an internal MIT symbol. MIT are not yet willing to commit
- * to a public interface for this functionality, so we have to be able to live
- * without it if the MIT libraries are hiding their internal symbols.
- */
-
-#if defined(KRB5_KRBHST_INIT)
-/* Heimdal */
- krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters)
-{
-	krb5_krbhst_handle hnd;
-	krb5_krbhst_info *hinfo;
-	krb5_error_code rc;
-	int num_kdcs, i;
-	struct sockaddr *sa;
-	struct addrinfo *ai;
-
-	*addr_pp = NULL;
-	*naddrs = 0;
-
-	rc = krb5_krbhst_init(ctx, realm->data, KRB5_KRBHST_KDC, &hnd);
-	if (rc) {
-		DEBUG(0, ("smb_krb5_locate_kdc: krb5_krbhst_init failed (%s)\n", error_message(rc)));
-		return rc;
-	}
-
-	for ( num_kdcs = 0; (rc = krb5_krbhst_next(ctx, hnd, &hinfo) == 0); num_kdcs++)
-		;
-
-	krb5_krbhst_reset(ctx, hnd);
-
-	if (!num_kdcs) {
-		DEBUG(0, ("smb_krb5_locate_kdc: zero kdcs found !\n"));
-		krb5_krbhst_free(ctx, hnd);
-		return -1;
-	}
-
-	sa = SMB_MALLOC_ARRAY( struct sockaddr, num_kdcs );
-	if (!sa) {
-		DEBUG(0, ("smb_krb5_locate_kdc: malloc failed\n"));
-		krb5_krbhst_free(ctx, hnd);
-		naddrs = 0;
-		return -1;
-	}
-
-	memset(sa, '\0', sizeof(struct sockaddr) * num_kdcs );
-
-	for (i = 0; i < num_kdcs && (rc = krb5_krbhst_next(ctx, hnd, &hinfo) == 0); i++) {
-
-#if defined(HAVE_KRB5_KRBHST_GET_ADDRINFO)
-		rc = krb5_krbhst_get_addrinfo(ctx, hinfo, &ai);
-		if (rc) {
-			DEBUG(0,("krb5_krbhst_get_addrinfo failed: %s\n", error_message(rc)));
-			continue;
-		}
-#endif
-		if (hinfo->ai && hinfo->ai->ai_family == AF_INET) 
-			memcpy(&sa[i], hinfo->ai->ai_addr, sizeof(struct sockaddr));
-	}
-
-	krb5_krbhst_free(ctx, hnd);
-
-	*naddrs = num_kdcs;
-	*addr_pp = sa;
-	return 0;
-}
-
-#else /* ! defined(KRB5_KRBHST_INIT) */
-
- krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm,
-		struct sockaddr **addr_pp, int *naddrs, int get_masters)
-{
-	DEBUG(0, ("unable to explicitly locate the KDC on this platform\n"));
-	return KRB5_KDC_UNREACH;
-}
-
-#endif /* KRB5_KRBHST_INIT */
-
-#else /* ! HAVE_KRB5_LOCATE_KDC */
-
- krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm,
-		struct sockaddr **addr_pp, int *naddrs, int get_masters)
-{
-	return krb5_locate_kdc(ctx, realm, addr_pp, naddrs, get_masters);
-}
-
-#endif /* HAVE_KRB5_LOCATE_KDC */
-
 #if !defined(HAVE_KRB5_FREE_UNPARSED_NAME)
  void krb5_free_unparsed_name(krb5_context context, char *val)
 {

Modified: branches/samba/upstream/source3/locking/locking.c
===================================================================
--- branches/samba/upstream/source3/locking/locking.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/locking/locking.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -1735,42 +1735,32 @@
 static int traverse_fn(struct db_record *rec, void *_state)
 {
 	struct forall_state *state = (struct forall_state *)_state;
-	struct locking_data *data;
-	struct share_mode_entry *shares;
-	const char *sharepath;
-	const char *fname;
-	const char *del_tokens;
-	uint32_t total_del_token_size = 0;
 	int i;
+	struct share_mode_lock *lck;
 
 	/* Ensure this is a locking_key record. */
 	if (rec->key.dsize != sizeof(struct file_id))
 		return 0;
 
-	data = (struct locking_data *)rec->value.dptr;
-	shares = (struct share_mode_entry *)(rec->value.dptr + sizeof(*data));
-	del_tokens = (const char *)rec->value.dptr + sizeof(*data) +
-		data->u.s.num_share_mode_entries*sizeof(*shares);
+	lck = TALLOC_ZERO_P(talloc_tos(), struct share_mode_lock);
+	if (lck == NULL) {
+		return 0;
+	}
 
-	for (i = 0; i < data->u.s.num_delete_token_entries; i++) {
-		uint32_t del_token_size;
-		memcpy(&del_token_size, del_tokens, sizeof(uint32_t));
-		total_del_token_size += del_token_size;
-		del_tokens += del_token_size;
+	if (!parse_share_modes(rec->value, lck)) {
+		TALLOC_FREE(lck);
+		DEBUG(1, ("parse_share_modes failed\n"));
+		return 0;
 	}
 
-	sharepath = (const char *)rec->value.dptr + sizeof(*data) +
-		data->u.s.num_share_mode_entries*sizeof(*shares) +
-		total_del_token_size;
-	fname = (const char *)rec->value.dptr + sizeof(*data) +
-		data->u.s.num_share_mode_entries*sizeof(*shares) +
-		total_del_token_size +
-		strlen(sharepath) + 1;
-
-	for (i=0;i<data->u.s.num_share_mode_entries;i++) {
-		state->fn(&shares[i], sharepath, fname,
-			  state->private_data);
+	for (i=0; i<lck->num_share_modes; i++) {
+		struct share_mode_entry *se = &lck->share_modes[i];
+		state->fn(se,
+			lck->servicepath,
+			lck->base_name,
+			state->private_data);
 	}
+	TALLOC_FREE(lck);
 	return 0;
 }
 

Modified: branches/samba/upstream/source3/nmbd/nmbd_winsserver.c
===================================================================
--- branches/samba/upstream/source3/nmbd/nmbd_winsserver.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/nmbd/nmbd_winsserver.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -1038,7 +1038,7 @@
 	DEBUG(3,("wins_register_query_success: Original client at IP %s still wants the \
 name %s. Rejecting registration request.\n", inet_ntoa(ip), nmb_namestr(question_name) ));
 
-	send_wins_name_registration_response(RFS_ERR, 0, orig_reg_packet);
+	send_wins_name_registration_response(ACT_ERR, 0, orig_reg_packet);
 
 	orig_reg_packet->locked = False;
 	free_packet(orig_reg_packet);

Modified: branches/samba/upstream/source3/printing/print_generic.c
===================================================================
--- branches/samba/upstream/source3/printing/print_generic.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/printing/print_generic.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -288,7 +288,7 @@
 		ret = 0;
 	}
 	if (pjob->sysjob == -1) {
-		DEBUG(0, ("failed to get sysjob for job %u (%s), tracking as "
+		DEBUG(2, ("failed to get sysjob for job %u (%s), tracking as "
 			  "Unix job\n", pjob->jobid, jobname));
 	}
 

Modified: branches/samba/upstream/source3/printing/printing.c
===================================================================
--- branches/samba/upstream/source3/printing/printing.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/printing/printing.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2843,8 +2843,7 @@
 	}
 
 	slprintf(pjob->filename, sizeof(pjob->filename)-1,
-		 "%s/%s%.8u.XXXXXX", lp_pathname(snum),
-		 PRINT_SPOOL_PREFIX, (unsigned int)jobid);
+		 "%s/%sXXXXXX", lp_pathname(snum), PRINT_SPOOL_PREFIX);
 	pjob->fd = mkstemp(pjob->filename);
 
 	if (pjob->fd == -1) {

Modified: branches/samba/upstream/source3/registry/regfio.c
===================================================================
--- branches/samba/upstream/source3/registry/regfio.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/registry/regfio.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -1467,7 +1467,7 @@
 	if ( !(hbin = TALLOC_ZERO_P( file->mem_ctx, REGF_HBIN )) )
 		return NULL;
 
-	memcpy( hbin->header, "hbin", sizeof(HBIN_HDR_SIZE) );
+	memcpy( hbin->header, "hbin", HBIN_HDR_SIZE);
 
 
 	if (sys_fstat(file->fd, &sbuf, false)) {

Modified: branches/samba/upstream/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
===================================================================
--- branches/samba/upstream/source3/rpc_server/srvsvc/srv_srvsvc_nt.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/rpc_server/srvsvc/srv_srvsvc_nt.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -2318,27 +2318,8 @@
 	psd = r->in.sd_buf->sd;
 	security_info_sent = r->in.securityinformation;
 
-	if (psd->owner_sid==0) {
-		security_info_sent &= ~SECINFO_OWNER;
-	}
-	if (psd->group_sid==0) {
-		security_info_sent &= ~SECINFO_GROUP;
-	}
-	if (psd->sacl==0) {
-		security_info_sent &= ~SECINFO_SACL;
-	}
-	if (psd->dacl==0) {
-		security_info_sent &= ~SECINFO_DACL;
-	}
+	nt_status = set_sd(fsp, psd, security_info_sent);
 
-	/* Convert all the generic bits. */
-	security_acl_map_generic(psd->dacl, &file_generic_mapping);
-	security_acl_map_generic(psd->sacl, &file_generic_mapping);
-
-	nt_status = SMB_VFS_FSET_NT_ACL(fsp,
-					security_info_sent,
-					psd);
-
 	if (!NT_STATUS_IS_OK(nt_status) ) {
 		DEBUG(3,("_srvsvc_NetSetFileSecurity: Unable to set NT ACL "
 			 "on file %s\n", r->in.share));

Modified: branches/samba/upstream/source3/smbd/blocking.c
===================================================================
--- branches/samba/upstream/source3/smbd/blocking.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/smbd/blocking.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -326,7 +326,7 @@
  obtained first.
 *****************************************************************************/
 
-static void reply_lockingX_error(struct blocking_lock_record *blr, NTSTATUS status)
+static void undo_locks_obtained(struct blocking_lock_record *blr)
 {
 	files_struct *fsp = blr->fsp;
 	uint16 num_ulocks = SVAL(blr->req->vwv+6, 0);
@@ -370,8 +370,6 @@
 			offset,
 			WINDOWS_LOCK);
 	}
-
-	generic_blocking_lock_error(blr, status);
 }
 
 /****************************************************************************
@@ -384,8 +382,17 @@
 
 	switch(blr->req->cmd) {
 	case SMBlockingX:
-		reply_lockingX_error(blr, status);
-		break;
+		/*
+		 * This code can be called during the rundown of a
+		 * file after it was already closed. In that case,
+		 * blr->fsp==NULL and we do not need to undo any
+		 * locks, they are already gone.
+		 */
+		if (blr->fsp != NULL) {
+			undo_locks_obtained(blr);
+		}
+		generic_blocking_lock_error(blr, status);
+                break;
 	case SMBtrans2:
 	case SMBtranss2:
 		reply_nterror(blr->req, status);

Modified: branches/samba/upstream/source3/smbd/nttrans.c
===================================================================
--- branches/samba/upstream/source3/smbd/nttrans.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/smbd/nttrans.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -826,20 +826,48 @@
 	return;
 }
 
+/*********************************************************************
+ Windows seems to do canonicalization of inheritance bits. Do the
+ same.
+*********************************************************************/
+
+static void canonicalize_inheritance_bits(struct security_descriptor *psd)
+{
+	bool set_auto_inherited = false;
+
+	/*
+	 * We need to filter out the
+	 * SEC_DESC_DACL_AUTO_INHERITED|SEC_DESC_DACL_AUTO_INHERIT_REQ
+	 * bits. If both are set we store SEC_DESC_DACL_AUTO_INHERITED
+	 * as this alters whether SEC_ACE_FLAG_INHERITED_ACE is set
+	 * when an ACE is inherited. Otherwise we zero these bits out.
+	 * See:
+	 *
+	 * http://social.msdn.microsoft.com/Forums/eu/os_fileservices/thread/11f77b68-731e-407d-b1b3-064750716531
+	 *
+	 * for details.
+	 */
+
+	if ((psd->type & (SEC_DESC_DACL_AUTO_INHERITED|SEC_DESC_DACL_AUTO_INHERIT_REQ))
+			== (SEC_DESC_DACL_AUTO_INHERITED|SEC_DESC_DACL_AUTO_INHERIT_REQ)) {
+		set_auto_inherited = true;
+	}
+
+	psd->type &= ~(SEC_DESC_DACL_AUTO_INHERITED|SEC_DESC_DACL_AUTO_INHERIT_REQ);
+	if (set_auto_inherited) {
+		psd->type |= SEC_DESC_DACL_AUTO_INHERITED;
+	}
+}
+
 /****************************************************************************
  Internal fn to set security descriptors.
 ****************************************************************************/
 
-NTSTATUS set_sd(files_struct *fsp, uint8_t *data, uint32_t sd_len,
+NTSTATUS set_sd(files_struct *fsp, struct security_descriptor *psd,
 		       uint32_t security_info_sent)
 {
-	struct security_descriptor *psd = NULL;
 	NTSTATUS status;
 
-	if (sd_len == 0) {
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
 	if (!CAN_WRITE(fsp->conn)) {
 		return NT_STATUS_ACCESS_DENIED;
 	}
@@ -848,12 +876,6 @@
 		return NT_STATUS_OK;
 	}
 
-	status = unmarshall_sec_desc(talloc_tos(), data, sd_len, &psd);
-
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
-	}
-
 	if (psd->owner_sid == NULL) {
 		security_info_sent &= ~SECINFO_OWNER;
 	}
@@ -905,6 +927,8 @@
 		}
 	}
 
+	canonicalize_inheritance_bits(psd);
+
 	if (DEBUGLEVEL >= 10) {
 		DEBUG(10,("set_sd for file %s\n", fsp_str_dbg(fsp)));
 		NDR_PRINT_DEBUG(security_descriptor, psd);
@@ -918,6 +942,29 @@
 }
 
 /****************************************************************************
+ Internal fn to set security descriptors from a data blob.
+****************************************************************************/
+
+NTSTATUS set_sd_blob(files_struct *fsp, uint8_t *data, uint32_t sd_len,
+		       uint32_t security_info_sent)
+{
+	struct security_descriptor *psd = NULL;
+	NTSTATUS status;
+
+	if (sd_len == 0) {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
+	status = unmarshall_sec_desc(talloc_tos(), data, sd_len, &psd);
+
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
+	}
+
+	return set_sd(fsp, psd, security_info_sent);
+}
+
+/****************************************************************************
  Read a list of EA names and data from an incoming data buffer. Create an ea_list with them.
 ****************************************************************************/
 
@@ -2095,7 +2142,7 @@
 		return;
 	}
 
-	status = set_sd(fsp, (uint8 *)data, data_count, security_info_sent);
+	status = set_sd_blob(fsp, (uint8 *)data, data_count, security_info_sent);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		reply_nterror(req, status);

Modified: branches/samba/upstream/source3/smbd/open.c
===================================================================
--- branches/samba/upstream/source3/smbd/open.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/smbd/open.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -934,11 +934,6 @@
 	return NT_STATUS_OK;
 }
 
-static bool is_delete_request(files_struct *fsp) {
-	return ((fsp->access_mask == DELETE_ACCESS) &&
-		(fsp->oplock_type == NO_OPLOCK));
-}
-
 /*
  * Send a break message to the oplock holder and delay the open for
  * our client.
@@ -1083,13 +1078,8 @@
 	}
 
 	if (ex_entry != NULL) {
-		/* Found an exclusive or batch oplock */
-		bool delay_it = is_delete_request(fsp) ?
-				BATCH_OPLOCK_TYPE(ex_entry->op_type) : true;
-		if (delay_it) {
-			send_break_message(fsp, ex_entry, mid, oplock_request);
-			return true;
-		}
+		send_break_message(fsp, ex_entry, mid, oplock_request);
+		return true;
 	}
 	return false;
 }
@@ -3363,15 +3353,11 @@
 
 		fsp->access_mask = FILE_GENERIC_ALL;
 
-		/* Convert all the generic bits. */
-		security_acl_map_generic(sd->dacl, &file_generic_mapping);
-		security_acl_map_generic(sd->sacl, &file_generic_mapping);
-
 		if (sec_info_sent & (SECINFO_OWNER|
 					SECINFO_GROUP|
 					SECINFO_DACL|
 					SECINFO_SACL)) {
-			status = SMB_VFS_FSET_NT_ACL(fsp, sec_info_sent, sd);
+			status = set_sd(fsp, sd, sec_info_sent);
 		}
 
 		fsp->access_mask = saved_access_mask;

Modified: branches/samba/upstream/source3/smbd/proto.h
===================================================================
--- branches/samba/upstream/source3/smbd/proto.h	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/smbd/proto.h	2012-09-18 03:31:43 UTC (rev 4168)
@@ -561,8 +561,10 @@
 		     char *params, int paramsize,
 		     char *pdata, int datasize);
 void reply_ntcreate_and_X(struct smb_request *req);
-NTSTATUS set_sd(files_struct *fsp, uint8_t *data, uint32_t sd_len,
+NTSTATUS set_sd(files_struct *fsp, struct security_descriptor *psd,
                        uint32_t security_info_sent);
+NTSTATUS set_sd_blob(files_struct *fsp, uint8_t *data, uint32_t sd_len,
+                       uint32_t security_info_sent);
 NTSTATUS smb_fsctl(struct files_struct *fsp,
 		       TALLOC_CTX *ctx,
 		       uint32_t function,

Modified: branches/samba/upstream/source3/smbd/server.c
===================================================================
--- branches/samba/upstream/source3/smbd/server.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/smbd/server.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -1228,9 +1228,6 @@
 		return -1;
 	}
 
-	if (!print_backend_init(smbd_messaging_context()))
-		exit(1);
-
 	if (!init_guest_info()) {
 		DEBUG(0,("ERROR: failed to setup guest info.\n"));
 		return -1;
@@ -1257,6 +1254,13 @@
 		exit(1);
 	}
 
+	/*
+	 * The print backend init also migrates the printing tdb's,
+	 * this requires a winreg pipe.
+	 */
+	if (!print_backend_init(smbd_messaging_context()))
+		exit(1);
+
 	/* Publish nt printers, this requires a working winreg pipe */
 	pcap_cache_reload(server_event_context(), smbd_messaging_context(),
 			  &reload_printers);

Modified: branches/samba/upstream/source3/smbd/server_reload.c
===================================================================
--- branches/samba/upstream/source3/smbd/server_reload.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/smbd/server_reload.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -80,7 +80,7 @@
 		pname = lp_printername(snum);
 
 		/* check printer, but avoid removing non-autoloaded printers */
-		if (!pcap_printername_ok(pname) && lp_autoloaded(snum)) {
+		if (lp_autoloaded(snum) && !pcap_printername_ok(pname)) {
 			DEBUG(3, ("removing stale printer %s\n", pname));
 
 			if (is_printer_published(session_info, session_info,

Modified: branches/samba/upstream/source3/smbd/smb2_ioctl.c
===================================================================
--- branches/samba/upstream/source3/smbd/smb2_ioctl.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/smbd/smb2_ioctl.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -89,15 +89,34 @@
 	in_input_buffer.data = (uint8_t *)req->in.vector[i+2].iov_base;
 	in_input_buffer.length = in_input_length;
 
-	if (in_file_id_persistent == UINT64_MAX &&
-		   in_file_id_volatile == UINT64_MAX) {
-		/* without a handle */
-	} else {
+	switch (in_ctl_code) {
+	case FSCTL_DFS_GET_REFERRALS:
+	case FSCTL_DFS_GET_REFERRALS_EX:
+	case FSCTL_PIPE_WAIT:
+	case FSCTL_VALIDATE_NEGOTIATE_INFO_224:
+	case FSCTL_VALIDATE_NEGOTIATE_INFO:
+	case FSCTL_QUERY_NETWORK_INTERFACE_INFO:
+		/*
+		 * Some SMB2 specific CtlCodes like FSCTL_DFS_GET_REFERRALS or
+		 * FSCTL_PIPE_WAIT does not take a file handle.
+		 *
+		 * If FileId in the SMB2 Header of the request is not
+		 * 0xFFFFFFFFFFFFFFFF, then the server MUST fail the request
+		 * with STATUS_INVALID_PARAMETER.
+		 */
+		if (in_file_id_persistent != UINT64_MAX ||
+		    in_file_id_volatile != UINT64_MAX) {
+			return smbd_smb2_request_error(req,
+				NT_STATUS_INVALID_PARAMETER);
+		}
+		break;
+	default:
 		in_fsp = file_fsp_smb2(req, in_file_id_persistent,
 					in_file_id_volatile);
 		if (in_fsp == NULL) {
 			return smbd_smb2_request_error(req, NT_STATUS_FILE_CLOSED);
 		}
+		break;
 	}
 
 	subreq = smbd_smb2_ioctl_send(req,

Modified: branches/samba/upstream/source3/smbd/smb2_setinfo.c
===================================================================
--- branches/samba/upstream/source3/smbd/smb2_setinfo.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/smbd/smb2_setinfo.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -298,7 +298,7 @@
 			return tevent_req_post(req, ev);
 		}
 
-		status = set_sd(fsp,
+		status = set_sd_blob(fsp,
 				in_input_buffer.data,
 				in_input_buffer.length,
 				in_additional_information);

Modified: branches/samba/upstream/source3/utils/net_lookup.c
===================================================================
--- branches/samba/upstream/source3/utils/net_lookup.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/utils/net_lookup.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -276,10 +276,11 @@
 #ifdef HAVE_KRB5
 	krb5_error_code rc;
 	krb5_context ctx;
-	struct sockaddr_in *addrs;
-	int num_kdcs,i;
-	krb5_data realm;
-	char **realms;
+	struct ip_service *kdcs;
+	const char *realm;
+	int num_kdcs = 0;
+	int i;
+	NTSTATUS status;
 
 	initialize_krb5_error_table();
 	rc = krb5_init_context(&ctx);
@@ -289,34 +290,37 @@
 		return -1;
 	}
 
-	if (argc>0) {
-                realm.data = CONST_DISCARD(char *, argv[0]);
-		realm.length = strlen(argv[0]);
+	if (argc > 0) {
+                realm = argv[0];
 	} else if (lp_realm() && *lp_realm()) {
-		realm.data = lp_realm();
-		realm.length = strlen((const char *)realm.data);
+		realm = lp_realm();
 	} else {
+		char **realms;
+
 		rc = krb5_get_host_realm(ctx, NULL, &realms);
 		if (rc) {
 			DEBUG(1,("krb5_gethost_realm failed (%s)\n",
 				 error_message(rc)));
 			return -1;
 		}
-		realm.data = (char *) *realms;
-		realm.length = strlen((const char *)realm.data);
+		realm = (const char *) *realms;
 	}
 
-	rc = smb_krb5_locate_kdc(ctx, &realm, (struct sockaddr **)(void *)&addrs, &num_kdcs, 0);
-	if (rc) {
-		DEBUG(1, ("smb_krb5_locate_kdc failed (%s)\n", error_message(rc)));
+	status = get_kdc_list(realm, NULL, &kdcs, &num_kdcs);
+	if (!NT_STATUS_IS_OK(status)) {
+		DEBUG(1,("get_kdc_list failed (%s)\n", nt_errstr(status)));
 		return -1;
 	}
-	for (i=0;i<num_kdcs;i++)
-		if (addrs[i].sin_family == AF_INET)
-			d_printf("%s:%hd\n", inet_ntoa(addrs[i].sin_addr),
-				 ntohs(addrs[i].sin_port));
+
+	for (i = 0; i < num_kdcs; i++) {
+		char addr[INET6_ADDRSTRLEN];
+
+		print_sockaddr(addr, sizeof(addr), &kdcs[i].ss);
+
+		d_printf("%s:%hd\n", addr, kdcs[i].port);
+	}
+
 	return 0;
-
 #endif
 	DEBUG(1, ("No kerberos support\n"));
 	return -1;

Modified: branches/samba/upstream/source3/winbindd/winbindd.c
===================================================================
--- branches/samba/upstream/source3/winbindd/winbindd.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/winbindd/winbindd.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -588,6 +588,7 @@
 
 	state->cmd_name = "unknown request";
 	state->recv_fn = NULL;
+	state->last_access = time(NULL);
 
 	/* Process command */
 
@@ -889,7 +890,8 @@
 /* Is a client idle? */
 
 static bool client_is_idle(struct winbindd_cli_state *state) {
-  return (state->response == NULL &&
+  return (state->request == NULL &&
+	  state->response == NULL &&
 	  !state->pwent_state && !state->grent_state);
 }
 

Modified: branches/samba/upstream/source3/winbindd/winbindd_cred_cache.c
===================================================================
--- branches/samba/upstream/source3/winbindd/winbindd_cred_cache.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/winbindd/winbindd_cred_cache.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -490,6 +490,7 @@
 			    const char *ccname,
 			    const char *service,
 			    const char *username,
+			    const char *pass,
 			    const char *realm,
 			    uid_t uid,
 			    time_t create_time,
@@ -591,8 +592,22 @@
 			}
 
 			DEBUG(10,("add_ccache_to_list: added krb5_ticket handler\n"));
+
 		}
 
+		/*
+		 * If we're set up to renew our krb5 tickets, we must
+		 * cache the credentials in memory for the ticket
+		 * renew function (or increase the reference count
+		 * if we're logging in more than once). Fix inspired
+		 * by patch from Ian Gordon <ian.gordon at strath.ac.uk>
+		 * for bugid #9098.
+		 */
+
+		ntret = winbindd_add_memory_creds(username, uid, pass);
+		DEBUG(10, ("winbindd_add_memory_creds returned: %s\n",
+			nt_errstr(ntret)));
+
 		return NT_STATUS_OK;
 	}
 
@@ -675,6 +690,20 @@
 		"added ccache [%s] for user [%s] to the list\n",
 		ccname, username));
 
+	if (entry->event) {
+		/*
+		 * If we're set up to renew our krb5 tickets, we must
+		 * cache the credentials in memory for the ticket
+		 * renew function. Fix inspired by patch from
+		 * Ian Gordon <ian.gordon at strath.ac.uk> for
+		 * bugid #9098.
+		 */
+
+		ntret = winbindd_add_memory_creds(username, uid, pass);
+		DEBUG(10, ("winbindd_add_memory_creds returned: %s\n",
+			nt_errstr(ntret)));
+	}
+
 	return NT_STATUS_OK;
 
  no_mem:

Modified: branches/samba/upstream/source3/winbindd/winbindd_group.c
===================================================================
--- branches/samba/upstream/source3/winbindd/winbindd_group.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/winbindd/winbindd_group.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -35,9 +35,17 @@
 {
 	fstring full_group_name;
 	char *mapped_name = NULL;
-	struct winbindd_domain *domain = find_domain_from_name_noinit(dom_name);
+	struct winbindd_domain *domain;
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
 
+	domain = find_domain_from_name_noinit(dom_name);
+	if (domain == NULL) {
+		DEBUG(0, ("Failed to find domain '%s'. "
+			  "Check connection to trusted domains!\n",
+			  dom_name));
+		return false;
+	}
+
 	nt_status = normalize_name_map(mem_ctx, domain, gr_name,
 				       &mapped_name);
 

Modified: branches/samba/upstream/source3/winbindd/winbindd_pam.c
===================================================================
--- branches/samba/upstream/source3/winbindd/winbindd_pam.c	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/winbindd/winbindd_pam.c	2012-09-18 03:31:43 UTC (rev 4168)
@@ -640,6 +640,7 @@
 					    cc,
 					    service,
 					    user,
+					    pass,
 					    realm,
 					    uid,
 					    time(NULL),
@@ -957,6 +958,7 @@
 							    cc,
 							    service,
 							    state->request->data.auth.user,
+							    state->request->data.auth.pass,
 							    domain->alt_name,
 							    uid,
 							    time(NULL),
@@ -2105,6 +2107,13 @@
 		goto process_result;
 	}
 
+	/*
+	 * Remove any mlock'ed memory creds in the child
+	 * we might be using for krb5 ticket renewal.
+	 */
+
+	winbindd_delete_memory_creds(state->request->data.logoff.user);
+
 #else
 	result = NT_STATUS_NOT_SUPPORTED;
 #endif

Modified: branches/samba/upstream/source3/winbindd/winbindd_proto.h
===================================================================
--- branches/samba/upstream/source3/winbindd/winbindd_proto.h	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/winbindd/winbindd_proto.h	2012-09-18 03:31:43 UTC (rev 4168)
@@ -188,6 +188,7 @@
 			    const char *ccname,
 			    const char *service,
 			    const char *username,
+			    const char *password,
 			    const char *realm,
 			    uid_t uid,
 			    time_t create_time,

Modified: branches/samba/upstream/source3/wscript
===================================================================
--- branches/samba/upstream/source3/wscript	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source3/wscript	2012-09-18 03:31:43 UTC (rev 4168)
@@ -639,7 +639,7 @@
 krb5_set_real_time krb5_set_default_in_tkt_etypes krb5_set_default_tgs_enctypes
 krb5_set_default_tgs_ktypes krb5_principal2salt krb5_use_enctype
 krb5_string_to_key krb5_get_pw_salt krb5_string_to_key_salt krb5_auth_con_setkey
-krb5_auth_con_setuseruserkey krb5_locate_kdc krb5_get_permitted_enctypes
+krb5_auth_con_setuseruserkey krb5_get_permitted_enctypes
 krb5_get_default_in_tkt_etypes krb5_free_data_contents
 krb5_principal_get_comp_string krb5_free_unparsed_name
 krb5_free_keytab_entry_contents krb5_kt_free_entry krb5_krbhst_init

Modified: branches/samba/upstream/source4/torture/ndr/ndr.h
===================================================================
--- branches/samba/upstream/source4/torture/ndr/ndr.h	2012-08-11 20:14:50 UTC (rev 4167)
+++ branches/samba/upstream/source4/torture/ndr/ndr.h	2012-09-18 03:31:43 UTC (rev 4168)
@@ -43,7 +43,7 @@
 #define torture_suite_add_ndr_pull_test(suite,name,data,check_fn) \
 		_torture_suite_add_ndr_pull_test(suite, #name, \
 			 (ndr_pull_flags_fn_t)ndr_pull_ ## name, data_blob_talloc(suite, data, sizeof(data)), \
-			 sizeof(struct name), 0, (bool (*) (struct torture_context *, void *)) check_fn);
+			 sizeof(struct name), NDR_SCALARS|NDR_BUFFERS, (bool (*) (struct torture_context *, void *)) check_fn);
 
 #define torture_suite_add_ndr_pull_fn_test(suite,name,data,flags,check_fn) \
 		_torture_suite_add_ndr_pull_test(suite, #name "_" #flags, \



