[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  79f8299... pidl: fix handling of output arguments in s3 client 
stubs.
      from  0cc45b4... s4:upgrade.py - rework to make the upgrade s3 -> s4 
possible again

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


- Log -----------------------------------------------------------------
commit 79f82998b1aa8349f76a4c82c17daf7e03cdb41a
Author: Günther Deschner <g...@samba.org>
Date:   Fri Nov 27 16:06:40 2009 +0100

    pidl: fix handling of output arguments in s3 client stubs.
    
    a20e095 used (uint8_t) instead of (uint8_t *).
    
    Guenther

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

Summary of changes:
 librpc/gen_ndr/cli_spoolss.c            |    8 ++++----
 pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index 635a817..aba70f2 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -11057,7 +11057,7 @@ static void rpccli_spoolss_EnumPrinterData_done(struct 
tevent_req *subreq)
        }
 
        /* Copy out parameters */
-       memcpy(discard_const_p(uint8_t, state->orig.out.value_name), 
state->tmp.out.value_name, (state->tmp.in.value_offered / 2) * 
sizeof(*state->orig.out.value_name));
+       memcpy(discard_const_p(uint8_t *, state->orig.out.value_name), 
state->tmp.out.value_name, (state->tmp.in.value_offered / 2) * 
sizeof(*state->orig.out.value_name));
        *state->orig.out.value_needed = *state->tmp.out.value_needed;
        *state->orig.out.type = *state->tmp.out.type;
        memcpy(state->orig.out.data, state->tmp.out.data, 
(state->tmp.in.data_offered) * sizeof(*state->orig.out.data));
@@ -11132,7 +11132,7 @@ NTSTATUS rpccli_spoolss_EnumPrinterData(struct 
rpc_pipe_client *cli,
        }
 
        /* Return variables */
-       memcpy(discard_const_p(uint8_t, value_name), r.out.value_name, 
(r.in.value_offered / 2) * sizeof(*value_name));
+       memcpy(discard_const_p(uint8_t *, value_name), r.out.value_name, 
(r.in.value_offered / 2) * sizeof(*value_name));
        *value_needed = *r.out.value_needed;
        *type = *r.out.type;
        memcpy(data, r.out.data, (r.in.data_offered) * sizeof(*data));
@@ -15678,7 +15678,7 @@ static void 
rpccli_spoolss_GetPrinterDriverPackagePath_done(struct tevent_req *s
 
        /* Copy out parameters */
        if (state->orig.out.driver_package_cab && 
state->tmp.out.driver_package_cab) {
-               memcpy(discard_const_p(uint8_t, 
state->orig.out.driver_package_cab), state->tmp.out.driver_package_cab, 
(state->tmp.in.driver_package_cab_size) * 
sizeof(*state->orig.out.driver_package_cab));
+               memcpy(discard_const_p(uint8_t *, 
state->orig.out.driver_package_cab), state->tmp.out.driver_package_cab, 
(state->tmp.in.driver_package_cab_size) * 
sizeof(*state->orig.out.driver_package_cab));
        }
        *state->orig.out.required = *state->tmp.out.required;
 
@@ -15752,7 +15752,7 @@ NTSTATUS 
rpccli_spoolss_GetPrinterDriverPackagePath(struct rpc_pipe_client *cli,
 
        /* Return variables */
        if (driver_package_cab && r.out.driver_package_cab) {
-               memcpy(discard_const_p(uint8_t, driver_package_cab), 
r.out.driver_package_cab, (r.in.driver_package_cab_size) * 
sizeof(*driver_package_cab));
+               memcpy(discard_const_p(uint8_t *, driver_package_cab), 
r.out.driver_package_cab, (r.in.driver_package_cab_size) * 
sizeof(*driver_package_cab));
        }
        *required = *r.out.required;
 
diff --git a/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm 
b/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
index b26a08e..68579d2 100644
--- a/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
@@ -105,7 +105,7 @@ sub ParseOutputArgument($$$;$$)
                } else {
                        my $size_is = ParseExpr($l->{SIZE_IS}, $env, 
$e->{ORIGINAL});
                        if (has_property($e, "charset")) {
-                               $self->pidl("memcpy(discard_const_p(uint8_t, 
$o$e->{NAME}), ${r}out.$e->{NAME}, ($size_is) * sizeof(*$o$e->{NAME}));");
+                               $self->pidl("memcpy(discard_const_p(uint8_t *, 
$o$e->{NAME}), ${r}out.$e->{NAME}, ($size_is) * sizeof(*$o$e->{NAME}));");
                        } else {
                                $self->pidl("memcpy($o$e->{NAME}, 
${r}out.$e->{NAME}, ($size_is) * sizeof(*$o$e->{NAME}));");
                        }


-- 
Samba Shared Repository