Removed all free(inst->foo) where "foo" comes from parsing
authoraland <aland>
Wed, 14 Feb 2007 15:11:24 +0000 (15:11 +0000)
committeraland <aland>
Wed, 14 Feb 2007 15:11:24 +0000 (15:11 +0000)
PW_TYPE_STRING_PTR

36 files changed:
src/modules/rlm_acct_unique/rlm_acct_unique.c
src/modules/rlm_acctlog/rlm_acctlog.c
src/modules/rlm_always/rlm_always.c
src/modules/rlm_attr_filter/rlm_attr_filter.c
src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c
src/modules/rlm_caching/rlm_caching.c
src/modules/rlm_checkval/rlm_checkval.c
src/modules/rlm_copy_packet/rlm_copy_packet.c
src/modules/rlm_counter/rlm_counter.c
src/modules/rlm_dbm/rlm_dbm.c
src/modules/rlm_eap/rlm_eap.c
src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
src/modules/rlm_exec/rlm_exec.c
src/modules/rlm_expiration/rlm_expiration.c
src/modules/rlm_fastusers/rlm_fastusers.c
src/modules/rlm_ippool/rlm_ippool.c
src/modules/rlm_ldap/rlm_ldap.c
src/modules/rlm_linelog/rlm_linelog.c
src/modules/rlm_logintime/rlm_logintime.c
src/modules/rlm_mschap/rlm_mschap.c
src/modules/rlm_otp/otp_rlm.c
src/modules/rlm_pam/rlm_pam.c
src/modules/rlm_pap/rlm_pap.c
src/modules/rlm_passwd/rlm_passwd.c
src/modules/rlm_perl/rlm_perl.c
src/modules/rlm_policy/rlm_policy.c
src/modules/rlm_preprocess/rlm_preprocess.c
src/modules/rlm_protocol_filter/rlm_protocol_filter.c
src/modules/rlm_radutmp/rlm_radutmp.c
src/modules/rlm_radutmp/rlm_radutmp2.c
src/modules/rlm_smb/rlm_smb.c
src/modules/rlm_sqlippool/rlm_sqlippool.c
src/modules/rlm_unix/rlm_unix.c

index 8f529ee..ed51a71 100644 (file)
@@ -129,7 +129,6 @@ static int unique_detach(void *instance)
        rlm_acct_unique_t *inst = instance;
        rlm_acct_unique_list_t *this, *next;
 
