summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorGravatar Jeffrey Hutzelman <jhutz@cmu.edu>2012-11-18 16:58:02 -0500
committerGravatar Jeffrey Hutzelman <jhutz@cmu.edu>2012-11-24 18:13:15 -0500
commitdd47870219a96aa581163e5ea99d13467315be39 (patch)
treee85456df6ad2bc02258a8913d7481671c3c34d52 /server
parentf1fb967e94dea573dc0359bb6d3b4492c02bac47 (diff)
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.
Diffstat (limited to 'server')
-rw-r--r--server/subscr.c11
1 files 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 {