replace strncpy strlcpy `cat filelist`

diff --git a/src/main/radwho.c b/src/main/radwho.c
index a90d6e6..9a9dce9 100644 (file)
--- a/src/main/radwho.c
+++ b/src/main/radwho.c
@@ -99,7 +99,7 @@ static FILE *safe_popen(const char *cmd, const char *mode)
        /*
         *      Change all suspect characters into a space.
         */
-       strncpy(buf, cmd, sizeof(buf));
+       strlcpy(buf, cmd, sizeof(buf));
        buf[sizeof(buf) - 1] = 0;
        for (p = buf; *p; p++) {
                if (isalnum((int) *p))
@@ -220,10 +220,10 @@ static char *dotime(time_t t)
        char *s = ctime(&t);
 
        if (showname) {
-               strncpy(s + 4, s + 11, 5);
+               strlcpy(s + 4, s + 11, 5);
                s[9] = 0;
        } else {
-               strncpy(s + 4, s + 8, 8);
+               strlcpy(s + 4, s + 8, 8);
                s[12] = 0;
        }
 

diff --git a/src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c b/src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c
index c38af46..838bbf0 100644 (file)
--- a/src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c
+++ b/src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c
@@ -330,7 +330,7 @@ do_again:
                                return ret;
                        }
 
-                       strncpy(ptr, ptr2,len);
+                       strlcpy(ptr, ptr2,len);
                        ptr += len;
                        ptr2 += pmatch[0].rm_eo;
 
@@ -385,7 +385,7 @@ do_again:
                                return ret;
                        }
                        if (replace_len){
-                               strncpy(ptr, replace_STR, replace_len);
+                               strlcpy(ptr, replace_STR, replace_len);
                                ptr += replace_len;
                        }
                }
@@ -397,7 +397,7 @@ do_again:
                                        data->attribute, attr_vp->vp_strvalue);
                        return ret;
                }
-               strncpy(ptr, ptr2, len);
+               strlcpy(ptr, ptr2, len);
 
                DEBUG2("rlm_attr_rewrite: Changed value for attribute %s from '%s' to '%s'",
                                data->attribute, attr_vp->vp_strvalue, new_str);

diff --git a/src/modules/rlm_counter/rlm_counter.c b/src/modules/rlm_counter/rlm_counter.c
index 14287b6..589710e 100644 (file)
--- a/src/modules/rlm_counter/rlm_counter.c
+++ b/src/modules/rlm_counter/rlm_counter.c
@@ -664,7 +664,7 @@ static int counter_accounting(void *instance, REQUEST *request)
                DEBUG("rlm_counter: Could not find the requested key in the database.");
                counter.user_counter = 0;
                if (uniqueid_vp != NULL)
-                       strncpy(counter.uniqueid,uniqueid_vp->vp_strvalue,UNIQUEID_MAX_LEN - 1);
+                       strlcpy(counter.uniqueid,uniqueid_vp->vp_strvalue,UNIQUEID_MAX_LEN - 1);
                else
                        memset((char *)counter.uniqueid,0,UNIQUEID_MAX_LEN);
        }
@@ -680,7 +680,7 @@ static int counter_accounting(void *instance, REQUEST *request)
                                DEBUG("rlm_counter: Unique IDs for user match. Droping the request.");
                                return RLM_MODULE_NOOP;
                        }
-                       strncpy(counter.uniqueid,uniqueid_vp->vp_strvalue,UNIQUEID_MAX_LEN - 1);
+                       strlcpy(counter.uniqueid,uniqueid_vp->vp_strvalue,UNIQUEID_MAX_LEN - 1);
                }
                DEBUG("rlm_counter: User=%s, Counter=%d.",request->username->vp_strvalue,counter.user_counter);
        }

