3 files changed, 37 insertions, 34 deletions

diff --git a/source4/pidl/lib/Parse/Pidl/NDR.pm b/source4/pidl/lib/Parse/Pidl/NDR.pm
index 998b19aabf..f05e3120c7 100644
--- a/source4/pidl/lib/Parse/Pidl/NDR.pm
+++ b/source4/pidl/lib/Parse/Pidl/NDR.pm
@@ -35,7 +35,7 @@ use vars qw($VERSION);
 $VERSION = '0.01';
 @ISA = qw(Exporter);
 @EXPORT = qw(GetPrevLevel GetNextLevel ContainsDeferred ContainsString);
-@EXPORT_OK = qw(GetElementLevelTable ParseElement ValidElement align_type mapToScalar);
+@EXPORT_OK = qw(GetElementLevelTable ParseElement ValidElement align_type mapToScalar ParseType);
 
 use strict;
 use Parse::Pidl qw(warning fatal);
@@ -499,6 +499,7 @@ sub ParseType($$)
 	my ($d, $pointer_default) = @_;
 
 	if ($d->{TYPE} eq "STRUCT" or $d->{TYPE} eq "UNION") {
+		return $d if (not defined($d->{ELEMENTS}));
 		CheckPointerTypes($d, $pointer_default);
 	}
 
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm b/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm
index c254bfad38..054074297b 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm
@@ -426,14 +426,7 @@ sub EjsPushScalar($$$$$)
 					$var = get_pointer_to($var);
 			}
 
-		my $t;
-		if (ref($e->{TYPE}) eq "HASH") {
-			$t = "$e->{TYPE}->{TYPE}_$e->{TYPE}->{NAME}";
-		} else {
-			$t = $e->{TYPE};
-		}
-
-		pidl "NDR_CHECK(ejs_push_$t(ejs, v, $name, $var));";
+		pidl "NDR_CHECK(".TypeFunctionName("ejs_push", $e->{TYPE})."(ejs, v, $name, $var));";
 	}
 }
 
@@ -619,21 +612,22 @@ sub EjsTypePushFunction($$)
 	my ($d, $name) = @_;
 	return if (has_property($d, "noejs"));
 
-	if ($d->{TYPE} eq "TYPEDEF") {
-		EjsTypePushFunction($d->{DATA}, $name);
-		return;
-	}
-
-	if ($d->{TYPE} eq "STRUCT") {
-		fn_declare($d, "NTSTATUS ejs_push_$name(struct ejs_rpc *ejs, struct MprVar *v, const char *name, const struct $name *r)");
-	} elsif ($d->{TYPE} eq "UNION") {
-		fn_declare($d, "NTSTATUS ejs_push_$name(struct ejs_rpc *ejs, struct MprVar *v, const char *name, const union $name *r)");
-	} elsif ($d->{TYPE} eq "ENUM") {
-		fn_declare($d, "NTSTATUS ejs_push_$name(struct ejs_rpc *ejs, struct MprVar *v, const char *name, const enum $name *r)");
-	} elsif ($d->{TYPE} eq "BITMAP") {
-		my($type_decl) = Parse::Pidl::Typelist::mapTypeName($d->{BASE_TYPE});
-		fn_declare($d, "NTSTATUS ejs_push_$name(struct ejs_rpc *ejs, struct MprVar *v, const char *name, const $type_decl *r)");
-	}
+	my $var = undef;
+	my $dt = $d;
+	if ($dt->{TYPE} eq "TYPEDEF") {
+		$dt = $dt->{DATA};
+	}
+	if ($dt->{TYPE} eq "STRUCT") {
+		$var = "const struct $name *r";
+	} elsif ($dt->{TYPE} eq "UNION") {
+		$var = "const union $name *r";
+	} elsif ($dt->{TYPE} eq "ENUM") {
+		$var = "const enum $name *r";
+	} elsif ($dt->{TYPE} eq "BITMAP") {
+		my($type_decl) = Parse::Pidl::Typelist::mapTypeName($dt->{BASE_TYPE});
+		$var = "const $type_decl *r";
+	}
+	fn_declare($d, "NTSTATUS ".TypeFunctionName("ejs_push", $d) . "(struct ejs_rpc *ejs, struct MprVar *v, const char *name, $var)");
 	pidl "{";
 	indent;
 	EjsTypePush($d, "r");
@@ -644,6 +638,7 @@ sub EjsTypePushFunction($$)
 
 sub EjsTypePush($$)
 {
+	sub EjsTypePush($$);
 	my ($d, $varname) = @_;
 
 	if ($d->{TYPE} eq 'STRUCT') {
@@ -654,6 +649,8 @@ sub EjsTypePush($$)
 		EjsEnumPush($d, $varname);
 	} elsif ($d->{TYPE} eq 'BITMAP') {
 		EjsBitmapPush($d, $varname);
+	} elsif ($d->{TYPE} eq 'TYPEDEF') {
+		EjsTypePush($d->{DATA}, $varname);
 	} else {
 		warn "Unhandled push $varname of type $d->{TYPE}";
 	}
@@ -677,8 +674,7 @@ sub EjsPushFunction($)
 	}
 
 	if ($d->{RETURN_TYPE}) {
-		my $t = $d->{RETURN_TYPE};
-		pidl "NDR_CHECK(ejs_push_$t(ejs, v, \"result\", &r->out.result));";
+		pidl "NDR_CHECK(".TypeFunctionName("ejs_push", $d->{RETURN_TYPE})."(ejs, v, \"result\", &r->out.result));";
 	}
 
 	pidl "return NT_STATUS_OK;";
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm b/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm
index 11ecc17001..2eddf22b05 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/Header.pm
@@ -57,7 +57,11 @@ sub HeaderElement($)
 	if (has_property($element, "represent_as")) {
 		pidl mapTypeName($element->{PROPERTIES}->{represent_as})." ";
 	} else {
-		HeaderType($element, $element->{TYPE}, "");
+		if (ref($element->{TYPE}) eq "HASH") {
+			HeaderType($element, $element->{TYPE}, $element->{TYPE}->{NAME});
+		} else {
+			HeaderType($element, $element->{TYPE}, "");
+		}
 		pidl " ";
 		my $numstar = $element->{POINTERS};
 		if ($numstar >= 1) {
@@ -90,14 +94,14 @@ sub HeaderElement($)
 sub HeaderStruct($$)
 {
     my($struct,$name) = @_;
-	pidl "struct $name {\n";
+	pidl "struct $name";
+    return if (not defined($struct->{ELEMENTS}));
+	pidl " {\n";
     $tab_depth++;
     my $el_count=0;
-    if (defined $struct->{ELEMENTS}) {
-		foreach (@{$struct->{ELEMENTS}}) {
-		    HeaderElement($_);
-		    $el_count++;
-		}
+	foreach (@{$struct->{ELEMENTS}}) {
+		HeaderElement($_);
+		$el_count++;
     }
     if ($el_count == 0) {
 	    # some compilers can't handle empty structures
@@ -174,7 +178,9 @@ sub HeaderUnion($$)
 	my($union,$name) = @_;
 	my %done = ();
 
-	pidl "union $name {\n";
+	pidl "union $name";
+	return if (not defined($union->{ELEMENTS}));
+	pidl " {\n";
 	$tab_depth++;
 	foreach my $e (@{$union->{ELEMENTS}}) {
 		if ($e->{TYPE} ne "EMPTY") {