The branch, master has been updated
via 26a3728 drsblobs.idl: remove nopython from
package_PrimaryKerberosBlob related stuff
via bde8046 pidl:Samba4/Python.pm: ignore "SUBCONTEXT" levels
via 8babee2 pidl:Samba4/Python.pm: don't handle scalar reference types
special
from 6ef8524 build: compiler on aix is xlc_r not xlr_c
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 26a37284b9caffa1e2aebad27d683b15632e7240
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Dec 1 15:12:58 2010 +0100
drsblobs.idl: remove nopython from package_PrimaryKerberosBlob related stuff
This allows parsing and construction of the supplementatlCredentials
attribute in python.
metze
Autobuild-User: Stefan Metzmacher <me...@samba.org>
Autobuild-Date: Fri Dec 10 19:08:33 CET 2010 on sn-devel-104
commit bde8046ca5a736f5c56e680767ee7c820df6a29c
Author: Stefan Metzmacher <me...@samba.org>
Date: Wed Dec 8 15:11:48 2010 +0100
pidl:Samba4/Python.pm: ignore "SUBCONTEXT" levels
These are only important for the NDR marshalling
and not for the python bindings.
metze
commit 8babee2c0083c5ec3d3824a6919ef1217eec6c31
Author: Stefan Metzmacher <me...@samba.org>
Date: Fri Dec 10 16:32:35 2010 +0100
pidl:Samba4/Python.pm: don't handle scalar reference types special
The only special thing is that don't need get_value_of(),
all other checks are needed.
metze
-----------------------------------------------------------------------
Summary of changes:
librpc/idl/drsblobs.idl | 16 +++++-----
pidl/lib/Parse/Pidl/Samba4/Python.pm | 49 ++++++++++++++++++++-------------
2 files changed, 38 insertions(+), 27 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/idl/drsblobs.idl b/librpc/idl/drsblobs.idl
index d160270..064f6ea 100644
--- a/librpc/idl/drsblobs.idl
+++ b/librpc/idl/drsblobs.idl
@@ -334,13 +334,13 @@ interface drsblobs {
[in] package_PackagesBlob blob
);
- typedef [nopython] struct {
+ typedef struct {
[value(2*strlen_m(string))] uint16 length;
[value(2*strlen_m(string))] uint16 size;
[relative,subcontext(0),subcontext_size(size),flag(STR_NOTERM|NDR_REMAINING)]
string *string;
} package_PrimaryKerberosString;
- typedef [nopython] struct {
+ typedef struct {
[value(0)] uint16 reserved1;
[value(0)] uint16 reserved2;
[value(0)] uint32 reserved3;
@@ -349,7 +349,7 @@ interface drsblobs {
[relative,subcontext(0),subcontext_size(value_len),flag(NDR_REMAINING)]
DATA_BLOB *value;
} package_PrimaryKerberosKey3;
- typedef [nopython] struct {
+ typedef struct {
uint16 num_keys;
uint16 num_old_keys;
package_PrimaryKerberosString salt;
@@ -362,7 +362,7 @@ interface drsblobs {
[value(0)] uint32 padding5;
} package_PrimaryKerberosCtr3;
- typedef [nopython] struct {
+ typedef struct {
[value(0)] uint16 reserved1;
[value(0)] uint16 reserved2;
[value(0)] uint32 reserved3;
@@ -372,7 +372,7 @@ interface drsblobs {
[relative,subcontext(0),subcontext_size(value_len),flag(NDR_REMAINING)]
DATA_BLOB *value;
} package_PrimaryKerberosKey4;
- typedef [nopython] struct {
+ typedef struct {
uint16 num_keys;
[value(0)] uint16 num_service_keys;
uint16 num_old_keys;
@@ -385,18 +385,18 @@ interface drsblobs {
package_PrimaryKerberosKey4 older_keys[num_older_keys];
} package_PrimaryKerberosCtr4;
- typedef [nodiscriminant,nopython] union {
+ typedef [nodiscriminant] union {
[case(3)] package_PrimaryKerberosCtr3 ctr3;
[case(4)] package_PrimaryKerberosCtr4 ctr4;
} package_PrimaryKerberosCtr;
- typedef [public,nopython] struct {
+ typedef [public] struct {
uint16 version;
[value(0)] uint16 flags;
[switch_is(version)] package_PrimaryKerberosCtr ctr;
} package_PrimaryKerberosBlob;
- [nopython] void decode_PrimaryKerberos(
+ void decode_PrimaryKerberos(
[in] package_PrimaryKerberosBlob blob
);
diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm
b/pidl/lib/Parse/Pidl/Samba4/Python.pm
index 1ed75ae..8fdb66a 100644
--- a/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -979,12 +979,15 @@ sub ConvertObjectFromPythonLevel($$$$$$$$)
{
my ($self, $env, $mem_ctx, $py_var, $e, $l, $var_name, $fail) = @_;
my $nl = GetNextLevel($e, $l);
+ if ($nl and $nl->{TYPE} eq "SUBCONTEXT") {
+ $nl = GetNextLevel($e, $nl);
+ }
+ my $pl = GetPrevLevel($e, $l);
+ if ($pl and $pl->{TYPE} eq "SUBCONTEXT") {
+ $pl = GetPrevLevel($e, $pl);
+ }
if ($l->{TYPE} eq "POINTER") {
- if ($nl->{TYPE} eq "DATA" and
Parse::Pidl::Typelist::scalar_is_reference($nl->{DATA_TYPE})) {
- $self->ConvertObjectFromPythonLevel($env, $mem_ctx,
$py_var, $e, $nl, $var_name, $fail);
- return;
- }
if ($l->{POINTER_TYPE} ne "ref") {
$self->pidl("if ($py_var == Py_None) {");
$self->indent;
@@ -1000,13 +1003,15 @@ sub ConvertObjectFromPythonLevel($$$$$$$$)
} else {
$self->pidl("$var_name = NULL;");
}
- $self->ConvertObjectFromPythonLevel($env, $mem_ctx, $py_var,
$e, $nl, get_value_of($var_name), $fail);
+ unless ($nl->{TYPE} eq "DATA" and
Parse::Pidl::Typelist::scalar_is_reference($nl->{DATA_TYPE})) {
+ $var_name = get_value_of($var_name);
+ }
+ $self->ConvertObjectFromPythonLevel($env, $mem_ctx, $py_var,
$e, $nl, $var_name, $fail);
if ($l->{POINTER_TYPE} ne "ref") {
$self->deindent;
$self->pidl("}");
}
} elsif ($l->{TYPE} eq "ARRAY") {
- my $pl = GetPrevLevel($e, $l);
if ($pl && $pl->{TYPE} eq "POINTER") {
$var_name = get_pointer_to($var_name);
}
@@ -1040,7 +1045,7 @@ sub ConvertObjectFromPythonLevel($$$$$$$$)
}
$self->pidl("for ($counter = 0; $counter <
PyList_GET_SIZE($py_var); $counter++) {");
$self->indent;
- $self->ConvertObjectFromPythonLevel($env, $var_name,
"PyList_GET_ITEM($py_var, $counter)", $e, GetNextLevel($e, $l),
$var_name."[$counter]", $fail);
+ $self->ConvertObjectFromPythonLevel($env, $var_name,
"PyList_GET_ITEM($py_var, $counter)", $e, $nl, $var_name."[$counter]", $fail);
$self->deindent;
$self->pidl("}");
$self->deindent;
@@ -1057,15 +1062,15 @@ sub ConvertObjectFromPythonLevel($$$$$$$$)
my $switch_ptr = "$e->{NAME}_switch_$l->{LEVEL_INDEX}";
$self->pidl("{");
$self->indent;
- my $union_type = mapTypeName(GetNextLevel($e, $l)->{DATA_TYPE});
+ my $union_type = mapTypeName($nl->{DATA_TYPE});
$self->pidl("$union_type *$switch_ptr;");
- $self->pidl("$switch_ptr = py_export_" . GetNextLevel($e,
$l)->{DATA_TYPE} . "($mem_ctx, $switch, $py_var);");
+ $self->pidl("$switch_ptr = py_export_" . $nl->{DATA_TYPE} .
"($mem_ctx, $switch, $py_var);");
$self->pidl("if ($switch_ptr == NULL) { $fail }");
$self->assign($var_name, "$switch_ptr");
$self->deindent;
$self->pidl("}");
} elsif ($l->{TYPE} eq "SUBCONTEXT") {
- $self->ConvertObjectFromPythonLevel($env, $mem_ctx, $py_var,
$e, GetNextLevel($e, $l), $var_name, $fail);
+ $self->ConvertObjectFromPythonLevel($env, $mem_ctx, $py_var,
$e, $nl, $var_name, $fail);
} else {
fatal($e->{ORIGINAL}, "unknown level type $l->{TYPE}");
}
@@ -1174,12 +1179,15 @@ sub ConvertObjectToPythonLevel($$$$$$)
{
my ($self, $mem_ctx, $env, $e, $l, $var_name, $py_var, $fail) = @_;
my $nl = GetNextLevel($e, $l);
+ if ($nl and $nl->{TYPE} eq "SUBCONTEXT") {
+ $nl = GetNextLevel($e, $nl);
+ }
+ my $pl = GetPrevLevel($e, $l);
+ if ($pl and $pl->{TYPE} eq "SUBCONTEXT") {
+ $pl = GetPrevLevel($e, $pl);
+ }
if ($l->{TYPE} eq "POINTER") {
- if ($nl->{TYPE} eq "DATA" and
Parse::Pidl::Typelist::scalar_is_reference($nl->{DATA_TYPE})) {
- $self->ConvertObjectToPythonLevel($var_name, $env, $e,
$nl, $var_name, $py_var, $fail);
- return;
- }
if ($l->{POINTER_TYPE} ne "ref") {
$self->pidl("if ($var_name == NULL) {");
$self->indent;
@@ -1189,13 +1197,16 @@ sub ConvertObjectToPythonLevel($$$$$$)
$self->pidl("} else {");
$self->indent;
}
- $self->ConvertObjectToPythonLevel($var_name, $env, $e, $nl,
get_value_of($var_name), $py_var, $fail);
+ my $var_name2 = $var_name;
+ unless ($nl->{TYPE} eq "DATA" and
Parse::Pidl::Typelist::scalar_is_reference($nl->{DATA_TYPE})) {
+ $var_name2 = get_value_of($var_name);
+ }
+ $self->ConvertObjectToPythonLevel($var_name, $env, $e, $nl,
$var_name2, $py_var, $fail);
if ($l->{POINTER_TYPE} ne "ref") {
$self->deindent;
$self->pidl("}");
}
} elsif ($l->{TYPE} eq "ARRAY") {
- my $pl = GetPrevLevel($e, $l);
if ($pl && $pl->{TYPE} eq "POINTER") {
$var_name = get_pointer_to($var_name);
}
@@ -1230,7 +1241,7 @@ sub ConvertObjectToPythonLevel($$$$$$)
$self->indent;
my $member_var = "py_$e->{NAME}_$l->{LEVEL_INDEX}";
$self->pidl("PyObject *$member_var;");
- $self->ConvertObjectToPythonLevel($var_name, $env, $e,
GetNextLevel($e, $l), $var_name."[$counter]", $member_var, $fail);
+ $self->ConvertObjectToPythonLevel($var_name, $env, $e,
$nl, $var_name."[$counter]", $member_var, $fail);
$self->pidl("PyList_SetItem($py_var, $counter,
$member_var);");
$self->deindent;
$self->pidl("}");
@@ -1240,7 +1251,7 @@ sub ConvertObjectToPythonLevel($$$$$$)
} elsif ($l->{TYPE} eq "SWITCH") {
$var_name = get_pointer_to($var_name);
my $switch = ParseExpr($l->{SWITCH_IS}, $env, $e);
- $self->pidl("$py_var = py_import_" . GetNextLevel($e,
$l)->{DATA_TYPE} . "($mem_ctx, $switch, $var_name);");
+ $self->pidl("$py_var = py_import_" . $nl->{DATA_TYPE} .
"($mem_ctx, $switch, $var_name);");
$self->fail_on_null($py_var, $fail);
} elsif ($l->{TYPE} eq "DATA") {
@@ -1250,7 +1261,7 @@ sub ConvertObjectToPythonLevel($$$$$$)
my $conv = $self->ConvertObjectToPythonData($mem_ctx,
$l->{DATA_TYPE}, $var_name, $e->{ORIGINAL});
$self->pidl("$py_var = $conv;");
} elsif ($l->{TYPE} eq "SUBCONTEXT") {
- $self->ConvertObjectToPythonLevel($mem_ctx, $env, $e,
GetNextLevel($e, $l), $var_name, $py_var, $fail);
+ $self->ConvertObjectToPythonLevel($mem_ctx, $env, $e, $nl,
$var_name, $py_var, $fail);
} else {
fatal($e->{ORIGINAL}, "Unknown level type $l->{TYPE}
$var_name");
}
--
Samba Shared Repository
