#include "rsync.h"
+static const char default_name[] = "UNKNOWN";
+
static int lookup_name(const struct sockaddr_storage *ss,
socklen_t ss_len,
char *name_buf, size_t name_buf_len,
static int check_name(const struct sockaddr_storage *ss,
socklen_t ss_len,
- const char *name_buf,
+ char *name_buf,
const char *port_buf);
/* Establish a proxy connection on an open socket to a web roxy by
*
* The name is statically cached so that repeated lookups are quick,
* so there is a limit of one lookup per customer.
+ *
+ * If anything goes wrong, including the name->addr->name check, then
+ * we just use "UNKNOWN", so you can use that value in hosts allow
+ * lines.
**/
char *client_name(int fd)
{
if (initialised) return name_buf;
+ strcpy(name_buf, default_name);
initialised = 1;
if (getpeername(fd, (struct sockaddr *)&ss, &ss_len)) {
char *port_buf, size_t port_buf_len)
{
int name_err;
- const char *def = "UNKNOWN";
#ifdef INET6
if (get_sockaddr_family(ss) == AF_INET6 &&
#endif
/* reverse lookup */
- if (!(name_err = getnameinfo((struct sockaddr *) ss, ss_len,
- name_buf, name_buf_len,
- port_buf, port_buf_len,
- NI_NAMEREQD | NI_NUMERICSERV))) {
- strcpy(name_buf, def);
- rprintf(FERROR, RSYNC_NAME ": reverse name lookup failed: %s\n",
+ name_err = getnameinfo((struct sockaddr *) ss, ss_len,
+ name_buf, name_buf_len,
+ port_buf, port_buf_len,
+ NI_NAMEREQD | NI_NUMERICSERV);
+ if (name_err != 0) {
+ strcpy(name_buf, default_name);
+ rprintf(FERROR, RSYNC_NAME ": name lookup failed: %s\n",
gai_strerror(name_err));
return name_err;
}
* we don't abort the connection but just emit a warning. */
static int check_name(const struct sockaddr_storage *ss,
socklen_t ss_len,
- const char *name_buf,
+ char *name_buf,
const char *port_buf)
{
struct addrinfo hints, *res, *res0;
hints.ai_socktype = SOCK_STREAM;
error = getaddrinfo(name_buf, port_buf, &hints, &res0);
if (error) {
- /* We still use the name found by the reverse lookup,
- * but emit a warning. */
+ strcpy(name_buf, default_name);
rprintf(FERROR,
RSYNC_NAME ": forward name lookup for %s:%s failed: %s\n",
name_buf, port_buf,
}
if (res == NULL) {
+ strcpy(name_buf, default_name);
/* We hit the end of the list without finding an
* address that was the same as ss. */
rprintf(FERROR, RSYNC_NAME