projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dpif-linux: Replace 'minor' by 'dp_idx'.
[openvswitch]
/
utilities
/
ovs-pki.in
diff --git
a/utilities/ovs-pki.in
b/utilities/ovs-pki.in
index 1f5286908c32b16ba5650b4df248a76d8829535d..0255251321e411a32f2cc7fcb4ac61821d1b2ea6 100755
(executable)
--- a/
utilities/ovs-pki.in
+++ b/
utilities/ovs-pki.in
@@
-1,6
+1,6
@@
#! /bin/sh
#! /bin/sh
-# Copyright (c) 2008, 2009, 2010 Nicira Networks, Inc.
+# Copyright (c) 2008, 2009, 2010
, 2011
Nicira Networks, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-173,7
+173,7
@@
if test -z "$dsaparam"; then
fi
case $log in
/*) ;;
fi
case $log in
/*) ;;
- *)
$
log="$PWD/$log" ;;
+ *) log="$PWD/$log" ;;
esac
logdir=$(dirname "$log")
esac
logdir=$(dirname "$log")
@@
-361,7
+361,7
@@
fingerprint() {
file=$1
name=${1-$2}
date=$(date -r $file)
file=$1
name=${1-$2}
date=$(date -r $file)
- if grep -
q -e '-BEGIN CERTIFICATE-' "$file"
; then
+ if grep -
e '-BEGIN CERTIFICATE-' "$file" > /dev/null
; then
fingerprint=$(openssl x509 -noout -in "$file" -fingerprint |
sed 's/SHA1 Fingerprint=//' | tr -d ':')
else
fingerprint=$(openssl x509 -noout -in "$file" -fingerprint |
sed 's/SHA1 Fingerprint=//' | tr -d ':')
else