From a76a746d5b7512829dd9f74e2b0f1af719d16332 Mon Sep 17 00:00:00 2001 From: Jim Norman Date: Fri, 20 Jan 2006 20:49:03 +0000 Subject: [PATCH] Attempt unlocking all gnome-keyrings --- CASA.changes | 5 +++++ c_micasad/cache/SecretStore.cs | 15 +++++++++++++++ make/defaults.lux | 2 +- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/CASA.changes b/CASA.changes index 99547964..3838d104 100644 --- a/CASA.changes +++ b/CASA.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 20 13:20:34 MST 2006 - jnorman@novell.com + +- Attempt unlocking all gnome-keyrings at login time. + ------------------------------------------------------------------- Thu Jan 20 11:39:34 MST 2006 - jnorman@novell.com diff --git a/c_micasad/cache/SecretStore.cs b/c_micasad/cache/SecretStore.cs index e1b1bc1c..27e7de2c 100644 --- a/c_micasad/cache/SecretStore.cs +++ b/c_micasad/cache/SecretStore.cs @@ -35,6 +35,10 @@ using sscs.constants; using sscs.lss; using sscs.crypto; +#if LINUX +using Novell.CASA.DataEngines.GK; +#endif + namespace sscs.cache { class SecretStore @@ -141,6 +145,17 @@ namespace sscs.cache internal bool StartPersistenceByDesktopPasswd(string desktopPasswd) { CSSSLogger.DbgLog("StartPersistenceByDesktopPasswd - Called"); +#if LINUX + // attempt unlock of gnome-keyring rings + try + { + GnomeKeyring.AttemptGKUnlock(desktopPasswd); + } + catch (Exception e) + { + CSSSLogger.DbgLog(e.ToString()); + } +#endif // make sure we have a user home directory if (GetUserHomeDirectory() == null || GetUserHomeDirectory().Length < 1) { diff --git a/make/defaults.lux b/make/defaults.lux index 8730ad9d..d5a63efd 100644 --- a/make/defaults.lux +++ b/make/defaults.lux @@ -52,7 +52,7 @@ ifeq ($(module),adlib) endif ifeq ($(module),csssd) - CFLAGS = -lib:../c_micasad/test/dependencies/ /r:Mono.Posix.dll /r:nunit.core.dll /r:nunit.framework.dll /r:nunit.extensions.dll /r:nunit.util.dll /r:nunit.mocks.dll /r:nunit.mocks.dll -lib:"$(CSLIBDIR)" /r:Novell.CASA.Common.dll + CFLAGS = -lib:../c_micasad/test/dependencies/ /r:Mono.Posix.dll /r:nunit.core.dll /r:nunit.framework.dll /r:nunit.extensions.dll /r:nunit.util.dll /r:nunit.mocks.dll /r:nunit.mocks.dll -lib:"$(CSLIBDIR)" /r:Novell.CASA.DataEngines.GnomeKeyring.dll /r:Novell.CASA.Common.dll OFILE = -out:"$(CSBINDIR)$@"exe EXT = bin endif