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 /init.c | |
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 'init.c')
-rw-r--r-- | init.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -615,7 +615,7 @@ init_static (void) #ifdef STATUS_PRINTF_TEST { struct gc_arena gc = gc_new (); - const char *tmp_file = create_temp_filename ("/tmp", "foo", &gc); + const char *tmp_file = create_temp_file ("/tmp", "foo", &gc); struct status_output *so = status_open (tmp_file, 0, -1, NULL, STATUS_OUTPUT_WRITE); status_printf (so, "%s", "foo"); status_printf (so, "%s", "bar"); |