[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via d984e76 xattr: fix listing EAs on *BSD for non-root users
from c228727 VERSION: Bump version up to 3.6.21.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit d984e764073df34729e5410026d6fa618699126f
Author: Jeremy Allison
Date: Tue Nov 12 12:17:26 2013 -0800
xattr: fix listing EAs on *BSD for non-root users
Thanks to Stefan Rompf for reporting.
This fixes bug #10247
Back-ported to 3.6.next from master commit
374b2cfde74e0c61f4b2da724b30d0e430596092
Signed-off-by: Bjoern Jacke
Reviewed-by: Jeremy Allison
---
Summary of changes:
source3/lib/system.c |4
1 files changed, 4 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/system.c b/source3/lib/system.c
index 1ca2f5e..d0e34bc 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -1801,6 +1801,10 @@ static ssize_t bsd_attr_list (int type, extattr_arg arg,
char *list, size_t size
char *buf;
/* Iterate through extattr(2) namespaces */
for(t = 0; t < (sizeof(extattr)/sizeof(extattr[0])); t++) {
+ if (t != EXTATTR_NAMESPACE_USER && geteuid() != 0) {
+ /* ignore all but user namespace when we are not root,
see bug 10247 */
+ continue;
+ }
switch(type) {
#if defined(HAVE_EXTATTR_LIST_FILE)
case 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/2013-11-13-0815/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2013-11-13-0815/samba3.stderr http://git.samba.org/autobuild.flakey/2013-11-13-0815/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2013-11-13-0815/samba.stderr http://git.samba.org/autobuild.flakey/2013-11-13-0815/samba.stdout The top commit at the time of the failure was: commit 744abc882284bfde41b087bc06e13160b915f371 Author: Andreas Schneider Date: Tue Nov 12 14:09:56 2013 +0100 s4-dsdb: Fix a use after free segfault. Signed-off-by: Andreas Schneider Reviewed-by: David Disseldorp Autobuild-User(master): David Disseldorp Autobuild-Date(master): Tue Nov 12 19:22:28 CET 2013 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 744abc8 s4-dsdb: Fix a use after free segfault.
via 4cf8f10 s4-torture: Relax time checking in CHECK_NTTIME.
via 654b784 s3-vfs: Fix stream_depot vfs module on btrfs.
via 2405e79 Revert "s3-vfs: Fix stream_depot vfs module on btrfs."
from 25be92b s3-libnetjoin: Fix Bug #10262: use upper-case realm when
composing default upn.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 744abc882284bfde41b087bc06e13160b915f371
Author: Andreas Schneider
Date: Tue Nov 12 14:09:56 2013 +0100
s4-dsdb: Fix a use after free segfault.
Signed-off-by: Andreas Schneider
Reviewed-by: David Disseldorp
Autobuild-User(master): David Disseldorp
Autobuild-Date(master): Tue Nov 12 19:22:28 CET 2013 on sn-devel-104
commit 4cf8f105005b1f9839be3d9de6d41b5f90bdb158
Author: Andreas Schneider
Date: Tue Nov 12 14:09:55 2013 +0100
s4-torture: Relax time checking in CHECK_NTTIME.
NTTIME has a nanosecond resolution. We should be tolerate if the system
is busy writing and reading the value. To reproduce this problem just
run the test under valgrind.
Signed-off-by: Andreas Schneider
Reviewed-by: David Disseldorp
commit 654b784e9c9c3563afd1af853f4795117c258e56
Author: Andreas Schneider
Date: Fri Nov 8 15:41:18 2013 +0100
s3-vfs: Fix stream_depot vfs module on btrfs.
Checking if the directory is empty using 'nlink == 2' only checks if
there are no subdirectories. It doesn't indicate if there are files in
the directory. However checking link count for no subdirectories is
wrong and applications shouldn't rely on it, see:
https://lkml.org/lkml/2012/2/1/756
Signed-off-by: Andreas Schneider
Reviewed-by: David Disseldorp
commit 2405e7906c41a2cd08f7e643dfc83b6380cadcf4
Author: David Disseldorp
Date: Tue Nov 12 16:33:20 2013 +0100
Revert "s3-vfs: Fix stream_depot vfs module on btrfs."
This reverts commit 29f12e7d5960906935e3af1405e9759a07d64750.
The wrong patch was pushed, according to Andreas:
I sent a second version cause the first was not complete. I've
discussed with Volker after I sent the patch and then sent a new
patch which
a) also does the right thin in the unlink case
b) only tried to remove the server is the deletion of the file
was successful.
Signed-off-by: David Disseldorp
Reviewed-by: Andreas Schneider
---
Summary of changes:
source3/modules/vfs_streams_depot.c | 24 +++-
source4/dsdb/samdb/ldb_modules/rootdse.c |7 ---
source4/torture/raw/open.c |2 +-
source4/torture/smb2/create.c|2 +-
4 files changed, 17 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_streams_depot.c
b/source3/modules/vfs_streams_depot.c
index f33d998..ae1af24 100644
--- a/source3/modules/vfs_streams_depot.c
+++ b/source3/modules/vfs_streams_depot.c
@@ -646,7 +646,8 @@ static int streams_depot_unlink(vfs_handle_struct *handle,
return -1;
}
- if (smb_fname_base->st.st_ex_nlink == 1) {
+ ret = SMB_VFS_NEXT_UNLINK(handle, smb_fname);
+ if (ret == 0) {
char *dirname = stream_dir(handle, smb_fname_base,
&smb_fname_base->st, false);
@@ -656,8 +657,6 @@ static int streams_depot_unlink(vfs_handle_struct *handle,
TALLOC_FREE(dirname);
}
- ret = SMB_VFS_NEXT_UNLINK(handle, smb_fname);
-
TALLOC_FREE(smb_fname_base);
return ret;
}
@@ -665,7 +664,6 @@ static int streams_depot_unlink(vfs_handle_struct *handle,
static int streams_depot_rmdir(vfs_handle_struct *handle, const char *path)
{
struct smb_filename *smb_fname_base = NULL;
- char *dirname;
int ret = -1;
DEBUG(10, ("streams_depot_rmdir called for %s\n", path));
@@ -691,16 +689,16 @@ static int streams_depot_rmdir(vfs_handle_struct *handle,
const char *path)
return -1;
}
- dirname = stream_dir(handle,
-smb_fname_base,
-&smb_fname_base->st,
-false);
- if (dirname != NULL) {
- SMB_VFS_NEXT_RMDIR(handle, dirname);
- }
- TALLOC_FREE(dirname);
-
ret = SMB_VFS_NEXT_RMDIR(handle, path);
+ if (ret == 0) {
+ char *dirname = stream_dir(handle, smb_fname_base,
+ &smb_fname_base->st, false);
+
+ if (dirname != NULL) {
+ SMB_VFS_NEXT_RMDIR(handle, dirname);
+ }
+ TALLOC_FREE(dirname);
+ }
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via 97f2002 Remove reference to SWAT via e8e19e0 Update LDAP Account Manager section from 4d083d7 Announce Samba 4.1.1, 4.0.11 and 3.6.20. http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit 97f200209ca9160b9f901aec91a04dcc3f02b505 Author: Lars Müller Date: Tue Nov 12 17:20:55 2013 +0100 Remove reference to SWAT commit e8e19e0744dea73a4d96c0ca679dd70af6fcac8f Author: Lars Müller Date: Tue Nov 12 17:14:30 2013 +0100 Update LDAP Account Manager section Modification on request from Roland Gruber --- Summary of changes: GUI/index.html | 14 +++--- 1 files changed, 3 insertions(+), 11 deletions(-) Changeset truncated at 500 lines: diff --git a/GUI/index.html b/GUI/index.html index 5b373db..b1173e7 100755 --- a/GUI/index.html +++ b/GUI/index.html @@ -31,17 +31,9 @@ SMB shares of your local network neighborhood. LDAP Account Manager -http://lam.sourceforge.net/";>LDAP Account Manager (lam) -is a webfrontend for managing accounts stored in an openLDAP server, -including Samba 2.x and 3.0 user and host accounts. - -SWAT - Samba Web Administration Tool - - - -This is a web based GUI manager that comes with Samba. You can have a look -at the SWAT demo page if you want to know what it can do. Note: [1/7/01] -The swat demo page is currently off-line. +https://www.ldap-account-manager.org/";>LDAP Account Manager +(lam) is a webfrontend for managing accounts stored in an OpenLDAP +directory. It supports Samba 3/4 users, groups and hosts. Webmin -- Samba Website Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 25be92b s3-libnetjoin: Fix Bug #10262: use upper-case realm when
composing default upn.
from 0dd512e s4:torture/netlogon: Test netlogon with additional attrs
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 25be92b92567d962fa66261f565d3a8116f97e30
Author: Günther Deschner
Date: Wed Nov 6 18:21:32 2013 +0100
s3-libnetjoin: Fix Bug #10262: use upper-case realm when composing default
upn.
In case we are about to generate a keytab during the join make sure the
default
upn we create is usable with kinit -k.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10262
Guenther
Signed-off-by: Günther Deschner
Reviewed-by: Andreas Schneider
Autobuild-User(master): Andreas Schneider
Autobuild-Date(master): Tue Nov 12 16:39:03 CET 2013 on sn-devel-104
---
Summary of changes:
source3/libnet/libnet_join.c | 17 -
1 files changed, 16 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 2dcb920..b84fcd6 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -449,10 +449,25 @@ static ADS_STATUS libnet_join_set_machine_upn(TALLOC_CTX
*mem_ctx,
}
if (!r->in.upn) {
+ char *realm = r->out.dns_domain_name;
+
+ /* in case we are about to generate a keytab during the join
+* make sure the default upn we create is usable with kinit -k.
+* gd */
+
+ if (USE_KERBEROS_KEYTAB) {
+ realm = talloc_strdup_upper(mem_ctx,
+ r->out.dns_domain_name);
+ }
+
+ if (!realm) {
+ return ADS_ERROR(LDAP_NO_MEMORY);
+ }
+
r->in.upn = talloc_asprintf(mem_ctx,
"host/%s@%s",
r->in.machine_name,
- r->out.dns_domain_name);
+ realm);
if (!r->in.upn) {
return ADS_ERROR(LDAP_NO_MEMORY);
}
--
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/2013-11-12-1419/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2013-11-12-1419/samba3.stderr http://git.samba.org/autobuild.flakey/2013-11-12-1419/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2013-11-12-1419/samba.stderr http://git.samba.org/autobuild.flakey/2013-11-12-1419/samba.stdout The top commit at the time of the failure was: commit 0dd512eead6dc999511e9e21f5304a224653db85 Author: Benjamin Franzke Date: Thu Oct 31 21:23:57 2013 +0100 s4:torture/netlogon: Test netlogon with additional attrs Reviewed-by: Andrew Bartlett Reviewed-by: Nadezhda Ivanova se enter the commit message for your changes. Lines starting Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Tue Nov 12 00:57:19 CET 2013 on sn-devel-104
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated
via c87f8ed xattr: fix listing EAs on *BSD for non-root users
from 0a52101 VERSION: Bump version number up to 4.0.12...
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit c87f8edd8918546630cbc1b7e02f99f17b782873
Author: Björn Jacke
Date: Wed Nov 6 12:37:07 2013 +0100
xattr: fix listing EAs on *BSD for non-root users
Thanks to Stefan Rompf for reporting.
This fixes bug #10247
Signed-off-by: Bjoern Jacke
Reviewed-by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Fri Nov 8 20:43:30 CET 2013 on sn-devel-104
(cherry picked from commit 374b2cfde74e0c61f4b2da724b30d0e430596092)
Autobuild-User(v4-0-test): Karolin Seeger
Autobuild-Date(v4-0-test): Tue Nov 12 13:31:21 CET 2013 on sn-devel-104
---
Summary of changes:
lib/replace/xattr.c |4
1 files changed, 4 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/xattr.c b/lib/replace/xattr.c
index a26ff67..459b7f3 100644
--- a/lib/replace/xattr.c
+++ b/lib/replace/xattr.c
@@ -194,6 +194,10 @@ static ssize_t bsd_attr_list (int type, extattr_arg arg,
char *list, size_t size
char *buf;
/* Iterate through extattr(2) namespaces */
for(t = 0; t < ARRAY_SIZE(extattr); t++) {
+ if (t != EXTATTR_NAMESPACE_USER && geteuid() != 0) {
+ /* ignore all but user namespace when we are not root,
see bug 10247 */
+ continue;
+ }
switch(type) {
#if defined(HAVE_EXTATTR_LIST_FILE)
case 0:
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-1-test updated
The branch, v4-1-test has been updated
via 2cfa1ef xattr: fix listing EAs on *BSD for non-root users
from a52afc3 VERSION: Bump version number up to 4.1.2...
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-1-test
- Log -
commit 2cfa1ef6a9e2728c9cdd185d6d08a452e0485200
Author: Björn Jacke
Date: Wed Nov 6 12:37:07 2013 +0100
xattr: fix listing EAs on *BSD for non-root users
Thanks to Stefan Rompf for reporting.
This fixes bug #10247
Signed-off-by: Bjoern Jacke
Reviewed-by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Fri Nov 8 20:43:30 CET 2013 on sn-devel-104
(cherry picked from commit 374b2cfde74e0c61f4b2da724b30d0e430596092)
Autobuild-User(v4-1-test): Karolin Seeger
Autobuild-Date(v4-1-test): Tue Nov 12 13:28:26 CET 2013 on sn-devel-104
---
Summary of changes:
lib/replace/xattr.c |4
1 files changed, 4 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/xattr.c b/lib/replace/xattr.c
index a26ff67..459b7f3 100644
--- a/lib/replace/xattr.c
+++ b/lib/replace/xattr.c
@@ -194,6 +194,10 @@ static ssize_t bsd_attr_list (int type, extattr_arg arg,
char *list, size_t size
char *buf;
/* Iterate through extattr(2) namespaces */
for(t = 0; t < ARRAY_SIZE(extattr); t++) {
+ if (t != EXTATTR_NAMESPACE_USER && geteuid() != 0) {
+ /* ignore all but user namespace when we are not root,
see bug 10247 */
+ continue;
+ }
switch(type) {
#if defined(HAVE_EXTATTR_LIST_FILE)
case 0:
--
Samba Shared Repository
