← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/samba/oneiric-security

« back to all changes in this revision

Viewing changes to librpc/gen_ndr/ndr_misc.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2011-03-02 16:05:41 UTC
  • Revision ID: james.westby@ubuntu.com-20110302160541-oi1y7yhqn9qe2phs
Tags: 2:3.5.6~dfsg-5ubuntu3
https://launchpad.net/bugs/674216
https://launchpad.net/bugs/652065
* debian/patches/fix-windows7-print-connection.patch: Fix
  error "0x000003e6" when trying to connect a Windows 7 printer
  to a domain. (LP: #674216)
* debian/samba-common.dhcp: Take in account of the upstart script.
  (LP: #652065)

Show diffs side-by-side

added added

removed removed

Lines of Context:
librpc/gen_ndr/ndr_misc.c
226
226
                                case REG_SZ: {
227
227
                                        {
228
228
                                                uint32_t _flags_save_string = ndr->flags;
229
 
                                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
229
                                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
230
230
                                                NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->string));
231
231
                                                ndr->flags = _flags_save_string;
232
232
                                        }
235
235
                                case REG_EXPAND_SZ: {
236
236
                                        {
237
237
                                                uint32_t _flags_save_string = ndr->flags;
238
 
                                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
238
                                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
239
239
                                                NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->string));
240
240
                                                ndr->flags = _flags_save_string;
241
241
                                        }
266
266
                                case REG_MULTI_SZ: {
267
267
                                        {
268
268
                                                uint32_t _flags_save_string_array = ndr->flags;
269
 
                                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
269
                                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
270
270
                                                NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->string_array));
271
271
                                                ndr->flags = _flags_save_string_array;
272
272
                                        }
333
333
                                case REG_SZ: {
334
334
                                        {
335
335
                                                uint32_t _flags_save_string = ndr->flags;
336
 
                                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
336
                                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
337
337
                                                NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->string));
338
338
                                                ndr->flags = _flags_save_string;
339
339
                                        }
342
342
                                case REG_EXPAND_SZ: {
343
343
                                        {
344
344
                                                uint32_t _flags_save_string = ndr->flags;
345
 
                                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
345
                                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
346
346
                                                NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->string));
347
347
                                                ndr->flags = _flags_save_string;
348
348
                                        }
373
373
                                case REG_MULTI_SZ: {
374
374
                                        {
375
375
                                                uint32_t _flags_save_string_array = ndr->flags;
376
 
                                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
376
                                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
377
377
                                                NDR_CHECK(ndr_pull_string_array(ndr, NDR_SCALARS, &r->string_array));
378
378
                                                ndr->flags = _flags_save_string_array;
379
379
                                        }