diff options
| author | Michael Brown <mcb30@ipxe.org> | 2011-03-28 20:44:17 +0100 |
|---|---|---|
| committer | Michael Brown <mcb30@ipxe.org> | 2011-03-28 20:47:10 +0100 |
| commit | 9126eb27d1d9597eb8751a5ef75c9bdcf4e429a6 (patch) | |
| tree | 49076813fad4a3ce45171d7ce397b7a811d9159e /core/fs | |
| parent | 239fed5bbdab41643af2d119107023ec3e0d8a3c (diff) | |
| download | syslinux-9126eb27d1d9597eb8751a5ef75c9bdcf4e429a6.tar.gz | |
pxe: allow TFTP server IP to be empty when not using TFTP
Reported-by: Marcus Grando <Marcus.Grando@corp.terra.com.br>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'core/fs')
| -rw-r--r-- | core/fs/pxe/pxe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/fs/pxe/pxe.c b/core/fs/pxe/pxe.c index aef2e7e1..12bbdad0 100644 --- a/core/fs/pxe/pxe.c +++ b/core/fs/pxe/pxe.c @@ -754,9 +754,6 @@ static void __pxe_searchdir(const char *filename, struct file *file) break; } - if (!ip) - return; /* No server */ - buf++; /* Point *past* the final NULL */ memcpy(buf, rrq_tail, sizeof rrq_tail); buf += sizeof rrq_tail; @@ -792,6 +789,9 @@ static void __pxe_searchdir(const char *filename, struct file *file) } #endif /* GPXE */ + if (!ip) + goto done; /* No server */ + timeout_ptr = TimeoutTable; /* Reset timeout */ sendreq: |