[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via e059bcc sysquota: we need to list nfs4 as a separate fs name for
the sys_get_nfs_quota backend
from 9acfa61 s3:client use more access bits for snapshot display
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit e059bcc59498661f165b13fb84edcb80900815ce
Author: Björn Jacke b...@sernet.de
Date: Thu Sep 6 07:58:00 2012 +0200
sysquota: we need to list nfs4 as a separate fs name for the
sys_get_nfs_quota backend
at least the Linux kernel up to 3.5.0 lists NFSv4 aѕ nfs4 and not as nfs
(cherry picked from commit a6df44b3ae1ca6395d05e1af804a779d785358db)
Fix bug #9144 - nfs quota support not working with Linux nfs4 mounts.
---
Summary of changes:
source3/lib/sysquotas.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/sysquotas.c b/source3/lib/sysquotas.c
index 12c34ed..9fdf3a0 100644
--- a/source3/lib/sysquotas.c
+++ b/source3/lib/sysquotas.c
@@ -179,6 +179,7 @@ static struct {
#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}
};
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 9d0a894 s3: delete requests are not special
from e059bcc sysquota: we need to list nfs4 as a separate fs name for
the sys_get_nfs_quota backend
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 9d0a8945ce9f521934d6f580d2b48abce0169a6d
Author: Volker Lendecke v...@samba.org
Date: Mon Sep 10 11:25:03 2012 +0200
s3: delete requests are not special
The only difference between batch and exclusive oplocks is the time of
the check: Batch is checked before the share mode check, exclusive after.
Signed-off-by: Jeremy Allison j...@samba.org
Fix bug #9150 - Valid open requests can cause smbd assert due to incorrect
oplock handling on delete requests.
---
Summary of changes:
source3/smbd/open.c | 14 ++
1 files changed, 2 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 3100ad0..7d6a25f 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -934,11 +934,6 @@ static NTSTATUS open_mode_check(connection_struct *conn,
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 @@ static bool delay_for_exclusive_oplocks(files_struct
*fsp,
}
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;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 5b4a7ae selftest/Samba4: make use of samba-tool domain provision
via 1d085f6 wintest: make use of samba-tool domain provision
via 52ba3c8 testprogs/blackbox: make use of samba-tool domain provision
via fdd2a7e s4:setup/tests: make use of samba-tool domain provision
via 318770a s4:scripting: install samba_kcc to SBINDIR
via 15c793f s4:scripting: use the 'sbin_files' variable
via a4fc79f s4:samba-tool: add 'samba-tool domain provision'
via ca3f285 s4:python/netcmd: give the Commad implementations access to
the raw arguments
via 7f98cf1 s4:samba-tool: remove unused code in testparm.py
via 475755e s4:samba-tool: allow sys.exit(ret) to control the exit code
from 5de7a3d quota: move function again to its belonging ifdef block
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 5b4a7aea17ea52fe620100076a9e08959d6fc4ed
Author: Stefan Metzmacher me...@samba.org
Date: Mon Sep 10 14:47:21 2012 +0200
selftest/Samba4: make use of samba-tool domain provision
metze
Autobuild-User(master): Stefan Metzmacher me...@samba.org
Autobuild-Date(master): Tue Sep 11 10:15:23 CEST 2012 on sn-devel-104
commit 1d085f6eb18f6984f409ea64150a060f503b4b13
Author: Stefan Metzmacher me...@samba.org
Date: Mon Sep 10 14:47:21 2012 +0200
wintest: make use of samba-tool domain provision
metze
commit 52ba3c8e6a4daa954995447292d367dffe9f0df7
Author: Stefan Metzmacher me...@samba.org
Date: Mon Sep 10 14:47:21 2012 +0200
testprogs/blackbox: make use of samba-tool domain provision
metze
commit fdd2a7e65f638eac91471c5428aef4ae8b2f2fb3
Author: Stefan Metzmacher me...@samba.org
Date: Mon Sep 10 14:47:21 2012 +0200
s4:setup/tests: make use of samba-tool domain provision
metze
commit 318770a67ffea2618d01f9636ce0e4a136854264
Author: Stefan Metzmacher me...@samba.org
Date: Mon Sep 10 14:21:57 2012 +0200
s4:scripting: install samba_kcc to SBINDIR
It's use as %s/samba_kcc, dyn_SCRIPTSBINDIR similar
to samba_spnupdate and samba_dnsupdate.
metze
commit 15c793fa34d66d599bfd05a5bab379fa5351d173
Author: Stefan Metzmacher me...@samba.org
Date: Mon Sep 10 14:18:54 2012 +0200
s4:scripting: use the 'sbin_files' variable
metze
commit a4fc79f8fcaf95b85fbb49e99b26d9322392236b
Author: Stefan Metzmacher me...@samba.org
Date: Mon Sep 10 14:05:14 2012 +0200
s4:samba-tool: add 'samba-tool domain provision'
This is mostly a copy of the standalone source4/setup/provision.
metze
commit ca3f2853901c9ae37da561434fe6c50cf23f012c
Author: Stefan Metzmacher me...@samba.org
Date: Mon Sep 10 14:02:19 2012 +0200
s4:python/netcmd: give the Commad implementations access to the raw
arguments
metze
commit 7f98cf169843d91571baaa5d8f29d6528c0fa359
Author: Stefan Metzmacher me...@samba.org
Date: Mon Sep 10 12:12:48 2012 +0200
s4:samba-tool: remove unused code in testparm.py
metze
commit 475755ef9ff5f39ba499de8f30c23efcce10ba0c
Author: Stefan Metzmacher me...@samba.org
Date: Tue Sep 11 08:21:27 2012 +0200
s4:samba-tool: allow sys.exit(ret) to control the exit code
Some subcommands may use sys.exit(0), which shouldn't be reported
as an error to the caller.
metze
---
Summary of changes:
selftest/target/Samba4.pm |4 +-
source4/scripting/bin/samba-tool |2 +-
source4/scripting/python/samba/netcmd/__init__.py |8 +
source4/scripting/python/samba/netcmd/domain.py | 265 -
source4/scripting/python/samba/netcmd/testparm.py |5 -
source4/scripting/wscript_build |6 +-
source4/setup/tests/blackbox_group.sh |2 +-
source4/setup/tests/blackbox_newuser.sh |2 +-
source4/setup/tests/blackbox_provision-backend.sh | 10 +-
source4/setup/tests/blackbox_provision.sh | 18 +-
source4/setup/tests/blackbox_setpassword.sh |2 +-
source4/setup/tests/blackbox_upgradeprovision.sh |4 +-
testprogs/blackbox/renamedc.sh|2 +-
wintest/test-s4-howto.py |4 +-
14 files changed, 302 insertions(+), 32 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 9563da6..f1f2e17 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -525,7 +525,9 @@ sub provision_raw_prepare($$)
if (defined($ENV{PYTHON})) {
push (@provision_options, $ENV{PYTHON});
}
- push (@provision_options, $self-{srcdir}/source4/setup/provision);
+ push (@provision_options, Samba::bindir_path($self, samba-tool));
+
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-09-11-1030/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-09-11-1030/samba3.stderr http://git.samba.org/autobuild.flakey/2012-09-11-1030/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-09-11-1030/samba.stderr http://git.samba.org/autobuild.flakey/2012-09-11-1030/samba.stdout The top commit at the time of the failure was: commit 5de7a3d73908f50dbaf141d2f964849904b2fa1a Author: Björn Jacke b...@sernet.de Date: Tue Sep 11 01:00:50 2012 +0200 quota: move function again to its belonging ifdef block Autobuild-User(master): Björn Jacke b...@sernet.de Autobuild-Date(master): Tue Sep 11 04:44:28 CEST 2012 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via b719e67 docs: Bump version up to 4.0. from 5b4a7ae selftest/Samba4: make use of samba-tool domain provision http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit b719e67704992caf31c8ccd06911968a481c24b5 Author: Karolin Seeger ksee...@samba.org Date: Tue Sep 11 10:50:08 2012 +0200 docs: Bump version up to 4.0. Karolin Autobuild-User(master): Karolin Seeger ksee...@samba.org Autobuild-Date(master): Tue Sep 11 12:37:17 CEST 2012 on sn-devel-104 --- Summary of changes: docs-xml/manpages/eventlogadm.8.xml |2 +- docs-xml/manpages/findsmb.1.xml |2 +- docs-xml/manpages/libsmbclient.7.xml |2 +- docs-xml/manpages/lmhosts.5.xml |2 +- docs-xml/manpages/log2pcap.1.xml |2 +- docs-xml/manpages/net.8.xml |2 +- docs-xml/manpages/nmbd.8.xml |2 +- docs-xml/manpages/nmblookup.1.xml|2 +- docs-xml/manpages/ntlm_auth.1.xml|2 +- docs-xml/manpages/pam_winbind.8.xml |2 +- docs-xml/manpages/pam_winbind.conf.5.xml |2 +- docs-xml/manpages/pdbedit.8.xml |2 +- docs-xml/manpages/profiles.1.xml |2 +- docs-xml/manpages/rpcclient.1.xml|2 +- docs-xml/manpages/samba.7.xml|2 +- docs-xml/manpages/sharesec.1.xml |2 +- docs-xml/manpages/smb.conf.5.xml |6 +++--- docs-xml/manpages/smbcacls.1.xml |2 +- docs-xml/manpages/smbclient.1.xml|2 +- docs-xml/manpages/smbcontrol.1.xml |2 +- docs-xml/manpages/smbcquotas.1.xml |2 +- docs-xml/manpages/smbd.8.xml |2 +- docs-xml/manpages/smbget.1.xml |2 +- docs-xml/manpages/smbgetrc.5.xml |2 +- docs-xml/manpages/smbpasswd.5.xml|2 +- docs-xml/manpages/smbpasswd.8.xml|2 +- docs-xml/manpages/smbspool.8.xml |2 +- docs-xml/manpages/smbstatus.1.xml|2 +- docs-xml/manpages/smbta-util.8.xml |2 +- docs-xml/manpages/smbtar.1.xml |2 +- docs-xml/manpages/smbtree.1.xml |2 +- docs-xml/manpages/swat.8.xml |2 +- docs-xml/manpages/testparm.1.xml |2 +- docs-xml/manpages/vfs_acl_tdb.8.xml |2 +- docs-xml/manpages/vfs_acl_xattr.8.xml|2 +- docs-xml/manpages/vfs_aio_fork.8.xml |4 ++-- docs-xml/manpages/vfs_aio_linux.8.xml|4 ++-- docs-xml/manpages/vfs_aio_pthread.8.xml |4 ++-- docs-xml/manpages/vfs_audit.8.xml|2 +- docs-xml/manpages/vfs_cacheprime.8.xml |2 +- docs-xml/manpages/vfs_cap.8.xml |2 +- docs-xml/manpages/vfs_catia.8.xml|2 +- docs-xml/manpages/vfs_commit.8.xml |2 +- docs-xml/manpages/vfs_crossrename.8.xml |4 ++-- docs-xml/manpages/vfs_default_quota.8.xml|2 +- docs-xml/manpages/vfs_dirsort.8.xml |2 +- docs-xml/manpages/vfs_extd_audit.8.xml |2 +- docs-xml/manpages/vfs_fake_perms.8.xml |2 +- docs-xml/manpages/vfs_fileid.8.xml |2 +- docs-xml/manpages/vfs_full_audit.8.xml |2 +- docs-xml/manpages/vfs_gpfs.8.xml |2 +- docs-xml/manpages/vfs_media_harmony.8.xml|2 +- docs-xml/manpages/vfs_netatalk.8.xml |2 +- docs-xml/manpages/vfs_notify_fam.8.xml |2 +- docs-xml/manpages/vfs_prealloc.8.xml |2 +- docs-xml/manpages/vfs_preopen.8.xml |2 +- docs-xml/manpages/vfs_readahead.8.xml|2 +- docs-xml/manpages/vfs_readonly.8.xml |2 +- docs-xml/manpages/vfs_recycle.8.xml |2 +- docs-xml/manpages/vfs_scannedonly.8.xml |4 ++-- docs-xml/manpages/vfs_shadow_copy.8.xml |2 +- docs-xml/manpages/vfs_shadow_copy2.8.xml |2 +- docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml |4 ++-- docs-xml/manpages/vfs_streams_depot.8.xml|2 +- docs-xml/manpages/vfs_streams_xattr.8.xml|2 +- docs-xml/manpages/vfs_time_audit.8.xml |4 ++-- docs-xml/manpages/vfs_tsmsm.8.xml|4 ++-- docs-xml/manpages/vfs_xattr_tdb.8.xml|2 +- docs-xml/manpages/vfstest.1.xml |2 +- docs-xml/manpages/wbinfo.1.xml |2 +- docs-xml/manpages/winbind_krb5_locator.7.xml |2 +-
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b657668 docs: Move idmap manpage to there old location.
from b719e67 docs: Bump version up to 4.0.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b6576686f95b09c5346274d2ec06e9dce0822073
Author: Andreas Schneider a...@samba.org
Date: Mon Sep 10 16:56:23 2012 +0200
docs: Move idmap manpage to there old location.
This wasn't planned and slipped trough, sorry.
Autobuild-User(master): Andreas Schneider a...@cryptomilk.org
Autobuild-Date(master): Tue Sep 11 14:28:53 CEST 2012 on sn-devel-104
---
Summary of changes:
.../man = docs-xml/manpages}/idmap_ad.8.xml |0
.../man = docs-xml/manpages}/idmap_autorid.8.xml |0
.../man = docs-xml/manpages}/idmap_hash.8.xml |0
.../man = docs-xml/manpages}/idmap_ldap.8.xml |0
.../man = docs-xml/manpages}/idmap_nss.8.xml |0
.../man = docs-xml/manpages}/idmap_rid.8.xml |0
.../man = docs-xml/manpages}/idmap_tdb.8.xml |0
.../man = docs-xml/manpages}/idmap_tdb2.8.xml |0
8 files changed, 0 insertions(+), 0 deletions(-)
rename {source3/winbindd/man = docs-xml/manpages}/idmap_ad.8.xml (100%)
rename {source3/winbindd/man = docs-xml/manpages}/idmap_autorid.8.xml (100%)
rename {source3/winbindd/man = docs-xml/manpages}/idmap_hash.8.xml (100%)
rename {source3/winbindd/man = docs-xml/manpages}/idmap_ldap.8.xml (100%)
rename {source3/winbindd/man = docs-xml/manpages}/idmap_nss.8.xml (100%)
rename {source3/winbindd/man = docs-xml/manpages}/idmap_rid.8.xml (100%)
rename {source3/winbindd/man = docs-xml/manpages}/idmap_tdb.8.xml (100%)
rename {source3/winbindd/man = docs-xml/manpages}/idmap_tdb2.8.xml (100%)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/man/idmap_ad.8.xml
b/docs-xml/manpages/idmap_ad.8.xml
similarity index 100%
rename from source3/winbindd/man/idmap_ad.8.xml
rename to docs-xml/manpages/idmap_ad.8.xml
diff --git a/source3/winbindd/man/idmap_autorid.8.xml
b/docs-xml/manpages/idmap_autorid.8.xml
similarity index 100%
rename from source3/winbindd/man/idmap_autorid.8.xml
rename to docs-xml/manpages/idmap_autorid.8.xml
diff --git a/source3/winbindd/man/idmap_hash.8.xml
b/docs-xml/manpages/idmap_hash.8.xml
similarity index 100%
rename from source3/winbindd/man/idmap_hash.8.xml
rename to docs-xml/manpages/idmap_hash.8.xml
diff --git a/source3/winbindd/man/idmap_ldap.8.xml
b/docs-xml/manpages/idmap_ldap.8.xml
similarity index 100%
rename from source3/winbindd/man/idmap_ldap.8.xml
rename to docs-xml/manpages/idmap_ldap.8.xml
diff --git a/source3/winbindd/man/idmap_nss.8.xml
b/docs-xml/manpages/idmap_nss.8.xml
similarity index 100%
rename from source3/winbindd/man/idmap_nss.8.xml
rename to docs-xml/manpages/idmap_nss.8.xml
diff --git a/source3/winbindd/man/idmap_rid.8.xml
b/docs-xml/manpages/idmap_rid.8.xml
similarity index 100%
rename from source3/winbindd/man/idmap_rid.8.xml
rename to docs-xml/manpages/idmap_rid.8.xml
diff --git a/source3/winbindd/man/idmap_tdb.8.xml
b/docs-xml/manpages/idmap_tdb.8.xml
similarity index 100%
rename from source3/winbindd/man/idmap_tdb.8.xml
rename to docs-xml/manpages/idmap_tdb.8.xml
diff --git a/source3/winbindd/man/idmap_tdb2.8.xml
b/docs-xml/manpages/idmap_tdb2.8.xml
similarity index 100%
rename from source3/winbindd/man/idmap_tdb2.8.xml
rename to docs-xml/manpages/idmap_tdb2.8.xml
--
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-09-11-1543/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-09-11-1543/samba3.stderr http://git.samba.org/autobuild.flakey/2012-09-11-1543/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-09-11-1543/samba.stderr http://git.samba.org/autobuild.flakey/2012-09-11-1543/samba.stdout The top commit at the time of the failure was: commit b719e67704992caf31c8ccd06911968a481c24b5 Author: Karolin Seeger ksee...@samba.org Date: Tue Sep 11 10:50:08 2012 +0200 docs: Bump version up to 4.0. Karolin Autobuild-User(master): Karolin Seeger ksee...@samba.org Autobuild-Date(master): Tue Sep 11 12:37:17 CEST 2012 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 69c2e18 selftest: we fail the smb2.durable-open.delete_on_close2
test
via a4358f6 s4:torture:smb2: add a durable-open.delete_on_close2 test
via 675871f selftest: pass smb2.durable-open.delete_on_close1
via f244b29 selftest: smb2.durable-open.delete_on_close1 is not
flapping any more
via 3d7196d s4:torture:smb2: fix the durable-open.delete_on_close1 test
via d237427 lib/replace: remove duplicate check for inotify
from b657668 docs: Move idmap manpage to there old location.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 69c2e18865ca3cfa8fe1558e43253a74521b2d65
Author: Michael Adam ob...@samba.org
Date: Tue Sep 11 14:13:51 2012 +0200
selftest: we fail the smb2.durable-open.delete_on_close2 test
(we currently do not grant durable on reconnect when delete-on-close is set)
Autobuild-User(master): Michael Adam ob...@samba.org
Autobuild-Date(master): Tue Sep 11 16:22:20 CEST 2012 on sn-devel-104
commit a4358f6ffdd1f4c31393c574244ba3883568f88d
Author: Michael Adam ob...@samba.org
Date: Tue Sep 11 14:08:28 2012 +0200
s4:torture:smb2: add a durable-open.delete_on_close2 test
This test verifies that the delete on close flag is kept during
a disconnect and is still active on the reconnected handle.
When the reconnected handle is closed, the file is deleted.
commit 675871f7a763cf9b22ff1ee7ef871e8cf9bb3b9e
Author: Michael Adam ob...@samba.org
Date: Tue Sep 11 13:07:21 2012 +0200
selftest: pass smb2.durable-open.delete_on_close1
commit f244b299498648901d82d80d6ba42b7561d4e436
Author: Michael Adam ob...@samba.org
Date: Tue Sep 11 13:06:22 2012 +0200
selftest: smb2.durable-open.delete_on_close1 is not flapping any more
The entry into flapping was not effective anyways since, the test
was also listed in knownfail...
commit 3d7196d0a470d31a531a618f210cd60635361daf
Author: Michael Adam ob...@samba.org
Date: Tue Sep 11 13:43:17 2012 +0200
s4:torture:smb2: fix the durable-open.delete_on_close1 test
This test used to flap because there was an invalid check of
the file-id. This might or might not be the same after a
new open. Hence the flapping.
The new version simply opens a file as durable handle with
delete_on_close set, writes a byte and closes the file.
Then on a new connect, the file is opened again, and it is checked
that the file has been created (again) and that it is empty.
commit d237427f18b02958cfcfd6d775ee52231b3d095f
Author: Michael Adam ob...@samba.org
Date: Tue Sep 11 12:49:14 2012 +0200
lib/replace: remove duplicate check for inotify
---
Summary of changes:
lib/replace/wscript |2 +-
selftest/flapping |1 -
selftest/knownfail |2 +-
source4/torture/smb2/durable_open.c | 171 +--
4 files changed, 124 insertions(+), 52 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 3dbbd2a..2f632e1 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -65,7 +65,7 @@ def configure(conf):
conf.CHECK_HEADERS('libintl.h errno.h')
conf.CHECK_HEADERS('gcrypt.h getopt.h iconv.h')
conf.CHECK_HEADERS('sys/inotify.h memory.h nss.h sasl/sasl.h')
-conf.CHECK_HEADERS('security/pam_appl.h sys/inotify.h zlib.h asm/unistd.h')
+conf.CHECK_HEADERS('security/pam_appl.h zlib.h asm/unistd.h')
conf.CHECK_HEADERS('aio.h sys/unistd.h rpc/rpc.h rpc/nettype.h alloca.h
float.h')
conf.CHECK_HEADERS('rpcsvc/nis.h rpcsvc/ypclnt.h sys/prctl.h sys/sysctl.h')
diff --git a/selftest/flapping b/selftest/flapping
index cce6a9a..f0b1528 100644
--- a/selftest/flapping
+++ b/selftest/flapping
@@ -24,4 +24,3 @@
^samba3.raw.samba3checkfsp.samba3checkfsp\(plugin_s4_dc\) # Seems to flap -
succeeds on sn-devel, fails on Fedora 16
^samba3.raw.samba3closeerr.samba3closeerr\(plugin_s4_dc\) # Seems to flap -
succeeds on sn-devel, fails on Fedora 16
^samba4.nss.test.*using.*winbind # fails sometimes on sn-devel
-^samba3.smb2.durable-open.delete_on_close1 # another intermittent failure
diff --git a/selftest/knownfail b/selftest/knownfail
index 094b2a4..0180eb3 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -177,7 +177,7 @@
^samba3.smb2.notify.rec
^samba3.smb2.durable-open.lock-lease
^samba3.smb2.durable-open.reopen4
-^samba3.smb2.durable-open.delete_on_close1
+^samba3.smb2.durable-open.delete_on_close2
^samba3.smb2.durable-v2-open.open-lease
^samba3.smb2.durable-v2-open.persistent-open-lease
^samba3.smb2.ioctl.shadow_copy
diff --git a/source4/torture/smb2/durable_open.c
b/source4/torture/smb2/durable_open.c
index 1cf183b..d625852 100644
---
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 33d9a22 smbd: Print ACL used to create hash in vfs_xattr_common
via 6fbce90 provision: Only give the no posix ACLs exception if we
could not set the SD
via 1a3d6de torture: Add discard_const_p() to work around dlz_create
prototype
from 69c2e18 selftest: we fail the smb2.durable-open.delete_on_close2
test
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 33d9a22dcb3662e8a5e33d490d2739712151677c
Author: Andrew Bartlett abart...@samba.org
Date: Mon Sep 10 08:43:09 2012 +1000
smbd: Print ACL used to create hash in vfs_xattr_common
This should help us understand why sometimes an ACL set won't stick.
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Tue Sep 11 18:19:53 CEST 2012 on sn-devel-104
commit 6fbce905db5bc4ea5463727a13ea063811556db7
Author: Andrew Bartlett abart...@samba.org
Date: Sun Sep 9 17:08:49 2012 +1000
provision: Only give the no posix ACLs exception if we could not set the
SD
This will allow us to run make test on all platforms again, as we emululate
the posix ACLs using the fake_acls
module. By then testing smbd.have_posix_acls() we gain a more specific
error message.
Andrew Bartlett
commit 1a3d6de20aa4e45dd1c5a8ed6f8b5193efa52167
Author: Andrew Bartlett abart...@samba.org
Date: Fri Sep 7 15:10:24 2012 +1000
torture: Add discard_const_p() to work around dlz_create prototype
---
Summary of changes:
source3/modules/vfs_acl_common.c | 10 ++
.../scripting/python/samba/provision/__init__.py | 12 ++--
source4/torture/dns/dlz_bind9.c|4 ++--
3 files changed, 18 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index a3d53a1..c2ac875 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -375,6 +375,12 @@ static NTSTATUS get_nt_acl_internal(vfs_handle_struct
*handle,
file system SD mapping.\n,
name ));
+ if (DEBUGLEVEL = 10) {
+ DEBUG(10,(get_nt_acl_internal: acl for blob hash for %s is:\n,
+ name ));
+ NDR_PRINT_DEBUG(security_descriptor, pdesc_next);
+ }
+
TALLOC_FREE(psd);
psd = pdesc_next;
@@ -596,6 +602,10 @@ static NTSTATUS fset_nt_acl_common(vfs_handle_struct
*handle, files_struct *fsp,
fsp_str_dbg(fsp)));
NDR_PRINT_DEBUG(security_descriptor,
discard_const_p(struct security_descriptor, psd));
+
+ DEBUG(10,(fset_nt_acl_xattr: storing has in xattr sd based on
\n));
+ NDR_PRINT_DEBUG(security_descriptor,
+ discard_const_p(struct security_descriptor,
pdesc_next));
}
status = create_acl_blob(psd, blob, XATTR_SD_HASH_TYPE_SHA256, hash);
if (!NT_STATUS_IS_OK(status)) {
diff --git a/source4/scripting/python/samba/provision/__init__.py
b/source4/scripting/python/samba/provision/__init__.py
index 12904a7..862a0c7 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -1906,17 +1906,17 @@ def provision(logger, session_info, credentials,
smbconf=None,
if paths.sysvol is None:
raise MissingShareError(sysvol, paths.smbconf)
-if not smbd.have_posix_acls():
-# This clue is only strictly correct for RPM and
-# Debian-like Linux systems, but hopefully other users
-# will get enough clue from it.
-raise ProvisioningError(Samba was compiled without the posix ACL
support that s3fs requires. Try installing libacl1-dev or libacl-devel, then
re-run configure and make.)
-
file = tempfile.NamedTemporaryFile(dir=os.path.abspath(paths.sysvol))
try:
try:
smbd.set_simple_acl(file.name, 0755, wheel_gid)
except Exception:
+if not smbd.have_posix_acls():
+# This clue is only strictly correct for RPM and
+# Debian-like Linux systems, but hopefully other users
+# will get enough clue from it.
+raise ProvisioningError(Samba was compiled without the
posix ACL support that s3fs requires. Try installing libacl1-dev or
libacl-devel, then re-run configure and make.)
+
raise ProvisioningError(Your filesystem or build does not
support posix ACLs, which s3fs requires. Try the mounting the filesystem with
the 'acl' option.)
try:
smbd.chown(file.name,
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 7c1fd74 At Michael's suggestion, factor common code into a
function. My bad :-).
from 33d9a22 smbd: Print ACL used to create hash in vfs_xattr_common
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 7c1fd74ba5261aa447c54872e49b374b543b1831
Author: Jeremy Allison j...@samba.org
Date: Tue Sep 11 09:06:45 2012 -0700
At Michael's suggestion, factor common code into a function. My bad :-).
Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Tue Sep 11 20:08:37 CEST 2012 on sn-devel-104
---
Summary of changes:
lib/ldb/common/ldb_parse.c | 13 +
1 files changed, 9 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/common/ldb_parse.c b/lib/ldb/common/ldb_parse.c
index f47ef43..33e8444 100644
--- a/lib/ldb/common/ldb_parse.c
+++ b/lib/ldb/common/ldb_parse.c
@@ -111,6 +111,13 @@ struct ldb_val ldb_binary_decode(TALLOC_CTX *mem_ctx,
const char *str)
return ret;
}
+static bool need_encode(unsigned char cval)
+{
+ if (cval 0x20 || cval 0x7E || strchr( *()\\|!\, cval)) {
+ return true;
+ }
+ return false;
+}
/*
encode a blob as a RFC2254 binary string, escaping any
@@ -124,8 +131,7 @@ char *ldb_binary_encode(TALLOC_CTX *mem_ctx, struct ldb_val
val)
unsigned char *buf = val.data;
for (i=0;ival.length;i++) {
- unsigned int cval = buf[i];
- if (cval 0x20 || cval 0x7E || strchr( *()\\|!\,
buf[i])) {
+ if (need_encode(buf[i])) {
len += 2;
}
}
@@ -134,8 +140,7 @@ char *ldb_binary_encode(TALLOC_CTX *mem_ctx, struct ldb_val
val)
len = 0;
for (i=0;ival.length;i++) {
- unsigned int cval = buf[i];
- if (cval 0x20 || cval 0x7E || strchr( *()\\|!\,
buf[i])) {
+ if (need_encode(buf[i])) {
snprintf(ret+len, 4, \\%02X, buf[i]);
len += 3;
} else {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via df5f962 s4:torture:smb2: fix error reporting in the oplock-brl3 test
via 439c907 s4:torture:smb2: fix error reporting in the oplock-brl2 test
via e9df135 s4:torture:smb2: fix error reporting in the oplock-brl1 test
via c960e55 s4:torture:smb2: remove an unused variable from the
oplock-exclusive2 test
via 7c6f1fb s4:torture:smb2: remove an unused variable from the
oplock-exclusive1 test
from 7c1fd74 At Michael's suggestion, factor common code into a
function. My bad :-).
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit df5f962c60bb273c4759334ed6cc490d2a91d5ba
Author: Michael Adam ob...@samba.org
Date: Tue Sep 11 16:28:45 2012 +0200
s4:torture:smb2: fix error reporting in the oplock-brl3 test
(Error was set to an unused variable)
Autobuild-User(master): Michael Adam ob...@samba.org
Autobuild-Date(master): Tue Sep 11 22:09:18 CEST 2012 on sn-devel-104
commit 439c907f6b2b02fefa5f1913cbbb8ce971d2611a
Author: Michael Adam ob...@samba.org
Date: Tue Sep 11 16:28:15 2012 +0200
s4:torture:smb2: fix error reporting in the oplock-brl2 test
(Error was set to an unused variable)
commit e9df135ca52e07af1539cf15e6339d30ae525225
Author: Michael Adam ob...@samba.org
Date: Tue Sep 11 16:27:19 2012 +0200
s4:torture:smb2: fix error reporting in the oplock-brl1 test
(Error was set to an unused variable)
commit c960e55fbfbc12f85447af04778a7ac5888d499d
Author: Michael Adam ob...@samba.org
Date: Tue Sep 11 16:26:44 2012 +0200
s4:torture:smb2: remove an unused variable from the oplock-exclusive2 test
commit 7c6f1fb294635f25e5e70592f37871902c7525ca
Author: Michael Adam ob...@samba.org
Date: Tue Sep 11 16:25:50 2012 +0200
s4:torture:smb2: remove an unused variable from the oplock-exclusive1 test
---
Summary of changes:
source4/torture/smb2/oplock.c | 15 +++
1 files changed, 3 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/smb2/oplock.c b/source4/torture/smb2/oplock.c
index d489943..fc939cc 100644
--- a/source4/torture/smb2/oplock.c
+++ b/source4/torture/smb2/oplock.c
@@ -364,7 +364,6 @@ static bool test_smb2_oplock_exclusive1(struct
torture_context *tctx,
NTSTATUS status;
bool ret = true;
union smb_open io;
- union smb_unlink unl;
struct smb2_handle h1;
struct smb2_handle h;
@@ -411,8 +410,6 @@ static bool test_smb2_oplock_exclusive1(struct
torture_context *tctx,
CHECK_VAL(break_info.failures, 0);
torture_comment(tctx, unlink it - should also be no break\n);
- unl.unlink.in.pattern = fname;
- unl.unlink.in.attrib = 0;
status = smb2_util_unlink(tree2, fname);
torture_assert_ntstatus_equal(tctx, status, NT_STATUS_SHARING_VIOLATION,
Incorrect status);
@@ -435,7 +432,6 @@ static bool test_smb2_oplock_exclusive2(struct
torture_context *tctx,
NTSTATUS status;
bool ret = true;
union smb_open io;
- union smb_unlink unl;
struct smb2_handle h, h1, h2;
status = torture_smb2_testdir(tree1, BASEDIR, h);
@@ -490,8 +486,6 @@ static bool test_smb2_oplock_exclusive2(struct
torture_context *tctx,
/* now we have 2 level II oplocks... */
torture_comment(tctx, try to unlink it - should cause a break\n);
- unl.unlink.in.pattern = fname;
- unl.unlink.in.attrib = 0;
status = smb2_util_unlink(tree2, fname);
torture_assert_ntstatus_ok(tctx, status, Error unlinking the file);
torture_wait_for_oplock_break(tctx);
@@ -2973,7 +2967,6 @@ static bool test_smb2_oplock_brl1(struct torture_context
*tctx,
/*int fname, f;*/
bool ret = true;
uint8_t buf[1000];
- bool correct = true;
union smb_open io;
NTSTATUS status;
struct smb2_lock lck;
@@ -3025,7 +3018,7 @@ static bool test_smb2_oplock_brl1(struct torture_context
*tctx,
status = smb2_util_write(tree1, h1,buf, 0, sizeof(buf));
if (!NT_STATUS_EQUAL(status, NT_STATUS_OK)) {
torture_comment(tctx, Failed to create file\n);
- correct = false;
+ ret = false;
goto done;
}
@@ -3096,7 +3089,6 @@ static bool test_smb2_oplock_brl2(struct torture_context
*tctx, struct smb2_tree
/*int fname, f;*/
bool ret = true;
uint8_t buf[1000];
- bool correct = true;
union smb_open io;
NTSTATUS status;
struct smb2_handle h, h1;
@@ -3148,7 +3140,7 @@ static bool test_smb2_oplock_brl2(struct torture_context
*tctx, struct smb2_tree
status = smb2_util_write(tree1, h1, buf, 0, sizeof(buf));
if
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-09-11-2328/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-09-11-2328/samba3.stderr http://git.samba.org/autobuild.flakey/2012-09-11-2328/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-09-11-2328/samba.stderr http://git.samba.org/autobuild.flakey/2012-09-11-2328/samba.stdout The top commit at the time of the failure was: commit 7c1fd74ba5261aa447c54872e49b374b543b1831 Author: Jeremy Allison j...@samba.org Date: Tue Sep 11 09:06:45 2012 -0700 At Michael's suggestion, factor common code into a function. My bad :-). Autobuild-User(master): Jeremy Allison j...@samba.org Autobuild-Date(master): Tue Sep 11 20:08:37 CEST 2012 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/2012-09-12-0004/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-09-12-0004/samba3.stderr http://git.samba.org/autobuild.flakey/2012-09-12-0004/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-09-12-0004/samba.stderr http://git.samba.org/autobuild.flakey/2012-09-12-0004/samba.stdout The top commit at the time of the failure was: commit df5f962c60bb273c4759334ed6cc490d2a91d5ba Author: Michael Adam ob...@samba.org Date: Tue Sep 11 16:28:45 2012 +0200 s4:torture:smb2: fix error reporting in the oplock-brl3 test (Error was set to an unused variable) Autobuild-User(master): Michael Adam ob...@samba.org Autobuild-Date(master): Tue Sep 11 22:09:18 CEST 2012 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4e595f4 nsswitch: fix crash on null pam change pw response
from df5f962 s4:torture:smb2: fix error reporting in the oplock-brl3 test
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4e595f4bf08489cb69e871093804b9069d63d9f5
Author: Luca Lorenzetto lorenzetto-l...@ubuntu-it.org
Date: Tue Sep 11 18:35:42 2012 +0200
nsswitch: fix crash on null pam change pw response
The function _pam_winbind_change_pwd crashes due to a null value passed
to the function strcasecmp and denies to login via graphical login
manager. Check for a null value before doing a strcasecmp.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1003296
Bug: https://bugzilla.samba.org/show_bug.cgi?id=9013
Autobuild-User(master): David Disseldorp dd...@samba.org
Autobuild-Date(master): Wed Sep 12 00:07:28 CEST 2012 on sn-devel-104
---
Summary of changes:
nsswitch/pam_winbind.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index e3e9af1..fb84985 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -831,7 +831,7 @@ static bool _pam_winbind_change_pwd(struct pwb_context *ctx)
}
_pam_log(ctx, LOG_CRIT, Received [%s] reply from application.\n,
resp-resp);
- if (strcasecmp(resp-resp, yes) == 0) {
+ if ((resp-resp != NULL) (strcasecmp(resp-resp, yes) == 0)) {
retval = true;
}
--
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-09-12-0206/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-09-12-0206/samba3.stderr http://git.samba.org/autobuild.flakey/2012-09-12-0206/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-09-12-0206/samba.stderr http://git.samba.org/autobuild.flakey/2012-09-12-0206/samba.stdout The top commit at the time of the failure was: commit 4e595f4bf08489cb69e871093804b9069d63d9f5 Author: Luca Lorenzetto lorenzetto-l...@ubuntu-it.org Date: Tue Sep 11 18:35:42 2012 +0200 nsswitch: fix crash on null pam change pw response The function _pam_winbind_change_pwd crashes due to a null value passed to the function strcasecmp and denies to login via graphical login manager. Check for a null value before doing a strcasecmp. Bug-Ubuntu: https://bugs.launchpad.net/bugs/1003296 Bug: https://bugzilla.samba.org/show_bug.cgi?id=9013 Autobuild-User(master): David Disseldorp dd...@samba.org Autobuild-Date(master): Wed Sep 12 00:07:28 CEST 2012 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via bd2f160 Make metze happy and the code clearer :-).
from 4e595f4 nsswitch: fix crash on null pam change pw response
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit bd2f1604d73f05f3b2f151a81f09824c7bb99ab5
Author: Jeremy Allison j...@samba.org
Date: Tue Sep 11 16:16:37 2012 -0700
Make metze happy and the code clearer :-).
Ensure we know after the destructor fires we're never going to
look at this again.
Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Wed Sep 12 03:00:21 CEST 2012 on sn-devel-104
---
Summary of changes:
source3/smbd/smb2_sesssetup.c |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c
index 61b5519..2599d2a 100644
--- a/source3/smbd/smb2_sesssetup.c
+++ b/source3/smbd/smb2_sesssetup.c
@@ -446,6 +446,12 @@ struct smbd_smb2_session_setup_state {
static int pp_self_ref_destructor(struct smbd_smb2_session_setup_state
**pp_state)
{
(*pp_state)-session = NULL;
+ /*
+* To make things clearer, ensure the pp_self_ref
+* pointer is nulled out. We're never going to
+* access this again.
+*/
+ (*pp_state)-pp_self_ref = NULL;
return 0;
}
--
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-09-12-0628/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-09-12-0628/samba3.stderr http://git.samba.org/autobuild.flakey/2012-09-12-0628/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-09-12-0628/samba.stderr http://git.samba.org/autobuild.flakey/2012-09-12-0628/samba.stdout The top commit at the time of the failure was: commit bd2f1604d73f05f3b2f151a81f09824c7bb99ab5 Author: Jeremy Allison j...@samba.org Date: Tue Sep 11 16:16:37 2012 -0700 Make metze happy and the code clearer :-). Ensure we know after the destructor fires we're never going to look at this again. Autobuild-User(master): Jeremy Allison j...@samba.org Autobuild-Date(master): Wed Sep 12 03:00:21 CEST 2012 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e8375dd smbd: Add extra VFS hooks to get the posix ACL as a blob
via 6638d10 smbd: Remove pre-allocation of ACL array in sys_acl_init()
via ac804f0 smbd-posix_acls: Use a IDL union to store the ACL entry
from bd2f160 Make metze happy and the code clearer :-).
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e8375ddf2d29b12cfe84ceec7195de957d0a743c
Author: Andrew Bartlett abart...@samba.org
Date: Mon Sep 10 12:44:01 2012 +1000
smbd: Add extra VFS hooks to get the posix ACL as a blob
This will allow us to hash this, rather than the NT ACL it maps to.
This will in turn allow us to know if the NT ACL is valid even if we
have to change the mapping code.
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Wed Sep 12 07:06:01 CEST 2012 on sn-devel-104
commit 6638d1036688f7b0f15a1a18c9a251ab0a7ab626
Author: Andrew Bartlett abart...@samba.org
Date: Fri Sep 7 17:44:24 2012 +1000
smbd: Remove pre-allocation of ACL array in sys_acl_init()
Instead, this is just handled with realloc in sys_acl_create_entry()
This allows us to remove the size element from the SMB_ACL_T.
Andrew Bartlett
commit ac804f0d7f5a93ff2710e213d9213ad9960a15d6
Author: Andrew Bartlett abart...@samba.org
Date: Fri Sep 7 15:49:47 2012 +1000
smbd-posix_acls: Use a IDL union to store the ACL entry
This is a clearer, long-term-stable structure we can hash without
risking it changing.
Andrew Bartlett
---
Summary of changes:
examples/VFS/skel_opaque.c | 15 +
examples/VFS/skel_transparent.c | 18 ++
librpc/idl/smb_acl.idl | 25 ++--
source3/include/smb_acls.h |2 +-
source3/include/vfs.h| 18 ++
source3/include/vfs_macros.h | 10 +++
source3/lib/sysacls.c| 37 +---
source3/modules/vfs_fake_acls.c | 68 ++
source3/modules/vfs_full_audit.c | 37
source3/modules/vfs_posixacl.c | 10 ++--
source3/modules/vfs_time_audit.c | 48 +++
source3/smbd/posix_acls.c|6 +-
source3/smbd/pysmbd.c|2 +-
source3/smbd/vfs.c | 21 +++
source4/scripting/python/samba/tests/posixacl.py | 52 -
15 files changed, 292 insertions(+), 77 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index edfb772..a786a23 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -586,6 +586,18 @@ static SMB_ACL_T skel_sys_acl_get_fd(vfs_handle_struct
*handle, files_struct *fs
return (SMB_ACL_T)NULL;
}
+static int skel_sys_acl_blob_get_file(vfs_handle_struct *handle, const char
*path_p, SMB_ACL_TYPE_T type, TALLOC_CTX *mem_ctx, char **blob_description,
DATA_BLOB *blob)
+{
+ errno = ENOSYS;
+ return -1;
+}
+
+static int skel_sys_acl_blob_get_fd(vfs_handle_struct *handle, files_struct
*fsp, TALLOC_CTX *mem_ctx, char **blob_description, DATA_BLOB *blob)
+{
+ errno = ENOSYS;
+ return -1;
+}
+
static int skel_sys_acl_set_file(vfs_handle_struct *handle, const char *name,
SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
{
errno = ENOSYS;
@@ -771,10 +783,13 @@ struct vfs_fn_pointers skel_opaque_fns = {
.sys_acl_get_file_fn = skel_sys_acl_get_file,
.sys_acl_get_fd_fn = skel_sys_acl_get_fd,
+ .sys_acl_blob_get_file_fn = skel_sys_acl_blob_get_file,
+ .sys_acl_blob_get_fd_fn = skel_sys_acl_blob_get_fd,
.sys_acl_set_file_fn = skel_sys_acl_set_file,
.sys_acl_set_fd_fn = skel_sys_acl_set_fd,
.sys_acl_delete_def_file_fn = skel_sys_acl_delete_def_file,
+
/* EA operations. */
.getxattr_fn = skel_getxattr,
.fgetxattr_fn = skel_fgetxattr,
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 711b7fc..02a994c 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -699,6 +699,22 @@ static SMB_ACL_T skel_sys_acl_get_fd(vfs_handle_struct
*handle, files_struct *fs
return SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp);
}
+static int skel_sys_acl_blob_get_file(vfs_handle_struct *handle, const char
*path_p, SMB_ACL_TYPE_T type,
+ TALLOC_CTX *mem_ctx,
+ char **blob_description,
+ DATA_BLOB *blob)
+{
+ return
[SCM] CTDB repository - branch 1.2.40 updated - ctdb-1.2.49-2-ga17316a
The branch, 1.2.40 has been updated
via a17316ab3a5ee3cd748b26863c55e82937edf013 (commit)
via dc2bf2f7d27913f29f5b6c92e41c6b59fa31d163 (commit)
from 7c4998cad4d3debb06f62108fb099b6427310419 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2.40
- Log -
commit a17316ab3a5ee3cd748b26863c55e82937edf013
Author: Amitay Isaacs ami...@gmail.com
Date: Wed Sep 12 15:02:30 2012 +1000
New version 1.2.50
Signed-off-by: Amitay Isaacs ami...@gmail.com
commit dc2bf2f7d27913f29f5b6c92e41c6b59fa31d163
Author: Martin Schwenke mar...@meltin.net
Date: Thu Sep 6 20:22:38 2012 +1000
common: Debug ctdb_addr_to_str() using new function ctdb_external_trace()
We've seen this function report Unknown family, 0 and then CTDB
disappeared without a trace. If we can reproduce it then this might
help us to debug it.
The idea is that you do something like the following in /etc/sysconfig/ctdb:
export CTDB_EXTERNAL_TRACE=/etc/ctdb/config/gcore_trace.sh
When we hit this error than we call out to gcore to get a core file so
we can do forensics. This might block CTDB for a few seconds.
Signed-off-by: Martin Schwenke mar...@meltin.net
---
Summary of changes:
Makefile.in|1 +
common/ctdb_util.c | 25 +
config/gcore_trace.sh |3 +++
include/ctdb_private.h |1 +
packaging/RPM/ctdb.spec.in |5 -
5 files changed, 34 insertions(+), 1 deletions(-)
create mode 100755 config/gcore_trace.sh
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index c97a9ca..e3d6d5b 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -291,6 +291,7 @@ install: all
if [ -f doc/ltdbtool.1 ]; then ${INSTALLCMD} -m 644 doc/ltdbtool.1
$(DESTDIR)$(mandir)/man1; fi
if [ ! -f $(DESTDIR)$(etcdir)/ctdb/notify.sh ];then ${INSTALLCMD} -m
755 config/notify.sh $(DESTDIR)$(etcdir)/ctdb; fi
if [ ! -f $(DESTDIR)$(etcdir)/ctdb/ctdb-crash-cleanup.sh ];then
${INSTALLCMD} -m 755 config/ctdb-crash-cleanup.sh $(DESTDIR)$(etcdir)/ctdb; fi
+ if [ ! -f $(DESTDIR)$(etcdir)/ctdb/gcore_trace.sh ];then ${INSTALLCMD}
-m 755 config/gcore_trace.sh $(DESTDIR)$(etcdir)/ctdb; fi
test: all
tests/run_tests.sh
diff --git a/common/ctdb_util.c b/common/ctdb_util.c
index 061c16d..bb212f5 100644
--- a/common/ctdb_util.c
+++ b/common/ctdb_util.c
@@ -60,6 +60,30 @@ void ctdb_fatal(struct ctdb_context *ctdb, const char *msg)
abort();
}
+/* Invoke an external program to do some sort of tracing on the CTDB
+ * process. This might block for a little while. The external
+ * program is specified by the environment variable
+ * CTDB_EXTERNAL_TRACE. This program should take one argument: the
+ * pid of the process to trace. Commonly, the program would be a
+ * wrapper script around gcore.
+ */
+void ctdb_external_trace(void)
+{
+
+ const char * t = getenv(CTDB_EXTERNAL_TRACE);
+ char * cmd;
+
+ if (t == NULL) {
+ return;
+ }
+
+ cmd = talloc_asprintf(NULL, %s %lu, t, (unsigned long) getpid());
+ DEBUG(DEBUG_WARNING,(begin external trace: %s\n, cmd));
+ system(cmd);
+ DEBUG(DEBUG_WARNING,(end external trace: %s\n, cmd));
+ talloc_free(cmd);
+}
+
/*
parse a IP:port pair
*/
@@ -574,6 +598,7 @@ char *ctdb_addr_to_str(ctdb_sock_addr *addr)
break;
default:
DEBUG(DEBUG_ERR, (__location__ ERROR, unknown family %u\n,
addr-sa.sa_family));
+ ctdb_external_trace();
}
return cip;
diff --git a/config/gcore_trace.sh b/config/gcore_trace.sh
new file mode 100755
index 000..4d3e1d1
--- /dev/null
+++ b/config/gcore_trace.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+gcore -o /var/log/core $1 21 | logger -t ctdb:gcore_trace
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index 3a5d3cf..b5bd45c 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -655,6 +655,7 @@ struct ctdb_fetch_handle {
/* internal prototypes */
void ctdb_set_error(struct ctdb_context *ctdb, const char *fmt, ...)
PRINTF_ATTRIBUTE(2,3);
void ctdb_fatal(struct ctdb_context *ctdb, const char *msg);
+void ctdb_external_trace(void);
bool ctdb_same_address(struct ctdb_address *a1, struct ctdb_address *a2);
int ctdb_parse_address(struct ctdb_context *ctdb,
TALLOC_CTX *mem_ctx, const char *str,
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 2d744b2..2548eba 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -3,7 +3,7 @@ Name: ctdb
Summary: Clustered TDB
Vendor: Samba Team
Packager: Samba Team sa...@samba.org
-Version: 1.2.49
+Version: 1.2.50
Release: 1GITHASH
Epoch: 0
License: GNU GPL version 3
@@ -89,6 +89,7 @@ rm -rf
[SCM] CTDB repository - annotated tag ctdb-1.2.50 created - ctdb-1.2.50
The annotated tag, ctdb-1.2.50 has been created at 89efc26e091a5a24585659bbccafca07cfa4a77d (tag) tagging a17316ab3a5ee3cd748b26863c55e82937edf013 (commit) replaces ctdb-1.2.49 tagged by Amitay Isaacs on Wed Sep 12 15:03:00 2012 +1000 - Log - New version 1.2.50 Amitay Isaacs (1): New version 1.2.50 Martin Schwenke (1): common: Debug ctdb_addr_to_str() using new function ctdb_external_trace() --- -- CTDB repository
