projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Aha. Error is not some magic variable or exception, it's a normal string that
[mirror/userdir-ldap.git]
/
ud-mailgate
diff --git
a/ud-mailgate
b/ud-mailgate
index
4fa2edf
..
16f6a59
100755
(executable)
--- a/
ud-mailgate
+++ b/
ud-mailgate
@@
-32,6
+32,14
@@
DNS = {}
SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}) (.+)$')
SSHRSA1Match = re.compile('^^(.* )?\d+ \d+ \d+')
SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}) (.+)$')
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": ".*",
@@
-50,6
+58,7
@@
ArbChanges = {"c": "..",
"mailGreylisting": "^(TRUE|FALSE)$",
"mailCallout": "^(TRUE|FALSE)$",
"VoIP": ".*",
"mailGreylisting": "^(TRUE|FALSE)$",
"mailCallout": "^(TRUE|FALSE)$",
"VoIP": ".*",
+ "gender": "^(1|2|9|male|female|unspecified)$",
};
DelItems = {"c": None,
};
DelItems = {"c": None,
@@
-158,6
+167,12
@@
def DoArbChange(Str,Attrs):
if re.match(ArbChanges[attrName],G[1]) == None:
raise Error, "Item does not match the required format"+ArbChanges[attrName];
if re.match(ArbChanges[attrName],G[1]) == None:
raise Error, "Item does not match the required format"+ArbChanges[attrName];
+ value = G[1];
+ if attrName == 'gender':
+ if G[1] not in GenderTable:
+ raise Error, "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]) {
# $bd_yr = $1; $bd_mo = $2; $bd_day = $3;
# if attrName == 'birthDate':
# (re.match("^([0-9]{4})([01][0-9])([0-3][0-9])$",G[1]) {
# $bd_yr = $1; $bd_mo = $2; $bd_day = $3;
@@
-181,8
+196,8
@@
def DoArbChange(Str,Attrs):
# } elsif (not defined($query->param('birthdate')) or $query->param('birthdate') =~ /^\s*$/) {
# $bd_ok = 1;
# }
# } elsif (not defined($query->param('birthdate')) or $query->param('birthdate') =~ /^\s*$/) {
# $bd_ok = 1;
# }
- Attrs.append((ldap.MOD_REPLACE,attrName,
G[1]
));
- return "Changed entry %s to %s"%(attrName,
G[1]
);
+ Attrs.append((ldap.MOD_REPLACE,attrName,
value
));
+ return "Changed entry %s to %s"%(attrName,
value
);
# Handle changing a set of arbitary fields
# <field>: value
# Handle changing a set of arbitary fields
# <field>: value
@@
-467,7
+482,7
@@
def HandleChange(Reply,DnRecord,Key):
Result = Result + Res + "\n";
# Connect to the ldap server
Result = Result + Res + "\n";
# Connect to the ldap server
- l =
ldap.open(LDAPServer);
+ l =
connectLDAP()
F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r");
AccessPass = F.readline().strip().split(" ")
F.close();
F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r");
AccessPass = F.readline().strip().split(" ")
F.close();
@@
-538,7
+553,7
@@
def HandleChPass(Reply,DnRecord,Key):
Reply = Reply + TemplateSubst(Subst,open(TemplatesDir+"passwd-changed","r").read());
# Connect to the ldap server
Reply = Reply + TemplateSubst(Subst,open(TemplatesDir+"passwd-changed","r").read());
# Connect to the ldap server
- l =
ldap.open(LDAPServer);
+ l =
connectLDAP()
F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r");
AccessPass = F.readline().strip().split(" ")
F.close();
F = open(PassDir+"/pass-"+pwd.getpwuid(os.getuid())[0],"r");
AccessPass = F.readline().strip().split(" ")
F.close();
@@
-616,7
+631,7
@@
try:
ErrType = EX_TEMPFAIL;
ErrMsg = "An error occured while performing the LDAP lookup";
global l;
ErrType = EX_TEMPFAIL;
ErrMsg = "An error occured while performing the LDAP lookup";
global l;
- l =
ldap.open(LDAPServer);
+ l =
connectLDAP()
l.simple_bind_s("","");
# Search for the matching key fingerprint
l.simple_bind_s("","");
# Search for the matching key fingerprint