From 1efbd605b4c2453a23b75bbe0e219dfcff7dce01 Mon Sep 17 00:00:00 2001 From: Ralph Dolmans Date: Tue, 15 Dec 2015 11:00:59 +0000 Subject: [PATCH] Fix #729: omit use of escape sequences in echo since they are not portable (unbound-control-setup) git-svn-id: file:///svn/unbound/trunk@3587 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 4 ++++ smallapp/unbound-control-setup.sh.in | 30 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index 2a964681b..3b9d50653 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,7 @@ +15 December 2015: Ralph + - Fix #729: omit use of escape sequences in echo since they are not + portable (unbound-control-setup). + 11 December 2015: Wouter - remove NULL-checks before free, patch from Michael McConville. - updated ax_pthread.m4 to version 21 with clang support, this diff --git a/smallapp/unbound-control-setup.sh.in b/smallapp/unbound-control-setup.sh.in index f99d7bcba..0d759f441 100644 --- a/smallapp/unbound-control-setup.sh.in +++ b/smallapp/unbound-control-setup.sh.in @@ -107,14 +107,14 @@ else fi # create self-signed cert for server -echo "[req]\n" > request.cfg -echo "default_bits=$BITS\n" >> request.cfg -echo "default_md=$HASH\n" >> request.cfg -echo "prompt=no\n" >> request.cfg -echo "distinguished_name=req_distinguished_name\n" >> request.cfg -echo "\n" >> request.cfg -echo "[req_distinguished_name]\n" >> request.cfg -echo "commonName=$SERVERNAME\n" >> request.cfg +echo "[req]" > request.cfg +echo "default_bits=$BITS" >> request.cfg +echo "default_md=$HASH" >> request.cfg +echo "prompt=no" >> request.cfg +echo "distinguished_name=req_distinguished_name" >> request.cfg +echo "" >> request.cfg +echo "[req_distinguished_name]" >> request.cfg +echo "commonName=$SERVERNAME" >> request.cfg test -f request.cfg || error "could not create request.cfg" @@ -124,13 +124,13 @@ openssl req -key $SVR_BASE.key -config request.cfg -new -x509 -days $DAYS -out openssl x509 -in $SVR_BASE.pem -addtrust serverAuth -out $SVR_BASE"_trust.pem" # create client request and sign it, piped -echo "[req]\n" > request.cfg -echo "default_bits=$BITS\n" >> request.cfg -echo "default_md=$HASH\n" >> request.cfg -echo "prompt=no\n" >> request.cfg -echo "distinguished_name=req_distinguished_name\n" >> request.cfg -echo "\n" >> request.cfg -echo "[req_distinguished_name]\n" >> request.cfg +echo "[req]" > request.cfg +echo "default_bits=$BITS" >> request.cfg +echo "default_md=$HASH" >> request.cfg +echo "prompt=no" >> request.cfg +echo "distinguished_name=req_distinguished_name" >> request.cfg +echo "" >> request.cfg +echo "[req_distinguished_name]" >> request.cfg echo "commonName=$CLIENTNAME" >> request.cfg test -f request.cfg || error "could not create request.cfg" -- 2.47.2