j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Replace asprintf()s not covered by the merge to xasprintf().

Browse source
This commit is contained in:
Guus Sliepen 2009-09-16 20:28:30 +02:00
parent 1cbddbd573
commit 4bdf0e80ee
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/net.c
View file

@ -270,7 +270,7 @@ int reload_configuration(void) {
c->outgoing = NULL; c->outgoing = NULL;
} }
asprintf(&fname, "%s/hosts/%s", confbase, c->name); xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
if(stat(fname, &s) || s.st_mtime > last_config_check) if(stat(fname, &s) || s.st_mtime > last_config_check)
terminate_connection(c, c->status.active); terminate_connection(c, c->status.active);
free(fname); free(fname);

2
src/net_setup.c
View file

@ -63,7 +63,7 @@ bool read_rsa_public_key(connection_t *c) {
/* Else, check for PublicKeyFile statement and read it */ /* Else, check for PublicKeyFile statement and read it */
if(!get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &fname)) if(!get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &fname))
asprintf(&fname, "%s/hosts/%s", confbase, c->name); xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
fp = fopen(fname, "r"); fp = fopen(fname, "r");

20
src/tincctl.c
View file

@ -205,7 +205,7 @@ static bool keygen(int bits) {
} else } else
fprintf(stderr, _("Done.\n")); fprintf(stderr, _("Done.\n"));
asprintf(&filename, "%s/rsa_key.priv", confbase); xasprintf(&filename, "%s/rsa_key.priv", confbase);
f = ask_and_open(filename, _("private RSA key"), "a"); f = ask_and_open(filename, _("private RSA key"), "a");
if(!f) if(!f)
@ -225,9 +225,9 @@ static bool keygen(int bits) {
free(filename); free(filename);
if(name) if(name)
asprintf(&filename, "%s/hosts/%s", confbase, name); xasprintf(&filename, "%s/hosts/%s", confbase, name);
else else
asprintf(&filename, "%s/rsa_key.pub", confbase); xasprintf(&filename, "%s/rsa_key.pub", confbase);
f = ask_and_open(filename, _("public RSA key"), "a"); f = ask_and_open(filename, _("public RSA key"), "a");
@ -256,7 +256,7 @@ static void make_names(void) {
#endif #endif
if(netname) if(netname)
asprintf(&identname, "tinc.%s", netname); xasprintf(&identname, "tinc.%s", netname);
else else
identname = xstrdup("tinc"); identname = xstrdup("tinc");
@ -264,12 +264,12 @@ static void make_names(void) {
if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) { if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
if(!RegQueryValueEx(key, NULL, 0, 0, installdir, &len)) { if(!RegQueryValueEx(key, NULL, 0, 0, installdir, &len)) {
if(!logfilename) if(!logfilename)
asprintf(&logfilename, "%s/log/%s.log", identname); xasprintf(&logfilename, "%s/log/%s.log", identname);
if(!confbase) { if(!confbase) {
if(netname) if(netname)
asprintf(&confbase, "%s/%s", installdir, netname); xasprintf(&confbase, "%s/%s", installdir, netname);
else else
asprintf(&confbase, "%s", installdir); xasprintf(&confbase, "%s", installdir);
} }
} }
RegCloseKey(key); RegCloseKey(key);
@ -279,16 +279,16 @@ static void make_names(void) {
#endif #endif
if(!controlsocketname) if(!controlsocketname)
asprintf(&controlsocketname, "%s/run/%s.control/socket", LOCALSTATEDIR, identname); xasprintf(&controlsocketname, "%s/run/%s.control/socket", LOCALSTATEDIR, identname);
if(netname) { if(netname) {
if(!confbase) if(!confbase)
asprintf(&confbase, CONFDIR "/tinc/%s", netname); xasprintf(&confbase, CONFDIR "/tinc/%s", netname);
else else
fprintf(stderr, _("Both netname and configuration directory given, using the latter...\n")); fprintf(stderr, _("Both netname and configuration directory given, using the latter...\n"));
} else { } else {
if(!confbase) if(!confbase)
asprintf(&confbase, CONFDIR "/tinc"); xasprintf(&confbase, CONFDIR "/tinc");
} }
} }