Fix issues #39 and #40

- Add support for multiple domains with non-unique shortnames
- Fix Netgroups check

Author: peterpakos

checkipaconsistency/__init__.py

@@ -22,4 +22,4 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-VERSION = '2.7.0'
+VERSION = '2.7.1'

checkipaconsistency/freeipaserver.py

@@ -26,7 +26,6 @@
 import logging
 import ldap
 import dns.resolver
-import re
 
 
 class FreeIPAServer(object):
@@ -57,25 +56,14 @@ def __init__(self, host, domain, binddn, bindpw):
         self._bindpw = bindpw
         self._domain = domain
         self._url = 'ldaps://' + host
-        self.hostname_short = host
-
+        self.hostname_short = host.replace('.%s' % domain, '')
         self._conn = self._get_conn()
 
         if not self._conn:
             return
 
-        if re.match('^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$', host):
-            self._log.debug("IP %s supplied as host's address" % host)
-            self._fqdn = self._get_fqdn()
-            self.hostname_short = self._fqdn.partition('.')[0]
-        elif '.' not in host:
-            self._log.debug("Short hostname %s supplied as host's address" % host)
-            self._fqdn = self._get_fqdn()
-            self.hostname_short = host
-        else:
-            self._log.debug("FQDN supplied as host's address")
-            self._fqdn = host
-            self.hostname_short = host.partition('.')[0]
+        self._fqdn = self._get_fqdn()
+        self.hostname_short = self._fqdn.replace('.%s' % domain, '')
 
         self._log.debug('FQDN: %s, short hostname: %s' % (self._fqdn, self.hostname_short))
 
@@ -256,8 +244,8 @@ def _count_services(self):
     def _count_netgroups(self):
         self._log.debug('Counting netgroups...')
         results = self._search(
-            'cn=ng,cn=compat,%s' % self._base_dn,
-            '(cn=*)',
+            'cn=ng,cn=alt,%s' % self._base_dn,
+            '(ipaUniqueID=*)',
             ['dn'],
             scope=ldap.SCOPE_ONELEVEL
         )
@@ -423,10 +411,10 @@ def _replication_agreements(self):
         for result in results:
             dn, attrs = result
             host = attrs['nsDS5ReplicaHost'][0].decode('utf-8')
-            host = host.partition('.')[0]
+            host = host.replace('.%s' % self._domain, '')
             status = attrs['nsds5replicaLastUpdateStatus'][0].decode('utf-8')
             status = status.replace('Error ', '').partition(' ')[0].strip('()')
-            if status != '0':
+            if status not in ['0']:
                 healthy = False
             msg.append('%s %s' % (host, status))