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

Make "tinc add" idempotent.

Browse source 
When calling "tinc add" multiple times with the same variable and value,
make sure only one unique line is added to the configuration file.
This commit is contained in:
Guus Sliepen 2015-02-09 15:23:59 +01:00
parent 0b310bf406
commit 4b2ddded2c
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/tincctl.c
View file

@ -1610,6 +1610,11 @@ static int cmd_config(int argc, char *argv[]) {
}
set = true;
continue;
// Add
} else if(action > 0) {
// Check if we've already seen this variable with the same value
if(!strcasecmp(bvalue, value))
found = true;
}
}
@ -1642,7 +1647,7 @@ static int cmd_config(int argc, char *argv[]) {
}
// Add new variable if necessary.
if(action > 0 || (action == 0 && !set)) {
if((action > 0 && !found)|| (action == 0 && !set)) {
if(fprintf(tf, "%s = %s\n", variable, value) < 0) {
fprintf(stderr, "Error writing to temporary file %s: %s\n", tmpfile, strerror(errno));
return 1;