Added a routine to convert common Debian groups into numerical ids.

[mirror/userdir-ldap.git] / userdir_ldap.py

diff --git a/userdir_ldap.py b/userdir_ldap.py
index 80edc28..d70167d 100644 (file)
--- a/userdir_ldap.py
+++ b/userdir_ldap.py
@@ -27,12 +27,15 @@ Ech_MainLog = ConfModule.ech_mainlog;
 userdir_gpg.SetKeyrings(string.split(ConfModule.keyrings,":"));
 
 # This is a list of common last-name prefixes
-LastNamesPre = {"van": None, "le": None, "de": None, "di": None};
+LastNamesPre = {"van": None, "von": None, "le": None, "de": None, "di": None};
+
+# This is a list of common groups on Debian hosts
+DebianGroups = {"Debian": 800, "guest": 60000}
 
 # SSH Key splitting. The result is:
 # (options,size,modulous,exponent,comment)
 SSHAuthSplit = re.compile('^(.* )?(\d+) (\d+) (\d+) ?(.+)$');
-SSH2AuthSplit = re.compile('^(.* )?ssh-(dss|rsa) ([a-zA-Z0-9=/+]+) (.+)$');
+SSH2AuthSplit = re.compile('^(.* )?ssh-(dss|rsa) ([a-zA-Z0-9=/+]+) ?(.+)$');
 #'^([^\d](?:[^ "]+(?:".*")?)*)? ?(\d+) (\d+) (\d+) (.+)$');
 
 AddressSplit = re.compile("(.*).*<([^@]*)@([^>]*)>");
@@ -186,7 +189,7 @@ def FlushOutstanding(l,Outstanding,Fast=0):
 
 # Convert a lat/long attribute into Decimal degrees
 def DecDegree(Posn,Anon=0):
-  Parts = re.match('[+-]?(\d*)\\.?(\d*)?',Posn).groups();
+  Parts = re.match('[-+]?(\d*)\\.?(\d*)',Posn).groups();
   Val = string.atof(Posn);
 
   if (abs(Val) >= 1806060.0):
@@ -356,4 +359,9 @@ def GetUID(l,Name,UnknownMap = {}):
 
    return (None,None);
 
-   
+def Group2GID(name):
+   """Returns the numerical id of a common group"""
+   for g in DebianGroups.keys():
+      if name == g:
+         return DebianGroups[g]
+   return name