config: remove support for SSO_SECRET_PATH environment variable

diff --git a/src/common/gsignond-config.c b/src/common/gsignond-config.c
index b676a73..855777d 100644 (file)
--- a/src/common/gsignond-config.c
+++ b/src/common/gsignond-config.c
@@ -282,12 +282,6 @@ _load_environment (GSignondConfig *self)
     e_val = g_getenv ("SSO_STORAGE_PATH");
     if (e_val)
         _set_storage_path (self, e_val);
-
-    e_val = g_getenv ("SSO_SECRET_PATH");
-    if (e_val)
-        gsignond_config_set_string (self,
-                                    GSIGNOND_CONFIG_GENERAL_SECURE_DIR,
-                                    e_val);
 }
 #endif  /* ENABLE_DEBUG */
 

diff --git a/test/common/Makefile.am b/test/common/Makefile.am
index a6c6885..a43367c 100644 (file)
--- a/test/common/Makefile.am
+++ b/test/common/Makefile.am
@@ -2,7 +2,6 @@ TESTS = commontest
 TESTS_ENVIRONMENT= SSO_PLUGINS_DIR=$(top_builddir)/src/plugins/.libs \
     SSO_BIN_DIR=$(top_builddir)/src/daemon/.libs \
     SSO_STORAGE_PATH=/tmp/gsignond \
-    SSO_SECRET_PATH=/tmp/gsignond \
     LD_LIBRARY_PATH="$(top_builddir)/src/daemon/plugins/plugind/.libs:$(top_builddir)/src/common/.libs:$(top_builddir)/src/common/db/.libs:$(top_builddir)/src/daemon/.libs:$(top_builddir)/src/daemon/db/.libs:$(top_builddir)/src/daemon/dbus/.libs:$(top_builddir)/src/daemon/plugins/.libs"
 
 VALGRIND_TESTS_DISABLE=

diff --git a/test/daemon/daemon-test.c b/test/daemon/daemon-test.c
index e9a9a3b..2f4e470 100644 (file)
--- a/test/daemon/daemon-test.c
+++ b/test/daemon/daemon-test.c
@@ -97,7 +97,6 @@ setup_daemon (void)
     fail_if (g_setenv ("SSO_DAEMON_TIMEOUT", "5", TRUE) == FALSE);
     fail_if (g_setenv ("SSO_AUTH_SESSION_TIMEOUT", "5", TRUE) == FALSE);
     fail_if (g_setenv ("SSO_STORAGE_PATH", "/tmp/gsignond", TRUE) == FALSE);
-    fail_if (g_setenv ("SSO_SECRET_PATH", "/tmp/gsignond", TRUE) == FALSE);
     fail_if (g_setenv ("SSO_KEYCHAIN_SYSCTX", exe_name, TRUE) == FALSE);
     fail_if (g_setenv ("SSO_PLUGIN_TIMEOUT", "5", TRUE) == FALSE);
 
@@ -207,7 +206,6 @@ teardown_daemon (void)
     g_unsetenv ("SSO_DAEMON_TIMEOUT");
     g_unsetenv ("SSO_AUTH_SESSION_TIMEOUT");
     g_unsetenv ("SSO_STORAGE_PATH");
-    g_unsetenv ("SSO_SECRET_PATH");
     g_unsetenv ("SSO_KEYCHAIN_SYSCTX");
 }
 

diff --git a/test/db/Makefile.am b/test/db/Makefile.am
index 94574f2..5301171 100644 (file)
--- a/test/db/Makefile.am
+++ b/test/db/Makefile.am
@@ -1,6 +1,5 @@
 TESTS = dbtest
-TESTS_ENVIRONMENT= SSO_STORAGE_PATH=/tmp/gsignond \
-    SSO_SECRET_PATH=/tmp/gsignond
+TESTS_ENVIRONMENT= SSO_STORAGE_PATH=/tmp/gsignond 
 
 VALGRIND_TESTS_DISABLE=
 

