X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=ud-info;fp=ud-info;h=8842e05b2f52614c6652ed7f494b382b47564273;hp=c5a45ea40a72e5c2157d06f8471db0b354b27df2;hb=b7bd5e0fd1dd4eb6a8f6f8b79f53dae09720f109;hpb=77f656f736ead9a88a821eed931375f5d87d6e12 diff --git a/ud-info b/ud-info index c5a45ea..8842e05 100755 --- 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: - print " %3u) %-18s: " % (at,OrderedIndex[at][0]), + print " %3u) %-19s: " % (at,OrderedIndex[at][0]), 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; - 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: - 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.",;