[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Tue Oct 5 07:52:01 MDT 2010


The branch, master has been updated
       via  9bcb88f s4-selftest: move spoolss to skip list.
       via  a416ff2 libndr: fix "excess elements in struct initializer" warning.
       via  caeb819 s3-reg_parse: fix uninitialized variable in srprs_key().
       via  0a1ce77 s3-libndr: handle NDR_ERR_IPV6ADDRESS case in ndr_errstr().
      from  2b58efb land: Fix failure detection.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9bcb88ff25a56290ea326fd1ccf12865a4935c4c
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 5 15:07:19 2010 +0200

    s4-selftest: move spoolss to skip list.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Tue Oct  5 13:51:28 UTC 2010 on sn-devel-104

commit a416ff26d6ada4ee96bf3963866f67d5788162d1
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 5 14:59:09 2010 +0200

    libndr: fix "excess elements in struct initializer" warning.
    
    Guenther

commit caeb819861e0d87aebc6c1253102529cba6dec56
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 5 14:58:52 2010 +0200

    s3-reg_parse: fix uninitialized variable in srprs_key().
    
    Guenther

commit 0a1ce77e29dd24f8f410e8832244bd8d03fd08b5
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 5 14:57:59 2010 +0200

    s3-libndr: handle NDR_ERR_IPV6ADDRESS case in ndr_errstr().
    
    Guenther

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

Summary of changes:
 librpc/ndr/libndr.h          |    1 +
 source3/librpc/ndr/util.c    |    3 +++
 source3/registry/reg_parse.c |    2 +-
 source4/selftest/knownfail   |    1 -
 source4/selftest/skip        |    1 +
 5 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index c110b76..bcfbf75 100644
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -334,6 +334,7 @@ struct ndr_interface_call {
 	ndr_push_flags_fn_t ndr_push;
 	ndr_pull_flags_fn_t ndr_pull;
 	ndr_print_function_t ndr_print;
+	bool _dummy;
 };
 
 struct ndr_interface_string_array {
diff --git a/source3/librpc/ndr/util.c b/source3/librpc/ndr/util.c
index 5966ca8..d6a41a0 100644
--- a/source3/librpc/ndr/util.c
+++ b/source3/librpc/ndr/util.c
@@ -101,6 +101,9 @@ const char *ndr_errstr(enum ndr_err_code err)
 	case NDR_ERR_IPV4ADDRESS:
 		return "NDR_ERR_IPV4ADDRESS";
 		break;
+	case NDR_ERR_IPV6ADDRESS:
+		return "NDR_ERR_IPV6ADDRESS";
+		break;
 	case NDR_ERR_INVALID_POINTER:
 		return "NDR_ERR_INVALID_POINTER";
 		break;
diff --git a/source3/registry/reg_parse.c b/source3/registry/reg_parse.c
index 2fcdb41..98704ec 100644
--- a/source3/registry/reg_parse.c
+++ b/source3/registry/reg_parse.c
@@ -263,7 +263,7 @@ static bool srprs_key(const char** ptr, cbuf* key, bool* del)
 {
 	const char* pos = *ptr;
 	const char* closing_bracket_pos = NULL;
-	size_t      closing_bracket_idx;
+	size_t      closing_bracket_idx = 0;
 
 	if (!srprs_skipws(&pos) || !srprs_char(&pos, '[')) {
 		return false;
diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail
index 971e9c6..cc7e2ae 100644
--- a/source4/selftest/knownfail
+++ b/source4/selftest/knownfail
@@ -37,7 +37,6 @@ samba4.rpc.netlogon.*.ServerGetTrustInfo
 samba4.rpc.netlogon.*.GetForestTrustInformation
 samba4.rpc.samr.passwords.badpwdcount # Not provided by Samba 4 yet
 samba4.rpc.samr.passwords.lockout
-samba4.rpc.spoolss # Not provided by Samba 4 yet
 samba4.base.charset.*.Testing partial surrogate
 .*net.api.delshare.*				# DelShare isn't implemented yet
 samba4.rap.*netservergetinfo
diff --git a/source4/selftest/skip b/source4/selftest/skip
index 7f7967f..047e4f7 100644
--- a/source4/selftest/skip
+++ b/source4/selftest/skip
@@ -49,6 +49,7 @@ rpc.remact							# Not provided by Samba 4
 rpc.oxidresolve						# Not provided by Samba 4
 rpc.eventlog						# Not provided by Samba 4
 rpc.initshutdown					# Not provided by Samba 4
+rpc.spoolss						# Not provided by Samba 4
 rpc.svcctl							# Not provided by Samba 4
 rpc.atsvc							# Not provided by Samba 4
 rpc.frsapi							# Not provided by Samba 4


-- 
Samba Shared Repository


More information about the samba-cvs mailing list