[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  fd74ee5 pidl:Typelist: fix perl warnings about recursiv function calls
       via  c10a24d pidl:Samba3/ServerNDR: correctly initialise ndr_push struct
       via  b271a9f From Metze - make sure we're using the same string length for the hash. (cherry picked from commit 30065ac02e825bd0202294202069a0bc890cbdf1)
      from  7819c94 s3-winbind: share a common winbind_samlogon_retry_loop().

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


- Log -----------------------------------------------------------------
commit fd74ee5f3e480407cd543d547cdf441a6641a853
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Jan 26 08:48:34 2011 +0100

    pidl:Typelist: fix perl warnings about recursiv function calls
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Wed Jan 26 10:59:04 CET 2011 on sn-devel-104
    (cherry picked from commit 34664338f3c0bd9acbb2ada3d92d482e30cbdf1c)

commit c10a24dc199963b9ca726c735266582dd46d287c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jan 25 19:46:18 2011 +0100

    pidl:Samba3/ServerNDR: correctly initialise ndr_push struct
    
    We need to copy the ptr_count from the ndr_pull struct to the ndr_push struct,
    otherwise we'll reuse full pointer ids, which will cause the client to
    fail in the ndr unmarshalling.
    
    metze
    (cherry picked from commit 4b068bb91994a0fc3a76abd45bff4e2fe53e9a34)

commit b271a9fdfcc4b5c465fd644f211658f07a8bad21
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jan 26 08:43:43 2011 -0800

    From Metze - make sure we're using the same string length for the hash.
    (cherry picked from commit 30065ac02e825bd0202294202069a0bc890cbdf1)

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

Summary of changes:
 pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm |    6 ++++++
 pidl/lib/Parse/Pidl/Typelist.pm         |    1 +
 source3/libsmb/smb_share_modes.c        |    2 +-
 3 files changed, 8 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
index 0ebccf5..64a4ec5 100644
--- a/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
@@ -199,6 +199,12 @@ sub ParseFunction($$)
 	pidl "\treturn false;";
 	pidl "}";
 	pidl "";
+	pidl "/*";
+	pidl " * carry over the pointer count to the reply in case we are";
+	pidl " * using full pointer. See NDR specification for full pointers";
+	pidl " */";
+	pidl "push->ptr_count = pull->ptr_count;";
+	pidl "";
 	pidl "ndr_err = call->ndr_push(push, NDR_OUT, r);";
 	pidl "if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {";
 	pidl "\ttalloc_free(r);";
diff --git a/pidl/lib/Parse/Pidl/Typelist.pm b/pidl/lib/Parse/Pidl/Typelist.pm
index 4733f91..a89b1a7 100644
--- a/pidl/lib/Parse/Pidl/Typelist.pm
+++ b/pidl/lib/Parse/Pidl/Typelist.pm
@@ -128,6 +128,7 @@ sub getType($)
 	return $types{$t};
 }
 
+sub typeIs($$);
 sub typeIs($$)
 {
 	my ($t,$tt) = @_;
diff --git a/source3/libsmb/smb_share_modes.c b/source3/libsmb/smb_share_modes.c
index 9392349..fd5f0ea 100644
--- a/source3/libsmb/smb_share_modes.c
+++ b/source3/libsmb/smb_share_modes.c
@@ -277,7 +277,7 @@ static uint32_t smb_name_hash(const char *sharepath, const char *filename, int *
 		return 0;
 	}
 	key.dptr = (uint8_t *)fullpath;
-	key.dsize = strlen(fullpath);
+	key.dsize = strlen(fullpath) + 1;
 	name_hash = tdb_jenkins_hash(&key);
 	free(fullpath);
 	return name_hash;


-- 
Samba Shared Repository