← Back to branch summary

~ubuntu-branches/ubuntu/vivid/samba/vivid

« back to all changes in this revision

Viewing changes to librpc/ndr/ndr_preg.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-12-21 13:18:04 UTC
  • mfrom: (0.39.21 sid)
  • Revision ID: package-import@ubuntu.com-20111221131804-xtlr39wx6njehxxr
Tags: 2:3.6.1-3ubuntu1
* Merge from Debian testing.  Remaining changes:
  + debian/patches/VERSION.patch:
    - set SAMBA_VERSION_SUFFIX to Ubuntu.
  + debian/patches/error-trans.fix-276472:
    - Add the translation of Unix Error code -ENOTSUP to NT Error Code
    - NT_STATUS_NOT_SUPPORTED to prevent the Permission denied error.
  + 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.
    - Set 'usershare allow guests', so that usershare admins are 
      allowed to create public shares in addition to authenticated
      ones.
    - add map to guest = Bad user, maps bad username to guest access.
  + 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.dirs, debian/samba.files: install
      profile
    - debian/control: have samba suggest ufw
  + Add apport hook:
    - Created debian/source_samba.py.
    - debian/rules, debian/samba.dirs, debian/samba-common-bin.files: install
  + Switch to upstart:
    - Add debian/samba.{nmbd,smbd}.upstart.
  + debian/samba.logrotate, debian/samba-common.dhcp, debian/samba.if-up:
    - Make them upstart compatible
  + debian/samba.postinst: 
    - Avoid scary pdbedit warnings on first import.
  + debian/samba-common.postinst: Add more informative error message for
    the case where smb.conf was manually deleted
  + debian/patches/fix-debuglevel-name-conflict.patch: don't use 'debug_level'
    as a global variable name in an NSS module 
  + Dropped:
    - debian/patches/error-trans.fix-276472
    - debian/patches/fix-debuglevel-name-conflict.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
librpc/ndr/ndr_preg.c
 
1
/*
 
2
   Unix SMB/CIFS implementation.
 
3
 
 
4
   routines for marshalling/unmarshalling preg structures
 
5
 
 
6
   Copyright (C) Guenther Deschner 2010
 
7
 
 
8
   This program is free software; you can redistribute it and/or modify
 
9
   it under the terms of the GNU General Public License as published by
 
10
   the Free Software Foundation; either version 3 of the License, or
 
11
   (at your option) any later version.
 
12
 
 
13
   This program is distributed in the hope that it will be useful,
 
14
   but WITHOUT ANY WARRANTY; without even the implied warranty of
 
15
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
16
   GNU General Public License for more details.
 
17
 
 
18
   You should have received a copy of the GNU General Public License
 
19
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
20
*/
 
21
 
 
22
#include "includes.h"
 
23
#include "librpc/gen_ndr/ndr_preg.h"
 
24
 
 
25
_PUBLIC_ enum ndr_err_code ndr_push_preg_file(struct ndr_push *ndr, int ndr_flags, const struct preg_file *r)
 
26
{
 
27
        uint32_t cntr_entries_0;
 
28
        {
 
29
                uint32_t _flags_save_STRUCT = ndr->flags;
 
30
                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN);
 
31
                if (ndr_flags & NDR_SCALARS) {
 
32
                        NDR_CHECK(ndr_push_align(ndr, 4));
 
33
                        NDR_CHECK(ndr_push_preg_header(ndr, NDR_SCALARS, &r->header));
 
34
                        for (cntr_entries_0 = 0; cntr_entries_0 < r->num_entries; cntr_entries_0++) {
 
35
                                NDR_CHECK(ndr_push_preg_entry(ndr, NDR_SCALARS, &r->entries[cntr_entries_0]));
 
36
                        }
 
37
                        NDR_CHECK(ndr_push_trailer_align(ndr, 4));
 
38
                }
 
39
                if (ndr_flags & NDR_BUFFERS) {
 
40
                }
 
41
                ndr->flags = _flags_save_STRUCT;
 
42
        }
 
43
        return NDR_ERR_SUCCESS;
 
44
}
 
45
 
 
46
_PUBLIC_ enum ndr_err_code ndr_pull_preg_file(struct ndr_pull *ndr, int ndr_flags, struct preg_file *r)
 
47
{
 
48
        {
 
49
                uint32_t _flags_save_STRUCT = ndr->flags;
 
50
                ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN);
 
51
                if (ndr_flags & NDR_SCALARS) {
 
52
                        NDR_CHECK(ndr_pull_align(ndr, 4));
 
53
                        NDR_CHECK(ndr_pull_preg_header(ndr, NDR_SCALARS, &r->header));
 
54
                        r->num_entries = 0;
 
55
                        NDR_PULL_ALLOC_N(ndr, r->entries, r->num_entries);
 
56
                        while (ndr->offset + 12 <= ndr->data_size) {
 
57
                                r->entries = talloc_realloc(ndr, r->entries, struct preg_entry, r->num_entries + 1);
 
58
                                NDR_ERR_HAVE_NO_MEMORY(r->entries);
 
59
                                NDR_CHECK(ndr_pull_preg_entry(ndr, NDR_SCALARS, &r->entries[r->num_entries]));
 
60
                                r->num_entries++;
 
61
                        }
 
62
                        NDR_CHECK(ndr_pull_trailer_align(ndr, 4));
 
63
                }
 
64
                if (ndr_flags & NDR_BUFFERS) {
 
65
                }
 
66
                ndr->flags = _flags_save_STRUCT;
 
67
        }
 
68
        return NDR_ERR_SUCCESS;
 
69
}