From: Martin Zobel-Helas <zobel@debian.org>
Date: Fri, 8 Mar 2013 23:30:07 +0000 (+0100)
Subject: disable dnsZoneEntry and privateSub for guest accounts
X-Git-Tag: userdir-ldap-0.3.85~56
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=5bef88f3d6253fc7109d753e9a48284fd420f504

disable dnsZoneEntry and privateSub for guest accounts
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

diff --git a/UDLdap.py b/UDLdap.py
index 3c0f0ef..f19703f 100644
--- a/UDLdap.py
+++ b/UDLdap.py
@@ -87,6 +87,9 @@ class Account:
     def is_active_user(self):
         return self['accountStatus'] == 'active' and self.numkeys() != 0
 
+    def is_guest_account(self):
+        return self['gidNumber'] == 60000
+
     def latitude_dec(self, anonymized=False):
         return userdir_ldap.DecDegree(self['latitude'], anonymized)
     def longitude_dec(self, anonymized=False):
diff --git a/ud-generate b/ud-generate
index 955757e..44bccc4 100755
--- a/ud-generate
+++ b/ud-generate
@@ -665,6 +665,7 @@ def GenPrivate(accounts, File):
       # Write out the position for each user
       for a in accounts:
          if not a.is_active_user(): continue
+         if a.is_guest_account(): continue
          if not 'privateSub' in a: continue
          try:
             Line = "%s"%(a['privateSub'])
@@ -778,6 +779,7 @@ def GenDNS(accounts, File):
       for a in accounts:
          if not 'dnsZoneEntry' in a: continue
          if not a.is_active_user() and not isRoleAccount(a): continue
+         if a.is_guest_account(): continue
 
          try:
             F.write("; %s\n"%(a.email_address()))