diff options
author | Mark Wielaard <mjw@redhat.com> | 2009-02-20 14:56:38 +0100 |
---|---|---|
committer | Mark Wielaard <mjw@redhat.com> | 2009-02-20 14:56:38 +0100 |
commit | 02615365a92ca2570c1f96abc8a97674aa2ccae1 (patch) | |
tree | ebedfd91a0f6d299b39e84295e091e12c0767dc8 /stap-add-server-cert | |
parent | c3bad3042df505a3470f1e20b09822a9df1d4761 (diff) | |
parent | adc67597f327cd43d58b1d0cb740dab14a75a058 (diff) | |
download | systemtap-steved-02615365a92ca2570c1f96abc8a97674aa2ccae1.tar.gz systemtap-steved-02615365a92ca2570c1f96abc8a97674aa2ccae1.tar.xz systemtap-steved-02615365a92ca2570c1f96abc8a97674aa2ccae1.zip |
Merge branch 'master' into pr6866
Conflicts:
ChangeLog: Removed
runtime/ChangeLog: Removed
runtime/sym.c: Merged
runtime/task_finder.c: Merged
tapset/ChangeLog: Removed
testsuite/ChangeLog: Removed
Diffstat (limited to 'stap-add-server-cert')
-rwxr-xr-x | stap-add-server-cert | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/stap-add-server-cert b/stap-add-server-cert index 976f323f..a94c5955 100755 --- a/stap-add-server-cert +++ b/stap-add-server-cert @@ -25,21 +25,21 @@ if test "X$2" = "X"; then echo "Certificate database directory must be specified" >&2 exit 1 fi -if ! test -d $2/client; then - if ! mkdir -p $2/client; then - echo "Unable to find or create the client certificate database directory: $2/client" >&2 +if ! test -d $2; then + if ! mkdir -p -m 755 $2; then + echo "Unable to find or create the client certificate database directory: $2" >&2 exit 1 fi fi # Add the certificate -if ! certutil -A -n stap-server -d $2/client -i $1 -t "P,P,P" > /dev/null; then +if ! certutil -A -n stap-server -d $2 -i $1 -t "P,P,P" > /dev/null; then echo "Unable to add $1 to the client certificate database $2" >&2 exit 1 fi # Ensure that the database is readable by others -if ! chmod +r $2/client/*.db; then +if ! chmod +r $2/*.db; then echo "Warning: unable to make the client certificate database $2 readable by others" >&2 fi |