← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/python-dns/gutsy-security

« back to all changes in this revision

Viewing changes to DNS/win32dns.py

  • Committer: Bazaar Package Importer
  • Author(s): Michael Bienia, Scott Kitterman, Michael Bienia
  • Date: 2007-02-16 13:49:26 UTC
  • Revision ID: james.westby@ubuntu.com-20070216134926-f92050i6ic6aiy53
Tags: 2.3.0-5.1ubuntu2
[ Scott Kitterman ]
* Fix multiple upstream reported bugs from sourceforge
  - [ 1563723 ] lazy should initilize defaults['server']
  - [ 863364 ] Mac OS X, Win2000 DHCP, addr2bin and bin2addr.
  - [ 1180344 ] win32dns.py fails on windows server 2003
  - [ 954095 ] Bug in DNS.Lib.Unpacker.getbyte()
  - [ 658601 ] Missing "import Lib"; for TCP protocol

[ Michael Bienia ]
* debian/control: Change Maintainer/XSBC-Original-Maintainer field.

Show diffs side-by-side

added added

removed removed

Lines of Context:
DNS/win32dns.py
61
61
            pass
62
62
        return nameservers # no idea
63
63
 
 
64
    # Sourceforge #863364 and 1180344
 
65
    try:
 
66
        nameserver = _winreg.QueryValueEx(y, "DhcpNameServer")[0].split()
 
67
    except:
 
68
        nameserver = _winreg.QueryValueEx(y, "NameServer")[0].split()
 
69
    if nameserver:
 
70
        nameservers=nameserver
64
71
    nameserver = _winreg.QueryValueEx(y,"NameServer")[0]
65
 
    if nameserver:
66
 
        nameservers=[nameserver]
67
72
    _winreg.CloseKey(y)
68
73
    try: # for win2000
69
74
        y= _winreg.OpenKey(x,
135
140
# Really, ParseResolvConf() should be renamed "FindNameServers" or
136
141
# some such.
137
142
#
138
 
#
 
143