← Back to branch summary

~ubuntu-branches/ubuntu/raring/postfix/raring

« back to all changes in this revision

Viewing changes to src/global/dict_ldap.c

  • Committer: Bazaar Package Importer
  • Author(s): LaMont Jones, Matt Moen, Wietse Venema, LaMont Jones
  • Date: 2010-06-13 18:30:59 UTC
  • mfrom: (1.1.26 upstream)
  • Revision ID: james.westby@ubuntu.com-20100613183059-ld3hxro9m3pj21q8
http://bugs.debian.org/575464
http://bugs.debian.org/570327
http://bugs.debian.org/577997
[Matt Moen]

* Create ca-certificates.crt for smtp{,d}_enforce_tls case, too. 
  Closes: #575464

[Wietse Venema]

* New upstream release.

[LaMont Jones]

* add freebsd 8 support.  Closes: #570327
* Drop tinycdb build-dep.  Closes: #577997

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/global/dict_ldap.c
1082
1082
    static VSTRING *result;
1083
1083
    int     rc = 0;
1084
1084
    int     sizelimit;
 
1085
    const char *cp;
1085
1086
 
1086
1087
    dict_errno = 0;
1087
1088
 
1088
1089
    if (msg_verbose)
1089
1090
        msg_info("%s: In dict_ldap_lookup", myname);
1090
1091
 
 
1092
    for (cp = name; *cp; ++cp)
 
1093
        if (!ISASCII(*cp)) {
 
1094
            if (msg_verbose)
 
1095
                msg_info("%s: %s: Skipping lookup of non-ASCII key '%s'",
 
1096
                         myname, dict_ldap->parser->name, name);
 
1097
            return (0);
 
1098
        }
 
1099
 
1091
1100
    /*
1092
1101
     * Optionally fold the key.
1093
1102
     */
1105
1114
     */
1106
1115
    if (db_common_check_domain(dict_ldap->ctx, name) == 0) {
1107
1116
        if (msg_verbose)
1108
 
            msg_info("%s: Skipping lookup of '%s'", myname, name);
 
1117
            msg_info("%s: %s: Skipping lookup of key '%s': domain mismatch",
 
1118
                     myname, dict_ldap->parser->name, name);
1109
1119
        return (0);
1110
1120
    }
1111
1121
#define INIT_VSTR(buf, len) do { \