← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/rpc_server/srv_lsa_nt.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/rpc_server/srv_lsa_nt.c
828
828
                                           &names,
829
829
                                           &mapped_count);
830
830
 
 
831
        /* Only return here when there is a real error.
 
832
           NT_STATUS_NONE_MAPPED is a special case as it indicates that none of
 
833
           the requested sids could be resolved. Older versions of XP (pre SP3)
 
834
           rely that we return with the string representations of those SIDs in
 
835
           that case. If we don't, XP crashes - Guenther
 
836
           */
 
837
 
 
838
        if (NT_STATUS_IS_ERR(status) &&
 
839
            !NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) {
 
840
                return status;
 
841
        }
 
842
 
831
843
        /* Convert from lsa_TranslatedName2 to lsa_TranslatedName */
832
844
        names_out = TALLOC_ARRAY(p->mem_ctx, struct lsa_TranslatedName,
833
845
                                 num_sids);