diff options
| author | Günther Deschner <gd@samba.org> | 2009-12-14 14:17:05 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2010-02-18 13:44:00 +0100 |
| commit | c869328b1642043480f9600c88bcce9da37959b1 (patch) | |
| tree | 735feadcb2f6494a629e654c4f0950cfecf5b683 /librpc/gen_ndr/ndr_svcctl.c | |
| parent | a049d75193b284fe9efb28d303ea46ba407e5a7a (diff) | |
| download | samba-c869328b1642043480f9600c88bcce9da37959b1.tar.gz samba-c869328b1642043480f9600c88bcce9da37959b1.tar.bz2 samba-c869328b1642043480f9600c88bcce9da37959b1.zip | |
s3: re-run make full_idl.
Guenther
Diffstat (limited to 'librpc/gen_ndr/ndr_svcctl.c')
| -rw-r--r-- | librpc/gen_ndr/ndr_svcctl.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/librpc/gen_ndr/ndr_svcctl.c b/librpc/gen_ndr/ndr_svcctl.c index f4d5a70b40..a51b0eb3f2 100644 --- a/librpc/gen_ndr/ndr_svcctl.c +++ b/librpc/gen_ndr/ndr_svcctl.c @@ -244,8 +244,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_ENUM_SERVICE_STATUSW(struct ndr_push *ndr, i uint32_t _flags_save_string = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); if (r->service_name) { - NDR_CHECK(ndr_push_relative_ptr2(ndr, r->service_name)); + NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->service_name)); NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->service_name)); + NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->service_name)); } ndr->flags = _flags_save_string; } @@ -253,8 +254,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_ENUM_SERVICE_STATUSW(struct ndr_push *ndr, i uint32_t _flags_save_string = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); if (r->display_name) { - NDR_CHECK(ndr_push_relative_ptr2(ndr, r->display_name)); + NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->display_name)); NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->display_name)); + NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->display_name)); } ndr->flags = _flags_save_string; } @@ -387,8 +389,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_ENUM_SERVICE_STATUSA(struct ndr_push *ndr, i uint32_t _flags_save_string = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM); if (r->service_name) { - NDR_CHECK(ndr_push_relative_ptr2(ndr, r->service_name)); + NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->service_name)); NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->service_name)); + NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->service_name)); } ndr->flags = _flags_save_string; } @@ -396,8 +399,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_ENUM_SERVICE_STATUSA(struct ndr_push *ndr, i uint32_t _flags_save_string = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM); if (r->display_name) { - NDR_CHECK(ndr_push_relative_ptr2(ndr, r->display_name)); + NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->display_name)); NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->display_name)); + NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->display_name)); } ndr->flags = _flags_save_string; } @@ -1035,8 +1039,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_SERVICE_DESCRIPTION(struct ndr_push *ndr, in uint32_t _flags_save_string = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); if (r->description) { - NDR_CHECK(ndr_push_relative_ptr2(ndr, r->description)); + NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->description)); NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->description)); + NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->description)); } ndr->flags = _flags_save_string; } @@ -1194,8 +1199,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_SERVICE_FAILURE_ACTIONS(struct ndr_push *ndr uint32_t _flags_save_string = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); if (r->rebootmsg) { - NDR_CHECK(ndr_push_relative_ptr2(ndr, r->rebootmsg)); + NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->rebootmsg)); NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->rebootmsg)); + NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->rebootmsg)); } ndr->flags = _flags_save_string; } @@ -1203,17 +1209,19 @@ _PUBLIC_ enum ndr_err_code ndr_push_SERVICE_FAILURE_ACTIONS(struct ndr_push *ndr uint32_t _flags_save_string = ndr->flags; ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); if (r->command) { - NDR_CHECK(ndr_push_relative_ptr2(ndr, r->command)); + NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->command)); NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->command)); + NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->command)); } ndr->flags = _flags_save_string; } if (r->actions) { - NDR_CHECK(ndr_push_relative_ptr2(ndr, r->actions)); + NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->actions)); NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->num_actions)); for (cntr_actions_1 = 0; cntr_actions_1 < r->num_actions; cntr_actions_1++) { NDR_CHECK(ndr_push_SC_ACTION(ndr, NDR_SCALARS, &r->actions[cntr_actions_1])); } + NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->actions)); } } return NDR_ERR_SUCCESS; |