← Back to branch summary

~ubuntu-branches/ubuntu/maverick/samba/maverick-security

« back to all changes in this revision

Viewing changes to source/libnet/libnet_join.c

  • Committer: Bazaar Package Importer
  • Author(s): Andrew Mitchell
  • Date: 2009-05-18 13:26:04 UTC
  • mfrom: (0.28.5 sid)
  • Revision ID: james.westby@ubuntu.com-20090518132604-ebyuqimgymtr3h0k
Tags: 2:3.3.4-2ubuntu1
https://launchpad.net/bugs/312449
https://launchpad.net/bugs/300221
* Merge from debian unstable, remaining changes:
  + debian/patches/VERSION.patch:
    - setup 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.
    - 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/samba-common.postinst: Add more informative error message for
    the case where smb.conf was manually deleted (LP: #312449)
  + debian/mksambapasswd.awk:
    - Do not add user with UID less than 1000 to smbpasswd.
  + debian/control:
    - Make libwbclient0 replace/conflict with hardy's likewise-open.
    - Don't build against ctdb.
    - Add suggests keyutils for smbfs. (LP: #300221)
  + debian/rules:
    - enable "native" PIE hardening.
    - remove --with-ctdb and --with-cluster-support=yes
  + Add ufw integration:
    - Created debian/samba.ufw profile.
    - debian/rules, debian/samba.dirs, debian/samba.files: install 
      profile
    - debian/control: have samba sugguest ufw.
* Dropped patches:
  + debian/patches/fix-upstream-bug-6186.patch: Merged upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/libnet/libnet_join.c
50
50
#define LIBNET_UNJOIN_OUT_DUMP_CTX(ctx, r) \
51
51
        LIBNET_UNJOIN_DUMP_CTX(ctx, r, NDR_OUT)
52
52
 
53
 
#define W_ERROR_NOT_OK_GOTO_DONE(x) do { \
54
 
        if (!W_ERROR_IS_OK(x)) {\
55
 
                goto done;\
56
 
        }\
57
 
} while (0)
58
 
 
59
53
/****************************************************************
60
54
****************************************************************/
61
55
 
791
785
        status = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
792
786
                                      pipe_hnd->desthost,
793
787
                                      SAMR_ACCESS_ENUM_DOMAINS
794
 
                                      | SAMR_ACCESS_OPEN_DOMAIN,
 
788
                                      | SAMR_ACCESS_LOOKUP_DOMAIN,
795
789
                                      &sam_pol);
796
790
        if (!NT_STATUS_IS_OK(status)) {
797
791
                goto done;