BIND 10 master, updated. bfefbfda28cb512b12643555790149b7c64414f3 [master]Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  bfefbfda28cb512b12643555790149b7c64414f3 (commit)
       via  4d074c3e7048f8dde151e078bee4967949d3b32e (commit)
      from  f7a26a8f9ee4adf64d754e6c2a6c07977854c40c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bfefbfda28cb512b12643555790149b7c64414f3
Merge: 4d074c3 f7a26a8
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Wed Feb 6 10:47:22 2013 -0600

    [master]Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

commit 4d074c3e7048f8dde151e078bee4967949d3b32e
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Wed Feb 6 10:44:00 2013 -0600

    [master] add NetBSD support
    
    Actually the support was already there.
    Renamed the OpenBSD class to NetBSD (since it was first)
    and then use it for OpenBSD too (and NetBSD).
    
    This is for ticket #2692. It was reviewed on jabber.

-----------------------------------------------------------------------

Summary of changes:
 src/lib/python/isc/sysinfo/sysinfo.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/sysinfo/sysinfo.py b/src/lib/python/isc/sysinfo/sysinfo.py
index 3a59801..099ac89 100644
--- a/src/lib/python/isc/sysinfo/sysinfo.py
+++ b/src/lib/python/isc/sysinfo/sysinfo.py
@@ -325,8 +325,8 @@ class SysInfoBSD(SysInfoPOSIX):
         except (subprocess.CalledProcessError, OSError):
             self._net_connections = 'Warning: "netstat -nr" command failed.\n'
 
-class SysInfoOpenBSD(SysInfoBSD):
-    """OpenBSD implementation of the SysInfo class.
+class SysInfoNetBSD(SysInfoBSD):
+    """NetBSD and OpenBSD implementation of the SysInfo class.
     See the SysInfo class documentation for more information.
     """
     def __init__(self):
@@ -502,8 +502,8 @@ def SysInfoFromFactory():
     osname = platform.system()
     if osname == 'Linux':
         return SysInfoLinux()
-    elif osname == 'OpenBSD':
-        return SysInfoOpenBSD()
+    elif (osname == 'NetBSD') or (osname == 'OpenBSD'):
+        return SysInfoNetBSD()
     elif osname == 'FreeBSD':
         return SysInfoFreeBSD()
     elif osname == 'Darwin':