projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small fixes.
[tinc]
/
src
/
process.c
diff --git
a/src/process.c
b/src/process.c
index
d81fdd6
..
d08f70f
100644
(file)
--- a/
src/process.c
+++ b/
src/process.c
@@
-17,7
+17,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: process.c,v 1.1.2.
68 2003/08/08 19:56:11
guus Exp $
+ $Id: process.c,v 1.1.2.
71 2003/08/10 13:35:05
guus Exp $
*/
#include "system.h"
*/
#include "system.h"
@@
-85,6
+85,7
@@
bool install_service(void) {
char command[4096] = "";
char **argp;
bool space;
char command[4096] = "";
char **argp;
bool space;
+ SERVICE_DESCRIPTION description = {"Virtual Private Network daemon"};
manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
if(!manager) {
manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
if(!manager) {
@@
-120,6
+121,8
@@
bool install_service(void) {
return false;
}
return false;
}
+ ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &description);
+
logger(LOG_INFO, _("%s service installed"), identname);
if(!StartService(service, 0, NULL))
logger(LOG_INFO, _("%s service installed"), identname);
if(!StartService(service, 0, NULL))
@@
-359,22
+362,23
@@
bool detach(void)
bool execute_script(const char *name, char **envp)
{
#ifdef HAVE_SYSTEM
bool execute_script(const char *name, char **envp)
{
#ifdef HAVE_SYSTEM
- pid_t pid;
int status;
struct stat s;
char *scriptname;
cp();
int status;
struct stat s;
char *scriptname;
cp();
- asprintf(&scriptname, "\"%s/%s\"", confbase, name);
-
#ifndef HAVE_MINGW
#ifndef HAVE_MINGW
+ asprintf(&scriptname, "%s/%s", confbase, name);
+
/* First check if there is a script */
if(stat(scriptname, &s))
return true;
ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
/* First check if there is a script */
if(stat(scriptname, &s))
return true;
ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
+
+ free(scriptname);
#endif
#ifdef HAVE_PUTENV
#endif
#ifdef HAVE_PUTENV
@@
-384,6
+388,7
@@
bool execute_script(const char *name, char **envp)
putenv(*envp++);
#endif
putenv(*envp++);
#endif
+ asprintf(&scriptname, "\"%s/%s\"", confbase, name);
status = system(scriptname);
free(scriptname);
status = system(scriptname);
free(scriptname);
@@
-394,22
+399,20
@@
bool execute_script(const char *name, char **envp)
if(status != -1) {
if(WIFEXITED(status)) { /* Child exited by itself */
if(WEXITSTATUS(status)) {
if(status != -1) {
if(WIFEXITED(status)) { /* Child exited by itself */
if(WEXITSTATUS(status)) {
- logger(LOG_ERR, _("
Process %d (%s)
exited with non-zero status %d"),
-
pid,
name, WEXITSTATUS(status));
+ logger(LOG_ERR, _("
Script %s
exited with non-zero status %d"),
+ name, WEXITSTATUS(status));
return false;
}
} else if(WIFSIGNALED(status)) { /* Child was killed by a signal */
return false;
}
} else if(WIFSIGNALED(status)) { /* Child was killed by a signal */
- logger(LOG_ERR, _("
Process %d (%s) was killed by signal %d (%s)"), pid
,
+ logger(LOG_ERR, _("
Script %s was killed by signal %d (%s)")
,
name, WTERMSIG(status), strsignal(WTERMSIG(status)));
return false;
} else { /* Something strange happened */
name, WTERMSIG(status), strsignal(WTERMSIG(status)));
return false;
} else { /* Something strange happened */
- logger(LOG_ERR, _("Process %d (%s) terminated abnormally"), pid,
- name);
+ logger(LOG_ERR, _("Script %s terminated abnormally"), name);
return false;
}
} else {
return false;
}
} else {
- logger(LOG_ERR, _("System call `%s' failed: %s"), "system",
- strerror(errno));
+ logger(LOG_ERR, _("System call `%s' failed: %s"), "system", strerror(errno));
return false;
}
#endif
return false;
}
#endif