← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/lib/smbldap.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/lib/smbldap.c
994
994
                ldap_state->paged_results = True;
995
995
        }
996
996
 
997
 
        DEBUG(3, ("ldap_connect_system: succesful connection to the LDAP server\n"));
 
997
        DEBUG(3, ("ldap_connect_system: successful connection to the LDAP server\n"));
998
998
        DEBUGADD(10, ("ldap_connect_system: LDAP server %s support paged results\n", 
999
999
                ldap_state->paged_results ? "does" : "does not"));
1000
1000
        return rc;
1062
1062
 
1063
1063
        ldap_state->last_ping = time(NULL);
1064
1064
        ldap_state->pid = sys_getpid();
1065
 
        DEBUG(4,("The LDAP server is succesfully connected\n"));
 
1065
        DEBUG(4,("The LDAP server is successfully connected\n"));
1066
1066
 
1067
1067
        return LDAP_SUCCESS;
1068
1068
}