projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6f6f426
)
Start a tinc service if it already exists.
author
Guus Sliepen
<guus@tinc-vpn.org>
Sun, 1 Nov 2009 14:57:28 +0000
(15:57 +0100)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Sun, 1 Nov 2009 14:57:28 +0000
(15:57 +0100)
src/process.c
patch
|
blob
|
history
diff --git
a/src/process.c
b/src/process.c
index
01ebe49
..
6d0e499
100644
(file)
--- a/
src/process.c
+++ b/
src/process.c
@@
-103,13
+103,18
@@
bool install_service(void) {
command, NULL, NULL, NULL, NULL, NULL);
if(!service) {
command, NULL, NULL, NULL, NULL, NULL);
if(!service) {
- logger(LOG_ERR, "Could not create %s service: %s", identname, winerror(GetLastError()));
- return false;
+ DWORD lasterror = GetLastError();
+ logger(LOG_ERR, "Could not create %s service: %s", identname, winerror(lasterror));
+ if(lasterror != ERROR_SERVICE_EXISTS)
+ return false;
}
}
- ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &description);
-
- logger(LOG_INFO, "%s service installed", identname);
+ if(service) {
+ ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &description);
+ logger(LOG_INFO, "%s service installed", identname);
+ } else {
+ service = OpenService(manager, identname, SERVICE_ALL_ACCESS);
+ }
if(!StartService(service, 0, NULL))
logger(LOG_WARNING, "Could not start %s service: %s", identname, winerror(GetLastError()));
if(!StartService(service, 0, NULL))
logger(LOG_WARNING, "Could not start %s service: %s", identname, winerror(GetLastError()));