[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 9b2aa35 s3: Remove old mode special substitution.
via 4a9e5d2 s3:idmap_autorid: Add a NULL check in
idmap_autorid_preallocate_wellknown
via ca90681 s3:idmap_autorid: Don't zero in
idmap_autorid_preallocate_wellknown
via a061b6f s3:idmap_autorid: Use ARRAY_SIZE where appropriate
from 0529b59 s3-winbind: Do not delete an existing valid credential
cache.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9b2aa351ceb756d6ea63f3158f0e983ae7262da8
Author: Alexander Werth
Date: Tue Jul 9 17:14:08 2013 +0200
s3: Remove old mode special substitution.
The mode special substitution now happens in a separate function.
The substitution at this point is unnecessary.
Reviewed-by: Andrew Bartlett
Reviewed-by: Christian Ambach
Autobuild-User(master): Christian Ambach
Autobuild-Date(master): Tue Jul 16 00:52:26 CEST 2013 on sn-devel-104
commit 4a9e5d24749f7d8571f107c20ee66092ce7ab21d
Author: Volker Lendecke
Date: Thu Jul 11 13:10:25 2013 +0200
s3:idmap_autorid: Add a NULL check in idmap_autorid_preallocate_wellknown
Signed-off-by: Volker Lendecke
Reviewed-by: Christian Ambach
commit ca9068189e00ce1714790933250080ab1c310ee5
Author: Volker Lendecke
Date: Thu Jul 11 13:08:39 2013 +0200
s3:idmap_autorid: Don't zero in idmap_autorid_preallocate_wellknown
We initialize everything later anyway
Signed-off-by: Volker Lendecke
Reviewed-by: Christian Ambach
commit a061b6fe43f3e00dadb5c23244c68e5bc241dfce
Author: Volker Lendecke
Date: Thu Jul 11 13:07:52 2013 +0200
s3:idmap_autorid: Use ARRAY_SIZE where appropriate
Signed-off-by: Volker Lendecke
Reviewed-by: Christian Ambach
---
Summary of changes:
source3/modules/nfs4_acls.c | 15 ++-
source3/winbindd/idmap_autorid.c |8 ++--
2 files changed, 8 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 255741c..dab1a2a 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -739,20 +739,9 @@ static bool smbacl4_fill_ace4(
if (sid_to_gid(&ace_nt->trustee, &gid)) {
ace_v4->aceFlags |= SMB_ACE4_IDENTIFIER_GROUP;
-
- if (params->mode==e_special && gid==ownerGID) {
- ace_v4->flags |= SMB_ACE4_ID_SPECIAL;
- ace_v4->who.special_id = SMB_ACE4_WHO_GROUP;
- } else {
- ace_v4->who.gid = gid;
- }
+ ace_v4->who.gid = gid;
} else if (sid_to_uid(&ace_nt->trustee, &uid)) {
- if (params->mode==e_special && uid==ownerUID) {
- ace_v4->flags |= SMB_ACE4_ID_SPECIAL;
- ace_v4->who.special_id = SMB_ACE4_WHO_OWNER;
- } else {
- ace_v4->who.uid = uid;
- }
+ ace_v4->who.uid = uid;
} else {
DEBUG(1, ("nfs4_acls.c: file [%s]: could not "
"convert %s to uid or gid\n",
diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index 391a314..16f609d 100644
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -834,15 +834,19 @@ static NTSTATUS
idmap_autorid_preallocate_wellknown(struct idmap_domain *dom)
return NT_STATUS_OK;
}
- num = sizeof(groups)/sizeof(char*);
+ num = ARRAY_SIZE(groups);
- maps = talloc_zero_array(talloc_tos(), struct id_map*, num+1);
+ maps = talloc_array(talloc_tos(), struct id_map*, num+1);
if (!maps) {
return NT_STATUS_NO_MEMORY;
}
for (i = 0; i < num; i++) {
maps[i] = talloc(maps, struct id_map);
+ if (maps[i] == NULL) {
+ talloc_free(maps);
+ return NT_STATUS_NO_MEMORY;
+ }
maps[i]->xid.type = ID_TYPE_GID;
maps[i]->sid = dom_sid_parse_talloc(maps, groups[i]);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-1-test updated
The branch, v4-1-test has been updated
via 4e74c61 smbd: Fix a 100% loop at shutdown time
via 54ee31e s3-smbstatus: display [u|g]id of -1 as "-1" in connection
list
via d07b694 s3-lib: hide incomplete smbXsrv_tcon_global records
via 38841bb s3-lib: fix segf while reading incomplete session info (bug
#10003)
from d95ed7f VERSION: Bump version number up to 4.1.0rc2...
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-1-test
- Log -
commit 4e74c615d56465b5a57f65e6815cbdf0d0b2928a
Author: Volker Lendecke
Date: Thu Jul 11 16:22:26 2013 +0200
smbd: Fix a 100% loop at shutdown time
In the destructor of fsp->aio_requests[0] we put another request into
fsp->aio_requests[0]. Don't overwrite that with TALLOC_FREE.
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Thu Jul 11 20:56:42 CEST 2013 on sn-devel-104
(cherry picked from commit 940395d38bcc348eb5f1be7ba03cd554d9d3bc93)
Fix bug #10013 - 940395d from master needs porting to 4.0 and 4.1.
Autobuild-User(v4-1-test): Karolin Seeger
Autobuild-Date(v4-1-test): Mon Jul 15 23:04:19 CEST 2013 on sn-devel-104
commit 54ee31eae52e72373d28b9666e5680da5bd99da8
Author: Björn Baumbach
Date: Tue Jul 9 12:32:34 2013 +0200
s3-smbstatus: display [u|g]id of -1 as "-1" in connection list
In order to avoid displayed uid or gid of "4294967295" instead of "-1", we
need to fetch the special case -1.
The id can be -1 if we are reading e.g. incomplete session information.
Signed-off-by: Björn Baumbach
Reviewed-by: Stefan Metzmacher
Reviewed-by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Wed Jul 10 01:18:30 CEST 2013 on sn-devel-104
(cherry picked from commit 577cef82c776759c9f3cad7d33057ac865c40769)
The last 3 patches address bug #10003 - s3-lib:segmentation fault while
reading incomplete session info.
commit d07b694f85c31a461d5697b56494c8ee4000925f
Author: Stefan Metzmacher
Date: Mon Jul 8 16:31:13 2013 +0200
s3-lib: hide incomplete smbXsrv_tcon_global records
Part of fix for bug #10003
Pair-programmed-with: Björn Baumbach
Signed-off-by: Stefan Metzmacher
Signed-off-by: Björn Baumbach
Reviewed-by: Jeremy Allison
(cherry picked from commit c52e61f7ba215da28cbb7b8e328aea110ad79b11)
commit 38841bb0dbee310dc2eafdb78482a72cf906644f
Author: Björn Baumbach
Date: Fri Jul 5 13:19:59 2013 +0200
s3-lib: fix segf while reading incomplete session info (bug #10003)
Pair-programmed-with: Stefan Metzmacher
Signed-off-by: Stefan Metzmacher
Signed-off-by: Björn Baumbach
Reviewed-by: Jeremy Allison
(cherry picked from commit 53aa069b97070c73b782e2868b9b9686abe353cc)
---
Summary of changes:
source3/lib/conn_tdb.c | 22 --
source3/lib/sessionid_tdb.c | 15 ++-
source3/smbd/close.c|7 +--
source3/utils/status.c | 24
4 files changed, 55 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/conn_tdb.c b/source3/lib/conn_tdb.c
index a7e7cf0..b218831 100644
--- a/source3/lib/conn_tdb.c
+++ b/source3/lib/conn_tdb.c
@@ -53,8 +53,13 @@ static int collect_sessions_fn(struct
smbXsrv_session_global0 *global,
uint32_t id = global->session_global_id;
struct connections_forall_session sess;
- sess.uid = global->auth_session_info->unix_token->uid;
- sess.gid = global->auth_session_info->unix_token->gid;
+ if (global->auth_session_info == NULL) {
+ sess.uid = -1;
+ sess.gid = -1;
+ } else {
+ sess.uid = global->auth_session_info->unix_token->uid;
+ sess.gid = global->auth_session_info->unix_token->gid;
+ }
strncpy(sess.machine, global->channels[0].remote_name,
sizeof(sess.machine));
strncpy(sess.addr, global->channels[0].remote_address,
sizeof(sess.addr));
@@ -86,6 +91,19 @@ static int traverse_tcon_fn(struct smbXsrv_tcon_global0
*global,
TDB_DATA val = tdb_null;
+ /*
+* Note: that share_name is defined as array without a pointer.
+* that's why it's always a valid pointer here.
+*/
+ if (strlen(global->share_name) == 0) {
+ /*
+* when a smbXsrv_tcon is created it's created
+* with emtpy share_name first in order to allocate
+* an id, before filling in the details.
+*/
+ return 0;
+ }
+
status = dbwrap_fetch(state->session_by_pid, state,
make_tdb_data((void*)&sess_id,
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated via ed120ed lib/param: sync debug related options with source3/param via ba584a5 lib/ldb-samba: only debug LDB_DEBUG_TRACE at level 10 via 42cb71b lib/ldb-samba: make use of DBGC_LDB via 89644f4 lib/util: add 'ldb' debug class via 580740d debug: Add debugclass for DNS server via a56ccfb dsdb-ridalloc: Fix RID pools - RID numbers increase too quickly via afab702 smbd: Fix a 100% loop at shutdown time via f31f55b s3-smbstatus: display [u|g]id of -1 as "-1" in connection list via c286950 s3-lib: hide incomplete smbXsrv_tcon_global records via d15f6a8 s3-lib: fix segf while reading incomplete session info (bug #10003) from 0b80e93 vfs_streams_xattr: Do not attempt to write empty attribute twice http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit ed120ed4fc6e86d35a40206ad69813dee308d727 Author: Stefan Metzmacher Date: Thu Jul 4 18:11:02 2013 +0200 lib/param: sync debug related options with source3/param The most important change is "debug hires timestamp = Yes" and "syslog = 1". Signed-off-by: Stefan Metzmacher Reviewed-by: Björn Jacke Autobuild-User(master): Björn Jacke Autobuild-Date(master): Tue Jul 9 17:15:15 CEST 2013 on sn-devel-104 (cherry picked from commit cd36a3e902813c065e14059d325f7628b06595aa) The last 5 patches address bug #10015 - Fix/Improve debug options. Autobuild-User(v4-0-test): Karolin Seeger Autobuild-Date(v4-0-test): Mon Jul 15 22:56:13 CEST 2013 on sn-devel-104 commit ba584a5ce8e7795b3359435860b5f213fcfc87e4 Author: Stefan Metzmacher Date: Tue Jul 9 13:56:35 2013 +0200 lib/ldb-samba: only debug LDB_DEBUG_TRACE at level 10 Signed-off-by: Stefan Metzmacher Reviewed-by: Björn Jacke (cherry picked from commit 5f93822ede7ec3dc79a8057174342b2c6bb94a3b) commit 42cb71be5da8788c0294d960bcb541b627c24076 Author: Stefan Metzmacher Date: Tue Jul 9 13:56:08 2013 +0200 lib/ldb-samba: make use of DBGC_LDB Signed-off-by: Stefan Metzmacher Reviewed-by: Björn Jacke (cherry picked from commit 8e0752f4d6feea35304377222d3dd487355e4120) commit 89644f40d77a71b25c0a5f50f8ae6bfbe0ddd2db Author: Stefan Metzmacher Date: Tue Jul 9 13:55:44 2013 +0200 lib/util: add 'ldb' debug class Signed-off-by: Stefan Metzmacher Reviewed-by: Björn Jacke (cherry picked from commit baecc863de0ceb64187c6eb3545bf28706bd84fc) commit 580740dd7fe8fcdf6fa307744087344f7533cfab Author: Kai Blin Date: Mon Jan 14 01:13:47 2013 +0100 debug: Add debugclass for DNS server Signed-off-by: Kai Blin Reviewed-By: Amitay Isaacs (cherry picked from commit 4b010997486b059b90be1f69783a451f400d7df7) commit a56ccfbe9786c57ba0b02440a957a6b6b6334b65 Author: Andrew Bartlett Date: Sat Jun 22 19:30:50 2013 +1000 dsdb-ridalloc: Fix RID pools - RID numbers increase too quickly A patch by Cove Schneider who reports: I noticed that the RID numbers seem to increase incrementally, then will suddenly jump by 124501. Unless I'm misunderstanding, shouldn't RID pool allocations just be 500 at a time? e.g. Adding accounts one after another on a single test instance here's how they're incrementing (from 4.0.6): 1596 1597 1598 1599 126100 126101 126102 ... 126599 251100 ... 251599 376100 ... The problem is that this complicates using sssd's AD integration, as that it doesn't expect the RIDs to increase in a single domain so quickly. Signed-off-by: Andrew Bartlett Reviewed-by: Stefan Metzmacher Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Thu Jul 4 20:13:05 CEST 2013 on sn-devel-104 (cherry picked from commit 2763cad409430c183f7f1f6f57bc6b38ae616ed9) Fix bug #10014 - Excessive RID allocation. commit afab702a7d319a9dd6ba4e6f607d3868a4f8dbb8 Author: Volker Lendecke Date: Thu Jul 11 16:22:26 2013 +0200 smbd: Fix a 100% loop at shutdown time In the destructor of fsp->aio_requests[0] we put another request into fsp->aio_requests[0]. Don't overwrite that with TALLOC_FREE. Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Thu Jul 11 20:56:42 CEST 2013 on sn-devel-104 (cherry picked from commit 940395d38bcc348eb5f1be7ba03cd554d9d3bc93) Fix bug #10013 - 940395d from master needs porting to 4.0 and 4.1. commit f31f55b7b0f4e3acca06660ce42fc82ecd690f91 Author: Björn Baumbach Date: Tue Jul 9 12:32:34 2013 +0200 s3-smbstatus: display [u|g]id of -1 as "-1" in connection list In order to avoid displayed uid or gid of "4294967295" instead of "
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-07-15-1543/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2013-07-15-1543/samba3.stderr http://git.samba.org/autobuild.flakey/2013-07-15-1543/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2013-07-15-1543/samba.stderr http://git.samba.org/autobuild.flakey/2013-07-15-1543/samba.stdout The top commit at the time of the failure was: commit 0529b59fbe3f96509893fc4e93a75d6928b5a532 Author: Andreas Schneider Date: Thu Jul 11 13:44:53 2013 +0200 s3-winbind: Do not delete an existing valid credential cache. BUG: https://bugzilla.samba.org/show_bug.cgi?id=9994 Thanks to David Woodhouse . Reviewed-by: Günther Deschner Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Mon Jul 15 12:48:46 CEST 2013 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0529b59 s3-winbind: Do not delete an existing valid credential
cache.
from 940395d smbd: Fix a 100% loop at shutdown time
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0529b59fbe3f96509893fc4e93a75d6928b5a532
Author: Andreas Schneider
Date: Thu Jul 11 13:44:53 2013 +0200
s3-winbind: Do not delete an existing valid credential cache.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9994
Thanks to David Woodhouse .
Reviewed-by: Günther Deschner
Autobuild-User(master): Andreas Schneider
Autobuild-Date(master): Mon Jul 15 12:48:46 CEST 2013 on sn-devel-104
---
Summary of changes:
source3/winbindd/winbindd_pam.c |8
1 files changed, 8 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 158a7c4..aed4741 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -685,6 +685,14 @@ static NTSTATUS winbindd_raw_kerberos_login(TALLOC_CTX
*mem_ctx,
return NT_STATUS_OK;
failed:
+ /*
+* Do not delete an existing valid credential cache, if the user
+* e.g. enters a wrong password
+*/
+ if ((strequal(krb5_cc_type, "FILE") || strequal(krb5_cc_type, "WRFILE"))
+ && user_ccache_file != NULL) {
+ return result;
+ }
/* we could have created a new credential cache with a valid tgt in it
* but we werent able to get or verify the service ticket for this
--
Samba Shared Repository
