|
Added
Link Here
|
| 1 |
From 6ae738d0d86f6d7cccce19f315105ab7e0e33c13 Mon Sep 17 00:00:00 2001 |
| 2 |
From: ralph <ralph@be551aaa-1e26-0410-a405-d3ace91eadb9> |
| 3 |
Date: Tue, 15 Dec 2015 11:00:59 +0000 |
| 4 |
Subject: [PATCH] Fix #729: omit use of escape sequences in echo since they are |
| 5 |
not portable (unbound-control-setup) |
| 6 |
|
| 7 |
git-svn-id: http://unbound.nlnetlabs.nl/svn/trunk@3587 be551aaa-1e26-0410-a405-d3ace91eadb9 |
| 8 |
--- |
| 9 |
doc/Changelog | 4 ++++ |
| 10 |
smallapp/unbound-control-setup.sh.in | 30 +++++++++++++++--------------- |
| 11 |
2 files changed, 19 insertions(+), 15 deletions(-) |
| 12 |
|
| 13 |
diff --git a/smallapp/unbound-control-setup.sh.in b/smallapp/unbound-control-setup.sh.in |
| 14 |
index f99d7bc..0d759f4 100644 |
| 15 |
--- smallapp/unbound-control-setup.sh.in |
| 16 |
+++ smallapp/unbound-control-setup.sh.in |
| 17 |
@@ -107,14 +107,14 @@ else |
| 18 |
fi |
| 19 |
|
| 20 |
# create self-signed cert for server |
| 21 |
-echo "[req]\n" > request.cfg |
| 22 |
-echo "default_bits=$BITS\n" >> request.cfg |
| 23 |
-echo "default_md=$HASH\n" >> request.cfg |
| 24 |
-echo "prompt=no\n" >> request.cfg |
| 25 |
-echo "distinguished_name=req_distinguished_name\n" >> request.cfg |
| 26 |
-echo "\n" >> request.cfg |
| 27 |
-echo "[req_distinguished_name]\n" >> request.cfg |
| 28 |
-echo "commonName=$SERVERNAME\n" >> request.cfg |
| 29 |
+echo "[req]" > request.cfg |
| 30 |
+echo "default_bits=$BITS" >> request.cfg |
| 31 |
+echo "default_md=$HASH" >> request.cfg |
| 32 |
+echo "prompt=no" >> request.cfg |
| 33 |
+echo "distinguished_name=req_distinguished_name" >> request.cfg |
| 34 |
+echo "" >> request.cfg |
| 35 |
+echo "[req_distinguished_name]" >> request.cfg |
| 36 |
+echo "commonName=$SERVERNAME" >> request.cfg |
| 37 |
|
| 38 |
test -f request.cfg || error "could not create request.cfg" |
| 39 |
|
| 40 |
@@ -124,13 +124,13 @@ openssl req -key $SVR_BASE.key -config request.cfg -new -x509 -days $DAYS -out |
| 41 |
openssl x509 -in $SVR_BASE.pem -addtrust serverAuth -out $SVR_BASE"_trust.pem" |
| 42 |
|
| 43 |
# create client request and sign it, piped |
| 44 |
-echo "[req]\n" > request.cfg |
| 45 |
-echo "default_bits=$BITS\n" >> request.cfg |
| 46 |
-echo "default_md=$HASH\n" >> request.cfg |
| 47 |
-echo "prompt=no\n" >> request.cfg |
| 48 |
-echo "distinguished_name=req_distinguished_name\n" >> request.cfg |
| 49 |
-echo "\n" >> request.cfg |
| 50 |
-echo "[req_distinguished_name]\n" >> request.cfg |
| 51 |
+echo "[req]" > request.cfg |
| 52 |
+echo "default_bits=$BITS" >> request.cfg |
| 53 |
+echo "default_md=$HASH" >> request.cfg |
| 54 |
+echo "prompt=no" >> request.cfg |
| 55 |
+echo "distinguished_name=req_distinguished_name" >> request.cfg |
| 56 |
+echo "" >> request.cfg |
| 57 |
+echo "[req_distinguished_name]" >> request.cfg |
| 58 |
echo "commonName=$CLIENTNAME" >> request.cfg |
| 59 |
|
| 60 |
test -f request.cfg || error "could not create request.cfg" |