|
 |
653d32 |
From 66e6706039677c364f1181ed3c5620fee59a38e1 Mon Sep 17 00:00:00 2001
|
|
|
653d32 |
From: "Alan T. DeKok" <aland@freeradius.org>
|
|
|
653d32 |
Date: Fri, 2 Jun 2017 09:10:05 -0400
|
|
|
653d32 |
Subject: [PATCH] parse port. Closes #2000
|
|
|
653d32 |
|
|
|
653d32 |
(cherry picked from commit 66c109361ef67906f52fe2d441f6b61ec2492f32)
|
|
|
653d32 |
---
|
|
|
653d32 |
src/modules/proto_dhcp/dhcpclient.c | 7 ++++---
|
|
|
653d32 |
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
653d32 |
|
|
|
653d32 |
diff --git a/src/modules/proto_dhcp/dhcpclient.c b/src/modules/proto_dhcp/dhcpclient.c
|
|
|
653d32 |
index 5c923f136..adbcb8c9d 100644
|
|
|
653d32 |
--- a/src/modules/proto_dhcp/dhcpclient.c
|
|
|
653d32 |
+++ b/src/modules/proto_dhcp/dhcpclient.c
|
|
|
653d32 |
@@ -413,10 +413,11 @@ int main(int argc, char **argv)
|
|
|
653d32 |
*/
|
|
|
653d32 |
server_ipaddr.af = AF_INET;
|
|
|
653d32 |
if (strcmp(argv[1], "-") != 0) {
|
|
|
653d32 |
- if (ip_hton(&server_ipaddr, AF_INET, argv[1], false) < 0) {
|
|
|
653d32 |
- fr_perror("dhcpclient");
|
|
|
653d32 |
- fr_exit_now(1);
|
|
|
653d32 |
+ if (fr_pton_port(&server_ipaddr, &server_port, argv[1], -1, AF_INET, true) < 0) {
|
|
|
653d32 |
+ fprintf(stderr, "dhcpclient: Failed parsing IP:port - %s", fr_strerror());
|
|
|
653d32 |
+ exit(1);
|
|
|
653d32 |
}
|
|
|
653d32 |
+
|
|
|
653d32 |
client_ipaddr.af = server_ipaddr.af;
|
|
|
653d32 |
}
|
|
|
653d32 |
|
|
|
653d32 |
--
|
|
|
653d32 |
2.11.0
|
|
|
653d32 |
|