Yedidyah Bar David has uploaded a new change for review. Change subject: pki: backup only if file is not '-' ......................................................................
pki: backup only if file is not '-' Make pki-pkcs12-extract.sh backup the file (key or cert) only if it's not '-'. Change-Id: I58a3a0cb87f7e39e7ce32f65c2a62cfd2fa822a7 Bug-Url: https://bugzilla.redhat.com/1209281 Signed-off-by: Yedidyah Bar David <d...@redhat.com> (cherry picked from commit 99ef576108723404445de4da83acb45d9a4ed58f) --- M packaging/bin/pki-pkcs12-extract.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/89/40089/1 diff --git a/packaging/bin/pki-pkcs12-extract.sh b/packaging/bin/pki-pkcs12-extract.sh index 9a9f5f1..aee892a 100755 --- a/packaging/bin/pki-pkcs12-extract.sh +++ b/packaging/bin/pki-pkcs12-extract.sh @@ -9,13 +9,13 @@ local extra_args="" local pkcs12="${PKIDIR}/keys/${name}.p12" - common_backup "${key}" [ -z "${passout}" ] && extra_args="${extra_args} -nodes" if [ "${key}" = - ]; then key=/proc/self/fd/1 else + common_backup "${key}" touch "${key}" chmod go-rwx "${key}" || die "Cannot set key permissions" fi @@ -39,11 +39,11 @@ local passin="$3" local pkcs12="${PKIDIR}/keys/${name}.p12" - common_backup "${cert}" if [ "${cert}" = - ]; then cert=/proc/self/fd/1 else + common_backup "${cert}" touch "${cert}" chmod a+r "${cert}" || die "Cannot set certificate permissions" fi -- To view, visit https://gerrit.ovirt.org/40089 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I58a3a0cb87f7e39e7ce32f65c2a62cfd2fa822a7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Yedidyah Bar David <d...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
