projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disallow CNAME and any other RR type for the same name for DNS entries.
[mirror/userdir-ldap.git]
/
userdir_ldap.py
diff --git
a/userdir_ldap.py
b/userdir_ldap.py
index
888158e
..
aee0e6f
100644
(file)
--- a/
userdir_ldap.py
+++ b/
userdir_ldap.py
@@
-11,7
+11,7
@@
File.close();
# Cheap hack
BaseDn = ConfModule.basedn;
# Cheap hack
BaseDn = ConfModule.basedn;
-
BaseDn = ConfModule.
basedn;
+
HostBaseDn = ConfModule.host
basedn;
LDAPServer = ConfModule.ldaphost;
EmailAppend = ConfModule.emailappend;
AdminUser = ConfModule.adminuser;
LDAPServer = ConfModule.ldaphost;
EmailAppend = ConfModule.emailappend;
AdminUser = ConfModule.adminuser;
@@
-32,7
+32,7
@@
LastNamesPre = {"van": None, "le": None, "de": None, "di": None};
# SSH Key splitting. The result is:
# (options,size,modulous,exponent,comment)
SSHAuthSplit = re.compile('^(.* )?(\d+) (\d+) (\d+) ?(.+)$');
# SSH Key splitting. The result is:
# (options,size,modulous,exponent,comment)
SSHAuthSplit = re.compile('^(.* )?(\d+) (\d+) (\d+) ?(.+)$');
-SSH
DSAAuthSplit = re.compile('^ssh-dss
([a-zA-Z0-9=/+]+) (.+)$');
+SSH
2AuthSplit = re.compile('^(.* )?ssh-(dss|rsa)
([a-zA-Z0-9=/+]+) (.+)$');
#'^([^\d](?:[^ "]+(?:".*")?)*)? ?(\d+) (\d+) (\d+) (.+)$');
AddressSplit = re.compile("(.*).*<([^@]*)@([^>]*)>");
#'^([^\d](?:[^ "]+(?:".*")?)*)? ?(\d+) (\d+) (\d+) (.+)$');
AddressSplit = re.compile("(.*).*<([^@]*)@([^>]*)>");
@@
-146,7
+146,7
@@
def GenPass():
def HashPass(Password):
# Hash it telling glibc to use the MD5 algorithm - if you dont have
# glibc then just change Salt = "$1$" to Salt = "";
def HashPass(Password):
# Hash it telling glibc to use the MD5 algorithm - if you dont have
# glibc then just change Salt = "$1$" to Salt = "";
- SaltVals = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/.";
+ SaltVals = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
0123456789
/.";
Salt = "$1$";
Rand = open("/dev/urandom");
for x in range(0,10):
Salt = "$1$";
Rand = open("/dev/urandom");
for x in range(0,10):
@@
-215,17
+215,19
@@
def DecDegree(Posn,Anon=0):
return Str;
def FormatSSH2Auth(Str):
return Str;
def FormatSSH2Auth(Str):
- Match = SSH
DSA
AuthSplit.match(Str);
+ Match = SSH
2
AuthSplit.match(Str);
if Match == None:
return "<unknown format>";
G = Match.groups();
if Match == None:
return "<unknown format>";
G = Match.groups();
- return "ssh-dss %s..%s %s"%(G[0][:8],G[0][-8:],G[1]);
+ if G[0] == None:
+ return "ssh-%s %s..%s %s"%(G[1],G[2][:8],G[2][-8:],G[3]);
+ return "%s ssh-%s %s..%s %s"%(G[0],G[1],G[2][:8],G[2][-8:],G[3]);
def FormatSSHAuth(Str):
Match = SSHAuthSplit.match(Str);
if Match == None:
def FormatSSHAuth(Str):
Match = SSHAuthSplit.match(Str);
if Match == None:
- return
"<unknown format>"
;
+ return
FormatSSH2Auth(Str)
;
G = Match.groups();
# No options
G = Match.groups();
# No options