[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 902b1d9 s4:ntvfs/cifs: return NT_STATUS_INTERNAL_ERROR if no credentials are available via a7b8593 s4:kdc: split s4u2self and s4u2proxy checks via 5f48c5d s4:kdc: UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION = flags.trusted_for_delegation via 053ef0f s4:auth/credentials: S4U2Self should force CRED_MUST_USE_KERBEROS via a41efe6 s4:auth/credentials: pass 'self_service' to cli_credentials_set_impersonate_principal() via c6836c8 s4:gensec_gssapi: avoid delegation if s4u2self/proxy is used via 2c46585 HEIMDAL:kdc: check and regenerate the PAC in the s4u2proxy case via 3797e46 HEIMDAL:kdc: pass the correct principal name for the resulting service ticket via cc0ff48 HEIMDAL:kdc: let check_PAC() to verify the incoming server and krbtgt cheksums from 2873429 Fix bug #8144 - touch /mnt/newfile fails to set timestamp with CIFS client. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 902b1d9a19ca8bbc32c3cf1f67efd9cf6627d711 Author: Stefan Metzmacher me...@samba.org Date: Mon May 2 12:51:58 2011 +0200 s4:ntvfs/cifs: return NT_STATUS_INTERNAL_ERROR if no credentials are available This is a configuration problem on the server, no invalid parameter from the client. metze Autobuild-User: Stefan Metzmacher me...@samba.org Autobuild-Date: Wed May 18 08:49:00 CEST 2011 on sn-devel-104 commit a7b8593f9c8f43f7861d2a0bc0e249f17d8ce7f5 Author: Stefan Metzmacher me...@samba.org Date: Thu Apr 7 11:16:55 2011 +0200 s4:kdc: split s4u2self and s4u2proxy checks metze commit 5f48c5df513eecaff162e72bfeff39b9390710e7 Author: Stefan Metzmacher me...@samba.org Date: Thu Apr 7 12:16:16 2011 +0200 s4:kdc: UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION = flags.trusted_for_delegation metze commit 053ef0f605e8e99bf10e784cf383f954a6940d0a Author: Stefan Metzmacher me...@samba.org Date: Thu Apr 28 17:10:03 2011 +0200 s4:auth/credentials: S4U2Self should force CRED_MUST_USE_KERBEROS Otherwise we would not impersonate the desired principal. This still doesn't work for plaintext auth, but should avoid ntlmssp. metze commit a41efe6802da4e81a4af72aa231daa00f5012ab8 Author: Stefan Metzmacher me...@samba.org Date: Fri Apr 22 11:22:50 2011 +0200 s4:auth/credentials: pass 'self_service' to cli_credentials_set_impersonate_principal() This also adds a cli_credentials_get_self_service() helper function. In order to support S4U2Proxy we need to be able to set the service principal for the S4U2Self step independent of the target principal. metze commit c6836c8ede90a97a31c208a0057cffe78ed5a3d9 Author: Stefan Metzmacher me...@samba.org Date: Fri Mar 25 15:44:50 2011 +0100 s4:gensec_gssapi: avoid delegation if s4u2self/proxy is used metze commit 2c46585a428eb224755892884af6bcb0d16df463 Author: Stefan Metzmacher me...@samba.org Date: Thu Apr 7 14:40:54 2011 +0200 HEIMDAL:kdc: check and regenerate the PAC in the s4u2proxy case TODO: we need to add a S4U_DELEGATION_INFO to the PAC later. metze commit 3797e465439ec146cde2b041a553c6dcf1eb9683 Author: Stefan Metzmacher me...@samba.org Date: Fri Mar 25 12:36:14 2011 +0100 HEIMDAL:kdc: pass the correct principal name for the resulting service ticket Depending on S4U2Proxy the principal name for the resulting ticket is not the principal of the client ticket. metze commit cc0ff48f28d13fd155489e08f75e64ff0e11b1de Author: Stefan Metzmacher me...@samba.org Date: Fri Mar 25 14:57:42 2011 +0100 HEIMDAL:kdc: let check_PAC() to verify the incoming server and krbtgt cheksums For a normal TGS-REQ they're both signed with krbtgt key. But for S4U2Proxy requests which ask for contrained delegation, the keys differ. metze --- Summary of changes: source4/auth/credentials/credentials.c |1 + source4/auth/credentials/credentials.h |6 +- source4/auth/credentials/credentials_krb5.c | 25 +- source4/auth/gensec/gensec_gssapi.c |4 + source4/auth/kerberos/kerberos_util.c |8 ++- source4/heimdal/kdc/krb5tgs.c | 130 --- source4/kdc/db-glue.c | 43 +++-- source4/kdc/db-glue.h | 14 ++- source4/kdc/hdb-samba4.c| 27 +-- source4/kdc/mit_samba.c |8 +- source4/ntvfs/cifs/vfs_cifs.c |2 +- source4/torture/rpc/remote_pac.c|7 +- 12 files changed, 189 insertions(+), 86 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/auth/credentials/credentials.c
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/2011-05-18-1027/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-05-18-1027/samba3.stderr http://git.samba.org/autobuild.flakey/2011-05-18-1027/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-05-18-1027/samba4.stderr http://git.samba.org/autobuild.flakey/2011-05-18-1027/samba4.stdout The top commit at the time of the failure was: commit 902b1d9a19ca8bbc32c3cf1f67efd9cf6627d711 Author: Stefan Metzmacher me...@samba.org Date: Mon May 2 12:51:58 2011 +0200 s4:ntvfs/cifs: return NT_STATUS_INTERNAL_ERROR if no credentials are available This is a configuration problem on the server, no invalid parameter from the client. metze Autobuild-User: Stefan Metzmacher me...@samba.org Autobuild-Date: Wed May 18 08:49:00 CEST 2011 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 192198a s3-modules: Fix the build of gpfs.c on RHEL 6.0 with gpfs 3.4.0-4 via 5608995 s3-docs: change eventlog path from lockdir to statedir via 23e23d0 s3-torture/nbio.c: Fix cli_errstr() usage (part of bug #7864) via 26f7c07 s3-client/clitar.c: Fix cli_errstr() usage (part of bug #7864) via 25f1583 s3-net_rpc_printer.c: Fix cli_errstr() usage (part of bug #7864) via 6552ed6 s3-libsmb/passchange.c: Fix cli_errstr() usage (part of bug #7864) via 310502a s3-torture/mangle_test.c: Fix cli_errstr() usage (part of bug #7864) via 6fd0e06 s3-torture: torture.c: Fix cli_errstr() usage (part of bug #7864) from 902b1d9 s4:ntvfs/cifs: return NT_STATUS_INTERNAL_ERROR if no credentials are available http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 192198ad70474e56d4708b65482eee976ea78a05 Author: Björn Baumbach b...@sernet.de Date: Mon May 16 14:25:01 2011 +0200 s3-modules: Fix the build of gpfs.c on RHEL 6.0 with gpfs 3.4.0-4 Signed-off-by: Stefan Metzmacher me...@samba.org Autobuild-User: Stefan Metzmacher me...@samba.org Autobuild-Date: Wed May 18 11:58:14 CEST 2011 on sn-devel-104 commit 5608995bd2182c12310ef4b4dd39583b6fe77b1e Author: Björn Baumbach b...@sernet.de Date: Thu Feb 3 11:06:57 2011 +0100 s3-docs: change eventlog path from lockdir to statedir See elog_tdbname() in source3/lib/eventlog/eventlog.c. Signed-off-by: Stefan Metzmacher me...@samba.org commit 23e23d083602d59ec500b4abfc331a451f6e5dbb Author: Björn Baumbach b...@sernet.de Date: Mon Feb 7 11:27:02 2011 +0100 s3-torture/nbio.c: Fix cli_errstr() usage (part of bug #7864) Convert cli_errstr() to nt_errstr() Signed-off-by: Stefan Metzmacher me...@samba.org commit 26f7c0771bfba85c0d203996aee1d3ada04e56b6 Author: Björn Baumbach b...@sernet.de Date: Mon Feb 7 11:27:02 2011 +0100 s3-client/clitar.c: Fix cli_errstr() usage (part of bug #7864) Convert cli_errstr() to nt_errstr() Signed-off-by: Stefan Metzmacher me...@samba.org commit 25f1583b9f6eb2a4569b448830bb5ef4d5a06818 Author: Björn Baumbach b...@sernet.de Date: Tue Feb 1 16:58:48 2011 +0100 s3-net_rpc_printer.c: Fix cli_errstr() usage (part of bug #7864) Convert cli_errstr() to nt_errstr() Signed-off-by: Stefan Metzmacher me...@samba.org commit 6552ed64c1dbae25c3b413b6d7a8f61e8b7033c7 Author: Björn Baumbach b...@sernet.de Date: Fri Feb 4 14:25:52 2011 +0100 s3-libsmb/passchange.c: Fix cli_errstr() usage (part of bug #7864) Convert cli_errstr() to nt_errstr() Signed-off-by: Stefan Metzmacher me...@samba.org commit 310502a15ac03e642d0015e050e8407351f6dcd9 Author: Björn Baumbach b...@sernet.de Date: Tue Feb 1 11:27:55 2011 +0100 s3-torture/mangle_test.c: Fix cli_errstr() usage (part of bug #7864) Convert cli_errstr() to nt_errstr() Signed-off-by: Stefan Metzmacher me...@samba.org commit 6fd0e062d3606264967756246964669de2eb2454 Author: Björn Baumbach b...@sernet.de Date: Thu Jan 20 14:21:40 2011 +0100 s3-torture: torture.c: Fix cli_errstr() usage (part of bug #7864) Convert cli_errstr() to nt_errstr() Signed-off-by: Stefan Metzmacher me...@samba.org --- Summary of changes: docs-xml/smbdotconf/protocol/eventloglist.xml |2 +- source3/client/clitar.c | 23 +- source3/libsmb/passchange.c | 17 +- source3/modules/gpfs.c|1 + source3/torture/mangle_test.c | 33 +- source3/torture/nbio.c| 23 +- source3/torture/torture.c | 1314 +++-- source3/utils/net_rpc_printer.c | 116 ++-- 8 files changed, 922 insertions(+), 607 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/protocol/eventloglist.xml b/docs-xml/smbdotconf/protocol/eventloglist.xml index e98559b..101821a 100644 --- a/docs-xml/smbdotconf/protocol/eventloglist.xml +++ b/docs-xml/smbdotconf/protocol/eventloglist.xml @@ -6,7 +6,7 @@ paraThis option defines a list of log names that Samba will report to the Microsoft EventViewer utility. The listed eventlogs will be associated with tdb file on disk in the -filename$(lockdir)/eventlog/filename. +filename$(statedir)/eventlog/filename. /para para diff --git a/source3/client/clitar.c b/source3/client/clitar.c index 2a78a18..4dc202e 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -509,6 +509,7 @@ static bool ensurepath(const char *fname) const char *p=fname; char *basehack; char *saveptr; + NTSTATUS status; DEBUG(5, ( Ensurepath
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b25f7d4 torture: desactivate the level 4 tests for DFS referral
via 29a03cd s4-dfs: Add workaround so that XP really works well
from 192198a s3-modules: Fix the build of gpfs.c on RHEL 6.0 with gpfs
3.4.0-4
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b25f7d4020276c199b29597ba4c575d9f8f8a4e3
Author: Matthieu Patou m...@matws.net
Date: Wed May 18 08:44:05 2011 +0400
torture: desactivate the level 4 tests for DFS referral
Autobuild-User: Matthieu Patou m...@samba.org
Autobuild-Date: Wed May 18 13:04:00 CEST 2011 on sn-devel-104
commit 29a03cdbc297460415b27a5acc8ecfb7240cd2b4
Author: Matthieu Patou m...@matws.net
Date: Wed May 18 01:14:24 2011 +0400
s4-dfs: Add workaround so that XP really works well
XP seems to have problems working at a correct speed (or even
working at all if we return referral of level 4).
---
Summary of changes:
source4/smb_server/smb/trans2.c | 31 ++-
source4/torture/dfs/domaindfs.c | 19 +--
2 files changed, 35 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/smb_server/smb/trans2.c b/source4/smb_server/smb/trans2.c
index 1637123..b3aa690 100644
--- a/source4/smb_server/smb/trans2.c
+++ b/source4/smb_server/smb/trans2.c
@@ -868,21 +868,13 @@ static NTSTATUS fill_normal_dfs_referraltype(struct
dfs_referral_type *ref,
const char *server_path, int
isfirstoffset)
{
ZERO_STRUCTP(ref);
- ref-version = version;
-
switch (version) {
- case 3:
- ref-referral.v3.server_type = DFS_SERVER_NON_ROOT;
- /* normal referral seems to always include the GUID */
- ref-referral.v3.size = 34;
-
- ref-referral.v3.entry_flags = 0;
- ref-referral.v3.ttl = 600; /* As w2k3 */
- ref-referral.v3.referrals.r1.DFS_path = talloc_strdup(ref,
dfs_path);
- ref-referral.v3.referrals.r1.DFS_alt_path = talloc_strdup(ref,
dfs_path);
- ref-referral.v3.referrals.r1.netw_address = talloc_strdup(ref,
server_path);
- return NT_STATUS_OK;
case 4:
+ version = 3;
+# if 0
+ /* For the moment there is a bug with XP that don't seems to
appriciate much
+* level4 so we return just level 3 for everyone
+*/
ref-referral.v4.server_type = DFS_SERVER_NON_ROOT;
/* normal referral seems to always include the GUID */
ref-referral.v4.size = 34;
@@ -895,6 +887,19 @@ static NTSTATUS fill_normal_dfs_referraltype(struct
dfs_referral_type *ref,
ref-referral.v4.referrals.r1.DFS_alt_path = talloc_strdup(ref,
dfs_path);
ref-referral.v4.referrals.r1.netw_address = talloc_strdup(ref,
server_path);
return NT_STATUS_OK;
+#endif
+ case 3:
+ ref-version = version;
+ ref-referral.v3.server_type = DFS_SERVER_NON_ROOT;
+ /* normal referral seems to always include the GUID */
+ ref-referral.v3.size = 34;
+
+ ref-referral.v3.entry_flags = 0;
+ ref-referral.v3.ttl = 600; /* As w2k3 */
+ ref-referral.v3.referrals.r1.DFS_path = talloc_strdup(ref,
dfs_path);
+ ref-referral.v3.referrals.r1.DFS_alt_path = talloc_strdup(ref,
dfs_path);
+ ref-referral.v3.referrals.r1.netw_address = talloc_strdup(ref,
server_path);
+ return NT_STATUS_OK;
}
return NT_STATUS_INVALID_LEVEL;
}
diff --git a/source4/torture/dfs/domaindfs.c b/source4/torture/dfs/domaindfs.c
index fafae17..4914217 100644
--- a/source4/torture/dfs/domaindfs.c
+++ b/source4/torture/dfs/domaindfs.c
@@ -380,7 +380,11 @@ static bool test_getsysvolreferral(struct torture_context
*tctx,
Wrong DFS_path %s unable to
find substring %s in it,
resp3.referral_entries[0].referral.v3.referrals.r1.netw_address,
str+1));
-
+#if 0
+ /*
+* Due to strange behavior with XP and level 4
+* we are obliged to degrade to level 3 ...
+*/
r3.in.req.max_referral_level = 4;
torture_assert_ntstatus_ok(tctx,
@@ -394,6 +398,17 @@ static bool test_getsysvolreferral(struct torture_context
*tctx,
torture_assert_int_equal(tctx,
memcmp(resp3.referral_entries[0].referral.v3.service_site_guid.value, zeros,
16), 0,
talloc_asprintf(tctx,
Service_site_guid is not NULL as
expected));
+#endif
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d97faae s3-smbtorture: fix build warning (shadowed NTSTATUS
variable).
from b25f7d4 torture: desactivate the level 4 tests for DFS referral
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d97faae7db451184d61c860d9756cdce2d792519
Author: Günther Deschner g...@samba.org
Date: Wed May 18 13:15:01 2011 +0200
s3-smbtorture: fix build warning (shadowed NTSTATUS variable).
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Wed May 18 14:17:13 CEST 2011 on sn-devel-104
---
Summary of changes:
source3/torture/torture.c |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index a05fbbf..684e079 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -822,7 +822,6 @@ static bool rw_torture2(struct cli_state *c1, struct
cli_state *c2)
for (i = 0; i torture_numops; i++)
{
- NTSTATUS status;
size_t buf_size = ((unsigned)sys_random()%(sizeof(buf)-1))+ 1;
if (i % 10 == 0) {
printf(%d\r, i); fflush(stdout);
--
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/2011-05-18-1427/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-05-18-1427/samba3.stderr http://git.samba.org/autobuild.flakey/2011-05-18-1427/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-05-18-1427/samba4.stderr http://git.samba.org/autobuild.flakey/2011-05-18-1427/samba4.stdout The top commit at the time of the failure was: commit b25f7d4020276c199b29597ba4c575d9f8f8a4e3 Author: Matthieu Patou m...@matws.net Date: Wed May 18 08:44:05 2011 +0400 torture: desactivate the level 4 tests for DFS referral Autobuild-User: Matthieu Patou m...@samba.org Autobuild-Date: Wed May 18 13:04:00 CEST 2011 on sn-devel-104
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/2011-05-18-1627/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-05-18-1627/samba3.stderr http://git.samba.org/autobuild.flakey/2011-05-18-1627/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-05-18-1627/samba4.stderr http://git.samba.org/autobuild.flakey/2011-05-18-1627/samba4.stdout The top commit at the time of the failure was: commit d97faae7db451184d61c860d9756cdce2d792519 Author: Günther Deschner g...@samba.org Date: Wed May 18 13:15:01 2011 +0200 s3-smbtorture: fix build warning (shadowed NTSTATUS variable). Guenther Autobuild-User: Günther Deschner g...@samba.org Autobuild-Date: Wed May 18 14:17:13 CEST 2011 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f19ab5d lib/util/charset: Remove unused strcasecmp_w and strncasecmp_w via 2a12424 s3-selftest Remove unused and unimplemented info3cache test via 57f41ef lib/util/charset use talloc_stackframe() rather than talloc_tos() via fa3e2fc selftest: Re-enable strings.py from source3/stf as a python subunit test via 06435ac s3-testparm Warn more on incorrect use of 'password server' via 3c8de7d lib/util/charset Don't allow invalid 'dos charset = utf8' via 035dbce s3-selftest Remove unused sambalib.py from comfychair test system via da662b8 s3-lib Replace StrnCaseCmp() with strncasecmp_m() via c615ebe s3-lib Replace StrCaseCmp() with strcasecmp_m() via 7a11e5d s3-param: Remove unused snum2params_static via b3258ad s3-param: remove unused share_iterator functions via c6cc22a s4-libnet: Remove libnet_Join and create libnet_Join_member via c47b078 build: Add 'cap' as a dependency of samba3core via 75faa9e build: Make POPT_SAMBA3 a library via 41b3c38 librpc/ndr Merge ndr_print_sockaddr_storage() into common code via 8d7be8a build: Make util_reg subsystem in libcli/registry a library via fc46628 build: Add rpc_client grouping library via d17367b build: Add depenencies needed by Samba3 subsystems via a2ff3e7 build: Make auth_sam_reply a library via baad855 build: Make msrpc3 a library via 30979f3 build: Expand dcerpc-samba grouping library via 2fc342c waf-build: Add more libraries to avoid duplicate symbols via d13fb8d s4-selftest: gensec test is finished, don't skip via 3dd76f2 selftest: Don't skip Samba3 tests in the top level build from d97faae s3-smbtorture: fix build warning (shadowed NTSTATUS variable). http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f19ab5d334e3fb15761fb009e5de876dfc6ea785 Author: Andrew Bartlett abart...@samba.org Date: Wed May 18 23:57:10 2011 +1000 lib/util/charset: Remove unused strcasecmp_w and strncasecmp_w Autobuild-User: Andrew Bartlett abart...@samba.org Autobuild-Date: Wed May 18 17:22:15 CEST 2011 on sn-devel-104 commit 2a12424e4b6da8fb3cd0ad50e14f75f0bc5132e0 Author: Andrew Bartlett abart...@samba.org Date: Wed May 18 14:13:18 2011 +1000 s3-selftest Remove unused and unimplemented info3cache test commit 57f41ef150b82523aeb23cde63c1f8731a061edb Author: Andrew Bartlett abart...@samba.org Date: Wed May 18 13:57:26 2011 +1000 lib/util/charset use talloc_stackframe() rather than talloc_tos() This is common code, and we can't assume a talloc_stackframe() so we must create it. Andrew Bartlett commit fa3e2fc8bb3e935c65b7043382cad1d649cb68a6 Author: Andrew Bartlett abart...@samba.org Date: Wed May 18 12:06:25 2011 +1000 selftest: Re-enable strings.py from source3/stf as a python subunit test commit 06435acf3b9afa94019f7654cda4ad9386c6384b Author: Andrew Bartlett abart...@samba.org Date: Wed May 18 11:53:34 2011 +1000 s3-testparm Warn more on incorrect use of 'password server' commit 3c8de7dd66390c00542118ec3aaa84e1e20956cb Author: Andrew Bartlett abart...@samba.org Date: Wed May 18 11:51:37 2011 +1000 lib/util/charset Don't allow invalid 'dos charset = utf8' No DOS client used UTF8, and this creates subtle, difficult to disagnose breakage of schannel (domain membership). Andrew Bartlett commit 035dbce3adcbf36afee5e9cc59912c4f07fe0f5e Author: Andrew Bartlett abart...@samba.org Date: Wed May 18 10:34:03 2011 +1000 s3-selftest Remove unused sambalib.py from comfychair test system The test binary t_snprintf has moved to lib/replace commit da662b82b87cdbe07762974b1f9e825ef15951bd Author: Andrew Bartlett abart...@samba.org Date: Fri May 13 20:23:36 2011 +0200 s3-lib Replace StrnCaseCmp() with strncasecmp_m() strncasecmp_m() never needs to call to talloc, and via next_codepoint() still has an ASCII fast-path bypassing iconv() calls. Andrew Bartlett commit c615ebed6e3d273a682806b952d543e834e5630d Author: Andrew Bartlett abart...@samba.org Date: Fri May 13 20:21:30 2011 +0200 s3-lib Replace StrCaseCmp() with strcasecmp_m() strcasecmp_m() never needs to call to talloc, and via next_codepoint() still has an ASCII fast-path bypassing iconv() calls. Andrew Bartlett commit 7a11e5de395c928e4a37c58a7a7ac21a314449fe Author: Andrew Bartlett abart...@samba.org Date: Mon May 16 22:27:28 2011 +1000 s3-param: Remove unused snum2params_static commit b3258addb4bc861d8d0cf8842397c209ec2d3704 Author: Andrew Bartlett abart...@samba.org Date: Mon May 16 22:26:00 2011 +1000 s3-param: remove unused share_iterator functions commit c6cc22adc059aeb6de50305b8a40d513d8f05bbc Author: Andrew Bartlett
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via d68dbed Fix bug #8144 - touch /mnt/newfile fails to set timestamp
with CIFS client.
from 881d39c WHATSNEW: Start release notes.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit d68dbed16939a4ba04435f7dad490d0a9fa60bdb
Author: Jeremy Allison j...@samba.org
Date: Tue May 17 16:18:51 2011 -0700
Fix bug #8144 - touch /mnt/newfile fails to set timestamp with CIFS client.
The extra checks added for Windows correctness in our metadata changing
paths
to ensure the file handle has been opened with the correct access mask to
allow FILE_WRITE_ATTRIBUTES etc. caused problems with the POSIX open code.
The old POSIX open code maped O_RDONLY into FILE_READ, O_WRONLY into
FILE_WRITE,
and O_RDWR into FILE_READ|FILE_WRITE. This patch extends the mapping to add
FILE_WRITE_ATTRIBUTES, FILE_READ_ATTRIBUTES and FILE_WRITE_EA, FILE_READ_EA
to
allow POSIX opens to set these values.
---
Summary of changes:
source3/smbd/trans2.c | 25 +++--
1 files changed, 15 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 83db346..42b915b 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -7227,6 +7227,9 @@ static NTSTATUS smb_posix_mkdir(connection_struct *conn,
Open/Create a file with POSIX semantics.
/
+#define SMB_O_RDONLY_MAPPING (FILE_READ_DATA|FILE_READ_ATTRIBUTES|FILE_READ_EA)
+#define SMB_O_WRONLY_MAPPING
(FILE_WRITE_DATA|FILE_WRITE_ATTRIBUTES|FILE_WRITE_EA)
+
static NTSTATUS smb_posix_open(connection_struct *conn,
struct smb_request *req,
char **ppdata,
@@ -7272,13 +7275,14 @@ static NTSTATUS smb_posix_open(connection_struct *conn,
switch (wire_open_mode SMB_ACCMODE) {
case SMB_O_RDONLY:
- access_mask = FILE_READ_DATA;
+ access_mask = SMB_O_RDONLY_MAPPING;
break;
case SMB_O_WRONLY:
- access_mask = FILE_WRITE_DATA;
+ access_mask = SMB_O_WRONLY_MAPPING;
break;
case SMB_O_RDWR:
- access_mask = FILE_READ_DATA|FILE_WRITE_DATA;
+ access_mask = (SMB_O_RDONLY_MAPPING|
+ SMB_O_WRONLY_MAPPING);
break;
default:
DEBUG(5,(smb_posix_open: invalid open mode 0x%x\n,
@@ -7356,20 +7360,21 @@ static NTSTATUS smb_posix_open(connection_struct *conn,
if (wire_open_mode SMB_O_SYNC) {
create_options |= FILE_WRITE_THROUGH;
}
+ if (wire_open_mode SMB_O_APPEND) {
+ access_mask |= FILE_APPEND_DATA;
+ }
+ if (wire_open_mode SMB_O_DIRECT) {
+ mod_unixmode |= FILE_FLAG_NO_BUFFERING;
+ }
+
if ((wire_open_mode SMB_O_DIRECTORY) ||
VALID_STAT_OF_DIR(smb_fname-st)) {
- if (access_mask != FILE_READ_DATA) {
+ if (access_mask != SMB_O_RDONLY_MAPPING) {
return NT_STATUS_FILE_IS_A_DIRECTORY;
}
create_options = ~FILE_NON_DIRECTORY_FILE;
create_options |= FILE_DIRECTORY_FILE;
}
- if (wire_open_mode SMB_O_APPEND) {
- access_mask |= FILE_APPEND_DATA;
- }
- if (wire_open_mode SMB_O_DIRECT) {
- mod_unixmode |= FILE_FLAG_NO_BUFFERING;
- }
DEBUG(10,(smb_posix_open: file %s, smb_posix_flags = %u, mode 0%o\n,
smb_fname_str_dbg(smb_fname),
--
Samba Shared Repository
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via 2ec6c01 add myself to the team list from 24f9ef6 Fix url. http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit 2ec6c01a6eef8936bad89f81ec19969e905297e5 Author: Christian Ambach a...@samba.org Date: Wed May 18 19:39:14 2011 +0200 add myself to the team list --- Summary of changes: team/index.html |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/team/index.html b/team/index.html index 41b82e4..c540a60 100755 --- a/team/index.html +++ b/team/index.html @@ -43,6 +43,7 @@ mailing list/a and start contributing to the development of Samba./p ul lia href=http://samba.org/~obnox/;Michael Adam/a/li lia href=http://samba.org/~jra;Jeremy Allison/a/li +lia href=mailto:a...@samba.org;Christian Ambach/a/li lia href=mailto:anato...@samba.org;Anatoliy Atanasov/a/li lia href=http://samba.org/~abartlet/;Andrew Bartlett/a/li lia href=mailto:k...@samba.org;Kai Blin/a/li -- Samba Website Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via eb15457 Fix typos in LDAP schema files from d68dbed Fix bug #8144 - touch /mnt/newfile fails to set timestamp with CIFS client. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit eb15457258ad7a54d5a3c4431be8307331e3a6e3 Author: Sumit Bose sb...@redhat.com Date: Tue May 17 08:58:50 2011 +0200 Fix typos in LDAP schema files Reported by: John Danks john.da...@gmail.com Signed-off-by: Günther Deschner g...@samba.org Autobuild-User: Günther Deschner g...@samba.org Autobuild-Date: Tue May 17 11:56:08 CEST 2011 on sn-devel-104 Fix bug #8142 (typo in several LDAP schema files). --- Summary of changes: examples/LDAP/samba-nds.schema |2 +- examples/LDAP/samba-schema-FDS.ldif |2 +- examples/LDAP/samba-schema-netscapeds5.x |2 +- examples/LDAP/samba.schema |4 ++-- examples/LDAP/samba.schema.oc.IBM-DS |2 +- 5 files changed, 6 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/examples/LDAP/samba-nds.schema b/examples/LDAP/samba-nds.schema index 7ba8665..0b3cf66 100644 --- a/examples/LDAP/samba-nds.schema +++ b/examples/LDAP/samba-nds.schema @@ -407,4 +407,4 @@ objectClasses: ( 1.3.6.1.4.1.7165.2.2.13 NAME 'sambaPrivilege' DESC 'Samba Privi dn: cn=schema changetype: modify add: objectClasses -objectClasses: ( 1.3.6.1.4.1.7165.2.2.16 NAME 'sambaTrustedDomain' SUP top STRUCTURAL DESC 'Samba Trusted Domain Object' MUST ( cn ) MAY ( sambaTrustTyp e $ sambaTrustAttributes $ sambaTrustDirection $ sambaTrustPartner $ sambaFlatName $ sambaTrustAuthOutgoing $ sambaTrustAuthIncoming $ sambaSecurityIdentifier $ sambaTrustForestTrustInfo ) ) +objectClasses: ( 1.3.6.1.4.1.7165.2.2.16 NAME 'sambaTrustedDomain' SUP top STRUCTURAL DESC 'Samba Trusted Domain Object' MUST ( cn ) MAY ( sambaTrustType $ sambaTrustAttributes $ sambaTrustDirection $ sambaTrustPartner $ sambaFlatName $ sambaTrustAuthOutgoing $ sambaTrustAuthIncoming $ sambaSecurityIdentifier $ sambaTrustForestTrustInfo ) ) diff --git a/examples/LDAP/samba-schema-FDS.ldif b/examples/LDAP/samba-schema-FDS.ldif index 981dada..7513a49 100644 --- a/examples/LDAP/samba-schema-FDS.ldif +++ b/examples/LDAP/samba-schema-FDS.ldif @@ -183,4 +183,4 @@ objectClasses: ( 1.3.6.1.4.1.7165.2.2.15 NAME 'sambaTrustedDomainPassword' SUP t ## ## used for IPA_ldapsam ## -objectClasses: ( 1.3.6.1.4.1.7165.2.2.16 NAME 'sambaTrustedDomain' SUP top STRUCTURAL DESC 'Samba Trusted Domain Object' MUST ( cn ) MAY ( sambaTrustTyp e $ sambaTrustAttributes $ sambaTrustDirection $ sambaTrustPartner $ sambaFlatName $ sambaTrustAuthOutgoing $ sambaTrustAuthIncoming $ sambaSecurityIdentifier $ sambaTrustForestTrustInfo ) ) +objectClasses: ( 1.3.6.1.4.1.7165.2.2.16 NAME 'sambaTrustedDomain' SUP top STRUCTURAL DESC 'Samba Trusted Domain Object' MUST ( cn ) MAY ( sambaTrustType $ sambaTrustAttributes $ sambaTrustDirection $ sambaTrustPartner $ sambaFlatName $ sambaTrustAuthOutgoing $ sambaTrustAuthIncoming $ sambaSecurityIdentifier $ sambaTrustForestTrustInfo ) ) diff --git a/examples/LDAP/samba-schema-netscapeds5.x b/examples/LDAP/samba-schema-netscapeds5.x index 8bf0e93..55c2aff 100644 --- a/examples/LDAP/samba-schema-netscapeds5.x +++ b/examples/LDAP/samba-schema-netscapeds5.x @@ -36,7 +36,7 @@ objectClasses: ( 1.3.6.1.4.1.7165.2.2.7 NAME 'sambaUnixIdPool' SUP top AUXILIARY objectClasses: ( 1.3.6.1.4.1.7165.2.2.8 NAME 'sambaIdmapEntry' SUP top AUXILIARY DESC 'Mapping from a SID to an ID' MUST ( sambaSID ) MAY ( uidNumber $ gidNumber ) X-ORIGIN 'user defined' ) objectClasses: ( 1.3.6.1.4.1.7165.2.2.9 NAME 'sambaSidEntry' SUP top STRUCTURAL DESC 'Structural Class for a SID' MUST ( sambaSID ) X-ORIGIN 'user defined' ) objectClasses: ( 1.3.6.1.4.1.7165.2.2.15 NAME 'sambaTrustedDomainPassword' SUP top STRUCTURAL DESC 'Samba Trusted Domain Password' MUST ( sambaDomainName $ sambaSID $ sambaClearTextPassword $ sambaPwdLastSet ) MAY ( sambaPreviousClearTextPassword ) X-ORIGIN 'user defined') -objectClasses: ( 1.3.6.1.4.1.7165.2.2.16 NAME 'sambaTrustedDomain' SUP top STRUCTURAL DESC 'Samba Trusted Domain Object' MUST ( cn ) MAY ( sambaTrustTyp e $ sambaTrustAttributes $ sambaTrustDirection $ sambaTrustPartner $ sambaFlatName $ sambaTrustAuthOutgoing $ sambaTrustAuthIncoming $ sambaSecurityIdentifier $ sambaTrustForestTrustInfo ) X-ORIGIN 'user defined' ) +objectClasses: ( 1.3.6.1.4.1.7165.2.2.16 NAME 'sambaTrustedDomain' SUP top STRUCTURAL DESC 'Samba Trusted Domain Object' MUST ( cn ) MAY ( sambaTrustType $ sambaTrustAttributes $ sambaTrustDirection $ sambaTrustPartner $ sambaFlatName $ sambaTrustAuthOutgoing $ sambaTrustAuthIncoming $ sambaSecurityIdentifier $ sambaTrustForestTrustInfo ) X-ORIGIN 'user defined' )
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via c8ba5d4 tdb_expand: limit the expansion with huge records
from 392d6b2 s3-printing: make cups_pull_comment_location() work again.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit c8ba5d41f3c2ab25cb9b9d0fa78b4f884d4b9721
Author: Simo Sorce i...@samba.org
Date: Mon Apr 18 22:15:11 2011 +0930
tdb_expand: limit the expansion with huge records
ldb can create huge records when saving indexes.
Limit the tdb expansion to avoid consuming a lot of memory for
no good reason if the record being saved is huge.
Fix bug #7610 (winbindd_cache.tdb grows too large when scaled).
---
Summary of changes:
lib/tdb/common/io.c | 25 -
1 files changed, 20 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tdb/common/io.c b/lib/tdb/common/io.c
index d549715..2f58a49 100644
--- a/lib/tdb/common/io.c
+++ b/lib/tdb/common/io.c
@@ -299,7 +299,7 @@ static int tdb_expand_file(struct tdb_context *tdb,
tdb_off_t size, tdb_off_t ad
int tdb_expand(struct tdb_context *tdb, tdb_off_t size)
{
struct tdb_record rec;
- tdb_off_t offset, new_size;
+ tdb_off_t offset, new_size, top_size, map_size;
if (tdb_lock(tdb, -1, F_WRLCK) == -1) {
TDB_LOG((tdb, TDB_DEBUG_ERROR, lock failed in tdb_expand\n));
@@ -309,10 +309,25 @@ int tdb_expand(struct tdb_context *tdb, tdb_off_t size)
/* must know about any previous expansions by another process */
tdb-methods-tdb_oob(tdb, tdb-map_size + 1, 1);
- /* always make room for at least 100 more records, and at
- least 25% more space. Round the database up to a multiple
- of the page size */
- new_size = MAX(tdb-map_size + size*100, tdb-map_size * 1.25);
+ /* limit size in order to avoid using up huge amounts of memory for
+* in memory tdbs if an oddball huge record creeps in */
+ if (size 100 * 1024) {
+ top_size = tdb-map_size + size * 2;
+ } else {
+ top_size = tdb-map_size + size * 100;
+ }
+
+ /* always make room for at least top_size more records, and at
+ least 25% more space. if the DB is smaller than 100MiB,
+ otherwise grow it by 10% only. */
+ if (tdb-map_size 100 * 1024 * 1024) {
+ map_size = tdb-map_size * 1.10;
+ } else {
+ map_size = tdb-map_size * 1.25;
+ }
+
+ /* Round the database up to a multiple of the page size */
+ new_size = MAX(top_size, map_size);
size = TDB_ALIGN(new_size, tdb-page_size) - tdb-map_size;
if (!(tdb-flags TDB_INTERNAL))
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via eb57d47 Make protocol version 2 the default protocol, and only run
on version 1 if V1 is explcitly given as a module option.
from f19ab5d lib/util/charset: Remove unused strcasecmp_w and
strncasecmp_w
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit eb57d4719fc41352080a514cb40a0aca54153d35
Author: Holger Hetterich hhet...@novell.com
Date: Wed May 18 15:24:23 2011 +0200
Make protocol version 2 the default protocol, and only run on version 1 if
V1 is explcitly given as a module option.
I haven't received a single line of feedback on protocol v1
for at least 1 1/2 years, whereas protocol v2 has an active
userbase and more people developing around it.
This patch includes a manpage update, describing the new
version handling, as well as documenting the recent changes
making the module transfer the IP address of the client machine
as submitted with
464c69609aa7e582f484c1d357b7c6d3eb2bcbe3.
Signed-off-by: Jeremy Allison j...@samba.org
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Wed May 18 21:36:44 CEST 2011 on sn-devel-104
---
Summary of changes:
docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml | 10 ++
source3/modules/vfs_smb_traffic_analyzer.c | 11 +--
2 files changed, 11 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
index 882ee6a..9450703 100644
--- a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
+++ b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
@@ -45,6 +45,8 @@
protocol, supporting only a small list of VFS operations, and had
several drawbacks. The protocol version 2 is a try to solve the
problems version 1 had while at the same time adding new features.
+ With the release of Samba 3.6.0, the module will run protocol version 2
+ by default.
/para
/refsect1
@@ -77,6 +79,7 @@
listitemparacommandSHARE/command - the name of the share on
which the VFS operation occured/para/listitem
listitemparacommandFILENAME/command - the name of the file that
was used by the VFS operation/para/listitem
listitemparacommandTIMESTAMP/command - a timestamp, formatted
as -mm-dd hh-mm-ss.ms indicating when the VFS operation
occured/para/listitem
+ listitemparacommandIP/command - The IP Address (v4 or v6) of
the client machine that initiated the VFS operation./para/listitem
/itemizedlist
/para
@@ -224,9 +227,9 @@
varlistentry
termsmb_traffic_analyzer:protocol_version = STRING/term
listitem
- paraIf STRING matches to V1 or is not given at all, the module
- will use version 1 of the protocol. If STRING matches to V2
- the module will use version 2 of the protocol.
+ paraIf STRING matches to V1, the module will use version 1 of
the
+ protocol. If STRING is not given, the module will use version 2
of the
+ protocol, which is the default.
/para
/listitem
/varlistentry
@@ -241,7 +244,6 @@
smbconfsection name=[example_share]/
smbconfoption name=path/data/example/smbconfoption
smbconfoption name=vfs_objectssmb_traffic_analyzer/smbconfoption
- smbconfoption
name=smb_traffic_analyzer:protocol_versionV2/smbconfoption
smbconfoption
name=smb_traffic_analyzer:hostexamplehost/smbconfoption
smbconfoption name=smb_traffic_analyzer:port3491/smbconfoption
/programlisting
diff --git a/source3/modules/vfs_smb_traffic_analyzer.c
b/source3/modules/vfs_smb_traffic_analyzer.c
index d1340c3..4146d78 100644
--- a/source3/modules/vfs_smb_traffic_analyzer.c
+++ b/source3/modules/vfs_smb_traffic_analyzer.c
@@ -452,7 +452,7 @@ static void
smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
protocol_version, NULL );
- if ( protocol_version == NULL || strcmp( protocol_version,V1) == 0) {
+ if (protocol_version != NULL strcmp(protocol_version,V1) == 0) {
struct rw_data *s_data = (struct rw_data *) data;
@@ -489,7 +489,10 @@ static void
smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
return;
}
- } else if ( strcmp( protocol_version, V2) == 0) {
+ } else {
+ /**
+* Protocol 2 is used by default.
+*/
switch( vfs_operation ) {
case vfs_id_open: ;
@@ -557,10 +560,6 @@ static void
smb_traffic_analyzer_send_data(vfs_handle_struct
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0b0abc1 packaging(RHEL-CTDB): honour rpm build target options
handed in to makerpms.sh
via c07cccd packaging(RHEL-CTDB): adapt configure.rpm
via b2dbdaa packaging(RHEL-CTDB): enforce building of libtdb and
libtalloc
via ec625f7 packaging(RHEL-CTDB): build libtdb and libtalloc packages
ourselves
via ac0307f packaging(RHEL-CTDB): update configure.rpm
(--disable-smbtorture4)
via 51d5975 packaging(RHEL-CTDB): disable smbtorture4 in the rpm build
via b758875 packaging(RHEL-CTDB): Remove the packaging of the
winbind-32bit compat package
via ab62871 packaging(RHEL-CTDB): create the rpm directories
from eb57d47 Make protocol version 2 the default protocol, and only run
on version 1 if V1 is explcitly given as a module option.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0b0abc1723063b1360557cbd42198708720fa0a4
Author: Michael Adam ob...@samba.org
Date: Wed May 18 10:35:42 2011 +0200
packaging(RHEL-CTDB): honour rpm build target options handed in to
makerpms.sh
This allows to call e.g. makerpms.sh -bs to only build the source rpm.
Autobuild-User: Michael Adam ob...@samba.org
Autobuild-Date: Wed May 18 23:10:59 CEST 2011 on sn-devel-104
commit c07cccd98355102d9747004ec44e029937644b91
Author: Michael Adam ob...@samba.org
Date: Fri May 6 17:22:06 2011 +0200
packaging(RHEL-CTDB): adapt configure.rpm
commit b2dbdaaa0f6f03506a9e55631aa89db503bca73f
Author: Michael Adam ob...@samba.org
Date: Fri May 6 17:21:10 2011 +0200
packaging(RHEL-CTDB): enforce building of libtdb and libtalloc
commit ec625f7b7bc1a06da8541f9d8538ce88851bb10e
Author: Michael Adam ob...@samba.org
Date: Fri May 6 12:29:10 2011 +0200
packaging(RHEL-CTDB): build libtdb and libtalloc packages ourselves
and add appropriate dependencies to the samba-common package.
It should also be possible to run with appropriate system talloc
and tdb packages.
commit ac0307ff898d5f8edfa783e9f5e7a89ebf6d6524
Author: Michael Adam ob...@samba.org
Date: Fri May 6 18:36:38 2011 +0200
packaging(RHEL-CTDB): update configure.rpm (--disable-smbtorture4)
commit 51d5975e5e88967414e594c56e5041ac278790a1
Author: Michael Adam ob...@samba.org
Date: Fri May 6 18:35:55 2011 +0200
packaging(RHEL-CTDB): disable smbtorture4 in the rpm build
commit b7588755e7c021e4071691787686b07f8041845e
Author: Michael Adam ob...@samba.org
Date: Fri May 6 12:03:52 2011 +0200
packaging(RHEL-CTDB): Remove the packaging of the winbind-32bit compat
package
commit ab628716e0c989a9d80afbdff58ecda863330b67
Author: Volker Lendecke v...@samba.org
Date: Wed Apr 27 10:25:05 2011 +0200
packaging(RHEL-CTDB): create the rpm directories
In RHEL6, rpms are built in /root/rpmbuild, and those directories do not
necessarily exist.
---
Summary of changes:
packaging/RHEL-CTDB/configure.rpm |3 +
packaging/RHEL-CTDB/makerpms.sh | 19 -
packaging/RHEL-CTDB/makespec.sh | 15 +++-
packaging/RHEL-CTDB/samba.spec.tmpl | 157 +--
4 files changed, 76 insertions(+), 118 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL-CTDB/configure.rpm
b/packaging/RHEL-CTDB/configure.rpm
index 616336e..c7057ec 100755
--- a/packaging/RHEL-CTDB/configure.rpm
+++ b/packaging/RHEL-CTDB/configure.rpm
@@ -60,6 +60,9 @@ CC=$CC CFLAGS=-Wall -g -D_GNU_SOURCE -O3 ./configure -C \
--without-dnsupdate \
--with-aio-support \
--disable-merged-build \
+ --disable-smbtorture4 \
+ --disable-external-libtalloc \
+ --disable-external-libtdb \
$*
make showlayout
diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh
index c1a4b70..d23d14e 100755
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ b/packaging/RHEL-CTDB/makerpms.sh
@@ -42,6 +42,14 @@ case $RPMVER in
;;
esac
+mkdir -p `rpm --eval %_specdir`
+mkdir -p `rpm --eval %_sourcedir`
+mkdir -p `rpm --eval %_builddir`
+mkdir -p `rpm --eval %_srcrpmdir`
+mkdir -p `rpm --eval %_rpmdir`/noarch
+mkdir -p `rpm --eval %_rpmdir`/i386
+mkdir -p `rpm --eval %_rpmdir`/x86_64
+
##
## Delete the old debuginfo remnants:
##
@@ -131,8 +139,17 @@ fi
##
echo $(basename $0): Getting Ready to build release package
+case ${EXTRA_OPTIONS} in
+ *-b*)
+ BUILD_TARGET=
+ ;;
+ *)
+ BUILD_TARGET=-ba
+ ;;
+esac
+
pushd ${RPMSPECDIR}
-${RPM} -ba $EXTRA_OPTIONS $SPECFILE
+${RPM} ${BUILD_TARGET} ${EXTRA_OPTIONS} ${SPECFILE}
popd
echo $(basename $0): Done.
diff --git a/packaging/RHEL-CTDB/makespec.sh b/packaging/RHEL-CTDB/makespec.sh
index 29dcbeb..946ce8e 100755
--- a/packaging/RHEL-CTDB/makespec.sh
+++
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 66c3d5d Fix bug found when building on an IPv6-only system by Kai
Blin.
from 0b0abc1 packaging(RHEL-CTDB): honour rpm build target options
handed in to makerpms.sh
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 66c3d5d74b25b9b7703c2f48fd02a43f1d2ae9f2
Author: Jeremy Allison j...@samba.org
Date: Wed May 18 15:28:28 2011 -0700
Fix bug found when building on an IPv6-only system by Kai Blin.
When building on IPv6-only, doing:
hints.ai_family = AF_INET;
getaddrinfo(0.0.0.0, NULL, hints, ppres)
fails as AF_INET is unavailable on an IPv6-only system. This
causes us to fallback to our replacement getaddrinfo code
which is IPv4-only.
As we're only trying to detect a specific AIX bug here,
broaden the tests to find that bug, and also test for
working getaddrinfo in an IPv6-only safe way.
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Thu May 19 02:21:54 CEST 2011 on sn-devel-104
---
Summary of changes:
lib/replace/libreplace_network.m4 | 19 ---
1 files changed, 16 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/libreplace_network.m4
b/lib/replace/libreplace_network.m4
index f9bca40..eadcc6b 100644
--- a/lib/replace/libreplace_network.m4
+++ b/lib/replace/libreplace_network.m4
@@ -240,12 +240,25 @@ if test x$libreplace_cv_HAVE_GETADDRINFO = xyes; then
{
struct addrinfo hints = {0,};
struct addrinfo *ppres;
- const char hostname[] = 0.0.0.0;
+ const char hostname1[] = 0.0.0.0;
+ const char hostname2[] = 127.0.0.1;
+ const char hostname3[] = ::;
hints.ai_socktype = SOCK_STREAM;
- hints.ai_family = AF_INET;
+ hints.ai_family = AF_UNSPEC;
hints.ai_flags =
AI_NUMERICHOST|AI_PASSIVE|AI_ADDRCONFIG;
- return getaddrinfo(hostname, NULL, hints, ppres) != 0
? 1 : 0;
+ /* Test for broken flag combination on AIX. */
+ if (getaddrinfo(hostname1, NULL, hints, ppres) ==
EAI_BADFLAGS) {
+ /* This fails on an IPv6-only box, but not with
+ the EAI_BADFLAGS error. */
+ return 1;
+ }
+ if (getaddrinfo(hostname2, NULL, hints, ppres) == 0) {
+ /* IPv4 lookup works - good enough. */
+ return 0;
+ }
+ /* Uh-oh, no IPv4. Are we IPv6-only ? */
+ return getaddrinfo(hostname3, NULL, hints, ppres) !=
0 ? 1 : 0;
}],
libreplace_cv_HAVE_GETADDRINFO=yes,
libreplace_cv_HAVE_GETADDRINFO=no)
--
Samba Shared Repository
