The branch, v4-0-test has been updated
via fe299e0336fcff780ef69a6b4f56cd1e0d0c50a8 (commit)
from dd77fc45eee2dde7bdd31a2e39387e94cec158aa (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit fe299e0336fcff780ef69a6b4f56cd1e0d0c50a8
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Thu Jan 24 17:43:38 2008 +0100
Add pidl --samba3-libnetapi option.
Guenther
-----------------------------------------------------------------------
Summary of changes:
.../Pidl/Samba3/{ClientNDR.pm => libnetapi.pm} | 81 +++++++++++++++-----
source/pidl/pidl | 15 ++++
2 files changed, 77 insertions(+), 19 deletions(-)
copy source/pidl/lib/Parse/Pidl/Samba3/{ClientNDR.pm => libnetapi.pm} (69%)
Changeset truncated at 500 lines:
diff --git a/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
b/source/pidl/lib/Parse/Pidl/Samba3/libnetapi.pm
similarity index 69%
copy from source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
copy to source/pidl/lib/Parse/Pidl/Samba3/libnetapi.pm
index 86b8951..8476bfb 100644
--- a/source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
+++ b/source/pidl/lib/Parse/Pidl/Samba3/libnetapi.pm
@@ -1,11 +1,11 @@
###################################################
-# Samba3 client generator for IDL structures
+# Samba3 libnetapi generator for IDL structures
# on top of Samba4 style NDR functions
# Copyright [EMAIL PROTECTED] 2005-2006
# Copyright [EMAIL PROTECTED] 2008
# released under the GNU GPL
-package Parse::Pidl::Samba3::ClientNDR;
+package Parse::Pidl::Samba3::libnetapi;
use Exporter;
@ISA = qw(Exporter);
@@ -25,7 +25,7 @@ $VERSION = '0.01';
sub indent($) { my ($self) = @_; $self->{tabs}.="\t"; }
sub deindent($) { my ($self) = @_; $self->{tabs} = substr($self->{tabs}, 1); }
sub pidl($$) { my ($self,$txt) = @_; $self->{res} .= $txt ?
"$self->{tabs}$txt\n" : "\n"; }
-sub pidl_hdr($$) { my ($self, $txt) = @_; $self->{res_hdr} .= "$txt\n"; }
+sub pidl_hdr($$) { my ($self, $txt) = @_; $self->{res_hdr} .= "$txt\n"; }
sub fn_declare($$) { my ($self,$n) = @_; $self->pidl($n);
$self->pidl_hdr("$n;"); }
sub genpad($)
@@ -49,25 +49,67 @@ sub ParseFunction($$$)
my ($self, $if, $fn) = @_;
my $fn_args = "";
+ my $fn_args2 = "ctx";
my $uif = uc($if);
my $ufn = "NDR_".uc($fn->{NAME});
- my $fn_str = "NTSTATUS rpccli_$fn->{NAME}";
+ my $fn_str = "NET_API_STATUS $fn->{NAME}";
+# my $fn_str2 = "werr = libnetapi_$fn->{NAME}";
+ my $fn_str_l = "werr = $fn->{NAME}_l";
+ my $fn_str_r = "werr = $fn->{NAME}_r";
my $pad = genpad($fn_str);
-
- $fn_args .= "struct rpc_pipe_client *cli,\n" . $pad . "TALLOC_CTX
*mem_ctx";
+# my $pad2 = genpad(" "x(8).$fn_str2);
+ my $pad2 = genpad(" "x(16).$fn_str_l);
foreach (@{$fn->{ELEMENTS}}) {
- $fn_args .= ",\n" . $pad . DeclLong($_);
+ $fn_args .= ($fn_args eq "") ?
DeclLong($_):",\n".$pad.DeclLong($_);
}
- if (defined($fn->{RETURN_TYPE}) && ($fn->{RETURN_TYPE} eq "WERROR")) {
- $fn_args .= ",\n" . $pad . "WERROR *werror";
+ foreach (@{$fn->{ELEMENTS}}) {
+ $fn_args2 .= ",\n" . $pad2 . $_->{NAME};
}
+
$self->pidl("/****************************************************************");
+ $self->pidl(" $fn->{NAME}");
+
$self->pidl("****************************************************************/");
+ $self->pidl("");
$self->fn_declare("$fn_str($fn_args)");
+ $self->pidl_hdr("WERROR $fn->{NAME}_r(struct libnetapi_ctx
*ctx,\n$pad$fn_args);");
+ $self->pidl_hdr("WERROR $fn->{NAME}_l(struct libnetapi_ctx
*ctx,\n$pad$fn_args);");
$self->pidl("{");
$self->indent;
- $self->pidl("struct $fn->{NAME} r;");
+ $self->pidl("struct libnetapi_ctx *ctx = NULL;");
+ $self->pidl("NET_API_STATUS status;");
+ $self->pidl("WERROR werr;");
+ $self->pidl("");
+
+ $self->pidl("status = libnetapi_getctx(&ctx);");
+ $self->pidl("if (status != 0) {");
+ $self->indent;
+ $self->pidl("return status;");
+ $self->deindent;
+ $self->pidl("}");
+ $self->pidl("");
+
+# $self->pidl("$fn_str2($fn_args2);");
+ $self->pidl("if (LIBNETAPI_LOCAL_SERVER($fn->{ELEMENTS}[0]->{NAME}))
{");
+ $self->indent;
+ $self->pidl("$fn_str_l($fn_args2);");
+ $self->deindent;
+ $self->pidl("} else {");
+ $self->indent;
+ $self->pidl("$fn_str_r($fn_args2);");
+ $self->deindent;
+ $self->pidl("}");
+ $self->pidl("");
+
+ $self->pidl("if (!W_ERROR_IS_OK(werr)) {");
+ $self->indent;
+ $self->pidl("return W_ERROR_V(werr);");
+ $self->deindent;
+ $self->pidl("}");
+ $self->pidl("");
+ $self->pidl("return NET_API_STATUS_SUCCESS;");
+=cut
$self->pidl("NTSTATUS status;");
$self->pidl("");
$self->pidl("/* In parameters */");
@@ -150,8 +192,8 @@ sub ParseFunction($$$)
$self->pidl("");
$self->pidl("/* Return result */");
if (not $fn->{RETURN_TYPE}) {
- $self->pidl("return NT_STATUS_OK;");
- } elsif ($fn->{RETURN_TYPE} eq "NTSTATUS") {
+ $self->pidl("return NET_API_STATUS_SUCCESS;");
+ } elsif ($fn->{RETURN_TYPE} eq "NET_API_STATUS") {
$self->pidl("return r.out.result;");
} elsif ($fn->{RETURN_TYPE} eq "WERROR") {
$self->pidl("if (werror) {");
@@ -165,7 +207,7 @@ sub ParseFunction($$$)
warning($fn->{ORIGINAL}, "Unable to convert $fn->{RETURN_TYPE}
to NTSTATUS");
$self->pidl("return NT_STATUS_OK;");
}
-
+=cut
$self->deindent;
$self->pidl("}");
$self->pidl("");
@@ -177,10 +219,10 @@ sub ParseInterface($$)
my $uif = uc($if->{NAME});
- $self->pidl_hdr("#ifndef __CLI_$uif\__");
- $self->pidl_hdr("#define __CLI_$uif\__");
+ $self->pidl_hdr("#ifndef __LIBNETAPI_$uif\__");
+ $self->pidl_hdr("#define __LIBNETAPI_$uif\__");
$self->ParseFunction($if->{NAME}, $_) foreach (@{$if->{FUNCTIONS}});
- $self->pidl_hdr("#endif /* __CLI_$uif\__ */");
+ $self->pidl_hdr("#endif /* __LIBNETAPI_$uif\__ */");
}
sub Parse($$$$)
@@ -189,14 +231,15 @@ sub Parse($$$$)
$self->pidl("/*");
$self->pidl(" * Unix SMB/CIFS implementation.");
- $self->pidl(" * client auto-generated by pidl. DO NOT MODIFY!");
+ $self->pidl(" * libnetapi auto-generated by pidl. DO NOT MODIFY!");
$self->pidl(" */");
$self->pidl("");
$self->pidl("#include \"includes.h\"");
+ $self->pidl("#include \"lib/netapi/netapi.h\"");
$self->pidl("#include \"$header\"");
- $self->pidl_hdr("#include \"$ndr_header\"");
+# $self->pidl_hdr("#include \"$ndr_header\"");
$self->pidl("");
-
+
foreach (@$ndr) {
$self->ParseInterface($_) if ($_->{TYPE} eq "INTERFACE");
}
diff --git a/source/pidl/pidl b/source/pidl/pidl
index 220d62c..82fee06 100755
--- a/source/pidl/pidl
+++ b/source/pidl/pidl
@@ -469,6 +469,7 @@ my($opt_samba3_parser);
my($opt_samba3_server);
my($opt_samba3_ndr_client);
my($opt_samba3_ndr_server);
+my($opt_samba3_libnetapi);
my($opt_template) = 0;
my($opt_client);
my($opt_typelib);
@@ -529,6 +530,8 @@ Samba 3 output:
using Samba4's NDR code [cli_BASENAME.c]
--samba3-ndr-server[=OUTF] create server call wrapper for Samba3
using Samba4's NDR code [srv_BASENAME.c]
+ --samba3-libnetapi[=OUTF] create libnetapi call wrapper for Samba3
+ using Samba4's NDR code [libnetapi_BASENAME.c]
Wireshark parsers:
--ws-parser[=OUTFILE] create Wireshark parser and header
@@ -554,6 +557,7 @@ my $result = GetOptions (
'dump-ndr-tree:s' => \$opt_dump_ndr_tree,
'samba3-ndr-client:s' => \$opt_samba3_ndr_client,
'samba3-ndr-server:s' => \$opt_samba3_ndr_server,
+ 'samba3-libnetapi:s' => \$opt_samba3_libnetapi,
'header:s' => \$opt_header,
'server:s' => \$opt_server,
'typelib:s' => \$opt_typelib,
@@ -642,6 +646,7 @@ sub process_file($)
defined($opt_samba3_header) or
defined($opt_samba3_parser) or
defined($opt_samba3_server) or
+ defined($opt_samba3_libnetapi) or
defined($opt_swig) or
defined($opt_samba3_ndr_client) or
defined($opt_samba3_ndr_server)) {
@@ -770,6 +775,16 @@ sub process_file($)
FileSave($header, $h_code);
}
+ if (defined($opt_samba3_libnetapi)) {
+ my $client = ($opt_samba3_libnetapi or
"$outputdir/libnetapi_$basename.c");
+ my $header = $client; $header =~ s/\.c$/\.h/;
+ require Parse::Pidl::Samba3::libnetapi;
+ my $generator = new Parse::Pidl::Samba3::libnetapi();
+ my ($c_code,$h_code) = $generator->Parse($ndr, $header,
$h_filename);
+ FileSave($client, $c_code);
+ FileSave($header, $h_code);
+ }
+
}
if (scalar(@ARGV) == 0) {
--
Samba Shared Repository
