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
aee0e6f
..
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:
@@
-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+) ?(.+)$');
-SSH2AuthSplit = re.compile('^(.* )?ssh-(dss|rsa) ([a-zA-Z0-9=/+]+) (.+)$');
+SSH2AuthSplit = 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;
@@
-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):