X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=ud-xearth;h=58f8e93f8465a35511b900ea86a89b38cdfcc0d4;hp=47fdbf1d57ab9878ee3d6f64330d1af5a65ad09c;hb=HEAD;hpb=29a64949fcfdee5b1fb6333037c78baf648827ed

diff --git a/ud-xearth b/ud-xearth
index 47fdbf1..58f8e93 100755
--- a/ud-xearth
+++ b/ud-xearth
@@ -1,23 +1,5 @@
 #!/usr/bin/env python
 # -*- mode: python -*-
-
-#   Copyright (c) 1999-2000  Jason Gunthorpe <jgg@debian.org>
-#   Copyright (c) 2004       Joey Schulze <joey@debian.org>
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 2 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
 # Generate an xearth database from the LDAP entries
 # LDAP entires for lat/long can be in one of 3 different formats
 #    1) Decimal Degrees
@@ -32,7 +14,7 @@
 #  DGMS -> DD  DDD + (MM + (SS.SSSSSS)/60)/60
 # For Latitude + is North, for Longitude + is East
 
-import string, re, time, ldap, getopt, sys, pwd, os, posix;
+import re, time, ldap, getopt, sys, pwd, os, posix;
 from userdir_ldap import *;
 
 Anon = 0;
@@ -48,7 +30,7 @@ for (switch, val) in options:
       Anon = 1;
 
 # Connect to the ldap server
-l = passwdAccessLDAP(LDAPServer, BaseDn, User)
+l = passwdAccessLDAP(BaseDn, User)
 
 Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"latitude=*",\
          ["uid","cn","mn","sn","latitude","longitude"]);