From 3def5a222e3dc2bb3b23e843b89f9fdcb35b9a21 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 17 Oct 2002 17:23:36 +0000
Subject: localmksslcerts: Handle all(?) option variants properly, and correct
 old mail-specific references in comments.

---
 localmksslcerts | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'localmksslcerts')

diff --git a/localmksslcerts b/localmksslcerts
index 0f66fa0..5cd7066 100755
--- a/localmksslcerts
+++ b/localmksslcerts
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# /usr/local/sbin/localmkmailcerts
+# /usr/local/sbin/localmksslcerts
 # Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk>
 #
-# $Id: localmksslcerts,v 1.6 2002-03-29 18:31:14 jonas Exp $
+# $Id: localmksslcerts,v 1.7 2002-10-17 17:23:36 jonas Exp $
 #
-# Generate certificates for mail servers
+# Generate certificates for mail (and other) servers
 # Based on uw-imapd-ssl post-install script
 #
 
@@ -15,8 +15,8 @@ copyright="(C) 2001-2002 Jonas Smedegaard <dr@jones.dk>"
 usage() {
 echo "$prg, $copyright
 
-Usage: $prg --fqdn <FQDN> [--issuer <issuer>] --daemon <daemon> [...] [--force]
-   or: $prg <FQDN> <daemon> [<daemon>...] [-f]
+Usage: $prg [--fqdn <FQDN>] [--issuer <issuer>] --daemon <daemon> [...] [--force]
+   or: $prg [<FQDN>] <daemon> [<daemon>...] [-f]
 
 Options:
       --fqdn    Fully Qualified Domain Name for this host.
@@ -70,12 +70,14 @@ if [ -z "$issuer" ]; then
 	ISSUER="postmaster@$DOMAINNAME"
 fi
 
-if [ -z "$fqdn" -a $# -gt 0 ]; then
+if [ -z "$fqdn" ]; then
+    if [ $# -gt 0 ]; then
 	fqdn=$1
 	shift
-else
+    else
 	echo "Too few parameters!"
 	usage
+    fi
 fi
 
 cd /etc/ssl/certs
-- 
cgit v1.2.3