aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Makefile22
-rw-r--r--src/ipcalc.c7
2 files changed, 17 insertions, 12 deletions
diff --git a/src/Makefile b/src/Makefile
index fd4a4d5f..cd9c812b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -15,16 +15,16 @@ clean:
install:
mkdir -p $(ROOT)/bin $(ROOT)/usr/sbin $(ROOT)$(mandir)/man{1,8} $(ROOT)/etc
- install -s -m 755 doexec $(ROOT)/bin/doexec
- install -s -m 755 usleep $(ROOT)/bin/usleep
- install -s -m 4755 usernetctl $(ROOT)/usr/sbin/usernetctl
- install -s -m 2755 netreport $(ROOT)/sbin/netreport
- install -s -m 755 ipcalc $(ROOT)/bin/ipcalc
- install -s -m 755 initlog $(ROOT)/sbin/initlog
- install -s -m 755 minilogd $(ROOT)/sbin/minilogd
- install -s -m 755 getkey $(ROOT)/sbin/getkey
- install -s -m 755 ppp-watch $(ROOT)/sbin/ppp-watch
- install -s -m 755 consoletype $(ROOT)/sbin/consoletype
+ install -m 755 doexec $(ROOT)/bin/doexec
+ install -m 755 usleep $(ROOT)/bin/usleep
+ install -m 4755 usernetctl $(ROOT)/usr/sbin/usernetctl
+ install -m 2755 netreport $(ROOT)/sbin/netreport
+ install -m 755 ipcalc $(ROOT)/bin/ipcalc
+ install -m 755 initlog $(ROOT)/sbin/initlog
+ install -m 755 minilogd $(ROOT)/sbin/minilogd
+ install -m 755 getkey $(ROOT)/sbin/getkey
+ install -m 755 ppp-watch $(ROOT)/sbin/ppp-watch
+ install -m 755 consoletype $(ROOT)/sbin/consoletype
install -m 644 initlog.1 $(ROOT)$(mandir)/man1
install -m 644 doexec.1 $(ROOT)$(mandir)/man1
install -m 644 netreport.1 $(ROOT)$(mandir)/man1
@@ -42,7 +42,7 @@ install:
# this daemon and initscript are useful for testing the up/down/status stuff
# not installed by default, only comes from sources.
install-test:
- install -s -m 755 testd $(ROOT)/usr/sbin/testd
+ install -m 755 testd $(ROOT)/usr/sbin/testd
install -m 755 testdinit $(ROOT)/etc/init.d/testd
ipcalc: ipcalc.o
diff --git a/src/ipcalc.c b/src/ipcalc.c
index 56b5ae87..ad279587 100644
--- a/src/ipcalc.c
+++ b/src/ipcalc.c
@@ -10,7 +10,7 @@
*
* Authors:
* Erik Troan <ewt@redhat.com>
- * Preston Brown <pbrown@redhat.com
+ * Preston Brown <pbrown@redhat.com>
*/
@@ -290,6 +290,11 @@ int main(int argc, const char **argv) {
}
poptFreeContext(optCon);
+
+ if (!(showNetmask|showPrefix|showBroadcast|showNetwork|showHostname)) {
+ poptPrintHelp(optCon, stderr, 0);
+ return 1;
+ }
/* we know what we want to display now, so display it. */