← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/squid3/jaunty-security

« back to all changes in this revision

Viewing changes to src/dns_internal.cc

  • Committer: Bazaar Package Importer
  • Author(s): Luigi Gangitano
  • Date: 2008-07-21 09:20:31 UTC
  • mfrom: (1.1.7 upstream) (3.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20080721092031-bj8vog645lw6487u
Tags: 3.0.STABLE8-1
* Urgency high to meet freeze deadline

* New upstream release

* debian/patches/10-mgr_active_requests
  - Added upstream patch fixing delay_pool reporting in cachemgr.cgi

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dns_internal.cc
388
388
            t = (char *) xmalloc(Size);
389
389
            RegQueryValueEx(hndKey, "Domain", NULL, &Type, (LPBYTE) t,
390
390
                &Size);
391
 
            debugs(78, 1, "Adding domain " << token << " from Registry");
 
391
            debugs(78, 1, "Adding domain " << t << " from Registry");
392
392
            idnsAddPathComponent(t);
393
393
            xfree(t);
394
394
        }
412
412
 
413
413
        RegCloseKey(hndKey);
414
414
    }
415
 
    if (npc == 0 && ((const char *) t = getMyHostname())) {
 
415
    if (npc == 0 && (t = (char *) getMyHostname())) {
416
416
        t = strchr(t, '.');
417
417
        if (t)
418
418
            idnsAddPathComponent(t + 1);
443
443
 
444
444
            if (Result == ERROR_SUCCESS && Size) {
445
445
                t = (char *) xmalloc(Size);
446
 
                RegQueryValueEx(hndKey, "DhcpNameServer", NULL, &Type, t,
 
446
                RegQueryValueEx(hndKey, "DhcpNameServer", NULL, &Type, (LPBYTE) t,
447
447
                                &Size);
448
448
                token = strtok(t, ", ");
449
449
 
460
460
 
461
461
            if (Result == ERROR_SUCCESS && Size) {
462
462
                t = (char *) xmalloc(Size);
463
 
                RegQueryValueEx(hndKey, "NameServer", NULL, &Type, t, &Size);
 
463
                RegQueryValueEx(hndKey, "NameServer", NULL, &Type, (LPBYTE) t, &Size);
464
464
                token = strtok(t, ", ");
465
465
 
466
466
                while (token) {
514
514
                        if (Result == ERROR_SUCCESS && Size) {
515
515
                            t = (char *) xmalloc(Size);
516
516
                            RegQueryValueEx(hndKey2, "DhcpNameServer", NULL,
517
 
                                            &Type, t, &Size);
 
517
                                            &Type, (LPBYTE) t, &Size);
518
518
                            token = strtok(t, ", ");
519
519
 
520
520
                            while (token) {
532
532
                        if (Result == ERROR_SUCCESS && Size) {
533
533
                            t = (char *) xmalloc(Size);
534
534
                            RegQueryValueEx(hndKey2, "NameServer", NULL, &Type,
535
 
                                            t, &Size);
 
535
                                            (LPBYTE) t, &Size);
536
536
                            token = strtok(t, ", ");
537
537
 
538
538
                            while (token) {
573
573
 
574
574
            if (Result == ERROR_SUCCESS && Size) {
575
575
                t = (char *) xmalloc(Size);
576
 
                RegQueryValueEx(hndKey, "NameServer", NULL, &Type, t, &Size);
 
576
                RegQueryValueEx(hndKey, "NameServer", NULL, &Type, (LPBYTE) t, &Size);
577
577
                token = strtok(t, ", ");
578
578
 
579
579
                while (token) {