← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/samba/intrepid-updates

« back to all changes in this revision

Viewing changes to source/nsswitch/winbindd_cm.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2008-06-02 09:01:46 UTC
  • mfrom: (0.25.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20080602090146-92ur4nx39ccg708r
Tags: 2:3.0.30-2ubuntu1
https://launchpad.net/bugs/32067
https://launchpad.net/bugs/201059
https://launchpad.net/bugs/206036
* Merge from debian unstable, remaining changes:
  * debian/patches/VERSION.patch
    - set SAMABA_VERSION_VENDOR_SUFFIX to Ubuntu
  * debian/smb.conf
    - add "(Samba, Ubuntu)" to server string.
    - comment out the default [homes] shares, and a comment about
      "value users = %S to show users how to restrict access to 
      \\server\useranem to only username.
    - Add map to guest = Bad user, maps bad username to guest access.
      (LP: #32067)
  * debian/samba-common.postinst:
    - Fix upgrade from a first installation done with feisty, edgy, or dapper.
      (LP: #201059)
    - When populating the new sambashare group, it's not an error if the user
      simply doesn't exist; test for this case and the install continue 
      instead of aborting. (LP: #206036)
  * debian/smba-common.config:
    - do not change priority to HIGH if dhclient3 is installed
    - used priority medium instead of hight for the workgroup question
  * debian/winbind.files
    - insclude additional files
  * debian/patches/fix-documentation.patch:
    - fix typos in net(8) and smb.conf(5) man pages
  * debian/mksambapasswd.awk:
    - Don't add user with UID less than 1000 to smbpasswd.
  * debian/samba.init:
    - add 'status' option for LSB conformance.
  * Updated control version.
  * Dropped Changes:
    - Dropped debian/patches/fix-smbprinting-os2.patch. Accepted upstream.
    - Dropped debian/patches/fix-documentation.patch. Accepted upstream.
     

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/nsswitch/winbindd_cm.c
720
720
                                         &machine_account,
721
721
                                         &machine_krb5_principal);
722
722
                if (!NT_STATUS_IS_OK(result)) {
723
 
                        goto done;
 
723
                        goto anon_fallback;
724
724
                }
725
725
 
726
726
                if (lp_security() == SEC_ADS) {
803
803
                }
804
804
        }
805
805
 
 
806
 anon_fallback:
 
807
 
806
808
        /* Fall back to anonymous connection, this might fail later */
807
809
 
808
810
        if (NT_STATUS_IS_OK(cli_session_setup(*cli, "", NULL, 0,
2027
2029
        struct winbindd_cm_conn *conn;
2028
2030
        NTSTATUS result;
2029
2031
 
2030
 
        uint32 neg_flags = NETLOGON_NEG_SELECT_AUTH2_FLAGS;
 
2032
        uint32 neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
2031
2033
        uint8  mach_pwd[16];
2032
2034
        uint32  sec_chan_type;
2033
2035
        const char *account_name;