diff options
| -rw-r--r-- | src/charon-cmd/charon-cmd.c | 2 | ||||
| -rw-r--r-- | src/charon-nm/charon-nm.c | 2 | ||||
| -rw-r--r-- | src/charon-tkm/src/charon-tkm.c | 2 | ||||
| -rw-r--r-- | src/charon-tkm/tests/tests.c | 2 | ||||
| -rw-r--r-- | src/charon/charon.c | 2 | ||||
| -rw-r--r-- | src/conftest/conftest.c | 2 | ||||
| -rw-r--r-- | src/frontends/android/jni/libandroidbridge/charonservice.c | 2 | ||||
| -rw-r--r-- | src/frontends/osx/charon-xpc/charon-xpc.c | 2 | ||||
| -rw-r--r-- | src/libcharon/daemon.c | 8 | ||||
| -rw-r--r-- | src/libcharon/daemon.h | 10 |
10 files changed, 13 insertions, 21 deletions
diff --git a/src/charon-cmd/charon-cmd.c b/src/charon-cmd/charon-cmd.c index e7e0c9db0..a70d314af 100644 --- a/src/charon-cmd/charon-cmd.c +++ b/src/charon-cmd/charon-cmd.c @@ -339,7 +339,7 @@ int main(int argc, char *argv[]) exit(SS_RC_INITIALIZATION_FAILED); } atexit(libcharon_deinit); - if (!libcharon_init("charon-cmd")) + if (!libcharon_init()) { exit(SS_RC_INITIALIZATION_FAILED); } diff --git a/src/charon-nm/charon-nm.c b/src/charon-nm/charon-nm.c index 830d44b39..32cec36ec 100644 --- a/src/charon-nm/charon-nm.c +++ b/src/charon-nm/charon-nm.c @@ -183,7 +183,7 @@ int main(int argc, char *argv[]) exit(SS_RC_INITIALIZATION_FAILED); } - if (!libcharon_init("charon-nm")) + if (!libcharon_init()) { dbg_syslog(DBG_DMN, 1, "initialization failed - aborting charon-nm"); goto deinit; diff --git a/src/charon-tkm/src/charon-tkm.c b/src/charon-tkm/src/charon-tkm.c index 1b9fc1cfb..9a22f9ad9 100644 --- a/src/charon-tkm/src/charon-tkm.c +++ b/src/charon-tkm/src/charon-tkm.c @@ -264,7 +264,7 @@ int main(int argc, char *argv[]) exit(status); } - if (!libcharon_init(dmn_name)) + if (!libcharon_init()) { dbg_syslog(DBG_DMN, 1, "initialization failed - aborting %s", dmn_name); goto deinit; diff --git a/src/charon-tkm/tests/tests.c b/src/charon-tkm/tests/tests.c index e6e3f301d..18754c717 100644 --- a/src/charon-tkm/tests/tests.c +++ b/src/charon-tkm/tests/tests.c @@ -51,7 +51,7 @@ static bool test_runner_init(bool init) if (init) { libhydra_init(); - libcharon_init("test_runner"); + libcharon_init(); lib->settings->set_int(lib->settings, "test_runner.filelog.stdout.default", 0); charon->load_loggers(charon, NULL, FALSE); diff --git a/src/charon/charon.c b/src/charon/charon.c index 8a89c763e..089ac4570 100644 --- a/src/charon/charon.c +++ b/src/charon/charon.c @@ -311,7 +311,7 @@ int main(int argc, char *argv[]) exit(SS_RC_INITIALIZATION_FAILED); } - if (!libcharon_init("charon")) + if (!libcharon_init()) { dbg_stderr(DBG_DMN, 1, "initialization failed - aborting charon"); goto deinit; diff --git a/src/conftest/conftest.c b/src/conftest/conftest.c index d26991f9f..ac6d697a5 100644 --- a/src/conftest/conftest.c +++ b/src/conftest/conftest.c @@ -446,7 +446,7 @@ int main(int argc, char *argv[]) library_deinit(); return SS_RC_INITIALIZATION_FAILED; } - if (!libcharon_init("conftest")) + if (!libcharon_init()) { libcharon_deinit(); libhydra_deinit(); diff --git a/src/frontends/android/jni/libandroidbridge/charonservice.c b/src/frontends/android/jni/libandroidbridge/charonservice.c index b50d5ace6..03351b721 100644 --- a/src/frontends/android/jni/libandroidbridge/charonservice.c +++ b/src/frontends/android/jni/libandroidbridge/charonservice.c @@ -626,7 +626,7 @@ JNI_METHOD(CharonVpnService, initializeCharon, jboolean, return FALSE; } - if (!libcharon_init("charon")) + if (!libcharon_init()) { libcharon_deinit(); libipsec_deinit(); diff --git a/src/frontends/osx/charon-xpc/charon-xpc.c b/src/frontends/osx/charon-xpc/charon-xpc.c index 4b7cd3a50..2235be12d 100644 --- a/src/frontends/osx/charon-xpc/charon-xpc.c +++ b/src/frontends/osx/charon-xpc/charon-xpc.c @@ -150,7 +150,7 @@ int main(int argc, char *argv[]) exit(SS_RC_INITIALIZATION_FAILED); } atexit(libcharon_deinit); - if (!libcharon_init("charon-xpc")) + if (!libcharon_init()) { exit(SS_RC_INITIALIZATION_FAILED); } diff --git a/src/libcharon/daemon.c b/src/libcharon/daemon.c index 682b0eef1..0cecd1d3b 100644 --- a/src/libcharon/daemon.c +++ b/src/libcharon/daemon.c @@ -473,7 +473,6 @@ static void destroy(private_daemon_t *this) DESTROY_IF(this->public.bus); this->loggers->destroy_function(this->loggers, (void*)logger_entry_destroy); this->mutex->destroy(this->mutex); - free((void*)this->public.name); free(this); } @@ -558,7 +557,7 @@ METHOD(daemon_t, initialize, bool, /** * Create the daemon. */ -private_daemon_t *daemon_create(const char *name) +private_daemon_t *daemon_create() { private_daemon_t *this; @@ -569,7 +568,6 @@ private_daemon_t *daemon_create(const char *name) .load_loggers = _load_loggers, .set_level = _set_level, .bus = bus_create(), - .name = strdup(name ?: "libcharon"), }, .loggers = linked_list_create(), .mutex = mutex_create(MUTEX_TYPE_DEFAULT), @@ -607,7 +605,7 @@ void libcharon_deinit() /** * Described in header. */ -bool libcharon_init(const char *name) +bool libcharon_init() { private_daemon_t *this; @@ -618,7 +616,7 @@ bool libcharon_init(const char *name) return !this->integrity_failed; } - this = daemon_create(name); + this = daemon_create(); /* for uncritical pseudo random numbers */ srandom(time(NULL) + getpid()); diff --git a/src/libcharon/daemon.h b/src/libcharon/daemon.h index 24e623c44..36242bb04 100644 --- a/src/libcharon/daemon.h +++ b/src/libcharon/daemon.h @@ -272,11 +272,6 @@ struct daemon_t { #endif /* ME */ /** - * Name of the binary that uses the library (used for settings etc.) - */ - const char *name; - - /** * Initialize the daemon. * * @param plugins list of plugins to load @@ -324,12 +319,11 @@ extern daemon_t *charon; * calling initialize(). * * libcharon_init() may be called multiple times in a single process, but each - * caller should call libcharon_deinit() for each call to libcharon_init(). + * caller must call libcharon_deinit() for each call to libcharon_init(). * - * @param name name of the binary that uses the library * @return FALSE if integrity check failed */ -bool libcharon_init(const char *name); +bool libcharon_init(); /** * Deinitialize libcharon and destroy the "charon" instance of daemon_t. |