Bug 150642. Return additional error codes when store is locked

This commit is contained in:
Jim Norman 2006-02-22 20:39:52 +00:00
parent 97cfe5dd7b
commit ae84c5f595
10 changed files with 31 additions and 18 deletions

View File

@ -1,15 +1,23 @@
-------------------------------------------------------------------
Mon Feb 21 16:25:20 MST 2006 - jnorman@novell.com
Tue Feb 22 13:33:20 MST 2006 - jnorman@novell.com
- Bug 150642. Return additional error codes when store is locked
-------------------------------------------------------------------
Tue Feb 22 10:25:20 MST 2006 - jnorman@novell.com
- Remove build dependency on krb5-devel and libgssapi
-------------------------------------------------------------------
Tue Feb 21 16:25:20 MST 2006 - jnorman@novell.com
- Bug 141689. Windows: change mouse handler for notifyicon to mouse
down event.
- Bug: Windows, start service at post install.
-------------------------------------------------------------------
Mon Feb 21 12:22:17 MST 2006 - jnorman@novell.com
Tue Feb 21 12:22:17 MST 2006 - jnorman@novell.com
- Bug 141651. On windows, uninstalls will kill CASAManager too.
-------------------------------------------------------------------
Mon Feb 21 12:05:17 MST 2006 - jnorman@novell.com
Tue Feb 21 12:05:17 MST 2006 - jnorman@novell.com
- Bug 148945. Handle the case were micasad is restarted, before
a user sets their master password

View File

@ -26,15 +26,14 @@
#define WINDOWS_LOGIN_ID 1
// return codes
#define MAX_RETURN_CODE 21
int32_t static gReturnCodes[21] = {
#define MAX_RETURN_CODE 27
int32_t static gReturnCodes[27] = {
NSSCS_SUCCESS, //SSCS_REPLY_SUCCESS 0
NSSCS_E_INVALID_PARAM, //SSCS_E_INVALID_MESSAGE -1
NSSCS_E_INCOMPATIBLE_VERSION, //SSCS_E_VERSION_NOT_SUPPORTED -2
NSSCS_E_SYSTEM_FAILURE, //SSCS_E_SYSTEM_ERROR -3
NSSCS_E_SERVICE_NOT_SUPPORTED, //SSCS_E_REPLY_NOT_AVAILABLE -4
NSSCS_E_INVALID_SECRET_ID, // REQUIRES New
//SSCS_E_INVALID_KEYCHAIN -5
NSSCS_E_INVALID_SECRET_ID, // REQUIRES New SSCS_E_INVALID_KEYCHAIN -5
NSSCS_E_INVALID_SECRET_ID, //SSCS_E_INVALID_SECRETID -6
NSSCS_E_SECRET_ID_EXISTS, // REQUIRES NEW -//SSCS_E_KEYCHAIN_ALREADY_EXISTS -7
NSSCS_E_SYSTEM_FAILURE, //SSCS_E_MAX_KEYCHAINS_REACHED -8
@ -50,6 +49,12 @@ int32_t static gReturnCodes[21] = {
NSSCS_E_SYSTEM_FAILURE, //SSCS_E_CREATE_SOCKET_FAILED -18
NSSCS_E_INVALID_SECRET_ID, //SSCS_E_SECRETID_DOES_NOT_EXIST -19
NSSCS_E_INVALID_PARAM, //SSCS_E_INVALID_INPUT -20
NSSCS_E_SYSTEM_FAILURE, //SSCS_E_SETTING_PASSCODE_FAILED -21
NSSCS_E_SYSTEM_FAILURE, //SSCS_STORE_IS_PERSISTENT -22;
NSSCS_E_SYSTEM_FAILURE, //SSCS_STORE_IS_NOT_PERSISTENT = -23;
NSSCS_E_SYSTEM_FAILURE, //SSCS_SECRET_IS_PERSISTENT = -24;
NSSCS_E_SYSTEM_FAILURE, //SSCS_SECRET_IS_NOT_PERSISTENT = -25;
NSSCS_E_ACCESS_DENIED //SSCS_SECRET_STORE_IS_LOCKED = -26;
};
/*-----------------------------------------------------------------------------

View File

@ -53,8 +53,7 @@ namespace sscs.constants
internal static int SSCS_STORE_IS_NOT_PERSISTENT = -23;
internal static int SSCS_SECRET_IS_PERSISTENT = -24;
internal static int SSCS_SECRET_IS_NOT_PERSISTENT = -25;
internal static int SSCS_SECRET_STORE_IS_LOCKED = -26;
internal static int SSCS_SECRET_STORE_IS_LOCKED = -26;
}
internal class ReqMsgId

View File

@ -135,7 +135,7 @@ namespace sscs.verbs
}
}
else
retCode = IPCRetCodes.SSCS_E_SECRETID_DOES_NOT_EXIST;
retCode = IPCRetCodes.SSCS_SECRET_STORE_IS_LOCKED;
}
catch(UserNotInSessionException)

View File

@ -136,7 +136,7 @@ namespace sscs.verbs
}
}
else
retCode = IPCRetCodes.SSCS_E_SECRETID_DOES_NOT_EXIST;
retCode = IPCRetCodes.SSCS_SECRET_STORE_IS_LOCKED;
}
catch(UserNotInSessionException)

View File

@ -125,7 +125,7 @@ namespace sscs.verbs
}
}
else
retCode = IPCRetCodes.SSCS_E_SECRETID_DOES_NOT_EXIST;
retCode = IPCRetCodes.SSCS_SECRET_STORE_IS_LOCKED;
}
catch(UserNotInSessionException)

View File

@ -218,8 +218,8 @@ namespace sscs.verbs
}
}
else
{
// do nothing
{
retCode = IPCRetCodes.SSCS_SECRET_STORE_IS_LOCKED;
}
}

View File

@ -218,8 +218,8 @@ namespace sscs.verbs
}
}
else
{
// do nothing
{
retCode = IPCRetCodes.SSCS_SECRET_STORE_IS_LOCKED;
}
}

View File

@ -204,8 +204,8 @@ namespace sscs.verbs
}
}
else
{
// do nothing
{
retCode = IPCRetCodes.SSCS_SECRET_STORE_IS_LOCKED;
}
}
catch(UserNotInSessionException)

View File

@ -67,6 +67,7 @@
#define SSCS_STORE_IS_NOT_PERSISTENT -23
#define SSCS_SECRET_IS_PERSISTENT -24
#define SSCS_SECRET_IS_NOT_PERSISTENT -25
#define SSCS_STORE_IS_LOCKED -26
#define SSCS_E_INCORRECT_FUNCTION_CALL_SEQUENCE -30