From 29a64949fcfdee5b1fb6333037c78baf648827ed Mon Sep 17 00:00:00 2001 From: joey <> Date: Sun, 21 Nov 2004 10:37:44 +0000 Subject: [PATCH] Added proper copyright notice --- ud-gpgimport | 18 ++++++++++++++++++ ud-killcrypt | 17 +++++++++++++++++ ud-userimport | 19 +++++++++++++++++++ ud-xearth | 24 +++++++++++++++++++----- 4 files changed, 73 insertions(+), 5 deletions(-) diff --git a/ud-gpgimport b/ud-gpgimport index 8c7ad73..fd1a052 100755 --- a/ud-gpgimport +++ b/ud-gpgimport @@ -1,5 +1,23 @@ #!/usr/bin/env python # -*- mode: python -*- + +# Copyright (c) 1999-2000 Jason Gunthorpe +# Copyright (c) 2004 Joey Schulze +# +# 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. + # This script tries to match key fingerprints from a keyring with user # name in a directory. When an unassigned key is found a heuristic match # against the keys given cn/sn and the directory is performed to try to get diff --git a/ud-killcrypt b/ud-killcrypt index 55f198c..45dbcc2 100644 --- a/ud-killcrypt +++ b/ud-killcrypt @@ -1,6 +1,23 @@ #!/usr/bin/env python # -*- mode: python -*- +# Copyright (c) 2001 Jason Gunthorpe +# Copyright (c) 2004 Joey Schulze +# +# 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. + import string, re, time, ldap, getopt, sys, pwd, os, posix; from userdir_ldap import *; diff --git a/ud-userimport b/ud-userimport index 3359782..fceaf4e 100755 --- a/ud-userimport +++ b/ud-userimport @@ -1,5 +1,24 @@ #!/usr/bin/env python # -*- mode: python -*- + +# Copyright (c) 1999 Jason Gunthorpe +# Copyright (c) 2003 James Troup +# Copyright (c) 2004 Joey Schulze +# +# 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. + # Imports passwd, shadow and group files into the directory. # You should cleanse the files of anything you do not want to add to the # directory. diff --git a/ud-xearth b/ud-xearth index d3025a0..47fdbf1 100755 --- a/ud-xearth +++ b/ud-xearth @@ -1,5 +1,23 @@ #!/usr/bin/env python # -*- mode: python -*- + +# Copyright (c) 1999-2000 Jason Gunthorpe +# Copyright (c) 2004 Joey Schulze +# +# 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 @@ -30,11 +48,7 @@ for (switch, val) in options: 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(LDAPServer, BaseDn, User) Attrs = l.search_s(BaseDn,ldap.SCOPE_ONELEVEL,"latitude=*",\ ["uid","cn","mn","sn","latitude","longitude"]); -- 2.20.1