diff --git a/src/modules/rlm_ippool/rlm_ippool_tool.c b/src/modules/rlm_ippool/rlm_ippool_tool.c
index ec43448..82ed522 100755 (executable)
--- a/src/modules/rlm_ippool/rlm_ippool_tool.c
+++ b/src/modules/rlm_ippool/rlm_ippool_tool.c
@@ -154,7 +154,7 @@ void addip(char *sessiondbname,char *indexdbname,char *ipaddress, char* NASname,
 
        if (old){
                memset(old_key.nas,0,MAX_NAS_NAME_SIZE);
-               strncpy(old_key.nas,NASname,MAX_NAS_NAME_SIZE -1 );
+               strlcpy(old_key.nas,NASname,MAX_NAS_NAME_SIZE -1 );
                old_key.port = port;
                key_datum.dptr = (char *) &old_key;
                key_datum.dsize = sizeof(old_ippool_key);
@@ -299,7 +299,7 @@ void addip(char *sessiondbname,char *indexdbname,char *ipaddress, char* NASname,
                        ippool_key key_tmp;
                        if (old){
                                memset(old_key_tmp.nas,0,MAX_NAS_NAME_SIZE);
-                               strncpy(old_key_tmp.nas,NASname,MAX_NAS_NAME_SIZE - 1);
+                               strlcpy(old_key_tmp.nas,NASname,MAX_NAS_NAME_SIZE - 1);
                                old_key_tmp.port=port;
                                key_datum_tmp.dptr = (char *) &old_key_tmp;
                                key_datum_tmp.dsize = sizeof(old_ippool_key);
@@ -342,7 +342,7 @@ void addip(char *sessiondbname,char *indexdbname,char *ipaddress, char* NASname,
 
                if (old){
                        memset(old_key.nas,0,MAX_NAS_NAME_SIZE);
-                       strncpy(old_key.nas,NASname,MAX_NAS_NAME_SIZE -1 );
+                       strlcpy(old_key.nas,NASname,MAX_NAS_NAME_SIZE -1 );
                        old_key.port = port;
                        key_datum.dptr = (char *) &old_key;
                        key_datum.dsize = sizeof(old_ippool_key);

diff --git a/src/modules/rlm_krb5/rlm_krb5.c b/src/modules/rlm_krb5/rlm_krb5.c
index 0d62492..1abedae 100644 (file)
--- a/src/modules/rlm_krb5/rlm_krb5.c
+++ b/src/modules/rlm_krb5/rlm_krb5.c
@@ -74,7 +74,7 @@ static int verify_krb5_tgt(krb5_context context, rlm_krb5_t *instance,
                        *servername = '\0';
                }
 
-               strncpy(service,instance->service_princ,sizeof(service));
+               strlcpy(service,instance->service_princ,sizeof(service));
                service[sizeof(service)-1] = '\0';
 
                if (servername != NULL) {
@@ -92,7 +92,7 @@ static int verify_krb5_tgt(krb5_context context, rlm_krb5_t *instance,
                return RLM_MODULE_REJECT;
        }
 
-       strncpy(phost, krb5_princ_component(c, princ, 1)->data, BUFSIZ);
+       strlcpy(phost, krb5_princ_component(c, princ, 1)->data, BUFSIZ);
        phost[BUFSIZ - 1] = '\0';
 
        /*

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index 98e194b..13d3ef5 100644 (file)
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -1169,7 +1169,7 @@ static int ldap_xlat(void *instance, REQUEST *request, char *fmt,
                        return 0;
                }
                DEBUG("rlm_ldap: Adding attribute %s, value: %s",ldap_url->lud_attrs[0],vals[0]);
-               strncpy(out,vals[0],ret);
+               strlcpy(out,vals[0],ret);
                ldap_value_free(vals);
        }
        else
@@ -1541,7 +1541,7 @@ static int ldap_authorize(void *instance, REQUEST * request)
                                                }
 
                                                passwd_len = strlen(passwd_val);
-                                               strncpy(passwd_item->vp_strvalue,passwd_val,MAX_STRING_LEN - 1);
+                                               strlcpy(passwd_item->vp_strvalue,passwd_val,MAX_STRING_LEN - 1);
                                                passwd_item->length = (passwd_len > (MAX_STRING_LEN - 1)) ? (MAX_STRING_LEN - 1) : passwd_len;
                                                pairadd(&request->config_items,passwd_item);
 

diff --git a/src/modules/rlm_logintime/timestr.c b/src/modules/rlm_logintime/timestr.c
index c7102c8..6798798 100644 (file)
--- a/src/modules/rlm_logintime/timestr.c
+++ b/src/modules/rlm_logintime/timestr.c
@@ -183,7 +183,7 @@ static int week_fill(char *bitmap, char *tm)
        char *s;
        char tmp[128];
 
-       strncpy(tmp, tm, 128);
+       strlcpy(tmp, tm, 128);
        tmp[127] = 0;
        for (s = tmp; *s; s++)
                if (isupper(*s)) *s = tolower(*s);

diff --git a/src/modules/rlm_radutmp/rlm_radutmp.c b/src/modules/rlm_radutmp/rlm_radutmp.c
index 1a00e8c..b75de54 100644 (file)
--- a/src/modules/rlm_radutmp/rlm_radutmp.c
+++ b/src/modules/rlm_radutmp/rlm_radutmp.c
@@ -414,7 +414,7 @@ static int radutmp_accounting(void *instance, REQUEST *request)
        /*
         *  Copy the previous translated user name.
         */
-       strncpy(ut.login, buffer, RUT_NAMESIZE);
+       strlcpy(ut.login, buffer, RUT_NAMESIZE);
 
        /*
         *      Perhaps we don't want to store this record into

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/sql_postgresql.c b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/sql_postgresql.c
index 4c49e8b..ca0efb3 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/sql_postgresql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/sql_postgresql.c
@@ -377,7 +377,7 @@ static int sql_fetch_row(SQLSOCK * sqlsocket, UNUSED SQL_CONFIG *config) {
                        len = PQgetlength(pg_sock->result, pg_sock->cur_row, i);
                        pg_sock->row[i] = (char *)rad_malloc(len+1);
                        memset(pg_sock->row[i], '\0', len+1);
-                       strncpy(pg_sock->row[i], PQgetvalue(pg_sock->result, pg_sock->cur_row,i),len);
+                       strlcpy(pg_sock->row[i], PQgetvalue(pg_sock->result, pg_sock->cur_row,i),len);
                }
                pg_sock->cur_row++;
                sqlsocket->row = pg_sock->row;

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 00a7eb4..babcc8e 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -215,7 +215,7 @@ static int sql_xlat(void *instance, REQUEST *request,
                return 0;
        }
 
-       strncpy(out,row[0],ret);
+       strlcpy(out,row[0],ret);
 
        DEBUG("rlm_sql (%s): - sql_xlat finished",
              inst->config->xlat_name);

diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c
index 9f70cae..b03f9b7 100644 (file)
--- a/src/modules/rlm_unix/rlm_unix.c
+++ b/src/modules/rlm_unix/rlm_unix.c
@@ -547,7 +547,7 @@ static int unix_accounting(void *instance, REQUEST *request)
 #ifdef UT_HOSTSIZE
        if (framed_address) {
                ip_ntoa(buf, framed_address);
-               strncpy(ut.ut_host, buf, sizeof(ut.ut_host));
+               strlcpy(ut.ut_host, buf, sizeof(ut.ut_host));
        }
 #endif
 #ifdef HAVE_UTMPX_H