← Back to branch summary

~ubuntu-branches/ubuntu/wily/samba/wily

« back to all changes in this revision

Viewing changes to .pc/CVE-2012-1182-2.patch/source3/librpc/gen_ndr/ndr_secrets.c

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2012-05-15 17:00:56 UTC
  • mfrom: (178.1.1 precise-security) (0.39.27 sid)
  • Revision ID: package-import@ubuntu.com-20120515170056-gludtas4257eb61q
Tags: 2:3.6.5-2ubuntu1
https://launchpad.net/bugs/999764
* Merge from Debian unstable, remaining changes: 
  + debian/patches/VERSION.patch:
    - set SAMBA_VERSION_SUFFIX to Ubuntu.
  + debian/smb.conf:
    - add "(Samba, Ubuntu)" to server string.
    - comment out the default [homes] share, and add a comment about
      "valid users = %S" to show users how to restrict access to
      \\server\username to only username.
    - Other changes now in Debian packaging.
  + debian/samba-common.config:
    - Do not change priority to high if dhclient3 is installed.
    - Use priority medium instead of high for the workgroup question.
  + debian/control:
    - Don't build against or suggest ctdb.
    - Add dependency on samba-common-bin to samba.
  + Add ufw integration:
    - Created debian/samba.ufw.profile
    - debian/rules, debian/samba.install: install profile.
    - debian/control: have samba suggest ufw.
  + Add apport hook:
    - Created debian/source_samba.py.
    - debian/rules, debian/samba-common-bin.install: install hook.
  + Switch to upstart:
    - Added debian/samba.{nmbd,smbd}.upstart.
    - debian/samba.logrotate, debian/samba-common.dhcp, debian/samba.if-up:
      Make upstart compatible.
* d/samba.install, d/samba-common-bin.install: Restore apport hook and ufw
  profile (LP: #999764).
* Dropped:
  + debian/patches/CVE-2012-1182-*.patch: fixed in upstream release 3.6.4.
  + debian/patches/CVE-2012-2111.patch: fixed in upstream release 3.6.5.
  + debian/patches/fix-debuglevel-name-conflict.patch: fixed upstream -
    debug_level is no longer used as a global variable name.
  + debian/patches/error-trans.fix-276472: fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/CVE-2012-1182-2.patch/source3/librpc/gen_ndr/ndr_secrets.c
1
 
/* parser auto-generated by pidl */
2
 
 
3
 
#include "includes.h"
4
 
#include "librpc/gen_ndr/ndr_secrets.h"
5
 
 
6
 
#include "librpc/gen_ndr/ndr_security.h"
7
 
_PUBLIC_ enum ndr_err_code ndr_push_TRUSTED_DOM_PASS(struct ndr_push *ndr, int ndr_flags, const struct TRUSTED_DOM_PASS *r)
8
 
{
9
 
        {
10
 
                uint32_t _flags_save_STRUCT = ndr->flags;
11
 
                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN);
12
 
                if (ndr_flags & NDR_SCALARS) {
13
 
                        NDR_CHECK(ndr_push_align(ndr, 4));
14
 
                        NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, strlen_m_term(r->uni_name)));
15
 
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->uni_name, 32, sizeof(uint16_t), CH_UTF16));
16
 
                        NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, strlen(r->pass)));
17
 
                        {
18
 
                                uint32_t _flags_save_string = ndr->flags;
19
 
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM);
20
 
                                NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->pass));
21
 
                                ndr->flags = _flags_save_string;
22
 
                        }
23
 
                        NDR_CHECK(ndr_push_time_t(ndr, NDR_SCALARS, r->mod_time));
24
 
                        NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, &r->domain_sid));
25
 
                        NDR_CHECK(ndr_push_trailer_align(ndr, 4));
26
 
                }
27
 
                if (ndr_flags & NDR_BUFFERS) {
28
 
                }
29
 
                ndr->flags = _flags_save_STRUCT;
30
 
        }
31
 
        return NDR_ERR_SUCCESS;
32
 
}
33
 
 
34
 
_PUBLIC_ enum ndr_err_code ndr_pull_TRUSTED_DOM_PASS(struct ndr_pull *ndr, int ndr_flags, struct TRUSTED_DOM_PASS *r)
35
 
{
36
 
        {
37
 
                uint32_t _flags_save_STRUCT = ndr->flags;
38
 
                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN);
39
 
                if (ndr_flags & NDR_SCALARS) {
40
 
                        NDR_CHECK(ndr_pull_align(ndr, 4));
41
 
                        NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->uni_name_len));
42
 
                        NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->uni_name, 32, sizeof(uint16_t), CH_UTF16));
43
 
                        NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->pass_len));
44
 
                        {
45
 
                                uint32_t _flags_save_string = ndr->flags;
46
 
                                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM);
47
 
                                NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->pass));
48
 
                                ndr->flags = _flags_save_string;
49
 
                        }
50
 
                        NDR_CHECK(ndr_pull_time_t(ndr, NDR_SCALARS, &r->mod_time));
51
 
                        NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS, &r->domain_sid));
52
 
                        NDR_CHECK(ndr_pull_trailer_align(ndr, 4));
53
 
                }
54
 
                if (ndr_flags & NDR_BUFFERS) {
55
 
                }
56
 
                ndr->flags = _flags_save_STRUCT;
57
 
        }
58
 
        return NDR_ERR_SUCCESS;
59
 
}
60
 
 
61
 
_PUBLIC_ void ndr_print_TRUSTED_DOM_PASS(struct ndr_print *ndr, const char *name, const struct TRUSTED_DOM_PASS *r)
62
 
{
63
 
        ndr_print_struct(ndr, name, "TRUSTED_DOM_PASS");
64
 
        if (r == NULL) { ndr_print_null(ndr); return; }
65
 
        {
66
 
                uint32_t _flags_save_STRUCT = ndr->flags;
67
 
                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN);
68
 
                ndr->depth++;
69
 
                ndr_print_uint32(ndr, "uni_name_len", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?strlen_m_term(r->uni_name):r->uni_name_len);
70
 
                ndr_print_string(ndr, "uni_name", r->uni_name);
71
 
                ndr_print_uint32(ndr, "pass_len", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?strlen(r->pass):r->pass_len);
72
 
                ndr_print_string(ndr, "pass", r->pass);
73
 
                ndr_print_time_t(ndr, "mod_time", r->mod_time);
74
 
                ndr_print_dom_sid(ndr, "domain_sid", &r->domain_sid);
75
 
                ndr->depth--;
76
 
                ndr->flags = _flags_save_STRUCT;
77
 
        }
78
 
}
79