[Pkg-ossec-devel] [SCM] Git repository for pkg-ossec branch, master, updated. 36a9b3295ba76b4093ceca70fecc3d0388819d1f

[Jose Antonio Quevedo]

The following commit has been merged in the master branch:
commit 36a9b3295ba76b4093ceca70fecc3d0388819d1f
Merge: ecbfa0047f402968bca34e4da10cb74b2a0ae4ab 83b540f410e5b3fa044b27978d029d762bf90f73
Author: Jose Antonio Quevedo <joseantonio.quevedo at gmail.com>
Date:   Wed Jul 27 02:28:02 2011 +0200

    Merge branch 'debian'
    
    Conflicts:
    	debian/ossec-hids-server.postinst
    	debian/ossec-hids-server.preinst

diff --combined debian/ossec-hids-server.postinst
index 87824cc,6c1822d..dd3b1d0
--- a/debian/ossec-hids-server.postinst
+++ b/debian/ossec-hids-server.postinst
@@@ -40,14 -40,13 +40,13 @@@ case "$1" i
  	[ -z "$EMAIL_SERVER" ] && EMAIL_SERVER="127.0.0.1"
  	[ -z "$SYSLOG" ] && SYSLOG="no"
  
--        # TODO - configure the configuration file
++    # TODO - configure the configuration file
  
--        CONF_FILE=/etc/ossec/ossec-init.conf
--        if ! dpkg-statoverride --list ${CONF_FILE} >/dev/null && [ -e ${CONF_FILE} ] 
--        then
--            chown ossec:ossec ${CONF_FILE}
--            chmod 640 ${CONF_FILE}
-             fi
++    CONF_FILE=/etc/ossec/ossec-init.conf
++    if ! dpkg-statoverride --list ${CONF_FILE} >/dev/null && [ -e ${CONF_FILE} ] 
++    then
++        chown ossec:ossec ${CONF_FILE}
++        chmod 640 ${CONF_FILE}
  	fi
  
  	db_stop
diff --combined debian/ossec-hids-server.preinst
index bb976d6,59940e0..330cb78
--- a/debian/ossec-hids-server.preinst
+++ b/debian/ossec-hids-server.preinst
@@@ -74,11 -74,11 +74,11 @@@ stats            ossec:ossec 75
  logs             ossec:ossec 750
  EOF  
          } | while read dir owner mode; do
 -	        if ! dpkg-statoverride --list ${HOMEDIR}$dir >/dev/null
 +	        if ! dpkg-statoverride --list ${HOMEDIR}/$dir >/dev/null
                  then
- 		    chown $owner ${HOMEDIR}/$dir
 -		    chown $owner ${HOMEDIR}$dir
 -        	    chmod $mode ${HOMEDIR}$dir
 -                fi
++		    	chown $owner ${HOMEDIR}/$dir
 +        	    chmod $mode ${HOMEDIR}/$dir
-                 fi
++            fi
          done
          
  

-- 
Git repository for pkg-ossec