projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ud-host: kill trailing semicolons
[mirror/userdir-ldap.git]
/
ud-ldapshow
diff --git
a/ud-ldapshow
b/ud-ldapshow
index
0c54cb4
..
43249a4
100755
(executable)
--- a/
ud-ldapshow
+++ b/
ud-ldapshow
@@
-4,7
+4,7
@@
# Call with nokey to generate a missing key report
# Call with noforward to generate a missing .forward report
# Call with nokey to generate a missing key report
# Call with noforward to generate a missing .forward report
-import
string,
re, time, ldap, getopt, sys;
+import re, time, ldap, getopt, sys;
from userdir_ldap import *;
def ShowDups(Attrs,Len):
from userdir_ldap import *;
def ShowDups(Attrs,Len):
@@
-31,7
+31,7
@@
for (switch, val) in options:
print "Connecting to LDAP directory";
# Connect to the ldap server
print "Connecting to LDAP directory";
# Connect to the ldap server
-l =
ldap.open(LDAPServer);
+l =
connectLDAP()
l.simple_bind_s("","");
if arguments[0] == "nokey":
l.simple_bind_s("","");
if arguments[0] == "nokey":
@@
-76,7
+76,7
@@
if arguments[0] == "keymap":
print "%s: %s" % (EmailAddress(x),I);
if arguments[0] == "devcount":
print "%s: %s" % (EmailAddress(x),I);
if arguments[0] == "devcount":
- Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"(&(keyFingerPrint=*)(
gidNumber=800
))",\
+ Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"(&(keyFingerPrint=*)(
supplementaryGid=Debian
))",\
["uid"]);
Count = 0;
for x in Attrs:
["uid"]);
Count = 0;
for x in Attrs:
@@
-85,7
+85,7
@@
if arguments[0] == "devcount":
if arguments[0] == "echelon":
Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,\
if arguments[0] == "echelon":
Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,\
- "(&(|(activity-pgp=*)(activity-from=*))(&(keyFingerPrint=*)(
gidNumber=800
)))",\
+ "(&(|(activity-pgp=*)(activity-from=*))(&(keyFingerPrint=*)(
supplementaryGid=Debian
)))",\
["activity-pgp","activity-from"]);
Count = 0;
PGPCount = 0;
["activity-pgp","activity-from"]);
Count = 0;
PGPCount = 0;
@@
-97,7
+97,7
@@
if arguments[0] == "echelon":
if arguments[0] == "missing":
Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,\
if arguments[0] == "missing":
Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,\
- "(&(!(|(activity-pgp=*)(activity-from=*)))(&(keyFingerPrint=*)(
gidNumber=800
)))",\
+ "(&(!(|(activity-pgp=*)(activity-from=*)))(&(keyFingerPrint=*)(
supplementaryGid=Debian
)))",\
["uid","cn","sn","mn"]);
Attrs.sort();
for x in Attrs:
["uid","cn","sn","mn"]);
Attrs.sort();
for x in Attrs: