diff options
| author | bubulle <bubulle@alioth.debian.org> | 2011-11-12 13:00:54 +0000 |
|---|---|---|
| committer | bubulle <bubulle@alioth.debian.org> | 2011-11-12 13:00:54 +0000 |
| commit | 6fba685eec3a1165ec0b82d72d3ae71e946a1404 (patch) | |
| tree | f3c0543c8f9df4a22ed62e3bd99d9d7bc1054c14 /source4/script/mkproto.pl | |
| parent | 77a7925c0509068d5cd2affd94a3996d0a86035a (diff) | |
| download | samba-6fba685eec3a1165ec0b82d72d3ae71e946a1404.tar.gz | |
Merge upstream 3.6.1 source
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@3972 fc4039ab-9d04-0410-8cac-899223bdd6b0
Diffstat (limited to 'source4/script/mkproto.pl')
| -rwxr-xr-x | source4/script/mkproto.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/script/mkproto.pl b/source4/script/mkproto.pl index 59307881c4..4760e63bda 100755 --- a/source4/script/mkproto.pl +++ b/source4/script/mkproto.pl @@ -128,7 +128,7 @@ sub handle_loadparm($$) { my ($file,$line) = @_; - if ($line =~ /^_PUBLIC_ FN_(GLOBAL|LOCAL)_(CONST_STRING|STRING|BOOL|bool|CHAR|INTEGER|LIST)\((\w+),.*\)/o) { + if ($line =~ /^FN_(GLOBAL|LOCAL)_(CONST_STRING|STRING|BOOL|bool|CHAR|INTEGER|LIST)\((\w+),.*\)/o) { my $scope = $1; my $type = $2; my $name = $3; @@ -147,7 +147,7 @@ sub handle_loadparm($$) "LOCAL" => "struct loadparm_service *, struct loadparm_service *" ); - $file->("$tmap{$type}$name($smap{$scope});\n"); + $file->("$tmap{$type}lpcfg_$name($smap{$scope});\n"); } } @@ -190,7 +190,7 @@ sub process_file($$$) next if ($line =~ /^\/|[;]/); - if ($line =~ /^_PUBLIC_ FN_/) { + if ($line =~ /^FN_/) { handle_loadparm($public_file, $line); handle_loadparm($private_file, $line); next; |