upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-28 10:39:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #729: omit use of escape sequences in echo since they are not portable (unbound-control-setup)

Browse source 
git-svn-id: file:///svn/unbound/trunk@3587 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Ralph Dolmans 2015-12-15 11:00:59 +00:00
parent 620b0d876c
commit 1efbd605b4
2 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/Changelog
View file

@ -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

30
smallapp/unbound-control-setup.sh.in
View file

@ -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"