diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-04 22:48:23 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-04 22:48:23 +0100 |
| commit | af744e0954bbe9ddfa2e3da173e79de65e640a4c (patch) | |
| tree | 78b98c28e6d54c5339c12f2f942883d5088fda84 /librpc | |
| parent | ce47b69d8e318bbb3642d27aa0451e2914c92be7 (diff) | |
| parent | 2c0faaf5d921fe57a88d3b999067458e8774c6f6 (diff) | |
| download | samba-af744e0954bbe9ddfa2e3da173e79de65e640a4c.tar.gz samba-af744e0954bbe9ddfa2e3da173e79de65e640a4c.tar.bz2 samba-af744e0954bbe9ddfa2e3da173e79de65e640a4c.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'librpc')
| -rw-r--r-- | librpc/gen_ndr/named_pipe_auth.h | 1 | ||||
| -rw-r--r-- | librpc/ndr/ndr_basic.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/librpc/gen_ndr/named_pipe_auth.h b/librpc/gen_ndr/named_pipe_auth.h index 87d4bfd712..7ca7444c92 100644 --- a/librpc/gen_ndr/named_pipe_auth.h +++ b/librpc/gen_ndr/named_pipe_auth.h @@ -19,6 +19,7 @@ struct named_pipe_auth_req { }/* [gensize,public] */; union named_pipe_auth_rep_info { + int _dummy_element; }/* [switch_type(uint32)] */; struct named_pipe_auth_rep { diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c index 921af15dae..97f75051b7 100644 --- a/librpc/ndr/ndr_basic.c +++ b/librpc/ndr/ndr_basic.c @@ -757,7 +757,7 @@ _PUBLIC_ void ndr_print_array_uint8(struct ndr_print *ndr, const char *name, ndr->depth++; for (i=0;i<count;i++) { char *idx=NULL; - if (asprintf(&idx, "[%d]", i) == -1) { + if (asprintf(&idx, "[%d]", i) != -1) { ndr_print_uint8(ndr, idx, data[i]); free(idx); } |