ip/ipconfig: increase maximum host and domainname size to 255 bytes. idn for -h option

This commit is contained in:
cinap_lenrek 2018-09-25 21:51:57 +02:00
parent 0126f10d05
commit f18e8dfde8
2 changed files with 5 additions and 5 deletions

View file

@ -54,8 +54,9 @@ struct Conf
ulong xid; ulong xid;
ulong starttime; ulong starttime;
char sname[64]; char sname[64];
char hostname[32]; char hostname[256];
char domainname[64]; char domainname[256];
char dnsdomain[256];
uchar server[IPaddrlen]; /* server IP address */ uchar server[IPaddrlen]; /* server IP address */
ulong offered; /* offered lease time */ ulong offered; /* offered lease time */
ulong lease; /* lease time */ ulong lease; /* lease time */
@ -87,8 +88,6 @@ struct Conf
uchar autoflag; /* flag: autonomous */ uchar autoflag; /* flag: autonomous */
ulong validlt; /* valid lifetime (seconds) */ ulong validlt; /* valid lifetime (seconds) */
ulong preflt; /* preferred lifetime (seconds) */ ulong preflt; /* preferred lifetime (seconds) */
char dnsdomain[256];
}; };
struct Ctl struct Ctl

View file

@ -350,7 +350,8 @@ main(int argc, char **argv)
plan9 = 0; plan9 = 0;
break; break;
case 'h': 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; sendhostname = 1;
break; break;
case 'm': case 'm':