D40441.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D40441.diff
View Options

	diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c
	--- a/sbin/ifconfig/af_inet6.c
	+++ b/sbin/ifconfig/af_inet6.c
	@@ -433,8 +433,6 @@
	{
	struct in6_px *px = sin6tab_nl[which];

	- newaddr &= 1;
	-
	px->set = true;
	px->plen = 128;
	if (which == ADDR) {
	@@ -546,8 +544,6 @@
	struct addrinfo hints, *res;
	int error = -1;

	- newaddr &= 1;
	-
	sin->sin6_len = sizeof(*sin);
	if (which != MASK)
	sin->sin6_family = AF_INET6;
	diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h
	--- a/sbin/ifconfig/ifconfig.h
	+++ b/sbin/ifconfig/ifconfig.h
	@@ -252,7 +252,6 @@
	extern ifconfig_handle_t *lifh;
	extern struct ifreq ifr;
	extern int allmedia;
	-extern int newaddr;
	extern int exit_code;
	extern char f_inet, f_inet6, f_ether, f_addr;

	diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
	--- a/sbin/ifconfig/ifconfig.c
	+++ b/sbin/ifconfig/ifconfig.c
	@@ -101,7 +101,7 @@
	static int setmask;
	static int doalias;
	static int clearaddr;
	-int newaddr = 1;
	+static int newaddr = 1;

	int exit_code = 0;