X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=af277ea310096b54d90db854e6d54889b0dcb464;hb=13918e9f29ac6b79f3dc5465d309d8f624fd3b5d;hp=02b379418b2e6ef71039ca69dce0e9a5e438cf2d;hpb=e9dc8e658380c666e2149d735c97a1116c71db08;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-generate b/ud-generate
index 02b3794..af277ea 100755
--- a/ud-generate
+++ b/ud-generate
@@ -137,7 +137,7 @@ def IsInGroup(account):
   if str(account['gidNumber']) in Allowed: return True
 
   # Check the host based ACL
-  if 'allowedHost' in account and CurrentHost in account['allowedHost']: return True
+  if account.is_allowed_by_hostacl(CurrentHost): return True
 
   # See if there are supplementary groups
   if not 'supplementaryGid' in account: return False
@@ -1049,7 +1049,7 @@ GenKeyrings(GlobalDir)
 # Compatibility.
 GenForward(accounts, GlobalDir + "forward-alias")
 
-GenAllUsers(accounts, 'all-accounts.json')
+GenAllUsers(accounts, GlobalDir + 'all-accounts.json')
 accounts = filter(lambda a: not a in accounts_disabled, accounts)
 
 SSHFiles = GenSSHShadow(accounts)