projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Enforce correct order of authentication requests
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
1536b58
..
7780a0b
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-19,7
+19,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: conf.c,v 1.9.4.1
7 2000/10/24 15:46:15
guus Exp $
+ $Id: conf.c,v 1.9.4.1
9 2000/10/29 00:24:31
guus Exp $
*/
*/
@@
-30,6
+30,7
@@
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
#include <stdlib.h>
#include <string.h>
#include <syslog.h>
+#include <stdio.h>
#include <xalloc.h>
#include <xalloc.h>
@@
-59,7
+60,6
@@
static internal_config_t hazahaza[] = {
{ "ConnectTo", connectto, TYPE_NAME },
{ "PingTimeout", pingtimeout, TYPE_INT },
{ "TapDevice", tapdevice, TYPE_NAME },
{ "ConnectTo", connectto, TYPE_NAME },
{ "PingTimeout", pingtimeout, TYPE_INT },
{ "TapDevice", tapdevice, TYPE_NAME },
- { "TapSubnet", tapsubnet, TYPE_IP },
{ "PrivateKey", privatekey, TYPE_NAME },
{ "KeyExpire", keyexpire, TYPE_INT },
{ "Hostnames", resolve_dns, TYPE_BOOL },
{ "PrivateKey", privatekey, TYPE_NAME },
{ "KeyExpire", keyexpire, TYPE_INT },
{ "Hostnames", resolve_dns, TYPE_BOOL },
@@
-85,7
+85,7
@@
static internal_config_t hazahaza[] = {
config_t *
add_config_val(config_t **cfg, int argtype, char *val)
{
config_t *
add_config_val(config_t **cfg, int argtype, char *val)
{
- config_t *p
, *r
;
+ config_t *p;
char *q;
cp
p = (config_t*)xmalloc(sizeof(*p));
char *q;
cp
p = (config_t*)xmalloc(sizeof(*p));