Index: contrib/mod_tls.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/contrib/mod_tls.c,v
retrieving revision 1.262
diff -u -r1.262 mod_tls.c
--- contrib/mod_tls.c 11 Nov 2011 23:14:13 -0000 1.262
+++ contrib/mod_tls.c 17 Nov 2011 21:26:30 -0000
@@ -1941,13 +1941,13 @@
k = (tls_pkey_t *) data;
if ((k->flags & TLS_PKEY_USE_RSA) && k->rsa_pkey) {
- strncpy(buf, k->rsa_pkey, buflen);
+ sstrncpy(buf, k->rsa_pkey, buflen);
buf[buflen - 1] = '\0';
return strlen(buf);
}
if ((k->flags & TLS_PKEY_USE_DSA) && k->dsa_pkey) {
- strncpy(buf, k->dsa_pkey, buflen);
+ sstrncpy(buf, k->dsa_pkey, buflen);
buf[buflen - 1] = '\0';
return strlen(buf);
}
Index: contrib/mod_sftp/keys.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/contrib/mod_sftp/keys.c,v
retrieving revision 1.16
diff -u -r1.16 keys.c
--- contrib/mod_sftp/keys.c 23 May 2011 21:03:12 -0000 1.16
+++ contrib/mod_sftp/keys.c 17 Nov 2011 21:26:30 -0000
@@ -718,7 +718,7 @@
k = (struct sftp_pkey *) d;
if (k->host_pkey) {
- strncpy(buf, k->host_pkey, buflen);
+ sstrncpy(buf, k->host_pkey, buflen);
buf[buflen - 1] = '\0';
return strlen(buf);
}
Index: lib/pr-syslog.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/lib/pr-syslog.c,v
retrieving revision 1.24
diff -u -r1.24 pr-syslog.c
--- lib/pr-syslog.c 1 May 2011 04:32:27 -0000 1.24
+++ lib/pr-syslog.c 17 Nov 2011 21:26:30 -0000
@@ -324,17 +324,17 @@
* hold more data than 14 bytes, so...
*/
if (sizeof(syslog_addr.sa_data) >= (strlen(PR_PATH_LOG) + 1)) {
- strncpy(syslog_addr.sa_data, PR_PATH_LOG, sizeof(syslog_addr.sa_data));
+ sstrncpy(syslog_addr.sa_data, PR_PATH_LOG, sizeof(syslog_addr.sa_data));
syslog_addr.sa_data[sizeof(syslog_addr.sa_data)-1] = '\0';
addrlen = sizeof(syslog_addr);
} else {
- strncpy(syslog_addr.sa_data, PR_PATH_LOG, strlen(PR_PATH_LOG) + 1);
+ sstrncpy(syslog_addr.sa_data, PR_PATH_LOG, strlen(PR_PATH_LOG) + 1);
addrlen = sizeof(syslog_addr) +
((strlen(PR_PATH_LOG) + 1) - sizeof(syslog_addr.sa_data));
}
# else
- strncpy(syslog_addr.sa_data, PR_PATH_LOG, sizeof(syslog_addr.sa_data));
+ sstrncpy(syslog_addr.sa_data, PR_PATH_LOG, sizeof(syslog_addr.sa_data));
syslog_addr.sa_data[sizeof(syslog_addr.sa_data)-1] = '\0';
addrlen = sizeof(syslog_addr);
# endif /* !Mac OSX */
Index: lib/pwgrent.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/lib/pwgrent.c,v
retrieving revision 1.16
diff -u -r1.16 pwgrent.c
--- lib/pwgrent.c 23 May 2011 21:08:34 -0000 1.16
+++ lib/pwgrent.c 17 Nov 2011 21:26:30 -0000
@@ -62,7 +62,7 @@
buffer = pwdbuf;
pwd = &pwent;
- strncpy(buffer, buf, BUFSIZ-1);
+ sstrncpy(buffer, buf, BUFSIZ-1);
buffer[BUFSIZ-1] = '\0';
for(cp = buffer, i = 0; i < NPWDFIELDS && cp; i++) {
Index: modules/mod_auth_file.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/modules/mod_auth_file.c,v
retrieving revision 1.40
diff -u -r1.40 mod_auth_file.c
--- modules/mod_auth_file.c 23 May 2011 21:11:56 -0000 1.40
+++ modules/mod_auth_file.c 17 Nov 2011 21:26:30 -0000
@@ -109,7 +109,7 @@
buffer = pwdbuf;
pwd = &pwent;
- strncpy(buffer, buf, BUFSIZ-1);
+ sstrncpy(buffer, buf, BUFSIZ-1);
buffer[BUFSIZ-1] = '\0';
for (cp = buffer, i = 0; i < NPWDFIELDS && cp; i++) {
Index: modules/mod_ctrls.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/modules/mod_ctrls.c,v
retrieving revision 1.50
diff -u -r1.50 mod_ctrls.c
--- modules/mod_ctrls.c 31 Jul 2011 22:07:03 -0000 1.50
+++ modules/mod_ctrls.c 17 Nov 2011 21:26:30 -0000
@@ -486,7 +486,7 @@
memset(&sock, 0, sizeof(sock));
sock.sun_family = AF_UNIX;
- strncpy(sock.sun_path, sock_file, strlen(sock_file));
+ sstrncpy(sock.sun_path, sock_file, strlen(sock_file));
len = sizeof(sock);
Index: src/ctrls.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/src/ctrls.c,v
retrieving revision 1.30
diff -u -r1.30 ctrls.c
--- src/ctrls.c 5 Jun 2011 22:45:14 -0000 1.30
+++ src/ctrls.c 17 Nov 2011 21:26:30 -0000
@@ -982,7 +982,7 @@
memset(&ctrl_sock, 0, sizeof(ctrl_sock));
ctrl_sock.sun_family = AF_UNIX;
- strncpy(ctrl_sock.sun_path, socket_file, strlen(socket_file));
+ sstrncpy(ctrl_sock.sun_path, socket_file, strlen(socket_file));
len = sizeof(ctrl_sock);
if (connect(sockfd, (struct sockaddr *) &ctrl_sock, len) < 0) {
Index: utils/ftptop.c
===================================================================
RCS file: /cvsroot/proftp/proftpd/utils/ftptop.c,v
retrieving revision 1.42
diff -u -r1.42 ftptop.c
--- utils/ftptop.c 23 May 2011 20:46:20 -0000 1.42
+++ utils/ftptop.c 17 Nov 2011 21:26:30 -0000
@@ -524,7 +524,7 @@
exit(1);
}
- strncpy(ftp_sessions[ftp_nsessions++], buf, strlen(buf) + 1);
+ util_sstrncpy(ftp_sessions[ftp_nsessions++], buf, strlen(buf) + 1);
}
scoreboard_close();