From dd47870219a96aa581163e5ea99d13467315be39 Mon Sep 17 00:00:00 2001 From: Jeffrey Hutzelman Date: Sun, 18 Nov 2012 16:58:02 -0500 Subject: add_subscriptions: fix botched merge Fix indentation and remove an inappropriate comment in add_subscriptions(), both of which were the result of a botched merge a long time ago. The actual logic was merged correctly and so does not change. --- server/subscr.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/server/subscr.c b/server/subscr.c index 4328056..8a06813 100644 --- a/server/subscr.c +++ b/server/subscr.c @@ -160,13 +160,12 @@ add_subscriptions(Client *who, } } if (realm && !bdumping) { - retval = subscr_realm_sendit(who, subs, notice, realm); - if (retval != ZERR_NONE) { - free_subscription(subs); - continue; /* the for loop */ + retval = subscr_realm_sendit(who, subs, notice, realm); + if (retval != ZERR_NONE) { + free_subscription(subs); + continue; /* the for loop */ } else { - /* Indicates we leaked traffic back to our realm */ - free_subscription(subs); /* free this one, wil get from + free_subscription(subs); /* free this one, wil get from ADD */ } } else { -- cgit v1.2.3