X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-sync-accounts-to-afs;h=41cc99913bba94ac125acc625d1fe0c2087ec68b;hb=refs%2Fheads%2Fsalsa;hp=6ce93ef6be9ce48a4c5a57a835f45e7c437023ed;hpb=e14c30b4b7a7db4a5b88f624d154781881d50228;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-sync-accounts-to-afs b/ud-sync-accounts-to-afs
index 6ce93ef..41cc999 100755
--- a/ud-sync-accounts-to-afs
+++ b/ud-sync-accounts-to-afs
@@ -18,11 +18,10 @@ import sys
 import tempfile
 
 
-import json
-if not '__author__' in json.__dict__:
-   sys.stderr.write("Warning: This is probably the wrong json module.  We want python 2.6's json\n")
-   sys.stderr.write("module, or simplejson on python 2.5.  Let's see if/how stuff blows up.\n")
+try:
    import simplejson as json
+except ImportError:
+   import json # this better be pthon 2.6's json..
 
 class UserEntries:
    def __init__(self):
@@ -124,7 +123,7 @@ def filter_have(a):
       if n == 'anonymous': # keep account, so remove from the have list
          a.del_name(n)
          continue
-      m = re.match('[0-9a-z]+$', n)
+      m = re.match('[0-9a-z-]+$', n)
       if not m: # weird name, probably has dots like weasel.admin etc.
          a.del_name(n)
          continue
@@ -163,7 +162,7 @@ def do_accounts():
    want = load_expected()
    have = load_existing()
 
-   if not options.user in have.by_name:
+   if options.user not in have.by_name:
       print >> sys.stderr, "Cannot find our user, '%s', in pts listentries"%(options.user)
       sys.exit(1)
    me = have.by_name[options.user]