diff --git a/test/db/dbtest.c b/test/db/dbtest.c
index c154238..72d830a 100644 (file)
--- a/test/db/dbtest.c
+++ b/test/db/dbtest.c
@@ -400,7 +400,6 @@ _gsignond_query_read_string (
 START_TEST (test_sql_database)
 {
     GSignondDbSecretDatabase *database = NULL;
-    GSignondConfig *config = NULL;
     gchar *filename = NULL;
     const gchar *dir = NULL;
     GSignondCredentials *creds = NULL;
@@ -436,12 +435,7 @@ START_TEST (test_sql_database)
     fail_unless (gsignond_db_secret_database_remove_data (
             database, 1, 2) == FALSE);
 
-    config = gsignond_config_new ();
-    dir = gsignond_config_get_string (config,
-            GSIGNOND_CONFIG_GENERAL_SECURE_DIR);
-    if (!dir) {
-        dir = g_get_user_cache_dir ();
-    }
+    dir = "/tmp/gsignond";
     g_mkdir_with_parents (dir, S_IRWXU);
     filename = g_build_filename (dir, "sql_db_test.db", NULL);
     fail_unless (gsignond_db_sql_database_open (sqldb, filename,
@@ -450,7 +444,6 @@ START_TEST (test_sql_database)
     fail_unless (gsignond_db_sql_database_open (sqldb, filename,
             SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE) == TRUE);
     g_free (filename);
-    g_object_unref(config);
 
     creds = gsignond_credentials_new ();
     fail_if (creds == NULL);
@@ -616,6 +609,8 @@ START_TEST (test_secret_storage)
     const gchar *dir = NULL;
 
     config = gsignond_config_new ();
+    gsignond_config_set_string (config, GSIGNOND_CONFIG_GENERAL_SECURE_DIR, "/tmp/gsignond");
+    
     /* Secret Storage */
     storage = g_object_new (GSIGNOND_TYPE_SECRET_STORAGE,
             "config", config, NULL);
@@ -719,6 +714,7 @@ START_TEST (test_metadata_database)
     GSignondSecurityContext *owner = NULL;
 
     config = gsignond_config_new ();
+    gsignond_config_set_string (config, GSIGNOND_CONFIG_GENERAL_SECURE_DIR, "/tmp/gsignond");
     GSignondDbMetadataDatabase* metadata_db = NULL;
     metadata_db = gsignond_db_metadata_database_new (config);
     g_object_unref(config);
@@ -893,6 +889,7 @@ START_TEST (test_credentials_database)
     GSignondDictionary *no_cap_filter = NULL;
 
     config = gsignond_config_new ();
+    gsignond_config_set_string (config, GSIGNOND_CONFIG_GENERAL_SECURE_DIR, "/tmp/gsignond");
     storage = g_object_new (GSIGNOND_TYPE_SECRET_STORAGE,
             "config", config, NULL);
     g_object_unref(config);

diff --git a/test/plugins/Makefile.am b/test/plugins/Makefile.am
index 90b02ea..4b77125 100644 (file)
--- a/test/plugins/Makefile.am
+++ b/test/plugins/Makefile.am
@@ -3,7 +3,6 @@ TESTS = digestplugintest passwordplugintest pluginproxytest pluginremotetest
 TESTS_ENVIRONMENT= SSO_PLUGINS_DIR=$(top_builddir)/src/plugins/.libs \
        SSO_BIN_DIR=$(top_builddir)/src/daemon/.libs \
     SSO_STORAGE_PATH=/tmp/gsignond \
-    SSO_SECRET_PATH=/tmp/gsignond \
     LD_LIBRARY_PATH="$(top_builddir)/src/daemon/plugins/plugind/.libs:$(top_builddir)/src/common/.libs:$(top_builddir)/src/common/db/.libs:$(top_builddir)/src/daemon/.libs:$(top_builddir)/src/daemon/db/.libs:$(top_builddir)/src/daemon/dbus/.libs:$(top_builddir)/src/daemon/plugins/.libs"
 
 VALGRIND_TESTS_DISABLE =

diff --git a/tools/run-tests.sh b/tools/run-tests.sh
index 0d271d4..6ed0257 100755 (executable)
--- a/tools/run-tests.sh
+++ b/tools/run-tests.sh
@@ -1,7 +1,6 @@
 #Environment variables for the tests
 export G_MESSAGES_DEBUG=all
 export SSO_STORAGE_PATH=/tmp/gsignond
-export SSO_SECRET_PATH=/tmp/gsignond
 
 rm -rf "$SSO_STORAGE_PATH"
 

diff --git a/tools/setup-and-start-daemon.sh b/tools/setup-and-start-daemon.sh
index a7ecd8b..62dc071 100755 (executable)
--- a/tools/setup-and-start-daemon.sh
+++ b/tools/setup-and-start-daemon.sh
@@ -16,7 +16,6 @@ fi
 
 killall gsignond
 
-export SSO_SECRET_PATH="/tmp/gsignond"
 export SSO_STORAGE_PATH="/tmp/gsignond"
 if [ -f "$SRC_HOME/test/daemon/.libs/lt-daemontest" ] ; then
 export SSO_KEYCHAIN_SYSCTX="$SRC_HOME/test/daemon/.libs/lt-daemontest"