summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkolla <kolla>2010-01-13 09:23:12 +0000
committerkolla <kolla@e88ac4ed-0b26-0410-9574-a7f39faa03bf>2010-01-13 09:23:12 +0000
commitd582147d3b0858bb0ecc5ba754151ec86826494e (patch)
tree5c93d40fe73ea300a49ef7c8d2d91ca95bea81a0
parent148cf9038ed5502a50cf1e153f3c2450ded92228 (diff)
Missing parantheses bug spotted by Daniel Bertolo
Reformatted while loop by Kolbjørn git-svn-id: https://svn.testnett.uninett.no/radsecproxy/trunk@513 e88ac4ed-0b26-0410-9574-a7f39faa03bf
-rw-r--r--radsecproxy.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/radsecproxy.c b/radsecproxy.c
index 37bf4cb..9ed4d70 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -979,15 +979,16 @@ void dorewriterm(struct radmsg *msg, uint8_t *rmattrs, uint32_t *rmvattrs) {
p = NULL;
n = list_first(msg->attrs);
while (n) {
- attr = (struct tlv *)n->data;
- if ((rmattrs && strchr((char *)rmattrs, attr->t)) ||
- (rmvattrs && attr->t == RAD_Attr_Vendor_Specific && dovendorrewriterm(attr, rmvattrs))) {
- list_removedata(msg->attrs, attr);
- freetlv(attr);
- n = p ? list_next(p) : list_first(msg->attrs);
- } else
- p = n;
- n = list_next(n);
+ attr = (struct tlv *)n->data;
+ if ((rmattrs && strchr((char *)rmattrs, attr->t)) ||
+ (rmvattrs && attr->t == RAD_Attr_Vendor_Specific && dovendorrewriterm(attr, rmvattrs))) {
+ list_removedata(msg->attrs, attr);
+ freetlv(attr);
+ n = p ? list_next(p) : list_first(msg->attrs);
+ } else {
+ p = n;
+ n = list_next(n);
+ }
}
}