| 1 |
brianr |
1.1 |
diff -ru bandwidthd-2.0.1/bandwidthd.c bandwidthd-2.0.1.new/bandwidthd.c |
| 2 |
|
|
--- bandwidth2.0.1.1/bandwidthd.c 2010-03-21 17:27:41.000000000 -0400 |
| 3 |
|
|
+++ bandwidth2.0.1.1.new/bandwidthd.c 2011-03-12 20:10:05.000000000 -0500 |
| 4 |
|
|
@@ -350,15 +350,15 @@ |
| 5 |
|
|
if (!stat("bandwidthd.conf", &StatBuf)) |
| 6 |
|
|
bd_conf = "bandwidthd.conf"; |
| 7 |
|
|
else |
| 8 |
|
|
- if (!stat("./etc/bandwidthd.conf", &StatBuf)) |
| 9 |
|
|
- bd_conf = "./etc/bandwidthd.conf"; |
| 10 |
|
|
+ if (!stat("/etc/bandwidthd.conf", &StatBuf)) |
| 11 |
|
|
+ bd_conf = "/etc/bandwidthd.conf"; |
| 12 |
|
|
else |
| 13 |
|
|
if (!stat(CONFIG_FILE, &StatBuf)) |
| 14 |
|
|
bd_conf = CONFIG_FILE; |
| 15 |
|
|
else |
| 16 |
|
|
{ |
| 17 |
|
|
- printf("Cannot find bandwidthd.conf, ./etc/bandwidthd.conf or %s\n", CONFIG_FILE); |
| 18 |
|
|
- syslog(LOG_ERR, "Cannot find bandwidthd.conf, ./etc/bandwidthd.conf or %s", CONFIG_FILE); |
| 19 |
|
|
+ printf("Cannot find bandwidthd.conf, /etc/bandwidthd.conf or %s\n", CONFIG_FILE); |
| 20 |
|
|
+ syslog(LOG_ERR, "Cannot find bandwidthd.conf, /etc/bandwidthd.conf or %s", CONFIG_FILE); |
| 21 |
|
|
exit(1); |
| 22 |
|
|
} |
| 23 |
|
|
} |
| 24 |
|
|
@@ -367,7 +367,7 @@ |
| 25 |
|
|
if (!bdconfig_in) |
| 26 |
|
|
{ |
| 27 |
|
|
syslog(LOG_ERR, "Cannot open bandwidthd.conf"); |
| 28 |
|
|
- printf("Cannot open ./etc/bandwidthd.conf\n"); |
| 29 |
|
|
+ printf("Cannot open /etc/bandwidthd.conf\n"); |
| 30 |
|
|
exit(1); |
| 31 |
|
|
} |
| 32 |
|
|
bdconfig_parse(); |
| 33 |
|
|
diff -ru bandwidthd-2.0.1/Makefile.in bandwidthd-2.0.1.new/Makefile.in |
| 34 |
|
|
--- bandwidth2.0.1.1/Makefile.in 2011-03-13 03:46:33.000000000 -0400 |
| 35 |
|
|
+++ bandwidth2.0.1.1.new/Makefile.in 2011-03-13 05:04:53.000000000 -0400 |
| 36 |
|
|
@@ -1,5 +1,7 @@ |
| 37 |
|
|
exec_prefix = @exec_prefix@ |
| 38 |
|
|
prefix = @prefix@ |
| 39 |
|
|
+datadir = @datadir@ |
| 40 |
|
|
+sbindir = @sbindir@ |
| 41 |
|
|
bindir = @bindir@ |
| 42 |
|
|
sysconfdir = @sysconfdir@ |
| 43 |
|
|
localstatedir = @localstatedir@ |
| 44 |
|
|
@@ -46,13 +48,13 @@ |
| 45 |
|
|
-rm -f conf.tab.c conf.tab.h conf.l.c config.h.in configure |
| 46 |
|
|
|
| 47 |
|
|
install: all |
| 48 |
|
|
- @INSTALL@ -d $(DESTDIR)$(bindir) |
| 49 |
|
|
- @INSTALL@ -d $(DESTDIR)$(sysconfdir) |
| 50 |
|
|
- @INSTALL@ -d $(DESTDIR)$(localstatedir)/bandwidthd/htdocs |
| 51 |
|
|
- @INSTALL@ -m755 -s bandwidthd $(DESTDIR)$(bindir) |
| 52 |
|
|
- if [ ! -f $(DESTDIR)$(sysconfdir)/bandwidthd.conf ] ; then @INSTALL@ -m644 etc/bandwidthd.conf $(DESTDIR)$(sysconfdir); fi |
| 53 |
|
|
- @INSTALL@ -m644 htdocs/legend.gif $(DESTDIR)$(localstatedir)/bandwidthd/htdocs |
| 54 |
|
|
- @INSTALL@ -m644 htdocs/logo.gif $(DESTDIR)$(localstatedir)/bandwidthd/htdocs |
| 55 |
|
|
+ @INSTALL@ -d $(DESTDIR)$(sbindir) |
| 56 |
|
|
+ @INSTALL@ -d $(DESTDIR)/etc |
| 57 |
|
|
+ @INSTALL@ -d $(DESTDIR)$(datadir)/bandwidthd/htdocs |
| 58 |
|
|
+ @INSTALL@ -m755 -s bandwidthd $(DESTDIR)$(sbindir)/bandwidthd |
| 59 |
|
|
+ if [ ! -f $(DESTDIR)/etc/bandwidthd.conf ] ; then @INSTALL@ -m644 etc/bandwidthd.conf $(DESTDIR)/etc/ ; fi |
| 60 |
|
|
+ @INSTALL@ -m644 htdocs/legend.gif $(DESTDIR)$(datadir)/bandwidthd/htdocs |
| 61 |
|
|
+ @INSTALL@ -m644 htdocs/logo.gif $(DESTDIR)$(datadir)/bandwidthd/htdocs |
| 62 |
|
|
|
| 63 |
|
|
#**** Stuff where -WALL is turned off to reduce the noise in a compile so I can see my own errors ******************* |
| 64 |
|
|
conf.l.o: conf.l.c |
Parent Directory
| 
Revision Log
| 
Revision Graph
