Don't make ofp-pki --log option relative to log directory.

That behavior may have made sense, but it was too surprising.

diff --git a/utilities/ofp-pki.8.in b/utilities/ofp-pki.8.in
index f8bd4b1573a140c699ff3e39f1410060eb297701..58bee973e1b2e3f1809362b428011f45398dd3e5 100644 (file)
--- a/utilities/ofp-pki.8.in
+++ b/utilities/ofp-pki.8.in
@@ -309,9 +309,8 @@ directories.  This option overrides this behavior.
 
 .TP
 \fB\-l\fR \fIfile\fR | \fB\-\^\-log=\fIfile\fR
-Sets the log file to \fIfile\fR.  If \fIfile\fR starts with \fB/\fR,
-it is taken as an absolute path; otherwise it is relative to @LOGDIR@.
-Default: \fBofp\-pki.log\fR.
+Sets the log file to \fIfile\fR.  Default:
+\fB@LOGDIR@/ofp\-pki.log\fR.
 
 .TP
 \fB\-h\fR | \fB\-\^\-help\fR

diff --git a/utilities/ofp-pki.in b/utilities/ofp-pki.in
index 3d3a00de6d87dff3a76ce1c2617f02aba5f1151e..a6d4521a87b169992ddbebaec93982abf92541ee 100755 (executable)
--- a/utilities/ofp-pki.in
+++ b/utilities/ofp-pki.in
@@ -155,6 +155,10 @@ fi
 if test -z "$dsaparam"; then
     dsaparam=$pkidir/dsaparam.pem
 fi
+case $log in
+    /*) ;;
+    *) $log="$PWD/$log" ;;
+esac
 
 if test "$command" = "init"; then
     if test -e "$pkidir" && test "$force" != "yes"; then
@@ -456,15 +460,7 @@ glob() {
     fi
 }
 
-case $log in
-    /*)
-        exec 3>>$log || true
-        ;;
-    *)
-        exec 3>>$pkidir/$log || true
-        ;;
-esac
-
+exec 3>>$log || true
 if test "$command" = req; then
     one_arg