projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import from samosa: Added space to improve the readability
[mirror/userdir-ldap.git]
/
userdir_ldap.py
diff --git
a/userdir_ldap.py
b/userdir_ldap.py
index
888158e
..
215d8e8
100644
(file)
--- a/
userdir_ldap.py
+++ b/
userdir_ldap.py
@@
-1,5
+1,5
@@
# Some routines and configuration that are used by the ldap progams
# Some routines and configuration that are used by the ldap progams
-import termios,
TERMIOS,
re, string, imp, ldap, sys, whrandom, crypt, rfc822;
+import termios, re, string, imp, ldap, sys, whrandom, crypt, rfc822;
import userdir_gpg
try:
import userdir_gpg
try:
@@
-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("(.*).*<([^@]*)@([^>]*)>");
@@
-70,16
+70,16
@@
def PrettyShow(DnRecord):
# Function to prompt for a password
def getpass(prompt = "Password: "):
# Function to prompt for a password
def getpass(prompt = "Password: "):
- import termios,
TERMIOS,
sys;
+ import termios, sys;
fd = sys.stdin.fileno();
old = termios.tcgetattr(fd);
new = termios.tcgetattr(fd);
fd = sys.stdin.fileno();
old = termios.tcgetattr(fd);
new = termios.tcgetattr(fd);
- new[3] = new[3] & ~
TERMIOS
.ECHO; # lflags
+ new[3] = new[3] & ~
termios
.ECHO; # lflags
try:
try:
- termios.tcsetattr(fd,
TERMIOS
.TCSADRAIN, new);
+ termios.tcsetattr(fd,
termios
.TCSADRAIN, new);
passwd = raw_input(prompt);
finally:
passwd = raw_input(prompt);
finally:
- termios.tcsetattr(fd,
TERMIOS
.TCSADRAIN, old);
+ termios.tcsetattr(fd,
termios
.TCSADRAIN, old);
print;
return passwd;
print;
return passwd;
@@
-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):
@@
-186,7
+186,7
@@
def FlushOutstanding(l,Outstanding,Fast=0):
# Convert a lat/long attribute into Decimal degrees
def DecDegree(Posn,Anon=0):
# Convert a lat/long attribute into Decimal degrees
def DecDegree(Posn,Anon=0):
- Parts = re.match('[
+-]?(\d*)\\.?(\d*)?
',Posn).groups();
+ Parts = re.match('[
-+]?(\d*)\\.?(\d*)
',Posn).groups();
Val = string.atof(Posn);
if (abs(Val) >= 1806060.0):
Val = string.atof(Posn);
if (abs(Val) >= 1806060.0):
@@
-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