← Back to branch summary

~ubuntu-branches/ubuntu/natty/samba/natty-security

« back to all changes in this revision

Viewing changes to librpc/gen_ndr/ndr_nbt.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_nbt.c
1749
1749
                        NDR_CHECK(ndr_push_netlogon_command(ndr, NDR_SCALARS, r->command));
1750
1750
                        {
1751
1751
                                uint32_t _flags_save_string = ndr->flags;
1752
 
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
1752
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
1753
1753
                                NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->server));
1754
1754
                                ndr->flags = _flags_save_string;
1755
1755
                        }
1756
1756
                        {
1757
1757
                                uint32_t _flags_save_string = ndr->flags;
1758
 
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
1758
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
1759
1759
                                NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->user_name));
1760
1760
                                ndr->flags = _flags_save_string;
1761
1761
                        }
1762
1762
                        {
1763
1763
                                uint32_t _flags_save_string = ndr->flags;
1764
 
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
1764
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
1765
1765
                                NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->domain));
1766
1766
                                ndr->flags = _flags_save_string;
1767
1767
                        }
1787
1787
                        NDR_CHECK(ndr_pull_netlogon_command(ndr, NDR_SCALARS, &r->command));
1788
1788
                        {
1789
1789
                                uint32_t _flags_save_string = ndr->flags;
1790
 
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
1790
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
1791
1791
                                NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->server));
1792
1792
                                ndr->flags = _flags_save_string;
1793
1793
                        }
1794
1794
                        {
1795
1795
                                uint32_t _flags_save_string = ndr->flags;
1796
 
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
1796
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
1797
1797
                                NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->user_name));
1798
1798
                                ndr->flags = _flags_save_string;
1799
1799
                        }
1800
1800
                        {
1801
1801
                                uint32_t _flags_save_string = ndr->flags;
1802
 
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
1802
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
1803
1803
                                NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->domain));
1804
1804
                                ndr->flags = _flags_save_string;
1805
1805
                        }
1844
1844
                        NDR_CHECK(ndr_push_netlogon_command(ndr, NDR_SCALARS, r->command));
1845
1845
                        {
1846
1846
                                uint32_t _flags_save_string = ndr->flags;
1847
 
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
1847
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
1848
1848
                                NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->pdc_name));
1849
1849
                                ndr->flags = _flags_save_string;
1850
1850
                        }
1851
1851
                        {
1852
1852
                                uint32_t _flags_save_string = ndr->flags;
1853
 
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
1853
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
1854
1854
                                NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->user_name));
1855
1855
                                ndr->flags = _flags_save_string;
1856
1856
                        }
1857
1857
                        {
1858
1858
                                uint32_t _flags_save_string = ndr->flags;
1859
 
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
1859
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
1860
1860
                                NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->domain_name));
1861
1861
                                ndr->flags = _flags_save_string;
1862
1862
                        }
1889
1889
                        NDR_CHECK(ndr_pull_netlogon_command(ndr, NDR_SCALARS, &r->command));
1890
1890
                        {
1891
1891
                                uint32_t _flags_save_string = ndr->flags;
1892
 
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
1892
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
1893
1893
                                NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->pdc_name));
1894
1894
                                ndr->flags = _flags_save_string;
1895
1895
                        }
1896
1896
                        {
1897
1897
                                uint32_t _flags_save_string = ndr->flags;
1898
 
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
1898
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
1899
1899
                                NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->user_name));
1900
1900
                                ndr->flags = _flags_save_string;
1901
1901
                        }
1902
1902
                        {
1903
1903
                                uint32_t _flags_save_string = ndr->flags;
1904
 
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
1904
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
1905
1905
                                NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->domain_name));
1906
1906
                                ndr->flags = _flags_save_string;
1907
1907
                        }
2082
2082
                }
2083
2083
                {
2084
2084
                        uint32_t _flags_save_string = ndr->flags;
2085
 
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
2085
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
2086
2086
                        NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->unicode_name));
2087
2087
                        ndr->flags = _flags_save_string;
2088
2088
                }
2120
2120
                }
2121
2121
                {
2122
2122
                        uint32_t _flags_save_string = ndr->flags;
2123
 
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
2123
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
2124
2124
                        NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->unicode_name));
2125
2125
                        ndr->flags = _flags_save_string;
2126
2126
                }
2170
2170
                        }
2171
2171
                        {
2172
2172
                                uint32_t _flags_save_string = ndr->flags;
2173
 
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
2173
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
2174
2174
                                NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->unicode_pdc_name));
2175
2175
                                ndr->flags = _flags_save_string;
2176
2176
                        }
2177
2177
                        {
2178
2178
                                uint32_t _flags_save_string = ndr->flags;
2179
 
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
2179
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
2180
2180
                                NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->domain_name));
2181
2181
                                ndr->flags = _flags_save_string;
2182
2182
                        }
2214
2214
                        }
2215
2215
                        {
2216
2216
                                uint32_t _flags_save_string = ndr->flags;
2217
 
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
2217
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
2218
2218
                                NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->unicode_pdc_name));
2219
2219
                                ndr->flags = _flags_save_string;
2220
2220
                        }
2221
2221
                        {
2222
2222
                                uint32_t _flags_save_string = ndr->flags;
2223
 
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
2223
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
2224
2224
                                NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->domain_name));
2225
2225
                                ndr->flags = _flags_save_string;
2226
2226
                        }
2323
2323
                }
2324
2324
                {
2325
2325
                        uint32_t _flags_save_string = ndr->flags;
2326
 
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
2326
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
2327
2327
                        NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->unicode_pdc_name));
2328
2328
                        ndr->flags = _flags_save_string;
2329
2329
                }
2330
2330
                {
2331
2331
                        uint32_t _flags_save_string = ndr->flags;
2332
 
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
2332
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
2333
2333
                        NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->unicode_domain));
2334
2334
                        ndr->flags = _flags_save_string;
2335
2335
                }
2383
2383
                }
2384
2384
                {
2385
2385
                        uint32_t _flags_save_string = ndr->flags;
2386
 
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
2386
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
2387
2387
                        NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->unicode_pdc_name));
2388
2388
                        ndr->flags = _flags_save_string;
2389
2389
                }
2390
2390
                {
2391
2391
                        uint32_t _flags_save_string = ndr->flags;
2392
 
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM);
 
2392
                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
2393
2393
                        NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->unicode_domain));
2394
2394
                        ndr->flags = _flags_save_string;
2395
2395
                }