libhydra: Remove unused hydra->daemon

diff --git a/src/charon-cmd/charon-cmd.c b/src/charon-cmd/charon-cmd.c
index 13f97856fa6f2ab3dec49b0009971a08df9ed8c2..e7e0c9db0d721210aa10dd9dd471a6d732eefaf8 100644 (file)
--- a/src/charon-cmd/charon-cmd.c
+++ b/src/charon-cmd/charon-cmd.c
@@ -334,7 +334,7 @@ int main(int argc, char *argv[])
                }
        }
        atexit(libhydra_deinit);
-       if (!libhydra_init("charon-cmd"))
+       if (!libhydra_init())
        {
                exit(SS_RC_INITIALIZATION_FAILED);
        }

diff --git a/src/charon-nm/charon-nm.c b/src/charon-nm/charon-nm.c
index 12667ab196f6b201f9a110edb3f20a35dedce749..830d44b390e3171fdadb686e51de2f5376390bb7 100644 (file)
--- a/src/charon-nm/charon-nm.c
+++ b/src/charon-nm/charon-nm.c
@@ -175,7 +175,7 @@ int main(int argc, char *argv[])
                exit(SS_RC_DAEMON_INTEGRITY);
        }
 
-       if (!libhydra_init("charon-nm"))
+       if (!libhydra_init())
        {
                dbg_syslog(DBG_DMN, 1, "initialization failed - aborting charon-nm");
                libhydra_deinit();

diff --git a/src/charon-tkm/src/charon-tkm.c b/src/charon-tkm/src/charon-tkm.c
index 1e9fecd2d87f1042ca259e6f905f838e2a899f49..1b9fc1cfbefd539c3793fa7686978411f74e28fc 100644 (file)
--- a/src/charon-tkm/src/charon-tkm.c
+++ b/src/charon-tkm/src/charon-tkm.c
@@ -256,7 +256,7 @@ int main(int argc, char *argv[])
                exit(status);
        }
 
