comparison src/director/director-connection.c @ 14674:efd276ab2577

Merged changes from v2.1 tree.
author Timo Sirainen <tss@iki.fi>
date Sun, 24 Jun 2012 20:57:06 +0300
parents c93ca5e46a8a 7be9411da17b
children ca37d1577291
comparison
equal deleted inserted replaced
14637:a77ad2346cf0 14674:efd276ab2577
709 struct user *user; 709 struct user *user;
710 struct director_host *src_host = conn->host; 710 struct director_host *src_host = conn->host;
711 bool weak = TRUE; 711 bool weak = TRUE;
712 int ret; 712 int ret;
713 713
714 if ((ret = director_cmd_is_seen(conn, &args, &dir_host)) < 0) 714 if ((ret = director_cmd_is_seen(conn, &args, &dir_host)) != 0)
715 return FALSE; 715 return FALSE;
716 716
717 if (str_array_length(args) != 2 || 717 if (str_array_length(args) != 2 ||
718 str_to_uint(args[0], &username_hash) < 0 || 718 str_to_uint(args[0], &username_hash) < 0 ||
719 net_addr2ip(args[1], &ip) < 0) { 719 net_addr2ip(args[1], &ip) < 0) {