autobuild: intermittent test failure detected

2012-11-06 Thread autobuild
The autobuild test system has detected an intermittent failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey/2012-11-06-0915/flakey.log

The samba3 build logs are available here:

   http://git.samba.org/autobuild.flakey/2012-11-06-0915/samba3.stderr
   http://git.samba.org/autobuild.flakey/2012-11-06-0915/samba3.stdout

The source4 build logs are available here:

   http://git.samba.org/autobuild.flakey/2012-11-06-0915/samba.stderr
   http://git.samba.org/autobuild.flakey/2012-11-06-0915/samba.stdout
  
The top commit at the time of the failure was:

commit 6073d214aa8bfeff8dae8cf151357f890dd37a48
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Nov 6 01:25:00 2012 +0100

ldb_secrets_tdb_sync: Add dependency on gssapi.

This is required when building with the system heimdal, as
gssapi/gssapi_spnego.h is included.

Reviewed-by: Andrew Bartlett abart...@samba.org
Signed-off-by: Andrew Bartlett abart...@samba.org

Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Tue Nov  6 05:12:28 CET 2012 on sn-devel-104


[SCM] Samba Shared Repository - branch v3-6-test updated

2012-11-06 Thread Karolin Seeger
The branch, v3-6-test has been updated
   via  a6dea8e docs-xml: fix use of smbconfoption tag (fix bug #9345)
  from  e95da42 s4:torture/smb2: improve the smb2.create.blob test

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -
commit a6dea8e6556bd5e391cd709b86664fb7cc34433a
Author: Björn Baumbach b...@sernet.de
Date:   Fri Nov 2 10:25:27 2012 +0100

docs-xml: fix use of smbconfoption tag (fix bug #9345)

Signed-off-by: Björn Baumbach b...@sernet.de
Reviewed-by: Karolin Seeger k...@samba.org

Autobuild-User(master): Karolin Seeger ksee...@samba.org
Autobuild-Date(master): Fri Nov  2 12:37:42 CET 2012 on sn-devel-104
(cherry picked from commit 3ecbe8c83a003825fc58f6dcb9e02a35aad2d86e)

Autobuild-User(v4-0-test): Karolin Seeger ksee...@samba.org
Autobuild-Date(v4-0-test): Mon Nov  5 13:09:12 CET 2012 on sn-devel-104
(cherry picked from commit 6195cb667b1c162436bfbf5d4f499bdc776f83b4)

---

Summary of changes:
 docs-xml/build/DTD/samba.entities |   13 -
 1 files changed, 8 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/build/DTD/samba.entities 
b/docs-xml/build/DTD/samba.entities
index f5d8cd2..c7e46c2 100644
--- a/docs-xml/build/DTD/samba.entities
+++ b/docs-xml/build/DTD/samba.entities
@@ -180,7 +180,7 @@ use only by developers and generate HUGE amounts of log
 data, most of which is extremely cryptic./para
 
 paraNote that specifying this parameter here will 
-override the smbconfoptionnamelog level/name/smbconfoption parameter
+override the smbconfoption name=log level / parameter
 in the smb.conf; file./para
 /listitem
 /varlistentry'
@@ -207,7 +207,7 @@ use only by developers and generate HUGE amounts of log
 data, most of which is extremely cryptic./para
 
 paraNote that specifying this parameter here will 
-override the smbconfoptionnamelog level/name/smbconfoption parameter
+override the smbconfoption name=log level / parameter
 in the smb.conf; file./para
 /listitem
 /varlistentry'
@@ -297,11 +297,13 @@ being on a locally connected subnet.
 
 paraIf this parameter is not set then the name resolve order 
 defined in the smb.conf; file parameter  
-(smbconfoptionnamename resolve order/name/smbconfoption) will be used.
+(smbconfoption name=name resolve order /) will be used.
 /para
 
 paraThe default order is lmhosts, host, wins, bcast. Without 
-this parameter or any entry in the smbconfoptionnamename resolve 
order/name/smbconfoption parameter of the smb.conf; file, the name 
+this parameter or any entry in the
+smbconfoption name=name resolve order / parameter of
+the smb.conf; file, the name
 resolution methods will be attempted in this order. /para/listitem
 /varlistentry'
 
@@ -310,7 +312,8 @@ resolution methods will be attempted in this order. 
/para/listitem
 term-n|--netbiosname lt;primary NetBIOS namegt;/term
 listitemparaThis option allows you to override
 the NetBIOS name that Samba uses for itself. This is identical
-to setting the smbconfoptionnamenetbios name/name/smbconfoption 
parameter in the smb.conf; file. 
+to setting the smbconfoption name=netbios name / parameter in
+the smb.conf; file.
 However, a command
 line setting will take precedence over settings in
 smb.conf;./para/listitem


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-5-test updated

2012-11-06 Thread Karolin Seeger
The branch, v3-5-test has been updated
   via  9a8d7ab docs-xml: fix use of smbconfoption tag (fix bug #9345)
  from  e81b3c9 Second part of fix for bug #7781 - Samba transforms 
ShareName to lowercase (sharename) when adding new share via MMC

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -
commit 9a8d7ab3773e1d4d1981f8b45998d689180a4cbf
Author: Björn Baumbach b...@sernet.de
Date:   Fri Nov 2 10:25:27 2012 +0100

docs-xml: fix use of smbconfoption tag (fix bug #9345)

Signed-off-by: Björn Baumbach b...@sernet.de
Reviewed-by: Karolin Seeger k...@samba.org

Autobuild-User(master): Karolin Seeger ksee...@samba.org
Autobuild-Date(master): Fri Nov  2 12:37:42 CET 2012 on sn-devel-104
(cherry picked from commit 3ecbe8c83a003825fc58f6dcb9e02a35aad2d86e)

Autobuild-User(v4-0-test): Karolin Seeger ksee...@samba.org
Autobuild-Date(v4-0-test): Mon Nov  5 13:09:12 CET 2012 on sn-devel-104
(cherry picked from commit 6195cb667b1c162436bfbf5d4f499bdc776f83b4)
(cherry picked from commit a6dea8e6556bd5e391cd709b86664fb7cc34433a)

---

Summary of changes:
 docs-xml/build/DTD/samba.entities |   13 -
 1 files changed, 8 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/build/DTD/samba.entities 
b/docs-xml/build/DTD/samba.entities
index f5d8cd2..c7e46c2 100644
--- a/docs-xml/build/DTD/samba.entities
+++ b/docs-xml/build/DTD/samba.entities
@@ -180,7 +180,7 @@ use only by developers and generate HUGE amounts of log
 data, most of which is extremely cryptic./para
 
 paraNote that specifying this parameter here will 
-override the smbconfoptionnamelog level/name/smbconfoption parameter
+override the smbconfoption name=log level / parameter
 in the smb.conf; file./para
 /listitem
 /varlistentry'
@@ -207,7 +207,7 @@ use only by developers and generate HUGE amounts of log
 data, most of which is extremely cryptic./para
 
 paraNote that specifying this parameter here will 
-override the smbconfoptionnamelog level/name/smbconfoption parameter
+override the smbconfoption name=log level / parameter
 in the smb.conf; file./para
 /listitem
 /varlistentry'
@@ -297,11 +297,13 @@ being on a locally connected subnet.
 
 paraIf this parameter is not set then the name resolve order 
 defined in the smb.conf; file parameter  
-(smbconfoptionnamename resolve order/name/smbconfoption) will be used.
+(smbconfoption name=name resolve order /) will be used.
 /para
 
 paraThe default order is lmhosts, host, wins, bcast. Without 
-this parameter or any entry in the smbconfoptionnamename resolve 
order/name/smbconfoption parameter of the smb.conf; file, the name 
+this parameter or any entry in the
+smbconfoption name=name resolve order / parameter of
+the smb.conf; file, the name
 resolution methods will be attempted in this order. /para/listitem
 /varlistentry'
 
@@ -310,7 +312,8 @@ resolution methods will be attempted in this order. 
/para/listitem
 term-n|--netbiosname lt;primary NetBIOS namegt;/term
 listitemparaThis option allows you to override
 the NetBIOS name that Samba uses for itself. This is identical
-to setting the smbconfoptionnamenetbios name/name/smbconfoption 
parameter in the smb.conf; file. 
+to setting the smbconfoption name=netbios name / parameter in
+the smb.conf; file.
 However, a command
 line setting will take precedence over settings in
 smb.conf;./para/listitem


-- 
Samba Shared Repository


autobuild: intermittent test failure detected

2012-11-06 Thread autobuild
The autobuild test system has detected an intermittent failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey/2012-11-06-1117/flakey.log

The samba3 build logs are available here:

   http://git.samba.org/autobuild.flakey/2012-11-06-1117/samba3.stderr
   http://git.samba.org/autobuild.flakey/2012-11-06-1117/samba3.stdout

The source4 build logs are available here:

   http://git.samba.org/autobuild.flakey/2012-11-06-1117/samba.stderr
   http://git.samba.org/autobuild.flakey/2012-11-06-1117/samba.stdout
  
The top commit at the time of the failure was:

commit 6073d214aa8bfeff8dae8cf151357f890dd37a48
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Nov 6 01:25:00 2012 +0100

ldb_secrets_tdb_sync: Add dependency on gssapi.

This is required when building with the system heimdal, as
gssapi/gssapi_spnego.h is included.

Reviewed-by: Andrew Bartlett abart...@samba.org
Signed-off-by: Andrew Bartlett abart...@samba.org

Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Tue Nov  6 05:12:28 CET 2012 on sn-devel-104


[SCM] Samba Shared Repository - branch v3-6-test updated

2012-11-06 Thread Karolin Seeger
The branch, v3-6-test has been updated
   via  0e607ea s3-aio_pthread: Optimize aio_pthread_handle_completion
   via  7f83d75 lib/tsocket: optimize syscalls in tstream_readv_pdu_send()
   via  53aa972 lib/tsocket: disable the syscall optimization for 
recvfrom/readv by default
  from  a6dea8e docs-xml: fix use of smbconfoption tag (fix bug #9345)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -
commit 0e607ead8e605f0ee7f2153f98b6c171e6acc437
Author: Volker Lendecke v...@samba.org
Date:   Mon Nov 5 15:53:31 2012 +0100

s3-aio_pthread: Optimize aio_pthread_handle_completion

Read as much as we can

The last 3 patches address bug #9359 - Optimization needed for SMB2 
performance
sensitive workloads.

commit 7f83d75a3a666ca1bc6213433344b8017eb4932a
Author: Stefan Metzmacher me...@samba.org
Date:   Fri Nov 2 13:56:53 2012 +0100

lib/tsocket: optimize syscalls in tstream_readv_pdu_send()

Once we've got the first part of a pdu we try to optimize
readv calls for the rest of the pdu.

Signed-off-by: Stefan Metzmacher me...@samba.org

commit 53aa9727b8157ca1ad6c59ef9ebbb9f519b33f1e
Author: Stefan Metzmacher me...@samba.org
Date:   Fri Nov 2 13:45:49 2012 +0100

lib/tsocket: disable the syscall optimization for recvfrom/readv by default

We only do the optimization on recvfrom/readv if the caller asked for it.

This is needed because in most cases we preferr to flush send
buffers before receiving incoming requests.

Signed-off-by: Stefan Metzmacher me...@samba.org

---

Summary of changes:
 lib/tsocket/tsocket.h |   42 +
 lib/tsocket/tsocket_bsd.c |   73 ++---
 lib/tsocket/tsocket_helpers.c |   29 +++
 source3/modules/vfs_aio_pthread.c |   58 +-
 4 files changed, 179 insertions(+), 23 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tsocket/tsocket.h b/lib/tsocket/tsocket.h
index 3aca536..98f864e 100644
--- a/lib/tsocket/tsocket.h
+++ b/lib/tsocket/tsocket.h
@@ -627,6 +627,27 @@ int _tsocket_address_unix_from_path(TALLOC_CTX *mem_ctx,
 char *tsocket_address_unix_path(const struct tsocket_address *addr,
TALLOC_CTX *mem_ctx);
 
+/**
+ * @brief Request a syscall optimization for tdgram_recvfrom_send()
+ *
+ * This function is only used to reduce the amount of syscalls and
+ * optimize performance. You should only use this if you know
+ * what you're doing.
+ *
+ * The optimization is off by default.
+ *
+ * @param[in]  dgramThe tdgram_context of a bsd socket, if this
+ *  not a bsd socket the function does nothing.
+ *
+ * @param[in]  on   The boolean value to turn the optimization on and off.
+ *
+ * @return  The old boolean value.
+ *
+ * @see tdgram_recvfrom_send()
+ */
+bool tdgram_bsd_optimize_recvfrom(struct tdgram_context *dgram,
+ bool on);
+
 #ifdef DOXYGEN
 /**
  * @brief Create a tdgram_context for a ipv4 or ipv6 UDP communication.
@@ -689,6 +710,27 @@ int _tdgram_unix_socket(const struct tsocket_address 
*local,
 #endif
 
 /**
+ * @brief Request a syscall optimization for tstream_readv_send()
+ *
+ * This function is only used to reduce the amount of syscalls and
+ * optimize performance. You should only use this if you know
+ * what you're doing.
+ *
+ * The optimization is off by default.
+ *
+ * @param[in]  stream   The tstream_context of a bsd socket, if this
+ *  not a bsd socket the function does nothing.
+ *
+ * @param[in]  on   The boolean value to turn the optimization on and off.
+ *
+ * @return  The old boolean value.
+ *
+ * @see tstream_readv_send()
+ */
+bool tstream_bsd_optimize_readv(struct tstream_context *stream,
+   bool on);
+
+/**
  * @brief Connect async to a TCP endpoint and create a tstream_context for the
  * stream based communication.
  *
diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
index 9e80065..58598d1 100644
--- a/lib/tsocket/tsocket_bsd.c
+++ b/lib/tsocket/tsocket_bsd.c
@@ -654,6 +654,7 @@ struct tdgram_bsd {
 
void *event_ptr;
struct tevent_fd *fde;
+   bool optimize_recvfrom;
 
void *readable_private;
void (*readable_handler)(void *private_data);
@@ -661,6 +662,25 @@ struct tdgram_bsd {
void (*writeable_handler)(void *private_data);
 };
 
+bool tdgram_bsd_optimize_recvfrom(struct tdgram_context *dgram,
+ bool on)
+{
+   struct tdgram_bsd *bsds =
+   talloc_get_type(_tdgram_context_data(dgram),
+   struct tdgram_bsd);
+   bool old;
+
+   if (bsds == NULL) {
+   /* not a bsd socket */
+ 

autobuild: intermittent test failure detected

2012-11-06 Thread autobuild
The autobuild test system has detected an intermittent failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey/2012-11-06-1225/flakey.log

The samba3 build logs are available here:

   http://git.samba.org/autobuild.flakey/2012-11-06-1225/samba3.stderr
   http://git.samba.org/autobuild.flakey/2012-11-06-1225/samba3.stdout

The source4 build logs are available here:

   http://git.samba.org/autobuild.flakey/2012-11-06-1225/samba.stderr
   http://git.samba.org/autobuild.flakey/2012-11-06-1225/samba.stdout
  
The top commit at the time of the failure was:

commit 6073d214aa8bfeff8dae8cf151357f890dd37a48
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Nov 6 01:25:00 2012 +0100

ldb_secrets_tdb_sync: Add dependency on gssapi.

This is required when building with the system heimdal, as
gssapi/gssapi_spnego.h is included.

Reviewed-by: Andrew Bartlett abart...@samba.org
Signed-off-by: Andrew Bartlett abart...@samba.org

Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Tue Nov  6 05:12:28 CET 2012 on sn-devel-104


[SCM] Samba Shared Repository - branch master updated

2012-11-06 Thread Stefan Metzmacher
The branch, master has been updated
   via  47bbf98 selftest/skip: add samba.tests.samba_tool.gpo until it's 
stable
  from  6073d21 ldb_secrets_tdb_sync: Add dependency on gssapi.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 47bbf9886f0cebf994435a32bafa07e36cce191b
Author: Stefan Metzmacher me...@samba.org
Date:   Tue Nov 6 12:16:37 2012 +0100

selftest/skip: add samba.tests.samba_tool.gpo until it's stable

See:

https://git.samba.org/autobuild.flakey/2012-11-06-0314/samba.stdout
https://git.samba.org/autobuild.flakey/2012-11-06-0514/samba.stdout
https://git.samba.org/autobuild.flakey/2012-11-06-0713/samba.stdout

Signed-off-by: Stefan Metzmacher me...@samba.org

Autobuild-User(master): Stefan Metzmacher me...@samba.org
Autobuild-Date(master): Tue Nov  6 14:24:08 CET 2012 on sn-devel-104

---

Summary of changes:
 selftest/skip |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/skip b/selftest/skip
index 66bb85c..097147e 100644
--- a/selftest/skip
+++ b/selftest/skip
@@ -105,3 +105,4 @@ bench # don't run benchmarks in our selftest
 ^samba4.drs.delete_object.python # flakey test
 ^samba4.rpc.unixinfo # This contains a server-side getpwuid call which hangs 
the server when nss_winbindd is in use
 ^samba.tests.dcerpc.unix  # This contains a server-side getpwuid call which 
hangs the server when nss_winbindd is in use
+^samba.tests.samba_tool.gpo # This is flakey, but reports an error


-- 
Samba Shared Repository


autobuild: intermittent test failure detected

2012-11-06 Thread autobuild
The autobuild test system has detected an intermittent failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey/2012-11-06-1517/flakey.log

The samba3 build logs are available here:

   http://git.samba.org/autobuild.flakey/2012-11-06-1517/samba3.stderr
   http://git.samba.org/autobuild.flakey/2012-11-06-1517/samba3.stdout

The source4 build logs are available here:

   http://git.samba.org/autobuild.flakey/2012-11-06-1517/samba.stderr
   http://git.samba.org/autobuild.flakey/2012-11-06-1517/samba.stdout
  
The top commit at the time of the failure was:

commit 6073d214aa8bfeff8dae8cf151357f890dd37a48
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Nov 6 01:25:00 2012 +0100

ldb_secrets_tdb_sync: Add dependency on gssapi.

This is required when building with the system heimdal, as
gssapi/gssapi_spnego.h is included.

Reviewed-by: Andrew Bartlett abart...@samba.org
Signed-off-by: Andrew Bartlett abart...@samba.org

Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Tue Nov  6 05:12:28 CET 2012 on sn-devel-104


[SCM] Samba Shared Repository - branch master updated

2012-11-06 Thread Jelmer Vernooij
The branch, master has been updated
   via  da284b3 heimdal_build: Fix finding of system heimdal.
   via  9cf985c heimdal_build: HEIMDAL_LIBRARY(): Remove unused cflags 
argument.
  from  47bbf98 selftest/skip: add samba.tests.samba_tool.gpo until it's 
stable

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit da284b3765e3c73d204fe2c8b45d6fbd2c08d451
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Nov 5 23:38:23 2012 +0100

heimdal_build: Fix finding of system heimdal.

When checking for Heimdal headers, make sure HAVE_CONFIG_H is not
defined, as config.h will not be available.

Reviewed-by: Andrew Bartlett abart...@samba.org
Signed-off-by: Jelmer Vernooij jel...@samba.org

Autobuild-User(master): Jelmer Vernooij jel...@samba.org
Autobuild-Date(master): Tue Nov  6 16:27:03 CET 2012 on sn-devel-104

commit 9cf985c53eb1a4bbe8b8110f123744291026cee6
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Nov 5 23:33:21 2012 +0100

heimdal_build: HEIMDAL_LIBRARY(): Remove unused cflags argument.

---

Summary of changes:
 source4/heimdal_build/wscript_build |3 +-
 source4/heimdal_build/wscript_configure |   55 --
 2 files changed, 30 insertions(+), 28 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/heimdal_build/wscript_build 
b/source4/heimdal_build/wscript_build
index 3dfeb2b..f4837ac 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -209,7 +209,7 @@ def HEIMDAL_GENERATOR(name, rule, source='', target='',
 name=name)
 
 
-def HEIMDAL_LIBRARY(libname, source, deps, vnum, version_script, includes='', 
cflags=''):
+def HEIMDAL_LIBRARY(libname, source, deps, vnum, version_script, includes=''):
 '''define a Heimdal library'''
 
 obj_target = libname + '.objlist'
@@ -221,7 +221,6 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, 
version_script, includes='', cf
 source = source,
 deps   = deps,
 includes   = includes,
-cflags = cflags,
 group  = 'main')
 
 if not SET_TARGET_TYPE(bld, libname, LIBRARY):
diff --git a/source4/heimdal_build/wscript_configure 
b/source4/heimdal_build/wscript_configure
index ea854f2..168be6d 100755
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -203,26 +203,31 @@ if check_system_heimdal_lib(roken, 
rk_socket_set_reuseaddr, roken.h):
 conf.env.LIBPATH_ROKEN_HOSTCC = conf.env.LIBPATH_ROKEN
 conf.env.LIB_ROKEN_HOSTCC = roken
 conf.SET_TARGET_TYPE(ROKEN_HOSTCC, 'SYSLIB')
-check_system_heimdal_lib(wind, wind_stringprep, wind.h, onlyif=roken)
-check_system_heimdal_lib(hx509, hx509_bitstring_print, hx509.h, 
onlyif=roken wind)
-check_system_heimdal_lib(asn1, initialize_asn1_error_table, asn1_err.h, 
onlyif=roken com_err)
-check_system_heimdal_lib(heimbase, heim_cmp, heimbase.h, onlyif=roken)
-check_system_heimdal_lib(hcrypto, MD4_Init, hcrypto/md4.h,
-onlyif=asn1 roken com_err)
-if check_system_heimdal_lib(krb5, krb5_anyaddr, krb5.h,
-onlyif=roken wind asn1 hx509 hcrypto com_err heimbase):
-conf.CHECK_FUNCS_IN('krb5_free_unparsed_name', 'krb5', headers=krb5.h)
-check_system_heimdal_lib(gssapi, gss_oid_to_name, gssapi.h,
-onlyif=hcrypto asn1 roken krb5 com_err wind)
-check_system_heimdal_lib(heimntlm, heim_ntlm_ntlmv2_key, heimntlm.h,
-onlyif=roken hcrypto krb5)
-if check_system_heimdal_lib(hdb, hdb_db_dir, krb5.h hdb.h,
-onlyif=roken krb5 hcrypto com_err wind):
-CCDEFINES = list(conf.env.CCDEFINES)
-conf.undefine(HAVE_CONFIG_H)
-while HAVE_CONFIG_H=1 in conf.env.CCDEFINES:
-conf.env.CCDEFINES.remove(HAVE_CONFIG_H=1)
-try:
+
+# Make sure HAVE_CONFIG_H is unset, as the system Heimdal headers use it
+# and include config.h if it is set, resulting in failure (since config.h
+# doesn't yet exist)
+
+CCDEFINES = list(conf.env.CCDEFINES)
+conf.undefine(HAVE_CONFIG_H)
+while HAVE_CONFIG_H=1 in conf.env.CCDEFINES:
+conf.env.CCDEFINES.remove(HAVE_CONFIG_H=1)
+try:
+check_system_heimdal_lib(wind, wind_stringprep, wind.h, 
onlyif=roken)
+check_system_heimdal_lib(hx509, hx509_bitstring_print, hx509.h, 
onlyif=roken wind)
+check_system_heimdal_lib(asn1, initialize_asn1_error_table, 
asn1_err.h, onlyif=roken com_err)
+check_system_heimdal_lib(heimbase, heim_cmp, heimbase.h, 
onlyif=roken)
+check_system_heimdal_lib(hcrypto, MD4_Init, hcrypto/md4.h,
+onlyif=asn1 roken com_err)
+if check_system_heimdal_lib(krb5, krb5_anyaddr, krb5.h,
+onlyif=roken wind asn1 hx509 hcrypto com_err heimbase):
+conf.CHECK_FUNCS_IN('krb5_free_unparsed_name', 'krb5', 
headers=krb5.h)
+