-       if (!libhydra_init(dmn_name))
+       if (!libhydra_init())
        {
                dbg_syslog(DBG_DMN, 1, "initialization failed - aborting %s", dmn_name);
                libhydra_deinit();

diff --git a/src/charon-tkm/tests/tests.c b/src/charon-tkm/tests/tests.c
index 5bbacacf3301d3d6e5684c1734c5dcf984f46337..7a25565475b5ade7fe4e7dab5dac592a836aca6a 100644 (file)
--- a/src/charon-tkm/tests/tests.c
+++ b/src/charon-tkm/tests/tests.c
@@ -50,7 +50,7 @@ static bool test_runner_init(bool init)
 
        if (init)
        {
-               libhydra_init("test_runner");
+               libhydra_init();
                libcharon_init("test_runner");
                lib->settings->set_int(lib->settings,
                                                           "test_runner.filelog.stdout.default", 0);

diff --git a/src/charon/charon.c b/src/charon/charon.c
index d799691259135e71222e5e73f58c7c4eef0ef060..8a89c763e28d461176b7751c9b087a9a892511d0 100644 (file)
--- a/src/charon/charon.c
+++ b/src/charon/charon.c
@@ -303,7 +303,7 @@ int main(int argc, char *argv[])
                exit(SS_RC_DAEMON_INTEGRITY);
        }
 
-       if (!libhydra_init("charon"))
+       if (!libhydra_init())
        {
                dbg_stderr(DBG_DMN, 1, "initialization failed - aborting charon");
                libhydra_deinit();

diff --git a/src/conftest/conftest.c b/src/conftest/conftest.c
index d935058cbf2c4f2119d36bcdc154acf9eaf01e05..d26991f9f40b7790348a928e1efe4d4f7d5c1df6 100644 (file)
--- a/src/conftest/conftest.c
+++ b/src/conftest/conftest.c
@@ -440,7 +440,7 @@ int main(int argc, char *argv[])
                library_deinit();
                return SS_RC_LIBSTRONGSWAN_INTEGRITY;
        }
-       if (!libhydra_init("conftest"))
+       if (!libhydra_init())
        {
                libhydra_deinit();
                library_deinit();

diff --git a/src/frontends/android/jni/libandroidbridge/charonservice.c b/src/frontends/android/jni/libandroidbridge/charonservice.c
index d5a68bbc1de1b3d537db9a0970ae21aab4634bd7..b50d5ace66063c05d68e949bc60e5fcf59e718dd 100644 (file)
--- a/src/frontends/android/jni/libandroidbridge/charonservice.c
+++ b/src/frontends/android/jni/libandroidbridge/charonservice.c
@@ -611,7 +611,7 @@ JNI_METHOD(CharonVpnService, initializeCharon, jboolean,
        set_options(logfile);
        free(logfile);
 
-       if (!libhydra_init("charon"))
+       if (!libhydra_init())
        {
                libhydra_deinit();
                library_deinit();

diff --git a/src/frontends/osx/charon-xpc/charon-xpc.c b/src/frontends/osx/charon-xpc/charon-xpc.c
index 74ad2140bbe9b5a7fd78517fbe04caabac6bde46..4b7cd3a503e1ed737e7f90dc044a025c93a43fe1 100644 (file)
--- a/src/frontends/osx/charon-xpc/charon-xpc.c
+++ b/src/frontends/osx/charon-xpc/charon-xpc.c
@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
                }
        }
        atexit(libhydra_deinit);
-       if (!libhydra_init("charon-xpc"))
+       if (!libhydra_init())
        {
                exit(SS_RC_INITIALIZATION_FAILED);
        }

diff --git a/src/libhydra/hydra.c b/src/libhydra/hydra.c
index f531bd5f4f89e1f424f0da2bb53c9892dd47955e..1b50650815bea307bfc5b20759c821dcf0b5dee9 100644 (file)
--- a/src/libhydra/hydra.c
+++ b/src/libhydra/hydra.c
@@ -59,7 +59,6 @@ void libhydra_deinit()
 
        this->public.attributes->destroy(this->public.attributes);
        this->public.kernel_interface->destroy(this->public.kernel_interface);
-       free((void*)this->public.daemon);
        free(this);
        hydra = NULL;
 }
@@ -67,7 +66,7 @@ void libhydra_deinit()
 /**
  * Described in header.
  */
-bool libhydra_init(const char *daemon)
+bool libhydra_init()
 {
        private_hydra_t *this;
 
@@ -81,7 +80,6 @@ bool libhydra_init(const char *daemon)
        INIT(this,
                .public = {
                        .attributes = attribute_manager_create(),
-                       .daemon = strdup(daemon ?: "libhydra"),
                },
                .ref = 1,
        );

diff --git a/src/libhydra/hydra.h b/src/libhydra/hydra.h
index 2a8709d72eb13f61a8eeb4ff7f78ac3a9f76d901..94209ff59e3ff1cc7376332ae39bb0101a5d4144 100644 (file)
--- a/src/libhydra/hydra.h
+++ b/src/libhydra/hydra.h
@@ -53,11 +53,6 @@ struct hydra_t {
         * kernel interface to communicate with kernel
         */
        kernel_interface_t *kernel_interface;
-
-       /**
-        * name of the daemon that initialized the library
-        */
-       const char *daemon;
 };
 
 /**
@@ -70,15 +65,12 @@ extern hydra_t *hydra;
 /**
  * Initialize libhydra.
  *
- * The daemon's name is used to load daemon-specific settings.
- *
  * libhydra_init() may be called multiple times in a single process, but each
- * caller should call libhydra_deinit() for each call to libhydra_init().
+ * caller must call libhydra_deinit() for each call to libhydra_init().
  *
- * @param daemon               name of the daemon that initializes the library
  * @return                             FALSE if integrity check failed
  */
-bool libhydra_init(const char *daemon);
+bool libhydra_init();
 
 /**
  * Deinitialize libhydra.

diff --git a/src/starter/starter.c b/src/starter/starter.c
index 87ad66dd921b064af71e0ff8609f02dd4e381141..33916c95c57560ba2e26215bfa669e84daed3b4b 100644 (file)
--- a/src/starter/starter.c
+++ b/src/starter/starter.c
@@ -422,7 +422,7 @@ int main (int argc, char **argv)
        library_init(NULL, "starter");
        atexit(library_deinit);
 
-       libhydra_init("starter");
+       libhydra_init();
        atexit(libhydra_deinit);
 
        /* parse command line */