diff options
author | David Sommerseth <dazo@users.sourceforge.net> | 2010-07-22 22:30:27 +0200 |
---|---|---|
committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-07-22 22:30:27 +0200 |
commit | c70135d8ed31d133f2fb085bee01db8ad26d7fec (patch) | |
tree | 6b1edab6b87bd4c0d5b4aeca747232e524d28b36 /easy-rsa/2.0/build-key | |
parent | Added win/build_exe.py script, which is similar to (diff) | |
parent | Fixed client hang when server don't PUSH (aka the NO_SOUP_FOR_YOU patch) (diff) | |
download | openvpn-c70135d8ed31d133f2fb085bee01db8ad26d7fec.tar.xz |
Merge branch 'bugfix2.1' into beta2.2
Conflicts:
openvpn.8
- New option descriped (--register-dns)
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to '')
-rwxr-xr-x | easy-rsa/2.0/build-key | 2 | ||||
-rwxr-xr-x | easy-rsa/2.0/build-key-pass | 2 | ||||
-rwxr-xr-x | easy-rsa/2.0/build-key-pkcs12 | 2 | ||||
-rwxr-xr-x | easy-rsa/2.0/build-key-server | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/easy-rsa/2.0/build-key b/easy-rsa/2.0/build-key index 6196308..6c0fed8 100755 --- a/easy-rsa/2.0/build-key +++ b/easy-rsa/2.0/build-key @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Make a certificate/private key pair using a locally generated # root certificate. diff --git a/easy-rsa/2.0/build-key-pass b/easy-rsa/2.0/build-key-pass index 35543e0..8ef8307 100755 --- a/easy-rsa/2.0/build-key-pass +++ b/easy-rsa/2.0/build-key-pass @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Similar to build-key, but protect the private key # with a password. diff --git a/easy-rsa/2.0/build-key-pkcs12 b/easy-rsa/2.0/build-key-pkcs12 index 5ef064f..ba90e6a 100755 --- a/easy-rsa/2.0/build-key-pkcs12 +++ b/easy-rsa/2.0/build-key-pkcs12 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Make a certificate/private key pair using a locally generated # root certificate and convert it to a PKCS #12 file including the diff --git a/easy-rsa/2.0/build-key-server b/easy-rsa/2.0/build-key-server index 5502675..fee0194 100755 --- a/easy-rsa/2.0/build-key-server +++ b/easy-rsa/2.0/build-key-server @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Make a certificate/private key pair using a locally generated # root certificate. |