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

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  dfc1cf9... pidl:NDR: correctly handle no pointer bracket arrays with 'string'
      from  7651996... s3:utils/net_rpc_service.c: we also need some ndr_pull functions

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


- Log -----------------------------------------------------------------
commit dfc1cf9e57b5cbdf924287d7b2f9c3c8284a54cf
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Aug 9 19:38:30 2010 +0200

    pidl:NDR: correctly handle no pointer bracket arrays with 'string'
    
    metze
    (cherry picked from commit a22989a54afd411a8d038110c7df2c545b4121b7)

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

Summary of changes:
 pidl/lib/Parse/Pidl/NDR.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/pidl/lib/Parse/Pidl/NDR.pm b/pidl/lib/Parse/Pidl/NDR.pm
index 1b45010..4c327a3 100644
--- a/pidl/lib/Parse/Pidl/NDR.pm
+++ b/pidl/lib/Parse/Pidl/NDR.pm
@@ -124,7 +124,7 @@ sub GetElementLevelTable($$)
 		if ($d eq "*") {
 			$is_conformant = 1;
 			if ($size = shift @size_is) {
-				if (has_property($e, "string")) {
+				if ($e->{POINTERS} < 1 and has_property($e, "string")) {
 					$is_string = 1;
 					delete($e->{PROPERTIES}->{string});
 				}


-- 
Samba Shared Repository