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, master has been updated via d22501e8132e671db2a362d95345347792f9bd31 (commit) via aebf1b54e16d7c9152be5cd8aa86e764540f7a58 (commit) from b83d68f3fd925f1361237335b92e34ac36215591 (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 d22501e8132e671db2a362d95345347792f9bd31 Merge: aebf1b5 b83d68f Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jan 4 00:31:41 2011 +0100

Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

Conflicts: config/rootfiles/core/44/filelists/files

commit aebf1b54e16d7c9152be5cd8aa86e764540f7a58 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jan 4 00:30:14 2011 +0100

fireinfo: Run action that was set on the webinterface immediately.

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

Summary of changes: config/rootfiles/common/misc-progs | 1 + config/rootfiles/core/44/filelists/files | 1 + html/cgi-bin/fireinfo.cgi | 1 + src/misc-progs/Makefile | 6 +++++- src/misc-progs/fireinfoctrl.c | 23 +++++++++++++++++++++++ 5 files changed, 31 insertions(+), 1 deletions(-) create mode 100644 src/misc-progs/fireinfoctrl.c

Difference in files: diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs index 7746d03..6e5d7ca 100644 --- a/config/rootfiles/common/misc-progs +++ b/config/rootfiles/common/misc-progs @@ -4,6 +4,7 @@ usr/local/bin/backupctrl #usr/local/bin/clamavctrl usr/local/bin/dhcpctrl usr/local/bin/extrahdctrl +usr/local/bin/fireinfoctrl usr/local/bin/getipstat usr/local/bin/getiptstate #usr/local/bin/iowrap diff --git a/config/rootfiles/core/44/filelists/files b/config/rootfiles/core/44/filelists/files index ec42996..48c38e2 100644 --- a/config/rootfiles/core/44/filelists/files +++ b/config/rootfiles/core/44/filelists/files @@ -39,6 +39,7 @@ var/ipfire/langs/en.pl var/ipfire/langs/fr.pl var/ipfire/langs/es.pl var/ipfire/menu.d/10-system.menu +usr/local/bin/fireinfoctrl var/ipfire/qos/bin/makeqosscripts.pl usr/local/bin/timectrl usr/local/bin/rebuild-initrd diff --git a/html/cgi-bin/fireinfo.cgi b/html/cgi-bin/fireinfo.cgi index 4b97252..31f899f 100644 --- a/html/cgi-bin/fireinfo.cgi +++ b/html/cgi-bin/fireinfo.cgi @@ -55,6 +55,7 @@ if ("$fireinfosettings{'ACTION'}" eq "trigger") { unlink "$configfile"; $fireinfosettings{'ENABLE_FIREINFO'} = 'off'; } + system("/usr/local/bin/fireinfoctrl &"); }

&Header::openpage('Fireinfo', 1, ''); diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile index 7b1e457..348f91c 100644 --- a/src/misc-progs/Makefile +++ b/src/misc-progs/Makefile @@ -32,7 +32,7 @@ SUID_PROGS = setdmzholes setportfw setxtaccess \ wirelessctrl getipstat getiptstate qosctrl launch-ether-wake \ redctrl syslogdctrl extrahdctrl sambactrl upnpctrl tripwirectrl \ smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \ - setaliases urlfilterctrl updxlratorctrl + setaliases urlfilterctrl updxlratorctrl fireinfoctrl SUID_UPDX = updxsetperms

install : all @@ -154,3 +154,7 @@ setaliases: setaliases.c setuid.o ../install+setup/libsmooth/varval.o

updxsetperms: updxsetperms.c setuid.o ../install+setup/libsmooth/varval.o $(COMPILE) -I../install+setup/libsmooth/ updxsetperms.c setuid.o ../install+setup/libsmooth/varval.o -o $@ + +fireinfoctrl: fireinfoctrl.c setuid.o ../install+setup/libsmooth/varval.o + $(COMPILE) -I../install+setup/libsmooth/ fireinfoctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@ + diff --git a/src/misc-progs/fireinfoctrl.c b/src/misc-progs/fireinfoctrl.c new file mode 100644 index 0000000..963459a --- /dev/null +++ b/src/misc-progs/fireinfoctrl.c @@ -0,0 +1,23 @@ +/* IPFire helper program - fireinfoctrl + * + * This program is distributed under the terms of the GNU General Public + * Licence. See the file COPYING for details. + * + * (c) IPFire Team, 2011 + * + * Simple program that calls "sendprofile" as the root user. + * + */ + +#include <stdlib.h> +#include "setuid.h" + +int main(void) +{ + if (!(initsetuid())) + exit(1); + + safe_system("/usr/bin/sendprofile"); + + return 0; +}

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