projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
release
[mirror/userdir-ldap.git]
/
ud-xearth
diff --git
a/ud-xearth
b/ud-xearth
index
9679866
..
58f8e93
100755
(executable)
--- a/
ud-xearth
+++ b/
ud-xearth
@@
-14,7
+14,7
@@
# DGMS -> DD DDD + (MM + (SS.SSSSSS)/60)/60
# For Latitude + is North, for Longitude + is East
# DGMS -> DD DDD + (MM + (SS.SSSSSS)/60)/60
# For Latitude + is North, for Longitude + is East
-import
string, re, time, ldap, getopt, sys, pwd
, posix;
+import
re, time, ldap, getopt, sys, pwd, os
, posix;
from userdir_ldap import *;
Anon = 0;
from userdir_ldap import *;
Anon = 0;
@@
-30,11
+30,7
@@
for (switch, val) in options:
Anon = 1;
# Connect to the ldap server
Anon = 1;
# Connect to the ldap server
-l = ldap.open(LDAPServer);
-print "Accessing LDAP directory as '" + User + "'";
-Password = getpass(User + "'s password: ");
-UserDn = "uid=" + User + "," + BaseDn;
-l.simple_bind_s(UserDn,Password);
+l = passwdAccessLDAP(BaseDn, User)
Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"latitude=*",\
["uid","cn","mn","sn","latitude","longitude"]);
Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"latitude=*",\
["uid","cn","mn","sn","latitude","longitude"]);
@@
-52,9
+48,9
@@
for x in Attrs:
Count = Count + 1;
try:
if Anon != 0:
Count = Count + 1;
try:
if Anon != 0:
- F.write("%8s %8s \"\"\n"%(DecDegree(
x,"latitude",Anon),DecDegree(x,"longitude"
,Anon)));
+ F.write("%8s %8s \"\"\n"%(DecDegree(
GetAttr(x,"latitude"),Anon),DecDegree(GetAttr(x,"longitude")
,Anon)));
else:
else:
- F.write("%16s %16s \"%s\" \t# %s\n"%(DecDegree(
x,"latitude",Anon),DecDegree(x,"longitude"
,Anon),GetAttr(x,"uid"),EmailAddress(x)));
+ F.write("%16s %16s \"%s\" \t# %s\n"%(DecDegree(
GetAttr(x,"latitude"),Anon),DecDegree(GetAttr(x,"longitude")
,Anon),GetAttr(x,"uid"),EmailAddress(x)));
except:
Failed = Failed + 1;
if Anon == 0:
except:
Failed = Failed + 1;
if Anon == 0: