generated from smedev/Template-for-SMEServer-Contribs-Package
65 lines
2.7 KiB
Diff
65 lines
2.7 KiB
Diff
|
diff -ru bandwidthd-2.0.1/bandwidthd.c bandwidthd-2.0.1.new/bandwidthd.c
|
||
|
|
--- bandwidth2.0.1.1/bandwidthd.c 2010-03-21 17:27:41.000000000 -0400
|
||
|
|
+++ bandwidth2.0.1.1.new/bandwidthd.c 2011-03-12 20:10:05.000000000 -0500
|
||
|
|
@@ -350,15 +350,15 @@
|
||
|
|
if (!stat("bandwidthd.conf", &StatBuf))
|
||
|
|
bd_conf = "bandwidthd.conf";
|
||
|
|
else
|
||
|
|
- if (!stat("./etc/bandwidthd.conf", &StatBuf))
|
||
|
|
- bd_conf = "./etc/bandwidthd.conf";
|
||
|
|
+ if (!stat("/etc/bandwidthd.conf", &StatBuf))
|
||
|
|
+ bd_conf = "/etc/bandwidthd.conf";
|
||
|
|
else
|
||
|
|
if (!stat(CONFIG_FILE, &StatBuf))
|
||
|
|
bd_conf = CONFIG_FILE;
|
||
|
|
else
|
||
|
|
{
|
||
|
|
- printf("Cannot find bandwidthd.conf, ./etc/bandwidthd.conf or %s\n", CONFIG_FILE);
|
||
|
|
- syslog(LOG_ERR, "Cannot find bandwidthd.conf, ./etc/bandwidthd.conf or %s", CONFIG_FILE);
|
||
|
|
+ printf("Cannot find bandwidthd.conf, /etc/bandwidthd.conf or %s\n", CONFIG_FILE);
|
||
|
|
+ syslog(LOG_ERR, "Cannot find bandwidthd.conf, /etc/bandwidthd.conf or %s", CONFIG_FILE);
|
||
|
|
exit(1);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
@@ -367,7 +367,7 @@
|
||
|
|
if (!bdconfig_in)
|
||
|
|
{
|
||
|
|
syslog(LOG_ERR, "Cannot open bandwidthd.conf");
|
||
|
|
- printf("Cannot open ./etc/bandwidthd.conf\n");
|
||
|
|
+ printf("Cannot open /etc/bandwidthd.conf\n");
|
||
|
|
exit(1);
|
||
|
|
}
|
||
|
|
bdconfig_parse();
|
||
|
|
diff -ru bandwidthd-2.0.1/Makefile.in bandwidthd-2.0.1.new/Makefile.in
|
||
|
|
--- bandwidth2.0.1.1/Makefile.in 2011-03-13 03:46:33.000000000 -0400
|
||
|
|
+++ bandwidth2.0.1.1.new/Makefile.in 2011-03-13 05:04:53.000000000 -0400
|
||
|
|
@@ -1,5 +1,7 @@
|
||
|
|
exec_prefix = @exec_prefix@
|
||
|
|
prefix = @prefix@
|
||
|
|
+datadir = @datadir@
|
||
|
|
+sbindir = @sbindir@
|
||
|
|
bindir = @bindir@
|
||
|
|
sysconfdir = @sysconfdir@
|
||
|
|
localstatedir = @localstatedir@
|
||
|
|
@@ -46,13 +48,13 @@
|
||
|
|
-rm -f conf.tab.c conf.tab.h conf.l.c config.h.in configure
|
||
|
|
|
||
|
|
install: all
|
||
|
|
- @INSTALL@ -d $(DESTDIR)$(bindir)
|
||
|
|
- @INSTALL@ -d $(DESTDIR)$(sysconfdir)
|
||
|
|
- @INSTALL@ -d $(DESTDIR)$(localstatedir)/bandwidthd/htdocs
|
||
|
|
- @INSTALL@ -m755 -s bandwidthd $(DESTDIR)$(bindir)
|
||
|
|
- if [ ! -f $(DESTDIR)$(sysconfdir)/bandwidthd.conf ] ; then @INSTALL@ -m644 etc/bandwidthd.conf $(DESTDIR)$(sysconfdir); fi
|
||
|
|
- @INSTALL@ -m644 htdocs/legend.gif $(DESTDIR)$(localstatedir)/bandwidthd/htdocs
|
||
|
|
- @INSTALL@ -m644 htdocs/logo.gif $(DESTDIR)$(localstatedir)/bandwidthd/htdocs
|
||
|
|
+ @INSTALL@ -d $(DESTDIR)$(sbindir)
|
||
|
|
+ @INSTALL@ -d $(DESTDIR)/etc
|
||
|
|
+ @INSTALL@ -d $(DESTDIR)$(datadir)/bandwidthd/htdocs
|
||
|
|
+ @INSTALL@ -m755 -s bandwidthd $(DESTDIR)$(sbindir)/bandwidthd
|
||
|
|
+ if [ ! -f $(DESTDIR)/etc/bandwidthd.conf ] ; then @INSTALL@ -m644 etc/bandwidthd.conf $(DESTDIR)/etc/ ; fi
|
||
|
|
+ @INSTALL@ -m644 htdocs/legend.gif $(DESTDIR)$(datadir)/bandwidthd/htdocs
|
||
|
|
+ @INSTALL@ -m644 htdocs/logo.gif $(DESTDIR)$(datadir)/bandwidthd/htdocs
|
||
|
|
|
||
|
|
#**** Stuff where -WALL is turned off to reduce the noise in a compile so I can see my own errors *******************
|
||
|
|
conf.l.o: conf.l.c
|