summaryrefslogtreecommitdiff
path: root/sys/src
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@felloff.net>2018-09-25 21:51:57 +0200
committercinap_lenrek <cinap_lenrek@felloff.net>2018-09-25 21:51:57 +0200
commitf18e8dfde88d00a19a184604865aa4d6383b16f5 (patch)
treed74a15f1a04b013fa5d224b89360e68fe705c3a6 /sys/src
parent0126f10d05933421a1db388368accd81578c9888 (diff)
ip/ipconfig: increase maximum host and domainname size to 255 bytes. idn for -h option
Diffstat (limited to 'sys/src')
-rw-r--r--sys/src/cmd/ip/ipconfig/ipconfig.h7
-rw-r--r--sys/src/cmd/ip/ipconfig/main.c3
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/src/cmd/ip/ipconfig/ipconfig.h b/sys/src/cmd/ip/ipconfig/ipconfig.h
index 7210a3112..acdd5d62c 100644
--- a/sys/src/cmd/ip/ipconfig/ipconfig.h
+++ b/sys/src/cmd/ip/ipconfig/ipconfig.h
@@ -54,8 +54,9 @@ struct Conf
ulong xid;
ulong starttime;
char sname[64];
- char hostname[32];
- char domainname[64];
+ char hostname[256];
+ char domainname[256];
+ char dnsdomain[256];
uchar server[IPaddrlen]; /* server IP address */
ulong offered; /* offered lease time */
ulong lease; /* lease time */
@@ -87,8 +88,6 @@ struct Conf
uchar autoflag; /* flag: autonomous */
ulong validlt; /* valid lifetime (seconds) */
ulong preflt; /* preferred lifetime (seconds) */
-
- char dnsdomain[256];
};
struct Ctl
diff --git a/sys/src/cmd/ip/ipconfig/main.c b/sys/src/cmd/ip/ipconfig/main.c
index 53f0184b6..8201e50d5 100644
--- a/sys/src/cmd/ip/ipconfig/main.c
+++ b/sys/src/cmd/ip/ipconfig/main.c
@@ -350,7 +350,8 @@ main(int argc, char **argv)
plan9 = 0;
break;
case 'h':
- snprint(conf.hostname, sizeof conf.hostname, "%s", EARGF(usage()));
+ if(utf2idn(EARGF(usage()), conf.hostname, sizeof(conf.hostname)) == nil)
+ sysfatal("bad hostname");
sendhostname = 1;
break;
case 'm':