summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sommerseth <dazo@users.sourceforge.net>2010-04-22 23:29:34 +0200
committerDavid Sommerseth <dazo@users.sourceforge.net>2010-07-22 22:57:22 +0200
commit87b342b7b0adcdda9ba55056b9c9a8298e0cebff (patch)
tree0fa747efb8dca59c3dcf3393090388dd3a796d34
parent42b39f281f8fb856d6ff8d72d48e88c2bc64df4e (diff)
downloadopenvpn-87b342b7b0adcdda9ba55056b9c9a8298e0cebff.tar.gz
openvpn-87b342b7b0adcdda9ba55056b9c9a8298e0cebff.tar.xz
openvpn-87b342b7b0adcdda9ba55056b9c9a8298e0cebff.zip
Solved hidden merge conflict between feat_misc and bugfix2.1
The OCSP patch (commit a3982181e284f8c5c8f, feat_misc) introduced a new function which was calling create_temp_filename(). When merging in bugfix2.1 into allmerged, create_temp_filename() got renamed to create_temp_file() in commit 5d30273a8741d2c141. This patch only changes create_temp_filename() to create_temp_file() in the new function introduced by commit a3982181e284f8c5c8f. Signed-off-by: David Sommerseth <dazo@users.sourceforge.net> (cherry picked from commit 926d1662e4d9e14b50eddec993b2f4e0209c0646)
-rw-r--r--ssl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl.c b/ssl.c
index 028173c..8c7a5ee 100644
--- a/ssl.c
+++ b/ssl.c
@@ -714,7 +714,7 @@ get_peer_cert(X509_STORE_CTX *ctx, const char *tmp_dir, struct gc_arena *gc)
}
/* create tmp file to store peer cert */
- peercert_filename = create_temp_filename (tmp_dir, "pcf", gc);
+ peercert_filename = create_temp_file (tmp_dir, "pcf", gc);
/* write peer-cert in tmp-file */
peercert_file = fopen(peercert_filename, "w+");