[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-0rc2-82-g6e0ca23

[Karolin Seeger]

The branch, v3-3-stable has been updated
       via  6e0ca23f3a485f45a5464c9e659d0df732b691b9 (commit)
       via  8c8844c62f495ff84e0bab6b494bf0ebd1abff43 (commit)
       via  80d1ca6a8d05f0e2f1e05550d6db758ff3c2eb97 (commit)
       via  c8f755ad99cc6afd93c3aaffef583f736b9cf448 (commit)
       via  2e607d7c9a772096293b16243df1be4501d73d66 (commit)
      from  8b4c199deffd724a4a2219ccb8ffb91524101cd9 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable


- Log -----------------------------------------------------------------
commit 6e0ca23f3a485f45a5464c9e659d0df732b691b9
Author: Michael Adam <obnox at samba.org>
Date:   Thu Dec 18 18:01:55 2008 +0100

    smbd: prevent access to root filesystem when connecting with empty service name
    
    This only applies to a setup with "registry shares = yes"
    
    Michael
    (cherry picked from commit 288fa94ac7cfdf7457b5098c33fc840bed3d5410)
    (cherry picked from commit e85526b184e66f86b7faa9d0a37288a09c12c19e)
    (cherry picked from commit 5dfa403498c4f4a0eb05a5331b81326832ddd63f)

commit 8c8844c62f495ff84e0bab6b494bf0ebd1abff43
Author: Jeremy Allison <jra at samba.org>
Date:   Sun Jan 4 11:46:28 2009 -0800

    Fix bug #6009 - Setting "min receivefile size = 1" breaks writes.
    Karolin please pull for 3.3.0. Thanks !
    Jeremy.
    (cherry picked from commit b8fef4ce2ed627387a22dfb5be1fa59c2e486aff)

commit 80d1ca6a8d05f0e2f1e05550d6db758ff3c2eb97
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jan 2 14:53:26 2009 +0100

    Alternative fix for 45db33e73 and 0d443ae7931
    
    Simo is right, we need to ask passdb first. At least this fixes a nasty to find
    NT_STATUS_ACCESS_DENIED problem in the build farm for the test run I just did
    on host "opi".
    
    Michael, can you re-check if this also fixes the error you found, leading to
    the two fixes?
    
    Thanks,
    
    Volker
    (cherry picked from commit f2535d7b94cfc6bec05127576186d93531304005)

commit c8f755ad99cc6afd93c3aaffef583f736b9cf448
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jan 2 15:02:03 2009 +0100

    Revert "Fix uid_to_sid mapping when the idmap cache is empty."
    
    This reverts commit d4bc1f8d79929dc1a1d06e92eaf85923a1848e6f.
    (cherry picked from commit 605f5911febc25f40c697d4fc1097584ba49021e)

commit 2e607d7c9a772096293b16243df1be4501d73d66
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jan 2 15:01:47 2009 +0100

    Revert "idmap: Remove passd check from idmap_backends_unixid_to_sid()."
    
    This reverts commit 3d22b77f1ac5e8f83d1063d87c68e60655a3ed6b.
    (cherry picked from commit 860da910633415d1a3c850ed977a6635d28a7bf2)

-----------------------------------------------------------------------

Summary of changes:
 source/smbd/process.c   |    2 +-
 source/smbd/service.c   |    4 ++++
 source/winbindd/idmap.c |   11 +++++++++++
 3 files changed, 16 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/process.c b/source/smbd/process.c
index 2587097..3184063 100644
--- a/source/smbd/process.c
+++ b/source/smbd/process.c
@@ -283,7 +283,7 @@ static NTSTATUS receive_smb_raw_talloc(TALLOC_CTX *mem_ctx, int fd,
 
 	if (CVAL(lenbuf,0) == 0 &&
 			min_recv_size &&
-			smb_len_large(lenbuf) > min_recv_size && /* Could be a UNIX large writeX. */
+			smb_len_large(lenbuf) > (min_recv_size + STANDARD_WRITE_AND_X_HEADER_SIZE) && /* Could be a UNIX large writeX. */
 			!srv_is_signing_active()) {
 
 		return receive_smb_raw_talloc_partial_read(
diff --git a/source/smbd/service.c b/source/smbd/service.c
index 0b851f1..c39584a 100644
--- a/source/smbd/service.c
+++ b/source/smbd/service.c
@@ -235,6 +235,10 @@ static int load_registry_service(const char *servicename)
 		return -1;
 	}
 
+	if ((servicename == NULL) || (*servicename == '\0')) {
+		return -1;
+	}
+
 	if (strequal(servicename, GLOBAL_NAME)) {
 		return -2;
 	}
diff --git a/source/winbindd/idmap.c b/source/winbindd/idmap.c
index 6be55ef..ca07f23 100644
--- a/source/winbindd/idmap.c
+++ b/source/winbindd/idmap.c
@@ -735,6 +735,17 @@ NTSTATUS idmap_backends_unixid_to_sid(const char *domname, struct id_map *id)
 	maps[0] = id;
 	maps[1] = NULL;
 
+	/*
+	 * Always give passdb a chance first
+	 */
+
+	dom = idmap_init_passdb_domain(NULL);
+	if ((dom != NULL)
+	    && NT_STATUS_IS_OK(dom->methods->unixids_to_sids(dom, maps))
+	    && id->status == ID_MAPPED) {
+		return NT_STATUS_OK;
+	}
+
 	dom = idmap_find_domain(domname);
 	if (dom == NULL) {
 		return NT_STATUS_NONE_MAPPED;


-- 
Samba Shared Repository