d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation error for install.c in loader

Browse Source 
Fix typo in interp_include() invocation (missing 'p')
Remove setting tftpip, as servip is used by the tftp code in libsa. There
is no separate tftpip global variable any more.

Obtained from:	Juniper Networks, Inc.
MFC after:	1 week
Differential Revision:	https://reviews.freebsd.org/D25897
This commit is contained in:
Stephen J. Kiernan 2020-07-31 16:08:25 +00:00
parent 0b87619ffe
commit fafe230db0
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stand/common/install.c
View File

@ -286,10 +286,6 @@ install(char *pkgname)
setenv("serverip", inet_ntoa(servip), 1); setenv("serverip", inet_ntoa(servip), 1);
if (proto == &tftp_fsops) {
tftpip.s_addr = servip.s_addr;
}
*pkgname = '/'; *pkgname = '/';
} else } else
pkgname = s; pkgname = s;
@ -340,7 +336,7 @@ install(char *pkgname)
fd = open(s, O_RDONLY); fd = open(s, O_RDONLY);
if (fd != -1) { if (fd != -1) {
close(fd); close(fd);
error = inter_include(s); error = interp_include(s);
if (error == CMD_ERROR) if (error == CMD_ERROR)
goto fail; goto fail;
} }