deleted hard-coded RADWTMP, and moved it to a configuration file

	directive

diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
index d8e1d1c..814af83 100644 (file)
--- a/raddb/radiusd.conf.in
+++ b/raddb/radiusd.conf.in
@@ -357,6 +357,13 @@ modules {
                passwd          = /etc/passwd
                #       shadow          = /etc/shadow
                group           = /etc/group
+
+
+               #
+               #  Where the 'wtmp' file is located.
+               #  This will be moved to it's own module soon..
+               #
+               radwtmp = ${logdir}/radwtmp
        }
 
 # Uncomment this if you want to use ldap (Auth-Type = LDAP)

diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c
index 657ff0d..a3cf204 100644 (file)
--- a/src/modules/rlm_unix/rlm_unix.c
+++ b/src/modules/rlm_unix/rlm_unix.c
@@ -46,9 +46,10 @@ static char trans[64] =
 
 struct unix_instance {
        int cache_passwd;
-       char *passwd_file;
-       char *shadow_file;
-       char *group_file;
+       const char *passwd_file;
+       const char *shadow_file;
+       const char *group_file;
+       const char *radwtmp;
        int usegroup;
        struct pwcache *cache;
 };
@@ -63,6 +64,7 @@ static CONF_PARSER module_config[] = {
        { "passwd",   PW_TYPE_STRING_PTR, &config.passwd_file,  NULL },
        { "shadow",   PW_TYPE_STRING_PTR, &config.shadow_file,  NULL },
        { "group",    PW_TYPE_STRING_PTR, &config.group_file,   NULL },
+       { "radwtmp",  PW_TYPE_STRING_PTR, &config.radwtmp,      "${logdir}/radwtmp" },
        { "usegroup", PW_TYPE_BOOLEAN,    &config.usegroup,     "no" },
        
        { NULL, -1, NULL, NULL }                /* end the list */
@@ -143,28 +145,36 @@ static int unix_init(void)
 
 static int unix_instantiate(CONF_SECTION *conf, void **instance)
 {
-       *instance = malloc(sizeof(struct unix_instance));
-       if(!*instance) {
-             return -1;
-       }
+       struct unix_instance *inst;
 
-#define inst ((struct unix_instance *)*instance)
+       /*
+        *      Parse the configuration, failing if we can't do so.
+        */
        if (cf_section_parse(conf, module_config) < 0) {
-               free(*instance);
                return -1;
        }
 
        /*
+        *      Allocate room for the instance.
+        */
+       inst = *instance = malloc(sizeof(struct unix_instance));
+       if(!inst) {
+             return -1;
+       }
+
+       /*
         *      Copy the configuration into the instance data
         */
        inst->cache_passwd = config.cache_passwd;
        inst->passwd_file = config.passwd_file;
        inst->shadow_file = config.shadow_file;
        inst->group_file = config.group_file;
+       inst->radwtmp = config.radwtmp;
        inst->usegroup = config.usegroup;
        config.passwd_file = NULL;
        config.shadow_file = NULL;
        config.group_file = NULL;
+       config.radwtmp = NULL;
 
        if (inst->cache_passwd) {
                radlog(L_INFO, "HASH:  Reinitializing hash structures "
@@ -204,9 +214,10 @@ static int unix_detach(void *instance)
                group_inst = NULL;
                group_inst_explicit = 0;
        }
-       free(inst->passwd_file);
-       free(inst->shadow_file);
-       free(inst->group_file);
+       free((char *) inst->passwd_file);
+       free((char *) inst->shadow_file);
+       free((char *) inst->group_file);
+       free((char *) inst->radwtmp);
        if (inst->cache) {
                unix_freepwcache(inst->cache);
        }
@@ -437,8 +448,7 @@ static int unix_accounting(void *instance, REQUEST *request)
        int             nas_port = 0;
        int             port_seen = 0;
        int             nas_port_type = 0;
-
-       instance = instance;
+       struct unix_instance *inst = (struct unix_instance *) instance;
 
        /*
         *      Which type is this.
@@ -565,7 +575,7 @@ static int unix_accounting(void *instance, REQUEST *request)
         *      wtmp file. If it is, we try to write. If we fail,
         *      return RLM_MODULE_FAIL ..
         */
-       if ((fp = fopen(RADWTMP, "a")) != NULL) {
+       if ((fp = fopen(inst->radwtmp, "a")) != NULL) {
                fwrite(&ut, sizeof(ut), 1, fp);
                fclose(fp);
        }