projects
/
m6w6
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
81e8f04
)
Set SASL errors correctly.
author
Brian Aker
<brian@tangent.org>
Sat, 30 Jun 2012 03:12:06 +0000
(20:12 -0700)
committer
Brian Aker
<brian@tangent.org>
Sat, 30 Jun 2012 03:12:06 +0000
(20:12 -0700)
libmemcached/sasl.cc
patch
|
blob
|
history
diff --git
a/libmemcached/sasl.cc
b/libmemcached/sasl.cc
index 3d93b78686b880f7cc20b4376565191f5b783eab..cb609257cac36dc634e9ccef3be56d5ff6697695 100644
(file)
--- a/
libmemcached/sasl.cc
+++ b/
libmemcached/sasl.cc
@@
-74,12
+74,12
@@
static memcached_return_t resolve_names(memcached_instance_st& server, char *lad
if (getsockname(server.fd, (struct sockaddr *)&saddr, &salen) < 0)
{
if (getsockname(server.fd, (struct sockaddr *)&saddr, &salen) < 0)
{
- return memcached_set_err
no(server, MEMCACHED_ERRNO
, MEMCACHED_AT);
+ return memcached_set_err
or(server, MEMCACHED_HOST_LOOKUP_FAILURE
, MEMCACHED_AT);
}
if (getnameinfo((struct sockaddr *)&saddr, salen, host, sizeof(host), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV) < 0)
{
}
if (getnameinfo((struct sockaddr *)&saddr, salen, host, sizeof(host), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV) < 0)
{
- return
MEMCACHED_HOST_LOOKUP_FAILURE
;
+ return
memcached_set_error(server, MEMCACHED_HOST_LOOKUP_FAILURE, MEMCACHED_AT)
;
}
(void)snprintf(laddr, laddr_length, "%s;%s", host, port);
}
(void)snprintf(laddr, laddr_length, "%s;%s", host, port);
@@
-87,7
+87,7
@@
static memcached_return_t resolve_names(memcached_instance_st& server, char *lad
if (getpeername(server.fd, (struct sockaddr *)&saddr, &salen) < 0)
{
if (getpeername(server.fd, (struct sockaddr *)&saddr, &salen) < 0)
{
- return memcached_set_err
no(server, MEMCACHED_ERRNO
, MEMCACHED_AT);
+ return memcached_set_err
or(server, MEMCACHED_HOST_LOOKUP_FAILURE
, MEMCACHED_AT);
}
if (getnameinfo((struct sockaddr *)&saddr, salen, host, sizeof(host),
}
if (getnameinfo((struct sockaddr *)&saddr, salen, host, sizeof(host),