[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  75628e6 pidl: add more mapped types
       via  a9e2b62 idl: wmi and dcom don't need python bindings
      from  f8ef240 samba-tool sites: Re-add support for option groups

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 75628e693aa6fad6d247d6ac774de03c52c33d90
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Feb 8 13:01:32 2012 +1100

    pidl: add more mapped types
    
    when we #define one type to another, we need special handling in the
    python generator
    
    Autobuild-User: Andrew Tridgell <tridge at samba.org>
    Autobuild-Date: Wed Feb  8 04:50:06 CET 2012 on sn-devel-104

commit a9e2b620ca5f00c1cb1d4274ed57a5f6c93b7102
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Feb 8 13:00:29 2012 +1100

    idl: wmi and dcom don't need python bindings
    
    the python generation for these IDL files is currently broken

-----------------------------------------------------------------------

Summary of changes:
 librpc/idl/wscript_build             |    2 +-
 pidl/lib/Parse/Pidl/Samba4/Python.pm |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index d2112b4..c90edf1 100644
--- a/librpc/idl/wscript_build
+++ b/librpc/idl/wscript_build
@@ -18,7 +18,7 @@ bld.SAMBA_PIDL_LIST('PIDL',
 
 bld.SAMBA_PIDL_LIST('PIDL',
                     'wmi.idl dcom.idl',
-                    options='--header --ndr-parser --server --client --python --dcom-proxy --com-header',
+                    options='--header --ndr-parser --server --client --dcom-proxy --com-header',
                     output_dir='../gen_ndr')
 
 bld.SAMBA_PIDL_LIST('PIDL',
diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm
index 63f41a1..39884ab 100644
--- a/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -826,9 +826,15 @@ sub use_type_variable($$)
 	my ($self, $orig_ctype) = @_;
 	# FIXME: Have a global lookup table for types that look different on the 
 	# wire than they are named in C?
-	if ($orig_ctype->{NAME} eq "dom_sid2" or $orig_ctype->{NAME} eq "dom_sid28") {
+	if ($orig_ctype->{NAME} eq "dom_sid2" or
+	    $orig_ctype->{NAME} eq "dom_sid28" or
+	    $orig_ctype->{NAME} eq "dom_sid0") {
 		$orig_ctype->{NAME} = "dom_sid";
 	}
+	if ($orig_ctype->{NAME} eq "spoolss_security_descriptor") {
+		$orig_ctype->{NAME} = "security_descriptor";
+	}
+
 	my $ctype = resolveType($orig_ctype);
 	unless (defined($ctype->{BASEFILE})) {
 		return undef;


-- 
Samba Shared Repository