Index: kolab_ca.sh.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_ca.sh.in,v
retrieving revision 1.2
diff -u -r1.2 kolab_ca.sh.in
--- kolab_ca.sh.in	27 Nov 2005 23:57:02 -0000	1.2
+++ kolab_ca.sh.in	23 Dec 2005 19:39:59 -0000
@@ -6,15 +6,13 @@
 ## CA management script that is heavily inspired by Tim Hudson's
 ## CA.sh script from the openssl distribution
 
-PREFIX=@prefix@
-
 DAYS="-days 3650"
-REQ="$PREFIX/bin/openssl req"
-CA="$PREFIX/bin/openssl ca"
-VERIFY="$PREFIX/bin/openssl verify"
-X509="$PREFIX/bin/openssl x509"
-RSA="$PREFIX/bin/openssl rsa"
-GENRSA="$PREFIX/bin/openssl genrsa"
+REQ="@bindir@/openssl req"
+CA="@bindir@/openssl ca"
+VERIFY="@bindir@/openssl verify"
+X509="@bindir@/openssl x509"
+RSA="@bindir@/openssl rsa"
+GENRSA="@bindir@/openssl genrsa"
 
 CATOP=@sysconfdir@/kolab/ca
 CAKEY=cakey.pem
@@ -202,6 +200,10 @@
                            -out ${CATOP}/$CACERT $DAYS
             RET=$?
         fi
+    else
+        while [ -n "$2" ]; do
+            shift
+        done
     fi
     ;;
 -newkey)