Clarify the code.

So that there aren't lots of if conditions

diff --git a/src/modules/rlm_linelog/rlm_linelog.c b/src/modules/rlm_linelog/rlm_linelog.c
index 906b668715b3b33c1626538d005f709237db9569..d0b1d84e694bbd69291bc5fb9646506dc4c2e0be 100644 (file)
--- a/src/modules/rlm_linelog/rlm_linelog.c
+++ b/src/modules/rlm_linelog/rlm_linelog.c
@@ -222,7 +222,6 @@ static rlm_rcode_t CC_HINT(nonnull) mod_do_linelog(void *instance, REQUEST *requ
 {
        int fd = -1;
        char *p;
-       char line[4096];
        rlm_linelog_t *inst = (rlm_linelog_t*) instance;
        char const *value = inst->line;
 
@@ -230,6 +229,8 @@ static rlm_rcode_t CC_HINT(nonnull) mod_do_linelog(void *instance, REQUEST *requ
        gid_t gid;
        char *endptr;
 #endif
+       char path[2048];
+       char line[4096];
 
        line[0] = '\0';
 
@@ -264,8 +265,8 @@ static rlm_rcode_t CC_HINT(nonnull) mod_do_linelog(void *instance, REQUEST *requ
                cp = cf_item_to_pair(ci);
                value = cf_pair_value(cp);
                if (!value) {
-                       RDEBUG2("Entry \"%s\" has no value", line);
-                       goto do_log;
+                       RWDEBUG2("Entry \"%s\" has no value", line);
+                       return RLM_MODULE_OK;
                }
 
                /*
@@ -278,73 +279,65 @@ static rlm_rcode_t CC_HINT(nonnull) mod_do_linelog(void *instance, REQUEST *requ
        /*
         *      FIXME: Check length.
         */
-       if (strcmp(inst->filename, "syslog") != 0) {
-               char path[2048];
+       if (radius_xlat(line, sizeof(line) - 1, request, value, linelog_escape_func, NULL) < 0) {
+               return RLM_MODULE_FAIL;
+       }
 
-               if (radius_xlat(path, sizeof(path), request, inst->filename, inst->escape_func, NULL) < 0) {
-                       return RLM_MODULE_FAIL;
-               }
+#ifdef HAVE_SYSLOG_H
+       if (strcmp(inst->filename, "syslog") == 0) {
+               syslog(inst->syslog_priority, "%s", line);
+               return RLM_MODULE_OK;
+       }
+#endif
 
-               /* check path and eventually create subdirs */
-               p = strrchr(path, '/');
-               if (p) {
-                       *p = '\0';
-                       if (rad_mkdir(path, 0700, -1, -1) < 0) {
-                               RERROR("rlm_linelog: Failed to create directory %s: %s", path, fr_syserror(errno));
-                               return RLM_MODULE_FAIL;
-                       }
-                       *p = '/';
-               }
+       /*
+        *      We're using a real filename now.
+        */
+       if (radius_xlat(path, sizeof(path), request, inst->filename, inst->escape_func, NULL) < 0) {
+               return RLM_MODULE_FAIL;
+       }
 
-               fd = exfile_open(inst->ef, path, inst->permissions, true);
-               if (fd < 0) {
-                       ERROR("rlm_linelog: Failed to open %s: %s", path, fr_syserror(errno));
+       /* check path and eventually create subdirs */
+       p = strrchr(path, '/');
+       if (p) {
+               *p = '\0';
+               if (rad_mkdir(path, 0700, -1, -1) < 0) {
+                       RERROR("rlm_linelog: Failed to create directory %s: %s", path, fr_syserror(errno));
                        return RLM_MODULE_FAIL;
                }
-
-               if (inst->group != NULL) {
-                       gid = strtol(inst->group, &endptr, 10);
-                       if (*endptr != '\0') {
-                               if (rad_getgid(request, &gid, inst->group) < 0) {
-                                       RDEBUG2("Unable to find system group \"%s\"", inst->group);
-                                       goto skip_group;
-                               }
-                       }
-
-                       if (chown(path, -1, gid) == -1) {
-                               RDEBUG2("Unable to change system group of \"%s\"", path);
-                       }
-               }
+               *p = '/';
        }
 
- skip_group:
-
-       /*
-        *      FIXME: Check length.
-        */
-       if (value && (radius_xlat(line, sizeof(line) - 1, request, value, linelog_escape_func, NULL) < 0)) {
-               if (fd >= 0) exfile_close(inst->ef, fd);
-
+       fd = exfile_open(inst->ef, path, inst->permissions, true);
+       if (fd < 0) {
+               ERROR("rlm_linelog: Failed to open %s: %s", path, fr_syserror(errno));
                return RLM_MODULE_FAIL;
        }
 
-       if (fd >= 0) {
-               strcat(line, "\n");
+       if (inst->group != NULL) {
+               gid = strtol(inst->group, &endptr, 10);
+               if (*endptr != '\0') {
+                       if (rad_getgid(request, &gid, inst->group) < 0) {
+                               RDEBUG2("Unable to find system group \"%s\"", inst->group);
+                               goto skip_group;
+                       }
+               }
 
-               if (write(fd, line, strlen(line)) < 0) {
-                       ERROR("rlm_linelog: Failed writing: %s", fr_syserror(errno));
-                       exfile_close(inst->ef, fd);
-                       return RLM_MODULE_FAIL;
+               if (chown(path, -1, gid) == -1) {
+                       RDEBUG2("Unable to change system group of \"%s\"", path);
                }
+       }
 
-               exfile_close(inst->ef, fd);
+ skip_group:
+       strcat(line, "\n");
 
-#ifdef HAVE_SYSLOG_H
-       } else {
-               syslog(inst->syslog_priority, "%s", line);
-#endif
+       if (write(fd, line, strlen(line)) < 0) {
+               exfile_close(inst->ef, fd);
+               ERROR("rlm_linelog: Failed writing: %s", fr_syserror(errno));
+               return RLM_MODULE_FAIL;
        }
 
+       exfile_close(inst->ef, fd);
        return RLM_MODULE_OK;
 }