[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. ec36876e6ade2e04d29963d8dcfab5d5bf580a99

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. ec36876e6ade2e04d29963d8dcfab5d5bf580a99

[git]

[-- Attachment #1: Type: text/plain, Size: 3931 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, fifteen has been updated
       via  ec36876e6ade2e04d29963d8dcfab5d5bf580a99 (commit)
       via  7603ec4e1620aeaf0f2b102af887b4c3c022677c (commit)
      from  42e4fa805ec8c3bbc085d2d9d8746afd97062009 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ec36876e6ade2e04d29963d8dcfab5d5bf580a99
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Oct 1 17:45:00 2013 +0200

    wirelessctrl: Fix evaluation of configuration settings.

commit 7603ec4e1620aeaf0f2b102af887b4c3c022677c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Oct 1 17:20:41 2013 +0200

    pakfire: Don't remove existing content from /opt/pakfire.

-----------------------------------------------------------------------

Summary of changes:
 lfs/pakfire                   | 1 -
 src/misc-progs/wirelessctrl.c | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/lfs/pakfire b/lfs/pakfire
index 11608b3..6f90f89 100644
--- a/lfs/pakfire
+++ b/lfs/pakfire
@@ -54,7 +54,6 @@ md5 :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP)
 	-mkdir -p /opt/pakfire/{db/{meta,lists,rootfiles,installed,core},etc,lib,tmp} \
 		/var/log/pakfire /var/cache/pakfire
 	cp -fRv $(DIR_SRC)/src/pakfire/* $(DIR_APP)
diff --git a/src/misc-progs/wirelessctrl.c b/src/misc-progs/wirelessctrl.c
index 1016613..1f1b0f8 100644
--- a/src/misc-progs/wirelessctrl.c
+++ b/src/misc-progs/wirelessctrl.c
@@ -97,7 +97,7 @@ int main(void) {
 	}
 
 	/* restrict blue access tp the proxy port */
-	if (findkey(kv, "DROPPROXY", buffer) && strcmp(buffer,"off") == 0) {
+	if (findkey(kv, "DROPPROXY", buffer) && strcmp(buffer, "on") == 0) {
 		/* Read the proxy values */
 		if (!readkeyvalues(kv, CONFIG_ROOT "/proxy/settings") || !(findkey(kv, "PROXY_PORT", buffer))) {
 			fprintf(stderr, "Cannot read proxy settings\n");
@@ -111,7 +111,7 @@ int main(void) {
 	}
 
 	/* not allow blue to acces a samba server running on local fire*/
-	if(findkey(kv, "DROPSAMBA", buffer) && strcmp(buffer,"off")){
+	if (findkey(kv, "DROPSAMBA", buffer) && strcmp(buffer, "on") == 0) {
 		snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSFORWARD -i %s -p tcp -m multiport --ports 135,137,138,139,445,1025 -j DROP -m comment --comment 'DROP_Wirelessforward'", blue_dev);
 		safe_system(command);
 		snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSINPUT -i %s -p tcp -m multiport --ports 135,137,138,139,445,1025 -j DROP -m comment --comment 'DROP_Wirelessinput'", blue_dev);
@@ -157,13 +157,13 @@ int main(void) {
 	}
 
 	/* with this rule you can disable the logging of the dropped wireless input packets*/
-	if (!findkey(kv, "DROPWIRELESSINPUT", buffer) || strcmp(buffer,"off") == 0) {
+	if (findkey(kv, "DROPWIRELESSINPUT", buffer) && strcmp(buffer, "on") == 0) {
 		snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSINPUT -i %s -j LOG --log-prefix 'DROP_Wirelessinput'", blue_dev);
 		safe_system(command);
 	}
 
 	/* with this rule you can disable the logging of the dropped wireless forward packets*/
-	if (!findkey(kv, "DROPWIRELESSFORWARD", buffer) || strcmp(buffer,"off") == 0) {
+	if (findkey(kv, "DROPWIRELESSFORWARD", buffer) && strcmp(buffer, "on") == 0) {
 		snprintf(command, STRING_SIZE-1, "/sbin/iptables -A WIRELESSFORWARD -i %s -j LOG --log-prefix 'DROP_Wirelessforward'", blue_dev);
 		safe_system(command);
 	}


hooks/post-receive
--
IPFire 2.x development tree