Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 795

Show
Ignore:
Timestamp:
09/04/07 01:56:16 (1 year ago)
Author:
raphael
Message:

Fixed #627: chkrootkit is missing on the package list
Fixed #629: : doesn't exist or can't be read.
Fixed #628: rkhunter during the setup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CHANGELOG

    r793 r795  
    77\_________________________________________________________________/ 
    88 
     92007-09-03 Raphael Geissert 
     10    - DOCS: 
     11        * Fixed #627: chkrootkit is missing on the package list 
     12        - GUI: 
     13                * Fixed #629: : doesn't exist or can't be read. 
     14        - SETUP: 
     15                * Fixed #628: rkhunter during the setup 
     16 
    9172007-09-03 Malte Geierhos 
    10         - GUI:  
     18        - GUI: 
    1119                * Fixed editing of ftp Accounts with custom dir doesn't work 
    1220                * Fixed PMA css (pictures have wrong path) 
    …… 
    1725                * Fixed #625: Error in SQL syntax on Admin Log -> Page 2 
    1826 
    19 2007-09-01 Raphael Geissert 
     272007-09-02 Raphael Geissert 
    2028    - CONFIGS: 
    2129        * Fixed #623: open_basedir restriction in effect. File(/var/log/chkrootkit.log) is not within the allowed path(s) 
    …… 
    2432        * Fixed error in admin/rootkit_log.php 
    2533        * Partially implemented #567 
     34        - MAKEFILE: 
     35                * Some more work on #394 
    2636 
    27372007-09-01 Raphael Geissert 

  • trunk/docs/Debian/debian-packages-etch

    r772 r795  
    1111courier-maildrop 
    1212courier-pop 
     13chkrootkit 
    1314diff 
    1415dnsutils 

  • trunk/docs/Debian/debian-packages-lenny

    r772 r795  
    1111courier-maildrop 
    1212courier-pop 
     13chkrootkit 
    1314diff 
    1415dnsutils 

  • trunk/docs/Debian/debian-packages-sarge

    r771 r795  
    99courier-maildrop 
    1010courier-pop 
     11chkrootkit 
    1112diff 
    1213dnsutils 

  • trunk/engine/setup/ispcp-setup

    r788 r795  
    904904        print STDOUT $shut_down_message; 
    905905 
    906         if (sys_command("which rkhunter") eq 0 ) { 
    907            print STDOUT "You might want to execute the next command as well: \n"; 
    908            print STDOUT "\trkhunter --update\n\n"; 
     906        if (sys_command_rs("which rkhunter > /dev/null") eq 0 ) { 
     907           print STDOUT "Setup is now updating rkhunter:\n"; 
     908           sys_command("rkhunter --update"); 
     909           print STDOUT "\n\n"; 
    909910        } 
    910911 
    …… 
    15191520                $rkhunter = ""; 
    15201521 
    1521                 if (sys_command("which rkhunter") ne 0) { 
     1522                if (sys_command_rs("which rkhunter > /dev/null") ne 0) { 
    15221523                        $rkhunter = "#"; 
    15231524                } 
    …… 
    15251526                $ckrootkit = ""; 
    15261527 
    1527                 if (sys_command("which chkrootkit") ne 0) { 
     1528                if (sys_command_rs("which chkrootkit > /dev/null") ne 0) { 
    15281529                        $ckrootkit = "#"; 
    15291530                } 

  • trunk/gui/admin/rootkit_log.php

    r790 r795  
    5151 
    5252foreach ($config_entries as $config_entry) { 
    53     if (empty($config_entry) || !isset($cfg[$config_entry])) { 
     53    if (empty($config_entry) || !isset($cfg[$config_entry]) || empty($cfg[$config_entry])) { 
    5454        continue; 
    5555    } 

  • trunk/language-files/ispCP.pot

    r786 r795  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2007-09-01 22:06-0500\n" 
     11"POT-Creation-Date: 2007-09-03 18:54-0500\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
    …… 
    10341034 
    10351035msgid "Mail account errors" 
     1036msgstr "" 
     1037 
     1038msgid "ispCP Daemon tools" 
     1039msgstr "" 
     1040 
     1041msgid "Execute requests" 
    10361042msgstr "" 
    10371043 

  • trunk/tools/BSDmakefile

    r688 r795  
    44DAEMON_DIR=$(SYSTEM_ROOT)/daemon 
    55 
    6 build: 
     6build: daemon/ispcp_daemon 
     7 
     8daemon/ispcp_daemon: 
    79        (cd ./daemon; \ 
    810        $(MAKE) ispcp_daemon;) 
    9         touch build 
    1011 
    1112install: build 
    …… 
    1617 
    1718        (cd ./daemon; \ 
    18         $(MAKE) uninstall;) 
     19        $(MAKE) clean;) 
    1920        rm -rf $(DAEMON_DIR) 
    2021        rm -rf build 

  • trunk/tools/Makefile

    r688 r795  
    44DAEMON_DIR=$(SYSTEM_ROOT)/daemon 
    55 
    6 build: 
     6 
     7build: daemon/ispcp_daemon 
     8 
     9daemon/ispcp_daemon: 
    710        (cd ./daemon; \ 
    8         $(MAKE) ispcp_daemon; ) 
    9         touch build 
     11        $(MAKE) ispcp_daemon;) 
    1012 
    1113install: build 
    …… 
    1618 
    1719        (cd ./daemon; \ 
    18         $(MAKE) uninstall; ) 
     20        $(MAKE) clean; ) 
    1921        rm -rf $(DAEMON_DIR) 
    2022        rm -rf build 

  • trunk/tools/daemon/BSDmakefile

    r712 r795  
    1717# 
    1818 
     19ifneq (,$(findstring noopt,$(DAEMON_OPTIONS))) 
     20        CFLAGS += -O0 
     21else 
     22        CFLAGS += -O3 
     23endif 
     24 
     25ifneq (,$(findstring nostrip,$(DAEMON_OPTIONS))) 
     26        STRIP = touch -a -c 
     27else 
     28        STRIP = strip -s 
     29endif 
     30 
     31 
    1932OBJS = ispcp_daemon.o message.o daemon_init.o say.o signal-handlers.o\ 
    2033receive_data.o send_data.o take_connection.o send_line.o recv_line.o\ 
    2134helo_cmd.o helo_syntax.o lr_cmd.o lr_syntax.o bye_cmd.o bye_syntax.o 
    2235 
    23 BUILD = gcc -O3 -ansi -Wall -Wstrict-prototypes -pedantic -o 
     36BUILD = gcc -ansi -Wall -Wstrict-prototypes -pedantic $(CFLAGS) 
    2437 
    25 COMPILE = gcc -O3 -ansi -Wall -Wstrict-prototypes -pedantic -c -o 
    26  
    27 STRIP = strip -s 
     38COMPILE = gcc -ansi -Wall -Wstrict-prototypes -pedantic -c $(CFLAGS) 
    2839 
    2940ispcp_daemon: $(OBJS) 
    30         $(BUILD) ispcp_daemon $(OBJS) 
     41        $(BUILD) -o ispcp_daemon $(OBJS) 
    3142        $(STRIP) ispcp_daemon 
    32          
    33 %.o: %.c 
    34         $(COMPILE) $@ $*.c 
    3543 
    36 uninstall: clean 
     44%.o: %.c %.h 
     45        $(COMPILE) -o $@ $*.c 
    3746 
    3847clean: 
    …… 
    4150        rm -rf ispcp_daemon 
    4251 
    43 .PHONY: clean uninstall 
     52.PHONY: clean 

  • trunk/tools/daemon/Makefile

    r736 r795  
    2828#    http://www.isp-control.net 
    2929 
     30ifneq (,$(findstring noopt,$(DAEMON_OPTIONS))) 
     31        CFLAGS += -O0 
     32else 
     33        CFLAGS += -O3 
     34endif 
     35 
     36ifneq (,$(findstring nostrip,$(DAEMON_OPTIONS))) 
     37        STRIP = touch -a -c 
     38else 
     39        STRIP = strip -s 
     40endif 
     41 
    3042 
    3143OBJS = ispcp_daemon.o message.o daemon_init.o say.o signal-handlers.o\ 
    …… 
    3345helo_cmd.o helo_syntax.o lr_cmd.o lr_syntax.o bye_cmd.o bye_syntax.o 
    3446 
    35 BUILD = gcc -O3 -ansi -Wall -Wstrict-prototypes -pedantic -o 
     47BUILD = gcc -ansi -Wall -Wstrict-prototypes -pedantic $(CFLAGS) 
    3648 
    37 COMPILE = gcc -O3 -ansi -Wall -Wstrict-prototypes -pedantic -c -o 
    38  
    39 STRIP = strip -s 
     49COMPILE = gcc -ansi -Wall -Wstrict-prototypes -pedantic -c $(CFLAGS) 
    4050 
    4151ispcp_daemon: $(OBJS) 
    42         $(BUILD) ispcp_daemon $(OBJS) 
     52        $(BUILD) -o ispcp_daemon $(OBJS) 
    4353        $(STRIP) ispcp_daemon 
    4454 
    4555%.o: %.c %.h 
    46         $(COMPILE) $@ $*.c 
    47  
    48 uninstall: clean 
     56        $(COMPILE) -o $@ $*.c 
    4957 
    5058clean: 
    …… 
    5361        rm -rf ispcp_daemon 
    5462 
    55 .PHONY: clean uninstall 
     63.PHONY: clean