From 49d858ace539e0947b509c43b032b3faf6a9d694 Mon Sep 17 00:00:00 2001
From: Fredrik Thulin <fredrik@thulin.net>
Date: Fri, 14 Dec 2012 13:01:56 +0100
Subject: [PATCH] gck_rpc_layer_initialize: Improve error reporting.
---
gck-rpc-dispatch.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/gck-rpc-dispatch.c b/gck-rpc-dispatch.c
index da802c1..5ed7979 100644
--- a/gck-rpc-dispatch.c
+++ b/gck-rpc-dispatch.c
@@ -2298,15 +2298,13 @@ int gck_rpc_layer_initialize(const char *prefix, CK_FUNCTION_LIST_PTR module)
const char *ip;
ip = strdup(prefix + 6);
- if (ip)
- p = strchr(ip, ':');
-
- if (!ip) {
- gck_rpc_warn("invalid syntax for pkcs11 socket : %s",
- prefix);
+ if (ip == NULL) {
+ gck_rpc_warn("out of memory");
return -1;
}
+ p = strchr(ip, ':');
+
if (p) {
*p = '\0';
port = strtol(p + 1, NULL, 0);
@@ -2323,7 +2321,7 @@ int gck_rpc_layer_initialize(const char *prefix, CK_FUNCTION_LIST_PTR module)
if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,
(char *)&one, sizeof (one)) == -1) {
- gck_rpc_warn("couldn't create set pkcs11 "
+ gck_rpc_warn("couldn't set pkcs11 "
"socket options : %s", strerror (errno));
return -1;
}
@@ -2331,7 +2329,7 @@ int gck_rpc_layer_initialize(const char *prefix, CK_FUNCTION_LIST_PTR module)
if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
(char *)&one, sizeof(one)) == -1) {
gck_rpc_warn
- ("couldn't create set pkcs11 socket options : %s",
+ ("couldn't set pkcs11 socket options : %s",
strerror(errno));
return -1;
}
--
GitLab