From 591ff7675dfe51f30029cb864df47bc8f6266494 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 2 May 2005 13:37:05 +0000
Subject: r6572: add "string_array" as new scalar type for handling SPOOLSS
 string array's

metze
(This used to be commit 23b529ee090e1858fc18794b949f7e466fa82b0e)
---
 source4/build/pidl/ndr_header.pm | 2 +-
 source4/build/pidl/typelist.pm   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'source4/build')

diff --git a/source4/build/pidl/ndr_header.pm b/source4/build/pidl/ndr_header.pm
index ddd4fa1eb3..f40810a84d 100644
--- a/source4/build/pidl/ndr_header.pm
+++ b/source4/build/pidl/ndr_header.pm
@@ -60,7 +60,7 @@ sub HeaderElement($)
     pidl tabs();
     HeaderType($element, $element->{TYPE}, "");
     pidl " ";
-    if ($element->{POINTERS} && $element->{TYPE} ne "string") {
+    if ($element->{POINTERS} && not $element->{TYPE} =~ "string") {
 	    for (my($i)=$element->{POINTERS}; $i > 0; $i--) {
 		    pidl "*";
 	    }
diff --git a/source4/build/pidl/typelist.pm b/source4/build/pidl/typelist.pm
index d9d545f060..9045e86bfd 100644
--- a/source4/build/pidl/typelist.pm
+++ b/source4/build/pidl/typelist.pm
@@ -86,6 +86,10 @@ my $scalars = {
 				C_TYPE		=> "const char *",
 				NDR_ALIGN	=> 4 #???
 			},
+	"string_array"	=> {
+				C_TYPE		=> "const char **",
+				NDR_ALIGN	=> 4 #???
+			},
 
 	# time types
 	"time_t"	=> {
-- 
cgit