oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

large strc{py,at}_truncate -> strlc{py,at} replacement

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6984 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-09-16 20:41:57 +00:00
parent 8e441f1158
commit bf75fac82a
42 changed files with 176 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
appl/ftp/ftpd/ftpcmd.y
View File

@@ -1023,7 +1023,7 @@ ftpd_getline(char *s, int n)
cs = s;
/* tmpline may contain saved command from urgent mode interruption */
if(ftp_command){
strcpy_truncate(s, ftp_command, n);
strlcpy(s, ftp_command, n);
if (debug)
syslog(LOG_DEBUG, "command: %s", s);
#ifdef XXX
@@ -1362,7 +1362,7 @@ help(struct tab *ctab, char *s)
columns = 1;
lines = (NCMDS + columns - 1) / columns;
for (i = 0; i < lines; i++) {
strcpy_truncate (buf, " ", sizeof(buf));
strlcpy (buf, " ", sizeof(buf));
for (j = 0; j < columns; j++) {
c = ctab + j * lines + i;
snprintf (buf + strlen(buf),
@@ -1374,7 +1374,7 @@ help(struct tab *ctab, char *s)
break;
w = strlen(c->name) + 1;
while (w < width) {
strcat_truncate (buf,
strlcat (buf,
" ",
sizeof(buf));
w++;

18
appl/ftp/ftpd/ftpd.c
View File

@@ -153,7 +153,7 @@ curdir(void)
if (getcwd(path, sizeof(path)-1) == NULL)
return ("");
if (path[1] != '\0') /* special case for root dir. */
strcat_truncate(path, "/", sizeof(path));
strlcat(path, "/", sizeof(path));
/* For guest account, skip / since it's chrooted */
return (guest ? path+1 : path);
}
@@ -526,7 +526,7 @@ user(char *name)
if (inet_ntop (his_addr->sa_family,
socket_get_address(his_addr),
data_addr, sizeof(data_addr)) == NULL)
strcpy_truncate (data_addr, "unknown address",
strlcpy (data_addr, "unknown address",
sizeof(data_addr));
syslog(LOG_NOTICE,
@@ -556,7 +556,7 @@ user(char *name)
socket_get_address(his_addr),
data_addr,
sizeof(data_addr)) == NULL)
strcpy_truncate (data_addr,
strlcpy (data_addr,
"unknown address",
sizeof(data_addr));
@@ -571,7 +571,7 @@ user(char *name)
}
}
if (logging)
strcpy_truncate(curname, name, sizeof(curname));
strlcpy(curname, name, sizeof(curname));
if(sec_complete) {
if(sec_userok(name) == 0)
do_login(232, name);
@@ -786,7 +786,7 @@ int do_login(int code, char *passwd)
if (inet_ntop (his_addr->sa_family,
socket_get_address(his_addr),
data_addr, sizeof(data_addr)) == NULL)
strcpy_truncate (data_addr, "unknown address",
strlcpy (data_addr, "unknown address",
sizeof(data_addr));
syslog(LOG_INFO, "ANONYMOUS FTP LOGIN FROM %s(%s), %s",
@@ -807,7 +807,7 @@ int do_login(int code, char *passwd)
if (inet_ntop (his_addr->sa_family,
socket_get_address(his_addr),
data_addr, sizeof(data_addr)) == NULL)
strcpy_truncate (data_addr, "unknown address",
strlcpy (data_addr, "unknown address",
sizeof(data_addr));
syslog(LOG_INFO, "FTP LOGIN FROM %s(%s) as %s",
@@ -898,7 +898,7 @@ pass(char *passwd)
if (inet_ntop (his_addr->sa_family,
socket_get_address(his_addr),
data_addr, sizeof(data_addr)) == NULL)
strcpy_truncate (data_addr, "unknown address",
strlcpy (data_addr, "unknown address",
sizeof(data_addr));
reply(530, "Login incorrect.");
@@ -1242,7 +1242,7 @@ dataconn(char *name, off_t size, char *mode)
if (inet_ntop (data_source->sa_family,
socket_get_address(data_source),
data_addr, sizeof(data_addr)) == NULL)
strcpy_truncate (data_addr, "unknown address",
strlcpy (data_addr, "unknown address",
sizeof(data_addr));
reply(425, "Can't create data socket (%s,%d): %s.",
@@ -1781,7 +1781,7 @@ dolog(struct sockaddr *sa)
if (inet_ntop (his_addr->sa_family,
socket_get_address(his_addr),
data_addr, sizeof(data_addr)) == NULL)
strcpy_truncate (data_addr, "unknown address",
strlcpy (data_addr, "unknown address",
sizeof(data_addr));

12
appl/ftp/ftpd/kauth.c
View File

@@ -85,7 +85,7 @@ store_ticket(KTEXT cip)
return(INTK_BADPW);
/* extract server's name */
strcpy_truncate(sp.name, ptr, sizeof(sp.name));
strlcpy(sp.name, ptr, sizeof(sp.name));
ptr += len + 1;
left -= len + 1;
@@ -94,7 +94,7 @@ store_ticket(KTEXT cip)
return(INTK_BADPW);
/* extract server's instance */
strcpy_truncate(sp.instance, ptr, sizeof(sp.instance));
strlcpy(sp.instance, ptr, sizeof(sp.instance));
ptr += len + 1;
left -= len + 1;
@@ -103,7 +103,7 @@ store_ticket(KTEXT cip)
return(INTK_BADPW);
/* extract server's realm */
strcpy_truncate(sp.realm, ptr, sizeof(sp.realm));
strlcpy(sp.realm, ptr, sizeof(sp.realm));
ptr += len + 1;
left -= len + 1;
@@ -304,12 +304,12 @@ klist(void)
" Issued", " Expires", " Principal (kvno)");
header = 0;
}
strcpy_truncate(buf1, short_date(c.issue_date), sizeof(buf1));
strlcpy(buf1, short_date(c.issue_date), sizeof(buf1));
c.issue_date = krb_life_to_time(c.issue_date, c.lifetime);
if (time(0) < (unsigned long) c.issue_date)
strcpy_truncate(buf2, short_date(c.issue_date), sizeof(buf2));
strlcpy(buf2, short_date(c.issue_date), sizeof(buf2));
else
strcpy_truncate(buf2, ">>> Expired <<< ", sizeof(buf2));
strlcpy(buf2, ">>> Expired <<< ", sizeof(buf2));
lreply(200, "%s %s %s (%d)", buf1, buf2,
krb_unparse_name_long(c.service, c.instance, c.realm), c.kvno);
}

4
appl/ftp/ftpd/popen.c
View File

@@ -89,10 +89,10 @@ ftp_rooted(const char *path)
if(!home[0])
if((pwd = k_getpwnam("ftp")))
strcpy_truncate(home, pwd->pw_dir, sizeof(home));
strlcpy(home, pwd->pw_dir, sizeof(home));
snprintf(newpath, sizeof(newpath), "%s/%s", home, path);
if(access(newpath, X_OK))
strcpy_truncate(newpath, path, sizeof(newpath));
strlcpy(newpath, path, sizeof(newpath));
return newpath;
}