[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 6e9aca7 waf: check for krb5_create_checksum and krb5_creds.flags
for some Heimdal versions
via f8c447b waf-mitkrb5: enable dcerpc_server library to support
OpenChange client code
from ae0a234 .gitignore: remove already-gone gen-8bit-gap.sh
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6e9aca7d4100e3c0f3a9b0ffe21fb3b4a8a5c87f
Author: Alexander Bokovoy a...@samba.org
Date: Thu May 31 12:44:50 2012 +0300
waf: check for krb5_create_checksum and krb5_creds.flags for some Heimdal
versions
Signed-off-by: Andreas Schneider a...@samba.org
Autobuild-User: Andreas Schneider a...@cryptomilk.org
Autobuild-Date: Fri Jun 1 11:23:21 CEST 2012 on sn-devel-104
commit f8c447b1a48eaf12dcf70b92fd7525c4ad26c246
Author: Alexander Bokovoy a...@samba.org
Date: Thu May 31 10:32:01 2012 +0300
waf-mitkrb5: enable dcerpc_server library to support OpenChange client code
Signed-off-by: Andreas Schneider a...@samba.org
---
Summary of changes:
lib/krb5_wrap/krb5_samba.c |4 ++
source3/configure.in| 12 ++
source4/heimdal_build/wscript_configure |1 +
source4/rpc_server/wscript_build| 57 ---
source4/smbd/wscript_build |4 +-
source4/wrepl_server/wscript_build |3 +-
wscript_configure_system_mitkrb5| 15 ++--
7 files changed, 70 insertions(+), 26 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 572d39e..dc90f19 100644
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -2162,7 +2162,11 @@ krb5_error_code smb_krb5_cc_get_lifetime(krb5_context
context,
}
while ((kerr = krb5_cc_next_cred(context, id, cursor, cred)) == 0) {
+#ifndef HAVE_FLAGS_IN_KRB5_CREDS
if (cred.ticket_flags TKT_FLG_INITIAL) {
+#else
+ if (cred.flags.b.initial) {
+#endif
if (now cred.times.endtime) {
*t = (time_t) (cred.times.endtime - now);
}
diff --git a/source3/configure.in b/source3/configure.in
index ea89fa2..06b51db 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3596,6 +3596,7 @@ if test x$with_ads_support != xno; then
AC_CHECK_FUNC_EXT(krb5_cc_get_lifetime, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_cc_retrieve_cred, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_free_checksum_contents, $KRB5_LIBS)
+ AC_CHECK_FUNC_EXT(krb5_create_checksum, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(krb5_c_make_checksum, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(gss_krb5_import_cred, $KRB5_LIBS)
AC_CHECK_FUNC_EXT(gss_get_name_attribute, $KRB5_LIBS)
@@ -4006,6 +4007,17 @@ if test x$with_ads_support != xno; then
AC_HAVE_DECL(KRB5_PDU_NONE,[#include krb5.h])
+ AC_CACHE_CHECK([for flags in krb5_creds],
+samba_cv_HAVE_FLAGS_IN_KRB5_CREDS,[
+AC_TRY_COMPILE([#include krb5.h],
+ [krb5_creds creds; creds.flags.b.initial = 0;],
+ samba_cv_HAVE_FLAGS_IN_KRB5_CREDS=yes,
+ samba_cv_HAVE_FLAGS_IN_KRB5_CREDS=no)])
+
+ if test x$samba_cv_HAVE_FLAGS_IN_KRB5_CREDS = xyes; then
+AC_DEFINE(HAVE_FLAGS_IN_KRB5_CREDS,1,
+ [Whether the krb5_creds struct has a flags property])
+ fi
#
#
# Now the decisions whether we can support krb5
diff --git a/source4/heimdal_build/wscript_configure
b/source4/heimdal_build/wscript_configure
index e8dab68..ea854f2 100755
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -156,6 +156,7 @@ conf.define('HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96', 1)
conf.define('HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96', 1)
conf.define('HAVE_KRB5_PRINCIPAL_GET_NUM_COMP', 1)
conf.define('HAVE_GSSAPI_GSSAPI_SPNEGO_H', 1)
+conf.define('HAVE_FLAGS_IN_KRB5_CREDS', 1)
heimdal_includedirs = []
heimdal_libdirs = []
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index e3a863a..84df78b 100755
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -11,25 +11,26 @@ bld.SAMBA_SUBSYSTEM('DCERPC_COMMON',
source='common/forward.c common/reply.c dcesrv_auth.c
common/loadparm.c',
autoproto='common/proto.h',
deps='ldb DCERPC_SHARE samba_server_gensec',
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ enabled=True
)
bld.SAMBA_LIBRARY('dcerpc_server',
source='dcerpc_server.c dcesrv_mgmt.c handles.c',
pc_files='dcerpc_server.pc',
- deps='LIBCLI_AUTH ndr samba_server_gensec dcerpc_remote service',
+ deps='LIBCLI_AUTH DCERPC_COMMON ndr samba_server_gensec dcerpc_remote
service',
public_deps='dcerpc',
autoproto='dcerpc_server_proto.h',
autobuild: intermittent test failure detected
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-06-01-1218/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-06-01-1218/samba3.stderr http://git.samba.org/autobuild.flakey/2012-06-01-1218/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-06-01-1218/samba4.stderr http://git.samba.org/autobuild.flakey/2012-06-01-1218/samba4.stdout The top commit at the time of the failure was: commit 6e9aca7d4100e3c0f3a9b0ffe21fb3b4a8a5c87f Author: Alexander Bokovoy a...@samba.org Date: Thu May 31 12:44:50 2012 +0300 waf: check for krb5_create_checksum and krb5_creds.flags for some Heimdal versions Signed-off-by: Andreas Schneider a...@samba.org Autobuild-User: Andreas Schneider a...@cryptomilk.org Autobuild-Date: Fri Jun 1 11:23:21 CEST 2012 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via eaf9b86 Revert waf-mitkrb5: enable dcerpc_server library to
support OpenChange client code
from 6e9aca7 waf: check for krb5_create_checksum and krb5_creds.flags
for some Heimdal versions
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit eaf9b86d601d7564199bdc037dc5024e6a4e5908
Author: Alexander Bokovoy a...@samba.org
Date: Fri Jun 1 15:38:56 2012 +0300
Revert waf-mitkrb5: enable dcerpc_server library to support OpenChange
client code
This reverts commit f8c447b1a48eaf12dcf70b92fd7525c4ad26c246.
After discussing with Julien (Openchange) and Metze, I decided to revert
this code.
Instead I made a patch to Openchange which allows to build client side only.
Openchange server code requires working s4 member DC and --without-ad-dc
build
does not provide working provisioning even if we enable dcerpc_server and
end point mapper.
Autobuild-User: Alexander Bokovoy a...@samba.org
Autobuild-Date: Fri Jun 1 16:46:08 CEST 2012 on sn-devel-104
---
Summary of changes:
source4/rpc_server/wscript_build | 57 ---
source4/smbd/wscript_build |4 +-
source4/wrepl_server/wscript_build |3 +-
3 files changed, 23 insertions(+), 41 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index 84df78b..e3a863a 100755
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -11,26 +11,25 @@ bld.SAMBA_SUBSYSTEM('DCERPC_COMMON',
source='common/forward.c common/reply.c dcesrv_auth.c
common/loadparm.c',
autoproto='common/proto.h',
deps='ldb DCERPC_SHARE samba_server_gensec',
- enabled=True
+ enabled=bld.AD_DC_BUILD_IS_ENABLED()
)
bld.SAMBA_LIBRARY('dcerpc_server',
source='dcerpc_server.c dcesrv_mgmt.c handles.c',
pc_files='dcerpc_server.pc',
- deps='LIBCLI_AUTH DCERPC_COMMON ndr samba_server_gensec dcerpc_remote
service',
+ deps='LIBCLI_AUTH ndr samba_server_gensec dcerpc_remote service',
public_deps='dcerpc',
autoproto='dcerpc_server_proto.h',
public_headers='dcerpc_server.h',
vnum='0.0.1',
- enabled=True
+ enabled=bld.AD_DC_BUILD_IS_ENABLED()
)
bld.SAMBA_MODULE('dcerpc_rpcecho',
source='echo/rpc_echo.c',
subsystem='dcerpc_server',
init_function='dcerpc_server_rpcecho_init',
- deps='ndr-standard events',
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ deps='ndr-standard events'
)
@@ -38,8 +37,7 @@ bld.SAMBA_MODULE('dcerpc_epmapper',
source='epmapper/rpc_epmapper.c',
subsystem='dcerpc_server',
init_function='dcerpc_server_epmapper_init',
- deps='NDR_EPMAPPER',
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ deps='NDR_EPMAPPER'
)
@@ -47,8 +45,7 @@ bld.SAMBA_MODULE('dcerpc_remote',
source='remote/dcesrv_remote.c',
subsystem='dcerpc_server',
init_function='dcerpc_server_remote_init',
- deps='LIBCLI_SMB ndr-table',
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ deps='LIBCLI_SMB ndr-table'
)
@@ -57,8 +54,7 @@ bld.SAMBA_MODULE('dcerpc_srvsvc',
autoproto='srvsvc/proto.h',
subsystem='dcerpc_server',
init_function='dcerpc_server_srvsvc_init',
- deps='DCERPC_COMMON NDR_SRVSVC share ntvfs',
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ deps='DCERPC_COMMON NDR_SRVSVC share ntvfs'
)
@@ -66,8 +62,7 @@ bld.SAMBA_MODULE('dcerpc_wkssvc',
source='wkssvc/dcesrv_wkssvc.c',
subsystem='dcerpc_server',
init_function='dcerpc_server_wkssvc_init',
- deps='DCERPC_COMMON ndr-standard',
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ deps='DCERPC_COMMON ndr-standard'
)
@@ -75,8 +70,7 @@ bld.SAMBA_MODULE('dcerpc_unixinfo',
source='unixinfo/dcesrv_unixinfo.c',
subsystem='dcerpc_server',
init_function='dcerpc_server_unixinfo_init',
- deps='DCERPC_COMMON samdb NDR_UNIXINFO LIBWBCLIENT_OLD',
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ deps='DCERPC_COMMON samdb NDR_UNIXINFO LIBWBCLIENT_OLD'
)
@@ -85,8 +79,7 @@ bld.SAMBA_MODULE('dcesrv_samr',
autoproto='samr/proto.h',
subsystem='dcerpc_server',
init_function='dcerpc_server_samr_init',
- deps='samdb DCERPC_COMMON ndr-standard',
- enabled=bld.AD_DC_BUILD_IS_ENABLED()
+ deps='samdb DCERPC_COMMON ndr-standard'
)
@@ -95,8 +88,7 @@ bld.SAMBA_MODULE('dcerpc_winreg',
subsystem='dcerpc_server',
init_function='dcerpc_server_winreg_init',
deps='registry ndr-standard',
- internal_module=True,
-
autobuild: intermittent test failure detected
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-06-01-1813/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-06-01-1813/samba3.stderr http://git.samba.org/autobuild.flakey/2012-06-01-1813/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-06-01-1813/samba4.stderr http://git.samba.org/autobuild.flakey/2012-06-01-1813/samba4.stdout The top commit at the time of the failure was: commit eaf9b86d601d7564199bdc037dc5024e6a4e5908 Author: Alexander Bokovoy a...@samba.org Date: Fri Jun 1 15:38:56 2012 +0300 Revert waf-mitkrb5: enable dcerpc_server library to support OpenChange client code This reverts commit f8c447b1a48eaf12dcf70b92fd7525c4ad26c246. After discussing with Julien (Openchange) and Metze, I decided to revert this code. Instead I made a patch to Openchange which allows to build client side only. Openchange server code requires working s4 member DC and --without-ad-dc build does not provide working provisioning even if we enable dcerpc_server and end point mapper. Autobuild-User: Alexander Bokovoy a...@samba.org Autobuild-Date: Fri Jun 1 16:46:08 CEST 2012 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 29a51a2 s3: Avoid a lot of calls to serverid_exists()
from eaf9b86 Revert waf-mitkrb5: enable dcerpc_server library to
support OpenChange client code
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 29a51a22df68ae8929bd8312df03c72bbfa26f81
Author: Volker Lendecke v...@samba.org
Date: Fri Jun 1 15:15:07 2012 +0200
s3: Avoid a lot of calls to serverid_exists()
Signed-off-by: Stefan Metzmacher me...@samba.org
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Fri Jun 1 18:58:30 CEST 2012 on sn-devel-104
---
Summary of changes:
source3/locking/locking.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 00a46fa..76c2bc7 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -620,7 +620,7 @@ bool is_valid_share_mode_entry(const struct
share_mode_entry *e)
num_props += (EXCLUSIVE_OPLOCK_TYPE(e-op_type) ? 1 : 0);
num_props += (LEVEL_II_OPLOCK_TYPE(e-op_type) ? 1 : 0);
- if (serverid_exists(e-pid) (num_props 1)) {
+ if ((num_props 1) serverid_exists(e-pid)) {
smb_panic(Invalid share mode entry);
}
return (num_props != 0);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 97a4901 s3: Same fix as 8576256, this time for fgetxattr from 29a51a2 s3: Avoid a lot of calls to serverid_exists() http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 97a4901d6c16a8628f348edb182849326c3b1f2d Author: Volker Lendecke v...@samba.org Date: Fri Jun 1 10:32:54 2012 +0200 s3: Same fix as 8576256, this time for fgetxattr Signed-off-by: Jeremy Allison j...@samba.org Autobuild-User: Jeremy Allison j...@samba.org Autobuild-Date: Sat Jun 2 02:12:31 CEST 2012 on sn-devel-104 --- Summary of changes: source3/modules/vfs_xattr_tdb.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/vfs_xattr_tdb.c b/source3/modules/vfs_xattr_tdb.c index fc5c3de..859e06b 100644 --- a/source3/modules/vfs_xattr_tdb.c +++ b/source3/modules/vfs_xattr_tdb.c @@ -91,7 +91,7 @@ static ssize_t xattr_tdb_fgetxattr(struct vfs_handle_struct *handle, errno = ERANGE; return -1; } - memcpy(value, blob.data, size); + memcpy(value, blob.data, xattr_size); TALLOC_FREE(frame); return xattr_size; } -- Samba Shared Repository
autobuild: intermittent test failure detected
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-06-02-0349/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-06-02-0349/samba3.stderr http://git.samba.org/autobuild.flakey/2012-06-02-0349/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-06-02-0349/samba4.stderr http://git.samba.org/autobuild.flakey/2012-06-02-0349/samba4.stdout The top commit at the time of the failure was: commit 29a51a22df68ae8929bd8312df03c72bbfa26f81 Author: Volker Lendecke v...@samba.org Date: Fri Jun 1 15:15:07 2012 +0200 s3: Avoid a lot of calls to serverid_exists() Signed-off-by: Stefan Metzmacher me...@samba.org Autobuild-User: Stefan Metzmacher me...@samba.org Autobuild-Date: Fri Jun 1 18:58:30 CEST 2012 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 81a754f lib/replace: Relicence xattr.c to LGPLv3 via 2716b0a build: Always attempt to build posix ACLs via e9d797e lib/replace: Merge remaining xattr test details from lib/util via f9b7cd5 s4-xattr: Use libreplace xattr functions directly via c290cdb lib/replace: xattr wrappers in lib/replace rather than source3/lib/system.c via 664af06 lib/replace: We cannot use strchr_m in lib/replace via 954da1b lib/replace: DEBUG is not acceptable here, as this may not be linked into Samba via b347067 lib/replace: Copy lib/system.c xattr wrappers to lib/replace from 97a4901 s3: Same fix as 8576256, this time for fgetxattr http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 81a754fb6462bc9f6b4be6bc1ee04a85a85e1686 Author: Andrew Bartlett abart...@samba.org Date: Sat Jun 2 09:28:04 2012 +1000 lib/replace: Relicence xattr.c to LGPLv3 By the kind consent of the copyright holders. (There wasn't any code from tridge in the code brought in from source3/lib/system.c). Andrew Bartlett Autobuild-User: Andrew Bartlett abart...@samba.org Autobuild-Date: Sat Jun 2 04:00:42 CEST 2012 on sn-devel-104 commit 2716b0a3f3037a5b8ac95b586158ed849c3418c3 Author: Andrew Bartlett abart...@samba.org Date: Fri Jun 1 15:24:20 2012 +1000 build: Always attempt to build posix ACLs These are on more systems than just linux. If the configure test passes then assume it is available. Andrew Bartlett commit e9d797e153ae95561dbb10b56a41281b2472f137 Author: Andrew Bartlett abart...@samba.org Date: Fri Jun 1 15:01:09 2012 +1000 lib/replace: Merge remaining xattr test details from lib/util I prefer the longer XATTR_ADDITIONAL_OPTIONS define and the NULL rather than 0 values in the getxattr test. Andrew Bartlett commit f9b7cd53b9fe253b122cb545c2dd1be073ab0592 Author: Andrew Bartlett abart...@samba.org Date: Fri Jun 1 13:41:46 2012 +1000 s4-xattr: Use libreplace xattr functions directly commit c290cdb9349220ba70b54143e1432da0230e2cee Author: Andrew Bartlett abart...@samba.org Date: Fri Jun 1 13:29:38 2012 +1000 lib/replace: xattr wrappers in lib/replace rather than source3/lib/system.c This also moves all the still-used configure tests etc. The unused OSF API is also removed at this time. Andrew Bartlett commit 664af060ac9ea83b565fbb817bb63d67d83843ef Author: Andrew Bartlett abart...@samba.org Date: Fri Jun 1 14:07:42 2012 +1000 lib/replace: We cannot use strchr_m in lib/replace In any case, it is always safe to search for . even in a multibyte string. Andrew Bartlett commit 954da1b81ec1a4ef9b417885e3a587b9c49b7056 Author: Andrew Bartlett abart...@samba.org Date: Fri Jun 1 14:05:10 2012 +1000 lib/replace: DEBUG is not acceptable here, as this may not be linked into Samba commit b347067a67b791fa83c1cfa5b33a5de1a3045170 Author: Andrew Bartlett abart...@samba.org Date: Fri Jun 1 14:14:45 2012 +1000 lib/replace: Copy lib/system.c xattr wrappers to lib/replace --- Summary of changes: lib/replace/libreplace.m4 | 47 ++ lib/replace/replace.h | 40 ++ lib/replace/system/filesys.h| 56 +++ lib/replace/wscript | 38 ++- lib/replace/xattr.c | 699 +++ lib/util/wrap_xattr.c | 120 - lib/util/wrap_xattr.h | 33 -- lib/util/wscript_build |9 - lib/util/wscript_configure | 13 - source3/configure.in| 59 --- source3/include/includes.h | 23 - source3/lib/system.c| 678 -- source3/modules/vfs_default.c | 16 +- source3/wscript | 44 +-- source4/ntvfs/posix/python/pyposix_eadb.c |1 - source4/ntvfs/posix/python/pyxattr_native.c |8 +- source4/ntvfs/posix/python/pyxattr_tdb.c|1 - source4/ntvfs/posix/wscript_build |4 +- source4/ntvfs/posix/xattr_system.c | 13 +- 19 files changed, 913 insertions(+), 989 deletions(-) create mode 100644 lib/replace/xattr.c delete mode 100644 lib/util/wrap_xattr.c delete mode 100644 lib/util/wrap_xattr.h Changeset truncated at 500 lines: diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4 index 7335c98..641d25b 100644 --- a/lib/replace/libreplace.m4 +++ b/lib/replace/libreplace.m4 @@ -144,6 +144,53 @@ AC_CHECK_FUNCS(clock_gettime,libreplace_cv_have_clock_gettime=yes,[ libreplace_cv_have_clock_gettime=yes AC_DEFINE(HAVE_CLOCK_GETTIME,
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 80913ae libreplace: Fix autoconf build on platforms needing xattrs
via a9311eb build: Check correctly for sendfile (missing .h in header)
from 81a754f lib/replace: Relicence xattr.c to LGPLv3
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 80913ae2a88e0e9f5730f565ed73c8cb77be123a
Author: Andrew Bartlett abart...@samba.org
Date: Sat Jun 2 13:08:32 2012 +1000
libreplace: Fix autoconf build on platforms needing xattrs
Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Sat Jun 2 07:23:32 CEST 2012 on sn-devel-104
commit a9311ebfe7a28f5f5ac79a9779ab6bd0faeebe49
Author: Andrew Bartlett abart...@samba.org
Date: Sat Jun 2 13:02:21 2012 +1000
build: Check correctly for sendfile (missing .h in header)
This will hopefully fix the build on SLES8, which does not support 64-bit
sendfile.
Andrew Bartlett
---
Summary of changes:
lib/replace/libreplace.m4 |2 +-
source3/wscript |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4
index 641d25b..16718d8 100644
--- a/lib/replace/libreplace.m4
+++ b/lib/replace/libreplace.m4
@@ -49,7 +49,7 @@ fi
LIBREPLACEOBJ=$libreplacedir/replace.o
AC_SUBST(LIBREPLACEOBJ)
-LIBREPLACEOBJ=${LIBREPLACEOBJ} $libreplacedir/snprintf.o
+LIBREPLACEOBJ=${LIBREPLACEOBJ} $libreplacedir/snprintf.o
$libreplacedir/xattr.o
AC_TYPE_UID_T
AC_TYPE_MODE_T
diff --git a/source3/wscript b/source3/wscript
index e9d971a..b08fc77 100755
--- a/source3/wscript
+++ b/source3/wscript
@@ -941,7 +941,7 @@ main() {
ssize_t nwritten = sendfile(tofd, fromfd, offset,
total);
''',
'_HAVE_SENDFILE',
-headers='sys/sendfile',
+headers='sys/sendfile.h',
msg='Checking for linux sendfile support')
# Try and cope with broken Linux sendfile
--
Samba Shared Repository
