diff --git a/bin/xymon-home.py b/bin/xymon-home.py index 197d83b479e65b97e188c6aa36e66b18c5d03db2..0d3897bcd5d5588868652af64d598cb5692d55fd 100755 --- a/bin/xymon-home.py +++ b/bin/xymon-home.py @@ -13,7 +13,7 @@ import dphysldap import pyxymon as pymon CHECK_NAME = 'permissions' -CHECK_VERSION = 5 +CHECK_VERSION = 6 LIFETIME = 30 home_dir = '/export/home1/*' @@ -153,8 +153,13 @@ def check_homes(top): no_ldap_user.append(home) if home.name in nis_homes: - if nis_homes[home.name].split(':', maxsplit=1)[1] != home.path: - bad_nis_map.append(': '.join([home.name, nis_homes[home.name]])) + nis_home_path = nis_homes[home.name].split(':', maxsplit=1)[1] + if nis_home_path.startswith('/export'): + if nis_home_path != home.path: + bad_nis_map.append(': '.join([home.name, nis_homes[home.name]])) + else: + if nis_home_path != home.path[7:]: + bad_nis_map.append(': '.join([home.name, nis_homes[home.name]])) del nis_homes[home.name] else: no_nis_map.append(home)