The branch, master has been updated via 052f3f0d4da01d27835ef265036a36d20941f1a8 (commit) via 7082e4526f268fa1d09d04b246025bce3174aab3 (commit) via d61e152b2970057a6ab34f8371fd19bd922b284e (commit) via 6563c2b7e4c15cf220ed618da72331d0aca4e282 (commit) from 96b3242f124d60fd8d8b6f5a34b57c26c42dfd14 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 052f3f0d4da01d27835ef265036a36d20941f1a8 Author: Stefan Metzmacher <me...@samba.org> Date: Thu Feb 19 11:12:33 2009 +0100 s4:librpc/ndr: if uninitialized variable in string_array code metze commit 7082e4526f268fa1d09d04b246025bce3174aab3 Author: Stefan Metzmacher <me...@samba.org> Date: Thu Feb 19 11:11:28 2009 +0100 s3:librpc/ndr: if uninitialized variable in string_array code metze commit d61e152b2970057a6ab34f8371fd19bd922b284e Author: Stefan Metzmacher <me...@samba.org> Date: Thu Feb 19 11:11:04 2009 +0100 librpc: rerun make idl commit 6563c2b7e4c15cf220ed618da72331d0aca4e282 Author: Stefan Metzmacher <me...@samba.org> Date: Thu Feb 19 10:32:48 2009 +0100 pidl:NDR/Parser: don't call [noopnum] function when creating the ndr_interface_table metze ----------------------------------------------------------------------- Summary of changes: librpc/gen_ndr/ndr_spoolss.c | 2 +- pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 6 +++--- source3/librpc/ndr/ndr_string.c | 2 +- source4/librpc/ndr/ndr_string.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c index 23eccfc..4aafa4a 100644 --- a/librpc/gen_ndr/ndr_spoolss.c +++ b/librpc/gen_ndr/ndr_spoolss.c @@ -23639,7 +23639,7 @@ const struct ndr_interface_table ndr_table_spoolss = { NDR_SPOOLSS_VERSION }, .helpstring = NDR_SPOOLSS_HELPSTRING, - .num_calls = 114, + .num_calls = 96, .calls = spoolss_calls, .endpoints = &spoolss_endpoints, .authservices = &spoolss_authservices diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm index 84752da..af6885f 100644 --- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm +++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm @@ -2236,7 +2236,7 @@ sub AuthServiceStruct($$$) sub FunctionCallEntry($$) { my ($self, $d) = @_; - return if not defined($d->{OPNUM}); + return 0 if not defined($d->{OPNUM}); $self->pidl("\t{"); $self->pidl("\t\t\"$d->{NAME}\","); $self->pidl("\t\tsizeof(struct $d->{NAME}),"); @@ -2245,6 +2245,7 @@ sub FunctionCallEntry($$) $self->pidl("\t\t(ndr_print_function_t) ndr_print_$d->{NAME},"); $self->pidl("\t\t".($d->{ASYNC}?"true":"false").","); $self->pidl("\t},"); + return 1; } ##################################################################### @@ -2261,8 +2262,7 @@ sub FunctionTable($$) $self->pidl("static const struct ndr_interface_call $interface->{NAME}\_calls[] = {"); foreach my $d (@{$interface->{INHERITED_FUNCTIONS}},@{$interface->{FUNCTIONS}}) { - $self->FunctionCallEntry($d); - $count++; + $count += $self->FunctionCallEntry($d); } $self->pidl("\t{ NULL, 0, NULL, NULL, NULL, false }"); $self->pidl("};"); diff --git a/source3/librpc/ndr/ndr_string.c b/source3/librpc/ndr/ndr_string.c index 985d0f4..519be7b 100644 --- a/source3/librpc/ndr/ndr_string.c +++ b/source3/librpc/ndr/ndr_string.c @@ -443,7 +443,7 @@ _PUBLIC_ uint32_t ndr_size_string(int ret, const char * const* string, int flags */ _PUBLIC_ enum ndr_err_code ndr_pull_string_array(struct ndr_pull *ndr, int ndr_flags, const char ***_a) { - const char **a = *_a; + const char **a = NULL; uint32_t count; unsigned flags = ndr->flags; unsigned saved_flags = ndr->flags; diff --git a/source4/librpc/ndr/ndr_string.c b/source4/librpc/ndr/ndr_string.c index a2fcdea..1b5da2d 100644 --- a/source4/librpc/ndr/ndr_string.c +++ b/source4/librpc/ndr/ndr_string.c @@ -443,7 +443,7 @@ _PUBLIC_ uint32_t ndr_size_string(int ret, const char * const* string, int flags */ _PUBLIC_ enum ndr_err_code ndr_pull_string_array(struct ndr_pull *ndr, int ndr_flags, const char ***_a) { - const char **a = *_a; + const char **a = NULL; uint32_t count; unsigned flags = ndr->flags; unsigned saved_flags = ndr->flags; -- Samba Shared Repository