summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Březina <pbrezina@redhat.com>2014-07-10 13:37:37 +0200
committerJakub Hrozek <jhrozek@redhat.com>2015-06-24 12:37:46 +0200
commita0e03d61a8664a151c7acb928d5bf3f8d9d3d348 (patch)
treed42d1f4e14ed43987082ea21ddacb3a5a5db5817
parentb525aa57f138f67624038c4a1bdeca9042bcf2f0 (diff)
downloadsssd-a0e03d61a8664a151c7acb928d5bf3f8d9d3d348.tar.gz
sssd-a0e03d61a8664a151c7acb928d5bf3f8d9d3d348.tar.xz
sssd-a0e03d61a8664a151c7acb928d5bf3f8d9d3d348.zip
resolv: fix server sort by weight
When the server list consist only from servers with zero weight the output list contained only one server. Resolves: https://fedorahosted.org/sssd/ticket/2357 Reviewed-by: Pavel Reichl <preichl@redhat.com> (cherry picked from commit 2be2220f15b2a819a80b07c8881822ef87053c69)
-rw-r--r--src/resolv/async_resolv.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/resolv/async_resolv.c b/src/resolv/async_resolv.c
index 9c32aa7cd..dcbdd5188 100644
--- a/src/resolv/async_resolv.c
+++ b/src/resolv/async_resolv.c
@@ -1857,13 +1857,9 @@ static int reply_weight_rearrange(TALLOC_CTX *mem_ctx,
r = *(start);
prev = NULL;
while (r != NULL) {
- if (r->weight == 0) {
+ if (r->weight == 0 && r != *start) {
/* remove from the old list */
- if (prev) {
- prev->next = r->next;
- } else {
- *start = r->next;
- }
+ prev->next = r->next;
/* add to the head of the new list */
tmp = r;