From: Joseph C. Lehner <joseph.c.lehner@gmail.com>
Date: Tue, 9 Aug 2016 15:16:21 +0000 (+0200)
Subject: Merge branches
X-Git-Tag: v0.9.4~5^2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bc6007beb7ed7ded54b0aa01cc39efe8f123d8d7;p=oweals%2Fnmrpflash.git

Merge branches
---

bc6007beb7ed7ded54b0aa01cc39efe8f123d8d7
diff --cc Makefile
index 01cc9ad,01cc9ad..d1f2e95
--- a/Makefile
+++ b/Makefile
@@@ -29,7 -29,7 +29,7 @@@ install: nmrpflas
  	install -m 755 nmrpflash $(PREFIX)/bin
  
  release/osx:
--	CFLAGS="-arch i686 -arch x86_64 -mmacosx-version-min=10.6" make release
++	CFLAGS="-arch i386 -arch x86_64 -mmacosx-version-min=10.6" make release
  	zip nmrpflash-osx.zip nmrpflash
  
  release/linux: release
diff --cc nmrp.c
index c696fcc,59938db..39d37f9
--- a/nmrp.c
+++ b/nmrp.c
@@@ -393,9 -462,7 +462,7 @@@ int nmrp_do(struct nmrpd_args *args
  		return 1;
  	}
  
- 	sigh_orig = signal(SIGINT, sigh);
- 
 -	status = is_valid_ip(sock, &ipconf.addr, &ipconf.mask);
 +	status = is_valid_ip(sock, &ipaddr, &ipmask);
  	if (status <= 0) {
  		if (!status) {
  			fprintf(stderr, "Address %s/%s cannot be used on interface %s.\n",