diff options
| author | Ken Raffenetti <raffenet@mcs.anl.gov> | 2006-09-20 21:48:02 +0000 |
|---|---|---|
| committer | Ken Raffenetti <raffenet@mcs.anl.gov> | 2006-09-20 21:48:02 +0000 |
| commit | 37e859ad825e18ace9d2e29b975abaa952e51adb (patch) | |
| tree | 8ca45a8afce837a56fea99caad34f43c17ef9293 /src | |
| parent | e28345d9a3ad5d417f0e36f1807fbde2d1e3204d (diff) | |
| download | bcfg2-37e859ad825e18ace9d2e29b975abaa952e51adb.tar.gz bcfg2-37e859ad825e18ace9d2e29b975abaa952e51adb.tar.bz2 bcfg2-37e859ad825e18ace9d2e29b975abaa952e51adb.zip | |
minor fixes
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2287 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Server/Plugins/Hostbase.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/Server/Plugins/Hostbase.py b/src/lib/Server/Plugins/Hostbase.py index e81c4dfd1..0dc8bf65f 100644 --- a/src/lib/Server/Plugins/Hostbase.py +++ b/src/lib/Server/Plugins/Hostbase.py @@ -166,7 +166,7 @@ class Hostbase(Plugin): if not prevhost[1] == host[1] or not prevhost[2] == host[2]: self.filedata[zone[1]] += ("%-32s%-10s%-32s\n" % (host[2].split(".", 1)[0], 'A', host[1])) - self.filedata[zone[1]] += ("%-32s%-10s%-3s%-29s.\n" % + self.filedata[zone[1]] += ("%-32s%-10s%-3s%s.\n" % ('', 'MX', host[4], host[5])) if host[3]: if host[3].split(".", 1)[1] == zone[1]: @@ -268,7 +268,8 @@ class Hostbase(Plugin): SELECT hostname, mac_addr, ip_addr FROM (hostbase_host h INNER JOIN hostbase_interface i ON h.id = i.host_id) INNER JOIN hostbase_ip ip ON i.id = ip.interface_id - WHERE h.dhcp=1 AND h.status = 'active' + WHERE h.dhcp=1 AND h.status='active' AND i.mac_addr <> '' + AND i.mac_addr <> 'float' AND i.mac_addr <> 'unknown' ORDER BY h.hostname, i.mac_addr """) |