Manually merge PR164 to address crashes in search users calls on one or more legacy grid sites

git-svn-id: svn+ssh://svn.code.sf.net/p/migrid/code/trunk@6177 b75ad72c-e7d7-11dd-a971-7dbc132099af

Author: jonasbardino

mig/shared/useradm.py

@@ -2295,11 +2295,15 @@ def search_users(search_filter, conf_path, db_path,
         match = True
         for (key, val) in search_filter.items():
             if key == 'expire_after':
-                if user_dict.get('expire', val) < val:
+                # NOTE: expire may be None for legacy sites
+                user_expire = user_dict.get('expire', val)
+                if user_expire is not None and user_expire < val:
                     match = False
                     break
             elif key == 'expire_before':
-                if user_dict.get('expire', 0) > val:
+                # NOTE: expire may be None for legacy sites
+                user_expire = user_dict.get('expire', 0)
+                if user_expire is None or user_expire > val:
                     match = False
                     break
             elif key in regex_match and \