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

Replace hard-code with new ScriptsInterpreter configuration property.

Browse source 
This new setting allows choosing a custom script interpreter used for the various tinc callbacks.
If none is specified, the script itself is called as executable (as before).
This is particularly useful when storing tinc configuration and script on a mount point with no-exec attribute.
This commit is contained in:
Vilbrekin 2012-08-25 19:14:00 +02:00 committed by Guus Sliepen
parent 8a6f278fd2
commit f2570c1b7f
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/process.c
View file

@ -358,6 +358,7 @@ bool execute_script(const char *name, char **envp) {
int status, len;
char *scriptname;
int i;
char *aInterpreter = NULL;
#ifndef HAVE_MINGW
len = xasprintf(&scriptname, "\"%s/%s\"", confbase, name);
@ -376,17 +377,21 @@ bool execute_script(const char *name, char **envp) {
free(scriptname);
return true;
}
else
#endif
// Custom scripts interpreter
if(get_config_string(lookup_config(config_tree, "ScriptsInterpreter"), &aInterpreter))
{
// Ugly hard-code allowing execution of scripts on android without execution flag (such as on /sdcard)
// Force custom scripts interpreter allowing execution of scripts on android without execution flag (such as on /sdcard)
free(scriptname);
len = xasprintf(&scriptname, "/system/bin/sh \"%s/%s\"", confbase, name);
len = xasprintf(&scriptname, "%s \"%s/%s\"", aInterpreter, confbase, name);
if(len < 0)
{
free(aInterpreter);
return false;
}
}
#endif
free(aInterpreter);
ifdebug(STATUS) logger(LOG_INFO, "Executing script %s", name);