-       free(inst->key);
        for (this = inst->head; this != NULL; this = next) {
                next = this->next;
                free(this);
index c7ebc90..137e666 100644 (file)
@@ -57,11 +57,6 @@ static int acctlog_detach(void *instance)
 {   
     rlm_acctlog_t *inst = instance;
        
-       free(inst->acctupdate);
-       free(inst->acctstart);
-       free(inst->acctstop);
-       free(inst->accton);
-       free(inst->acctoff);
        
     free(inst);
     return 0;
index cb908a0..27363e4 100644 (file)
@@ -114,8 +114,6 @@ static int always_instantiate(CONF_SECTION *conf, void **instance)
         *      Convert the rcode string to an int, and get rid of it
         */
        data->rcode = str2rcode(data->rcode_str);
-       free(data->rcode_str);
-       data->rcode_str = NULL;
        if (data->rcode == -1) {
                free(data);
                return -1;
index 9dbcb51..408f599 100644 (file)
@@ -152,8 +152,6 @@ static int attr_filter_detach(void *instance)
 {
        struct attr_filter_instance *inst = instance;
        pairlist_free(&inst->attrs);
-       free(inst->attrsfile);
-       free(inst->key);
        free(inst);
        return 0;
 }
index 838bbf0..e22ab58 100644 (file)
@@ -463,12 +463,6 @@ static int attr_rewrite_detach(void *instance)
 {
        rlm_attr_rewrite_t *data = (rlm_attr_rewrite_t *) instance;
 
-       if (data->attribute)
-               free(data->attribute);
-       if (data->search)
-               free(data->search);
-       if (data->replace)
-               free(data->replace);
        if (data->name)
                free(data->name);
 
index 0d28894..5a56e33 100644 (file)
@@ -481,10 +481,6 @@ static int caching_detach(void *instance)
 
        if (data->gdbm)
                gdbm_close(data->gdbm);
-       free(data->filename);
-       free(data->key);
-       free(data->post_auth);
-       free(data->cache_ttl_str);
        pthread_mutex_destroy(&data->mutex);
 
        free(instance);
index ebcfa03..04059a5 100644 (file)
@@ -81,13 +81,6 @@ static int checkval_detach(void *instance)
 {
        rlm_checkval_t *data = (rlm_checkval_t *) instance;
 
-       if (data->item_name)
-               free((char *)data->item_name);
-       if (data->check_name)
-               free((char *)data->check_name);
-       if (data->data_type)
-               free((char *)data->data_type);
-
        free(instance);
        return 0;
 }
index 345e5ed..72f0baa 100644 (file)
@@ -63,7 +63,6 @@ static int packet_detach(void *instance)
 {
        rlm_packet_t    *inst = instance;
 
-       if (inst->string) free(inst->string);
        free(instance);
        return 0;
 }
index 589710e..68da470 100644 (file)
@@ -916,14 +916,6 @@ static int counter_detach(void *instance)
        paircompare_unregister(data->dict_attr, counter_cmp);
        if (data->gdbm)
                gdbm_close(data->gdbm);
-       free(data->filename);
-       free(data->reset);
-       free(data->key_name);
-       free(data->count_attribute);
-       free(data->counter_name);
-       free(data->check_name);
-       if (data->reply_name) free(data->reply_name);
-       free(data->service_type);
        pthread_mutex_destroy(&data->mutex);
 
        free(instance);
index 10e141a..850670f 100644 (file)
@@ -363,7 +363,6 @@ static int rlm_dbm_authorize(void *instance, REQUEST *request)
 static int rlm_dbm_detach(void *instance)
 {
        struct rlm_dbm_t *inst = instance;
-       free(inst -> userfile);
        free(inst);
        return 0;
 }
index 22a946b..591361e 100644 (file)
@@ -63,7 +63,6 @@ static int eap_detach(void *instance)
 
        pthread_mutex_destroy(&(inst->session_mutex));
 
-       if (inst->default_eap_type_name) free(inst->default_eap_type_name);
        free(inst);
 
        return 0;
index 6325b5e..09879ff 100644 (file)
@@ -61,8 +61,6 @@ static int gtc_detach(void *arg)
 {
        rlm_eap_gtc_t *inst = (rlm_eap_gtc_t *) arg;
 
-       if (inst->challenge) free(inst->challenge);
-       if (inst->auth_type_name) free(inst->auth_type_name);
 
        free(inst);
 
index d526c96..5aab06a 100644 (file)
@@ -77,7 +77,6 @@ static int eappeap_detach(void *arg)
 {
        rlm_eap_peap_t *inst = (rlm_eap_peap_t *) arg;
 
-       if (inst->default_eap_type_name) free(inst->default_eap_type_name);
 
        free(inst);
 
index 81fecd2..99ddd3a 100644 (file)
@@ -461,18 +461,6 @@ static int eaptls_detach(void *arg)
        conf = inst->conf;
 
        if (conf) {
-               free(conf->dh_file);
-               free(conf->ca_path);
-               free(conf->certificate_file);
-               free(conf->private_key_file);
-               free(conf->private_key_password);
-               free(conf->ca_file);
-               free(conf->random_file);
-
-               free(conf->check_cert_cn);
-               free(conf->cipher_list);
-               free(conf->check_cert_issuer);
-
                memset(conf, 0, sizeof(*conf));
                free(inst->conf);
                inst->conf = NULL;
index 1a5ad0a..b320937 100644 (file)
@@ -69,7 +69,6 @@ static int eapttls_detach(void *arg)
 {
        rlm_eap_ttls_t *inst = (rlm_eap_ttls_t *) arg;
 
-       if (inst->default_eap_type_name) free(inst->default_eap_type_name);
 
        free(inst);
 
index b417335..9e8517d 100644 (file)
@@ -121,7 +121,7 @@ static VALUE_PAIR **decode_string(REQUEST *request, const char *string)
  *     Do xlat of strings.
  */
 static int exec_xlat(void *instance, REQUEST *request,
-                    char *fmt, char *out, int outlen,
+                    char *fmt, char *out, size_t outlen,
                     UNUSED RADIUS_ESCAPE_STRING func)
 {
        int             result;
@@ -164,14 +164,6 @@ static int exec_detach(void *instance)
                free(inst->xlat_name);
        }
 
-       /*
-        *  Free the strings.
-        */
-       if (inst->program) free(inst->program);
-       if (inst->input) free(inst->input);
-       if (inst->output) free(inst->output);
-       if (inst->packet_type) free(inst->packet_type);
-
        free(inst);
        return 0;
 }
index 0912b3e..d5e8a83 100644 (file)
@@ -84,7 +84,7 @@ static int expiration_authorize(void *instance, REQUEST *request)
 
                        DEBUG("rlm_expiration: Account has expired");
 
-                       if (data->msg){
+                       if (data->msg && data->msg[0]){
                                if (!radius_xlat(msg, sizeof(msg), data->msg, request, NULL)) {
                                        radlog(L_ERR, "rlm_expiration: xlat failed.");
                                        return RLM_MODULE_FAIL;
@@ -150,8 +150,6 @@ static int expiration_detach(void *instance)
        rlm_expiration_t *data = (rlm_expiration_t *) instance;
 
        paircompare_unregister(PW_EXPIRATION, expirecmp);
-       if (data->msg)
-               free(data->msg);
        free(instance);
        return 0;
 }
@@ -191,14 +189,6 @@ static int expiration_instantiate(CONF_SECTION *conf, void **instance)
        }
 
        /*
-        * If we are passed an empty reply-message don't use it
-        */
-       if (!strlen(data->msg)){
-               free(data->msg);
-               data->msg = NULL;
-       }
-
-       /*
         * Register the expiration comparison operation.
         */
        paircompare_register(PW_EXPIRATION, 0, expirecmp, data);
index 9cdc383..817f1f8 100644 (file)
@@ -768,13 +768,9 @@ static int fastuser_detach(void *instance)
                }
        }
 
-       free(inst->compat_mode);
        free(inst->hashtable);
        pairlist_free(&inst->defaults);
        pairlist_free(&inst->acctusers);
-       free(inst->usersfile);
-       free(inst->acctusersfile);
-       free(inst);
        return 0;
 }
 
index 9eb40bc..e283586 100644 (file)
@@ -835,9 +835,6 @@ static int ippool_detach(void *instance)
 
        gdbm_close(data->gdbm);
        gdbm_close(data->ip);
-       free(data->session_db);
-       free(data->key);
-       free(data->ip_index);
        pthread_mutex_destroy(&data->op_mutex);
 
        free(instance);
index 13d3ef5..53e8aa4 100644 (file)
@@ -2249,35 +2249,6 @@ ldap_detach(void *instance)
        ldap_instance  *inst = instance;
        TLDAP_RADIUS *pair, *nextpair;
 
-       if (inst->server)
-               free((char *) inst->server);
-       if (inst->login)
-               free((char *) inst->login);
-       if (inst->password)
-               free((char *) inst->password);
-       if (inst->basedn)
-               free((char *) inst->basedn);
-       if (inst->dictionary_mapping)
-               free(inst->dictionary_mapping);
-       if (inst->filter)
-               free((char *) inst->filter);
-       if (inst->base_filter)
-               free((char *) inst->base_filter);
-       if (inst->passwd_hdr)
-               free((char *) inst->passwd_hdr);
-       if (inst->passwd_attr)
-               free((char *) inst->passwd_attr);
-       if (inst->groupname_attr)
-               free((char *) inst->groupname_attr);
-       if (inst->groupmemb_filt)
-               free((char *) inst->groupmemb_filt);
-       if (inst->groupmemb_attr)
-               free((char *) inst->groupmemb_attr);
-       if (inst->access_attr)
-               free((char *) inst->access_attr);
-       if (inst->profile_attr)
-               free((char *) inst->profile_attr);
-
        if (inst->conns) {
                int i;
                
index a15609d..b58b969 100755 (executable)
@@ -75,8 +75,6 @@ static int linelog_detach(void *instance)
 {
        rlm_linelog_t *inst = instance;
 
-       free(inst->filename);
-       free(inst->line);
        
        free(inst);
        return 0;
index cfd4a2b..dd1a1d1 100644 (file)
@@ -198,7 +198,7 @@ static int logintime_authorize(void *instance, REQUEST *request)
                         */
                
                        DEBUG("rlm_logintime: timestr returned reject");
-                       if (data->msg){
+                       if (data->msg && data->msg[0]){
                                char msg[MAX_STRING_LEN];
                                VALUE_PAIR *tmp;
 
@@ -280,17 +280,8 @@ static int logintime_instantiate(CONF_SECTION *conf, void **instance)
                return -1;
        }
 
-       /*
-        * If we are passed an empty reply-message don't use it
-        */
-       if (!strlen(data->msg)){
-               free(data->msg);
-               data->msg = NULL;
-       }
-
        if (data->min_time == 0){
                radlog(L_ERR, "rlm_logintime: Minimum timeout should be non zero.");
-               free(data->msg);
                free(data);
                return -1;
        }
@@ -312,8 +303,6 @@ static int logintime_detach(void *instance)
 
        paircompare_unregister(PW_CURRENT_TIME, timecmp);
        paircompare_unregister(PW_TIME_OF_DAY, time_of_day);
-       if (data->msg)
-               free(data->msg);
        free(instance);
        return 0;
 }
index 78036d7..645abb1 100644 (file)
@@ -611,8 +611,6 @@ static const CONF_PARSER module_config[] = {
  */
 static int mschap_detach(void *instance){
 #define inst ((rlm_mschap_t *)instance)
-       free(inst->passwd_file);
-       free(inst->ntlm_auth);
        if (inst->xlat_name) {
                xlat_unregister(inst->xlat_name, mschap_xlat);
                free(inst->xlat_name);
index b9d1190..a487d8a 100644 (file)
@@ -396,8 +396,6 @@ otp_detach(void *instance)
 {
   otp_option_t *inst = (otp_option_t *) instance;
 
-  free(inst->otpd_rp);
-  free(inst->chal_prompt);
   free(instance);
   /*
    * Only the main thread instantiates and detaches instances,
index 3a01afa..1e7a289 100644 (file)
@@ -94,7 +94,6 @@ static int pam_detach(void *instance)
 {
        rlm_pam_t *data = (rlm_pam_t *) instance;
 
-       free((char *) data->pam_auth_name);
         free((char *) data);
        return 0;
 }
index e6621e4..504df4d 100644 (file)
@@ -117,7 +117,6 @@ static int pap_detach(void *instance)
 {
        rlm_pap_t *inst = (rlm_pap_t *) instance;
 
-       free((char *)inst->scheme);
        free(inst);
 
        return 0;
index 4f77a6f..4969d4d 100644 (file)
@@ -485,9 +485,6 @@ static int passwd_instantiate(CONF_SECTION *conf, void **instance)
 static int passwd_detach (void *instance) {
 #define inst ((struct passwd_instance *)instance)
        if(inst->ht) release_ht(inst->ht);
-        if (inst->filename != NULL)    free(inst->filename);
-        if (inst->format != NULL)      free(inst->format);
-        if (inst->delimiter != NULL)   free(inst->delimiter);
        free(instance);
        return 0;
 #undef inst
index 606c323..3fd351e 100644 (file)
@@ -1289,15 +1289,6 @@ static int perl_detach(void *instance)
        xlat_unregister(inst->xlat_name, perl_xlat);
        free(inst->xlat_name);
 
-       if (inst->func_authorize) free(inst->func_authorize);
-       if (inst->func_authenticate) free(inst->func_authenticate);
-       if (inst->func_accounting) free(inst->func_accounting);
-       if (inst->func_preacct) free(inst->func_preacct);
-       if (inst->func_checksimul) free(inst->func_checksimul);
-       if (inst->func_pre_proxy) free(inst->func_pre_proxy);
-       if (inst->func_post_proxy) free(inst->func_post_proxy);
-       if (inst->func_post_auth) free(inst->func_post_auth);
-       if (inst->func_detach) free(inst->func_detach);
 
 #ifdef USE_ITHREADS
        free(inst->perl_pool->head);
index 25d1556..fb6cb94 100644 (file)
@@ -63,7 +63,6 @@ static int policy_detach(void *instance)
 {
        rlm_policy_t *inst = instance;
 
-       if (inst->filename) free(inst->filename);
        if (inst->policies) rbtree_free(inst->policies);
        free(instance);
        return 0;
index 6f0aa5c..8f081d9 100644 (file)
@@ -653,8 +653,6 @@ static int preprocess_detach(void *instance)
        pairlist_free(&(data->huntgroups));
        pairlist_free(&(data->hints));
 
-       free(data->huntgroup_file);
-       free(data->hints_file);
        free(data);
 
        return 0;
index 53732d5..d5828ab 100755 (executable)
@@ -68,8 +68,6 @@ static int filter_detach(void *instance)
 {
        rlm_protocol_filter_t *inst = instance;
 
-       if (inst->filename) free(inst->filename);
-       if (inst->key) free(inst->key);
        if (inst->cs) cf_section_free(&(inst->cs));
 
        free(instance);
index b75de54..84350db 100644 (file)
@@ -117,8 +117,6 @@ static int radutmp_detach(void *instance)
                next = p->next;
                free(p);
        }
-       if (inst->filename) free(inst->filename);
-       if (inst->username) free(inst->username);
        free(inst);
        return 0;
 }
index 4c0a57c..f38ab0b 100644 (file)
@@ -206,8 +206,6 @@ static int radutmp_detach(void *instance)
 
        pthread_mutex_destroy(&(inst->cache.mutex));
 
-       if (inst->filename) free(inst->filename);
-       if (inst->username) free(inst->username);
 
        rbtree_free(inst->user_tree);
 
index 3615228..c88eddc 100644 (file)
@@ -168,9 +168,6 @@ static int smb_detach(void *instance)
 {
        rlm_smb_t *data = (rlm_smb_t *) instance;
 
-       if (data->server) free(data->server);
-       if (data->backup) free(data->backup);
-       if (data->domain) free(data->domain);
 
        free(instance);
        return 0;
index 1f15c53..836241d 100644 (file)
@@ -925,50 +925,6 @@ static int sqlippool_detach(void *instance)
 {
        rlm_sqlippool_t * data = (rlm_sqlippool_t *) instance;
 
-       free(data->sql_instance_name);
-       free(data->pool_name);
-
-       free(data->allocate_begin);
-       free(data->allocate_clear);
-       free(data->allocate_find);
-       free(data->allocate_update);
-       free(data->allocate_commit);
-       free(data->allocate_rollback);
-
-       free(data->pool_check);
-
-       free(data->start_begin);
-       free(data->start_update);
-       free(data->start_commit);
-       free(data->start_rollback);
-
-       free(data->alive_begin);
-       free(data->alive_update);
-       free(data->alive_commit);
-       free(data->alive_rollback);
-
-       free(data->stop_begin);
-       free(data->stop_clear);
-       free(data->stop_commit);
-       free(data->stop_rollback);
-
-       free(data->on_begin);
-       free(data->on_clear);
-       free(data->on_commit);
-       free(data->on_rollback);
-
-       free(data->off_begin);
-       free(data->off_clear);
-       free(data->off_commit);
-       free(data->off_rollback);
-       
-       free(data->log_exists);
-       free(data->log_failed);
-       free(data->log_nopool);
-       free(data->log_success);
-       free(data->log_clear);
-       free(data->defaultpool);
-
        return 0;
 }
 
index b03f9b7..d8d1038 100644 (file)
@@ -127,8 +127,6 @@ static int groupcmp(void *instance, UNUSED REQUEST *req, VALUE_PAIR *request,
 static int unix_detach(void *instance)
 {
 #define inst ((struct unix_instance *)instance)
-       if (inst->radwtmp)
-               free(inst->radwtmp);
 
        paircompare_unregister(PW_GROUP, groupcmp);
 #ifdef PW_GROUP_NAME