r14402: Generate seperate headers for RPC client functions.

(This used to be commit 7054ebf0249930843a2baf4d023ae8f62cedb109)

1 files changed, 14 insertions, 11 deletions

diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
index 1da765303c..60faa78df3 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
@@ -10,7 +10,7 @@ $VERSION = '0.01';
 
 use strict;
 
-my($res);
+my($res,$res_hdr);
 
 #####################################################################
 # parse a function
@@ -20,6 +20,10 @@ sub ParseFunction($$)
 	my $name = $fn->{NAME};
 	my $uname = uc $name;
 
+	$res_hdr .= "\nstruct rpc_request *dcerpc_$name\_send(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name *r);
+NTSTATUS dcerpc_$name(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name *r);
+";
+
 	$res .= "
 struct rpc_request *dcerpc_$name\_send(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name *r)
 {
@@ -74,29 +78,28 @@ sub ParseInterface($)
 	return $res;
 }
 
-sub Parse($$)
+sub Parse($$$$)
 {
-	my($ndr) = shift;
-	my($filename) = shift;
+	my($ndr,$header,$ndr_header,$client_header) = @_;
 
-	my $h_filename = $filename;
 	$res = "";
-
-	if ($h_filename =~ /(.*)\.c/) {
-		$h_filename = "$1.h";
-	}
+	$res_hdr = "";
 
 	$res .= "/* client functions auto-generated by pidl */\n";
 	$res .= "\n";
 	$res .= "#include \"includes.h\"\n";
-	$res .= "#include \"$h_filename\"\n";
+	$res .= "#include \"$ndr_header\"\n";
+	$res .= "#include \"$client_header\"\n";
 	$res .= "\n";
 
+	$res_hdr .= "#include \"librpc/rpc/dcerpc.h\"\n";
+	$res_hdr .= "#include \"$header\"\n";
+
 	foreach my $x (@{$ndr}) {
 		($x->{TYPE} eq "INTERFACE") && ParseInterface($x);
 	}
 
-	return $res;
+	return ($res,$res_hdr);
 }
 
 1;