projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
How one identifies is not relevant to their work in Debian: remove gender attribute...
[mirror/userdir-ldap.git]
/
ud-mailgate
diff --git
a/ud-mailgate
b/ud-mailgate
index
e6b54a9
..
918f5d0
100755
(executable)
--- a/
ud-mailgate
+++ b/
ud-mailgate
@@
-42,14
+42,6
@@
ValidHostNames = [] # will be initialized in later
SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}|SHA256:[0-9A-Za-z/+]{43}) (.+)$')
SSHRSA1Match = re.compile('^^(.* )?\d+ \d+ \d+')
SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}|SHA256:[0-9A-Za-z/+]{43}) (.+)$')
SSHRSA1Match = re.compile('^^(.* )?\d+ \d+ \d+')
-GenderTable = {"male": '1',
- "1": '1',
- "female": '2',
- "2": '2',
- "unspecified": '9',
- "9": '9',
-};
-
ArbChanges = {"c": "..",
"l": ".*",
"facsimileTelephoneNumber": ".*",
ArbChanges = {"c": "..",
"l": ".*",
"facsimileTelephoneNumber": ".*",
@@
-70,7
+62,6
@@
ArbChanges = {"c": "..",
"mailCallout": "^(TRUE|FALSE)$",
"mailDefaultOptions": "^(TRUE|FALSE)$",
"VoIP": ".*",
"mailCallout": "^(TRUE|FALSE)$",
"mailDefaultOptions": "^(TRUE|FALSE)$",
"VoIP": ".*",
- "gender": "^(1|2|9|male|female|unspecified)$",
"mailContentInspectionAction": "^(reject|blackhole|markup)$",
};
"mailContentInspectionAction": "^(reject|blackhole|markup)$",
};
@@
-184,10
+175,6
@@
def DoArbChange(Str,Attrs):
raise UDFormatError, "Item does not match the required format"+ArbChanges[attrName];
value = G[1];
raise UDFormatError, "Item does not match the required format"+ArbChanges[attrName];
value = G[1];
- if attrName == 'gender':
- if G[1] not in GenderTable:
- raise UDFormatError, "Gender not found in table"
- value = GenderTable[G[1]]
# if attrName == 'birthDate':
# (re.match("^([0-9]{4})([01][0-9])([0-3][0-9])$",G[1]) {
# if attrName == 'birthDate':
# (re.match("^([0-9]{4})([01][0-9])([0-3][0-9])$",G[1]) {
@@
-297,7
+284,7
@@
def DoSSH(Str, Attrs, badkeys, uid):
if not machine_regex.match(m):
return "machine specification for ssh key contains invalid characters"
if m not in ValidHostNames:
if not machine_regex.match(m):
return "machine specification for ssh key contains invalid characters"
if m not in ValidHostNames:
- return "unknown machine
used in allowed_hosts stanza for ssh keys"
+ return "unknown machine
{} used in allowed_hosts stanza for ssh keys".format(m)
(fd, path) = tempfile.mkstemp(".pub", "sshkeytry", "/tmp")
f = open(path, "w")
(fd, path) = tempfile.mkstemp(".pub", "sshkeytry", "/tmp")
f = open(path, "w")