projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove a lie from welcome-message-60000 - not that it's the only one.
[mirror/userdir-ldap.git]
/
ud-info
diff --git
a/ud-info
b/ud-info
index
c5a45ea
..
8b9618b
100755
(executable)
--- a/
ud-info
+++ b/
ud-info
@@
-219,7
+219,7
@@
def ShowAttrs(Attrs):
Keys.sort();
for at in Keys:
if at < 100 or RootMode != 0:
Keys.sort();
for at in Keys:
if at < 100 or RootMode != 0:
- print " %3u) %-1
8
s: " % (at,OrderedIndex[at][0]),
+ print " %3u) %-1
9
s: " % (at,OrderedIndex[at][0]),
for x in OrderedIndex[at][1]:
print "'%s'" % (re.sub('[\n\r]','?',x)),
print;
for x in OrderedIndex[at][1]:
print "'%s'" % (re.sub('[\n\r]','?',x)),
print;
@@
-252,13
+252,15
@@
def ChangeAttr(Attrs,Attr):
Attrs[1][Attr] = [""];
return;
Attrs[1][Attr] = [""];
return;
- if (Attr == "mailSpamOptOut" and NewValue != "true" and NewValue != "false"):
- if (NewValue == "1"): NewValue = "true"
- else:
- if (NewValue == "0"): NewValue = "false"
+ if (Attr == "mailSpamOptOut" or Attr == "mailGreylisting" or Attr == "mailCallout"):
+ if (NewValue.lower() != "true" and NewValue.lower() != "false"):
+ if (NewValue == "1"): NewValue = "true"
else:
else:
- print "Need a boolean value"
- return
+ if (NewValue == "0"): NewValue = "false"
+ else:
+ print "Need a boolean value"
+ return
+ NewValue = NewValue.upper()
# Set a new value
print "Setting.",;
# Set a new value
print "Setting.",;
@@
-349,14
+351,15
@@
else:
# Connect to the ldap server
l = connectLDAP()
# Connect to the ldap server
l = connectLDAP()
+UserDn = "uid=" + User + "," + BaseDn
if (BindUser != ""):
Password = getpass.getpass(BindUser + "'s password: ")
if (BindUser != ""):
Password = getpass.getpass(BindUser + "'s password: ")
- UserDn = "uid=" + BindUser + "," + BaseDn
+
Bind
UserDn = "uid=" + BindUser + "," + BaseDn
else:
Password = ""
else:
Password = ""
- UserDn = ""
+
Bind
UserDn = ""
try:
try:
- l.simple_bind_s(UserDn,Password)
+ l.simple_bind_s(
Bind
UserDn,Password)
except ldap.LDAPError,e:
print >> sys.stderr, "LDAP error:", e.args[0]['desc']
print >> sys.stderr, " ", e.args[0]['info']
except ldap.LDAPError,e:
print >> sys.stderr, "LDAP error:", e.args[0]['desc']
print >> sys.stderr, " ", e.args[0]['info']