From 5c7ed057e463d57c198e3db8882be94ac30538c8 Mon Sep 17 00:00:00 2001
From: Jean-Marc Pigeon <jmp@safe.c>
Date: Fri, 14 Nov 2025 09:22:23 -0500
Subject: [PATCH] Trying to improve preset logs

---
 sql/mailleur.sql       | 10 +++++-----
 support/do_database.sh |  8 ++++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/sql/mailleur.sql b/sql/mailleur.sql
index 825717c..8d3426d 100644
--- a/sql/mailleur.sql
+++ b/sql/mailleur.sql
@@ -175,17 +175,17 @@ CREATE TABLE admins	(
 #ifdef POSTGRESQL
 CREATE FUNCTION updpass()
   RETURNS trigger AS $$
+  DECLARE skip INT :=  0;
   BEGIN
-    DECLARE skip INT DEFAULT 0;
-    SET skip = skip_password_trigger;
+    skip := current_setting('skip_password_trigger', true)::int;
     IF skip = 0 THEN
       NEW.hash = md5(HASHING);
       NEW.password = crypt (NEW.password,gen_salt('md5'));
     ELSE
       NEW.password = NEW.password;
-    end if;
-    RETURN NEW;
-    END
+    END if;
+  RETURN NEW;
+  END;
   $$ LANGUAGE 'plpgsql';
 
 CREATE TRIGGER keephash
diff --git a/support/do_database.sh b/support/do_database.sh
index 6107f37..dac6b56 100755
--- a/support/do_database.sh
+++ b/support/do_database.sh
@@ -99,12 +99,16 @@ case "$DB_TYPE" in
 #loading database definition
 if [ -n "$MSQL" ] ; then
   echo "#--------------- Create Database ----------------" >> $SQLLOG
-  cpp -P -D$DB_TYPE /usr/share/$APPNAME/sql/$APPNAME.sql| tee -a $SQLLOG | $MSQL
+  cpp -P -D$DB_TYPE /usr/share/$APPNAME/sql/$APPNAME.sql	|	\
+	  	tee -a $SQLLOG					|	\
+	  	$MSQL >> $SQLLOG 2>&
   echo "#--------------- Set Preset value ---------------" >> $SQLLOG
   cpp -P -D$DB_TYPE 							\
 	  -DDOMAINNAME=\'$DOMAINNAME\'					\
 	  -DROOTDOMAINNAME=\'root@$DOMAINNAME\'				\
 	  -DRPASS=\'$RPASS\'						\
-	  /usr/share/$APPNAME/sql/preset.sql	| tee -a $SQLLOG | $MSQL
+	  /usr/share/$APPNAME/sql/preset.sql			|	\
+	  	tee -a $SQLLOG					|	\
+	  	$MSQL >> $SQLLOG 2>&
   echo "#--------------- Init Process Completed ---------" >> $SQLLOG
   fi
-- 
2.47.3