From bea4c4af4a33ce236ee50892661dbccdbc90cb1e Mon Sep 17 00:00:00 2001
From: roleo <roleo@iperbole.bologna.it>
Date: Sat, 11 Nov 2023 20:42:11 +0100
Subject: [PATCH] Minor fixes

---
 src/static/static/home/yi-hack/script/system.sh  |  5 +++++
 src/static/static/home/yi-hack/script/wd_rtsp.sh |  2 +-
 src/www/httpd/cgi-bin/service.sh                 | 12 ++++++------
 src/www/httpd/htdocs/pages/configurations.html   |  2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/static/static/home/yi-hack/script/system.sh b/src/static/static/home/yi-hack/script/system.sh
index 3b7a475..02cfe3e 100755
--- a/src/static/static/home/yi-hack/script/system.sh
+++ b/src/static/static/home/yi-hack/script/system.sh
@@ -140,6 +140,7 @@ if [[ x$(get_config USERNAME) != "x" ]] ; then
     ONVIF_USERPWD="user=$USERNAME\npassword=$PASSWORD"
     echo "/onvif::" > /tmp/httpd.conf
     echo "/:$USERNAME:$PASSWORD" >> /tmp/httpd.conf
+    chmod 0600 /tmp/httpd.conf
 fi
 
 if [[ x$(get_config SSH_PASSWORD) != "x" ]] ; then
@@ -149,8 +150,12 @@ if [[ x$(get_config SSH_PASSWORD) != "x" ]] ; then
     sed -i 's|^root::|root:x:|g' /etc/passwd
     sed -i 's|:/root:|:/home/yi-hack:|g' /etc/passwd
     sed -i 's|^root::|root:'${PASSWORD_MD5}':|g' /etc/shadow
+    chmod 0600 /etc/passwd
+    chmod 0600 /etc/shadow
 else
     sed -i 's|:/root:|:/home/yi-hack:|g' /etc/passwd
+    chmod 0600 /etc/passwd
+    chmod 0600 /etc/shadow
 fi
 
 case $(get_config RTSP_PORT) in
diff --git a/src/static/static/home/yi-hack/script/wd_rtsp.sh b/src/static/static/home/yi-hack/script/wd_rtsp.sh
index 8af6cee..9a2b7c8 100755
--- a/src/static/static/home/yi-hack/script/wd_rtsp.sh
+++ b/src/static/static/home/yi-hack/script/wd_rtsp.sh
@@ -82,7 +82,7 @@ check_rtsp()
                     sleep 1
                     restart_rtsp
                     COUNTER=0
-               fi
+                fi
             else
                 COUNTER=0
             fi
diff --git a/src/www/httpd/cgi-bin/service.sh b/src/www/httpd/cgi-bin/service.sh
index 7f2e1a6..85bb7be 100755
--- a/src/www/httpd/cgi-bin/service.sh
+++ b/src/www/httpd/cgi-bin/service.sh
@@ -320,20 +320,20 @@ if [ "$ACTION" == "start" ] ; then
     elif [ "$NAME" == "ftpd" ]; then
         start_ftpd $PARAM1
     elif [ "$NAME" == "mqtt" ]; then
-        mqttv4 >/dev/null &
-        mqtt-config >/dev/null &
+        mqttv4 > /dev/null &
+        mqtt-config > /dev/null &
     elif [ "$NAME" == "mp4record" ]; then
         cd /home/app
-        ./mp4record >/dev/null &
+        ./mp4record > /dev/null &
     elif [ "$NAME" == "all" ]; then
         start_rtsp
         start_onvif
         start_wsdd
         start_ftpd
-        mqttv4 >/dev/null &
-        mqtt-config >/dev/null &
+        mqttv4 > /dev/null &
+        mqtt-config > /dev/null &
         cd /home/app
-        ./mp4record >/dev/null &
+        ./mp4record > /dev/null &
     fi
 elif [ "$ACTION" == "stop" ] ; then
     if [ "$NAME" == "rtsp" ]; then
diff --git a/src/www/httpd/htdocs/pages/configurations.html b/src/www/httpd/htdocs/pages/configurations.html
index b92b725..2ed9286 100644
--- a/src/www/httpd/htdocs/pages/configurations.html
+++ b/src/www/httpd/htdocs/pages/configurations.html
@@ -112,7 +112,7 @@ <h4 class="no-margin">General</h4>
                                     <option value="pcm">pcm</option>
                                     <option value="alaw">alaw</option>
                                     <option value="ulaw">ulaw</option>
-                                    <option value="aac">aac (experimental)</option>
+                                    <option value="aac">aac</option>
                                 </select>
                             </div>
                             <span class="switch-description">