[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/4] Allow protocol to be separated from host with a semicolon
From: |
Matthew Garrett |
Subject: |
[PATCH 4/4] Allow protocol to be separated from host with a semicolon |
Date: |
Mon, 23 Jan 2017 16:36:01 -0800 |
Some DHCP servers (such as dnsmasq) tokenise parameters with commas, making
it impossible to pass boot files with commas in them. Allow using a
semicolon to separate the protocol from host if a comma wasn't found.
---
grub-core/net/net.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/grub-core/net/net.c b/grub-core/net/net.c
index 585f4f7..efacb30 100644
--- a/grub-core/net/net.c
+++ b/grub-core/net/net.c
@@ -1280,6 +1280,10 @@ grub_net_open_real (const char *name)
const char *comma;
char *colon;
comma = grub_strchr (name, ',');
+ if (!comma)
+ {
+ comma = grub_strchr (name, ';');
+ }
colon = grub_strchr (name, ':');
if (colon)
{
--
2.9.3
- Misc network boot patches, Matthew Garrett, 2017/01/23
- [PATCH 1/4] Allow non-default ports for HTTP requests, Matthew Garrett, 2017/01/23
- [PATCH 2/4] Send a user class identifier in bootp requests and tag it as DHCP discover, Matthew Garrett, 2017/01/23
- [PATCH 3/4] Don't allocate a new address buffer if we receive multiple DNS responses, Matthew Garrett, 2017/01/23
- [PATCH 4/4] Allow protocol to be separated from host with a semicolon,
Matthew Garrett <=
- Re: [PATCH 4/4] Allow protocol to be separated from host with a semicolon, Andrei Borzenkov, 2017/01/23
- Re: [PATCH 4/4] Allow protocol to be separated from host with a semicolon, Matthew Garrett, 2017/01/24
- Re: [PATCH 4/4] Allow protocol to be separated from host with a semicolon, Andrei Borzenkov, 2017/01/24
- Re: [PATCH 4/4] Allow protocol to be separated from host with a semicolon, Matthew Garrett, 2017/01/24
- Re: [PATCH 4/4] Allow protocol to be separated from host with a semicolon, Andrei Borzenkov, 2017/01/24
- Re: [PATCH 4/4] Allow protocol to be separated from host with a semicolon, Matthew Garrett, 2017/01/24
- Re: [PATCH 4/4] Allow protocol to be separated from host with a semicolon, Andrei Borzenkov, 2017/01/25
- Re: [PATCH 4/4] Allow protocol to be separated from host with a semicolon, Matthew Garrett, 2017/01/25
- Re: [PATCH 4/4] Allow protocol to be separated from host with a semicolon, Andrei Borzenkov, 2017/01/25
- Re: [PATCH 4/4] Allow protocol to be separated from host with a semicolon, Matthew Garrett, 2017/01/25