← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source3/winbindd/wb_sid2gid.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:
source3/winbindd/wb_sid2gid.c
19
19
 
20
20
#include "includes.h"
21
21
#include "winbindd.h"
22
 
#include "librpc/gen_ndr/cli_wbint.h"
 
22
#include "librpc/gen_ndr/ndr_wbint_c.h"
 
23
#include "idmap_cache.h"
 
24
#include "../libcli/security/security.h"
23
25
 
24
26
struct wb_sid2gid_state {
25
27
        struct tevent_context *ev;
92
94
 
93
95
        status = wb_lookupsid_recv(subreq, talloc_tos(), &type, &domname,
94
96
                                   &name);
95
 
        if (!NT_STATUS_IS_OK(status)) {
96
 
                tevent_req_nterror(req, status);
 
97
        if (tevent_req_nterror(req, status)) {
97
98
                return;
98
99
        }
99
100
 
124
125
 
125
126
        child = idmap_child();
126
127
 
127
 
        subreq = rpccli_wbint_Sid2Gid_send(state, state->ev, child->rpccli,
 
128
        subreq = dcerpc_wbint_Sid2Gid_send(state, state->ev, child->binding_handle,
128
129
                                           state->dom_name, &state->sid,
129
130
                                           &state->gid64);
130
131
        if (tevent_req_nomem(subreq, req)) {
141
142
                req, struct wb_sid2gid_state);
142
143
        NTSTATUS status, result;
143
144
 
144
 
        status = rpccli_wbint_Sid2Gid_recv(subreq, state, &result);
 
145
        status = dcerpc_wbint_Sid2Gid_recv(subreq, state, &result);
145
146
        TALLOC_FREE(subreq);
146
 
        if (!NT_STATUS_IS_OK(status)) {
 
147
        if (any_nt_status_not_ok(status, result, &status)) {
147
148
                tevent_req_nterror(req, status);
148
149
                return;
149
150
        }
150
 
        if (!NT_STATUS_IS_OK(result)) {
151
 
                tevent_req_nterror(req, result);
152
 
                return;
153
 
        }
154
151
 
155
152
        state->gid = state->gid64;
156
153
        tevent_req_done(req);