← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libgpo/gpext/gpext.h

  • 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:
libgpo/gpext/gpext.h
65
65
                                         TALLOC_CTX *mem_ctx,
66
66
                                         uint32_t flags,
67
67
                                         struct registry_key *root_key,
68
 
                                         const NT_USER_TOKEN *token,
 
68
                                         const struct security_token *token,
69
69
                                         struct GROUP_POLICY_OBJECT *gpo,
70
70
                                         const char *extension_guid,
71
71
                                         const char *snapin_guid);
73
73
        NTSTATUS (*process_group_policy2)(ADS_STRUCT *ads,
74
74
                                         TALLOC_CTX *mem_ctx,
75
75
                                         uint32_t flags,
76
 
                                         const NT_USER_TOKEN *token,
 
76
                                         const struct security_token *token,
77
77
                                         struct GROUP_POLICY_OBJECT *gpo_list,
78
78
                                         const char *extension_guid);
79
79
 
109
109
NTSTATUS process_gpo_list_with_extension(ADS_STRUCT *ads,
110
110
                           TALLOC_CTX *mem_ctx,
111
111
                           uint32_t flags,
112
 
                           const NT_USER_TOKEN *token,
 
112
                           const struct security_token *token,
113
113
                           struct GROUP_POLICY_OBJECT *gpo_list,
114
114
                           const char *extension_guid,
115
115
                           const char *snapin_guid);
116
116
NTSTATUS gpext_process_extension(ADS_STRUCT *ads,
117
117
                                 TALLOC_CTX *mem_ctx,
118
118
                                 uint32_t flags,
119
 
                                 const NT_USER_TOKEN *token,
 
119
                                 const struct security_token *token,
120
120
                                 struct registry_key *root_key,
121
121
                                 struct GROUP_POLICY_OBJECT *gpo,
122
122
                                 const char *extension_guid,