* radsecproxy.c: Fix typo introduced in 4779686 making rewrite a null
authorLinus Nordberg <linus@nordberg.se>
Mon, 24 May 2010 21:34:58 +0000 (23:34 +0200)
committerLinus Nordberg <linus@nordberg.se>
Mon, 24 May 2010 21:34:58 +0000 (23:34 +0200)
operation altogether.

radsecproxy.c

index 09adf63..cacf9d6 100644 (file)
@@ -1094,18 +1094,16 @@ int dorewritemod(struct radmsg *msg, struct list *modattrs) {
 int dorewrite(struct radmsg *msg, struct rewrite *rewrite) {
     int rv = 1;                        /* Success.  */
 
-    if (rewrite)
-       return 1;
-
-    if (rewrite->removeattrs || rewrite->removevendorattrs)
-       dorewriterm(msg, rewrite->removeattrs, rewrite->removevendorattrs);
-    if (rewrite->modattrs)
-       if (!dorewritemod(msg, rewrite->modattrs))
-           rv = 0;
-    if (rewrite->addattrs)
-       if (!dorewriteadd(msg, rewrite->addattrs))
-           rv = 0;
-
+    if (rewrite) {
+       if (rewrite->removeattrs || rewrite->removevendorattrs)
+           dorewriterm(msg, rewrite->removeattrs, rewrite->removevendorattrs);
+       if (rewrite->modattrs)
+           if (!dorewritemod(msg, rewrite->modattrs))
+               rv = 0;
+       if (rewrite->addattrs)
+           if (!dorewriteadd(msg, rewrite->addattrs))
+               rv = 0;
+    }
     return rv;
 }