← Back to branch summary

~ubuntu-branches/ubuntu/maverick/squid3/maverick-updates

« back to all changes in this revision

Viewing changes to src/tools.cc

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2010-08-10 17:28:42 UTC
  • mfrom: (21.2.1 sid)
  • Revision ID: james.westby@ubuntu.com-20100810172842-iji5h90owqorkix1
Tags: 3.1.6-1ubuntu1
* Merge with Debian unstable, remaining changes:
  - Provide ufw profile.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/tools.cc
1110
1110
            *nt = '\0';
1111
1111
            debugs(1, 5, "etc_hosts: got hostname '" << lt << "'");
1112
1112
 
1113
 
#if USE_IPV6
1114
1113
            /* For IPV6 addresses also check for a colon */
1115
1114
            if (Config.appendDomain && !strchr(lt, '.') && !strchr(lt, ':')) {
1116
 
#else
1117
 
            if (Config.appendDomain && !strchr(lt, '.')) {
1118
 
#endif
1119
1115
                /* I know it's ugly, but it's only at reconfig */
1120
1116
                strncpy(buf2, lt, 512);
1121
1117
                strncat(buf2, Config.appendDomain, 512 - strlen(lt) - 1);