Use the common routine from userdir_ldap.py which asks for the

AdminUser  password and checks if access if granted to the LDAP
server.

diff --git a/ud-arbimport b/ud-arbimport
index 02430fb..0574f79 100755 (executable)
--- a/ud-arbimport
+++ b/ud-arbimport
@@ -21,13 +21,7 @@ if len(arguments) == 0:
    os.exit(0);
 
 # Main program starts here
-print "Accessing LDAP directory as '" + AdminUser + "'";
-Password = getpass(AdminUser + "'s password: ");
-
-# Connect to the ldap server
-l = ldap.open(LDAPServer);
-UserDn = "uid=" + AdminUser + "," + BaseDn;
-#l.simple_bind_s(UserDn,Password);
+l = passwdAccessLDAP(LDAPServer, BaseDn, AdminUser)
 
 List = open(arguments[1],"r");
 Set = [];

diff --git a/ud-xearth b/ud-xearth
index 47fdbf1..53f65bd 100755 (executable)
--- 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