projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TODO: drop long-completed item r.e. restricting SSH keys to hosts
[mirror/userdir-ldap.git]
/
ud-info
diff --git
a/ud-info
b/ud-info
index
8b9618b
..
3db0648
100755
(executable)
--- a/
ud-info
+++ b/
ud-info
@@
-20,7
+20,7
@@
# Copyright (c) 1999-2001 Jason Gunthorpe <jgg@debian.org>
# Copyright (c) 2004-2005,7,8 Joey Schulze <joey@infodrom.org>
# Copyright (c) 2001-2006 Ryan Murray <rmurray@debian.org>
# Copyright (c) 1999-2001 Jason Gunthorpe <jgg@debian.org>
# Copyright (c) 2004-2005,7,8 Joey Schulze <joey@infodrom.org>
# Copyright (c) 2001-2006 Ryan Murray <rmurray@debian.org>
-# Copyright (c) 2008 Peter Palfrader <peter@palfrader.org>
+# Copyright (c) 2008
,2009
Peter Palfrader <peter@palfrader.org>
# Copyright (c) 2008 Martin Zobel-Helas <zobel@debian.org>
# Copyright (c) 2008 Marc 'HE' Brockschmidt <he@debian.org>
# Copyright (c) 2008 Mark Hymers <mhy@debian.org>
# Copyright (c) 2008 Martin Zobel-Helas <zobel@debian.org>
# Copyright (c) 2008 Marc 'HE' Brockschmidt <he@debian.org>
# Copyright (c) 2008 Mark Hymers <mhy@debian.org>
@@
-68,7
+68,6
@@
AttrInfo = {"cn": ["First Name", 101],
"icqUin": ["ICQ UIN",14],
"jabberJID": ["Jabber ID",15],
"privateSub": ["Debian-Private",16],
"icqUin": ["ICQ UIN",14],
"jabberJID": ["Jabber ID",15],
"privateSub": ["Debian-Private",16],
- "gender": ["Gender",17],
"birthDate": ["Date of Birth",18],
"mailDisableMessage": ["Mail Disabled",19],
"mailGreylisting": ["Mail Greylisting",20],
"birthDate": ["Date of Birth",18],
"mailDisableMessage": ["Mail Disabled",19],
"mailGreylisting": ["Mail Greylisting",20],
@@
-76,7
+75,7
@@
AttrInfo = {"cn": ["First Name", 101],
"mailRBL": ["Mail RBLs",22],
"mailRHSBL": ["Mail RHSBLs",23],
"mailWhitelist": ["Mail Whitelist",24],
"mailRBL": ["Mail RBLs",22],
"mailRHSBL": ["Mail RHSBLs",23],
"mailWhitelist": ["Mail Whitelist",24],
- "mail
SpamOptOut": ["Mail Spam Filtering
",25],
+ "mail
ContentInspectionAction": ["mail C-I Action
",25],
"VoIP": ["VoIP Address",26],
"comment": ["Comment",116],
"userPassword": ["Crypted Password",117],
"VoIP": ["VoIP Address",26],
"comment": ["Comment",116],
"userPassword": ["Crypted Password",117],
@@
-103,7
+102,6
@@
AttrPrompt = {"cn": ["Common name or first name"],
"supplementaryGid": ["Groups the user is in"],
"allowedHost": ["Grant access to certain hosts"],
"privateSub": ["Debian-Private mailing list subscription"],
"supplementaryGid": ["Groups the user is in"],
"allowedHost": ["Grant access to certain hosts"],
"privateSub": ["Debian-Private mailing list subscription"],
- "gender": ["ISO5218 Gender code (1=male,2=female,9=unspecified)"],
"birthDate": ["Date of Birth (YYYYMMDD)"],
"mailDisableMessage": ["Error message to return via SMTP"],
"mailGreylisting": ["SMTP Greylisting (TRUE/FALSE)"],
"birthDate": ["Date of Birth (YYYYMMDD)"],
"mailDisableMessage": ["Error message to return via SMTP"],
"mailGreylisting": ["SMTP Greylisting (TRUE/FALSE)"],
@@
-111,7
+109,7
@@
AttrPrompt = {"cn": ["Common name or first name"],
"mailRBL": ["SMTP time RBL lists"],
"mailRHSBL": ["SMTP time RHSBL lists"],
"mailWhitelist": ["SMTP time whitelist from other checks"],
"mailRBL": ["SMTP time RBL lists"],
"mailRHSBL": ["SMTP time RHSBL lists"],
"mailWhitelist": ["SMTP time whitelist from other checks"],
- "mail
SpamOptOut": ["Mail Spam Filtering
"],
+ "mail
ContentInspectionAction": ["Content Inspection Action (reject, blackhole, markup)
"],
"member": ["LDAP Group Member for slapd ACLs"],
"latitude": ["XEarth latitude in ISO 6709 format - see /usr/share/zoneinfo/zone.tab or etak.com"],
"longitude": ["XEarth latitude in ISO 6709 format - see /usr/share/zoneinfo/zone.tab or etak.com"],
"member": ["LDAP Group Member for slapd ACLs"],
"latitude": ["XEarth latitude in ISO 6709 format - see /usr/share/zoneinfo/zone.tab or etak.com"],
"longitude": ["XEarth latitude in ISO 6709 format - see /usr/share/zoneinfo/zone.tab or etak.com"],
@@
-252,7
+250,7
@@
def ChangeAttr(Attrs,Attr):
Attrs[1][Attr] = [""];
return;
Attrs[1][Attr] = [""];
return;
- if (Attr == "mail
SpamOptOut" or Attr == "mail
Greylisting" or Attr == "mailCallout"):
+ if (Attr == "mailGreylisting" or Attr == "mailCallout"):
if (NewValue.lower() != "true" and NewValue.lower() != "false"):
if (NewValue == "1"): NewValue = "true"
else:
if (NewValue.lower() != "true" and NewValue.lower() != "false"):
if (NewValue == "1"): NewValue = "true"
else: