From 8ea8b0937fb83d1db795b20b96acccff2ab4025a Mon Sep 17 00:00:00 2001
From: jgg <>
Date: Thu, 23 Sep 1999 02:10:03 +0000
Subject: [PATCH] Fixes

---
 doc/ud-info.1.yo   |  1 +
 doc/ud-xearth.1.yo |  4 ++++
 ud-generate        |  2 +-
 userdir_gpg.py     | 10 ++++++++--
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/doc/ud-info.1.yo b/doc/ud-info.1.yo
index 119d95d..8bf60a5 100644
--- a/doc/ud-info.1.yo
+++ b/doc/ud-info.1.yo
@@ -103,6 +103,7 @@ itemize(
  it() Map Blast! Canadian, US and some European maps - http://www.mapblast.com/
  it() Australian Database http://www.environment.gov.au/database/MAN200R.html
  it() Canadian Database http://GeoNames.NRCan.gc.ca/
+ it() Atlas of the World, indexed by city http://www.astro.com/atlas/
  it() GNU Timezone database, organized partially by country /usr/share/zoneinfo/zone.tab
 )
 
diff --git a/doc/ud-xearth.1.yo b/doc/ud-xearth.1.yo
index c25b71d..52140c1 100644
--- a/doc/ud-xearth.1.yo
+++ b/doc/ud-xearth.1.yo
@@ -16,6 +16,10 @@ The output is place in a file called ./markers.dat
 Since lat/long information is restricted to developers only a valid login is
 required to extract the information. 
 
+A good way to make use of the coordinates is the following command: 
+verb(xplanet --shade 100 --marker developers.coords --color white \
+--output developers.map.jpeg --geometry 750x450)
+	  
 manpageoptions()
 startdit()
 dit(bf(-u))
diff --git a/ud-generate b/ud-generate
index b627cae..6b004f0 100755
--- a/ud-generate
+++ b/ud-generate
@@ -146,7 +146,7 @@ def GenGroup(l,File,Allowed):
          if GroupMap.has_key(I):
 	    GroupMap[I].append(GetAttr(x,"uid"));
 	 else:
-	    GroupMap[I] = [GetAttr(x,"uid")];
+            print "Group does not exist ",I,"but",GetAttr(x,"uid"),"is in it";
 	    
    # Output the group file.
    Counter = 0; 
diff --git a/userdir_gpg.py b/userdir_gpg.py
index 82e9ed9..39667d2 100644
--- a/userdir_gpg.py
+++ b/userdir_gpg.py
@@ -264,16 +264,22 @@ def GPGCheckSig(Message):
             Why = "Verification of signature failed";
 
 	 # Bad signature response
-	 if Split[1] == "ERRSIG" or Split[1] == "NO_PUBKEY":
+	 if Split[1] == "ERRSIG":
 	    GoodSig = 0;
 	    KeyID = Split[2];
-	    if Split[7] == '9':
+            if len(Split) <= 7:
+               Why = "GPG error, ERRSIG status tag is invalid";
+            elif Split[7] == '9':
                Why = "Unable to verify signature, signing key missing.";
             elif Split[7] == '4':
                Why = "Unable to verify signature, unknown packet format/key type";
 	    else:   
                Why = "Unable to verify signature, unknown reason";
 
+         if Split[1] == "NO_PUBKEY":
+	    GoodSig = 0;
+            Why = "Unable to verify signature, signing key missing.";
+
 	 # Expired signature
 	 if Split[1] == "SIGEXPIRED":
 	    GoodSig = 0;
-- 
2.20.1