Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into registry

[ira/wip.git] / source4 / script / mkproto.pl

diff --git a/source4/script/mkproto.pl b/source4/script/mkproto.pl
index 3ed845e2bb558c293c73f459b81c1cf4c74a72d3..e1b790d41da216ce04cc8a98bec094607bed2c05 100755 (executable)
--- a/source4/script/mkproto.pl
+++ b/source4/script/mkproto.pl
@@ -144,7 +144,7 @@ sub handle_loadparm($$)
 
                my %smap = (
                            "GLOBAL" => "struct loadparm_context *",
-                           "LOCAL" => "struct loadparm_service *"
+                           "LOCAL" => "struct loadparm_service *, struct loadparm_service *"
                            );
 
                $file->("$tmap{$type}$name($smap{$scope});\n");
@@ -157,7 +157,9 @@ sub process_file($$$)
 
        $filename =~ s/\.o$/\.c/g;
 
-       if (!open(FH, "< $builddir/$filename")) {
+       if ($filename =~ /^\//) {
+               open(FH, "<$filename") or die("Failed to open $filename");
+       } elsif (!open(FH, "< $builddir/$filename")) {
            open(FH, "< $srcdir/$filename") || die "Failed to open $filename";
        }
 
@@ -190,6 +192,7 @@ sub process_file($$$)
 
                if ($line =~ /^_PUBLIC_ FN_/) {
                        handle_loadparm($public_file, $line);
+                       handle_loadparm($private_file, $line);
                        next;
                }