From cbd8ab4be0e2140f6d74b650666d88727a6b06ac Mon Sep 17 00:00:00 2001 From: Jim Norman Date: Thu, 4 May 2006 19:37:46 +0000 Subject: [PATCH] Bug 172719: Clean debug out. --- CASA.changes | 12 ++++++---- .../lib/communication/MiCasaRequestReply.cs | 3 ++- c_sharp/NSSCSWrapper/NativeCalls.cs | 23 ++++++++++++++----- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/CASA.changes b/CASA.changes index f554b806..94f77e24 100644 --- a/CASA.changes +++ b/CASA.changes @@ -1,5 +1,9 @@ ------------------------------------------------------------------- -Thu May 4 21:30:25 IST 2006 - smanojna@novell.com +Thu May 04 13:32:25 MST 2006 - jnorman@novell.com +- Bug 172719: Clean debug out. + +------------------------------------------------------------------- +Thu May 04 21:30:25 IST 2006 - smanojna@novell.com - Description: 1. Fixed Bug 152929: Secret with special characters in name causing @@ -14,7 +18,7 @@ Thu May 4 21:30:25 IST 2006 - smanojna@novell.com c_gui/Firefox.cs ------------------------------------------------------------------- -Thu May 4 17:38:25 IST 2006 - smanojna@novell.com +Thu May 04 17:38:25 IST 2006 - smanojna@novell.com - Description: 1. Fixed Bug 170854: CASAGui only allows one edit at a time. @@ -35,7 +39,7 @@ Thu May 4 17:38:25 IST 2006 - smanojna@novell.com c_gui/Common.cs ------------------------------------------------------------------- -Thu May 4 15:23:17 IST 2006 - smanojna@novell.com +Thu May 04 15:23:17 IST 2006 - smanojna@novell.com - Description: 1. Added dialog-modal property for change master password dialog. @@ -47,7 +51,7 @@ Thu May 4 15:23:17 IST 2006 - smanojna@novell.com c_gui/CommonGUI.cs ------------------------------------------------------------------- -Thu May 4 09:36:04 IST 2006 - smanojna@novell.com +Thu May 04 09:36:04 IST 2006 - smanojna@novell.com - Description: 1. Removed references to support for Mac OS from rpm spec files. 2. Fixed an invalid in Contents.htm file. diff --git a/c_micasad/lib/communication/MiCasaRequestReply.cs b/c_micasad/lib/communication/MiCasaRequestReply.cs index aa32c62f..25c3f6db 100644 --- a/c_micasad/lib/communication/MiCasaRequestReply.cs +++ b/c_micasad/lib/communication/MiCasaRequestReply.cs @@ -55,6 +55,7 @@ namespace Novell.CASA.MiCasa.Communication public const int VERB_GET_KEY_LIST = 17; public const int VERB_RESET_MASTER_PASSWORD = 18; public const int VERB_GET_SECRETIDS = 19; + public const int VERB_VALIDATE_DESKTOP_PWD = 20; public const int VERB_DUMP_LINKED_KEYS = 96; public const int VERB_CREATE_TEST_SECRETS = 97; @@ -169,7 +170,7 @@ namespace Novell.CASA.MiCasa.Communication } catch (Exception e1) { - Console.WriteLine(e1.ToString()); + //Console.WriteLine(e1.ToString()); //clientConnection.Dispose(); //throw new Exception(e1.ToString()); } diff --git a/c_sharp/NSSCSWrapper/NativeCalls.cs b/c_sharp/NSSCSWrapper/NativeCalls.cs index dc359083..ab2023c4 100644 --- a/c_sharp/NSSCSWrapper/NativeCalls.cs +++ b/c_sharp/NSSCSWrapper/NativeCalls.cs @@ -901,7 +901,7 @@ namespace Novell.CASA catch(Exception e) { rcode = -803; - Console.WriteLine(e.ToString()); + //Console.WriteLine(e.ToString()); } } } @@ -1105,7 +1105,7 @@ namespace Novell.CASA } catch (Exception e) { - Console.WriteLine(e.ToString()); + //Console.WriteLine(e.ToString()); Marshal.FreeHGlobal(pCredential); throw new miCasaException(-803); } @@ -1277,7 +1277,7 @@ namespace Novell.CASA } catch(Exception e) { - Console.WriteLine(e.ToString()); + //Console.WriteLine(e.ToString()); } return rcode; } @@ -1309,7 +1309,7 @@ namespace Novell.CASA } catch (Exception e) { - Console.WriteLine(e.ToString()); + //Console.WriteLine(e.ToString()); } @@ -1408,7 +1408,7 @@ namespace Novell.CASA } catch(Exception e) { - Console.WriteLine(e.ToString()); + //Console.WriteLine(e.ToString()); keyList = null; } return keyList; @@ -1438,7 +1438,7 @@ namespace Novell.CASA catch (Exception e) { // rcode = -803; - Console.WriteLine(e.ToString()); + //Console.WriteLine(e.ToString()); } } return value; @@ -1488,6 +1488,17 @@ namespace Novell.CASA else return true; } + + internal static bool ValidateDesktopPwd(string sPassword) + { + string sResult = (string)MiCasa.Communication.MiCasaRequestReply.Send(MiCasaRequestReply.VERB_VALIDATE_DESKTOP_PWD, null, null, null, sPassword); + + if (sResult.Equals("true")) + return true; + else + return false; + + } } }