svctool: fix mysqldump incompatibility introduced by oracle

indimail · May 21, 2024 · 417fb7d · 417fb7d
1 parent 62097e9
commit 417fb7d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/indimail-mta-x/doc/ChangeLog b/indimail-mta-x/doc/ChangeLog
@@ -24,6 +24,8 @@ Release @version@-@release@ Start 05/02/2024 End XX/XX/XXXX
 - 13/05/2024
 11. qmail-rm.c: added -f option to specify strptime format
 12. qmail-smtpd.c: added HOSTACCESS to list of env variables used
+- 21/05/2024
+13. svctool: fix mysqldump incompatibility introduced by oracle
 
 * Sun Mar 03 2024 12:20:15 +0000 Manvendra Bhangui <indimail-mta@indimail.org> 3.0.7-1.1%{?dist}
 Release 3.0.7-1.1 Start 02/01/2024 End 03/02/2024

diff --git a/indimail-mta-x/svctool.in b/indimail-mta-x/svctool.in
@@ -1,5 +1,5 @@
 #
-# $Id: svctool.in,v 2.726 2024-04-30 23:24:28+05:30 Cprogrammer Exp mbhangui $
+# $Id: svctool.in,v 2.727 2024-05-21 21:20:29+05:30 Cprogrammer Exp mbhangui $
 #
 
 #
@@ -27,7 +27,7 @@ host=@HOST@
 shared_objects=0
 use_dlmopen=0
 skip_sendmail_check=0
-RCSID="# \$Id: svctool.in,v 2.726 2024-04-30 23:24:28+05:30 Cprogrammer Exp mbhangui $"
+RCSID="# \$Id: svctool.in,v 2.727 2024-05-21 21:20:29+05:30 Cprogrammer Exp mbhangui $"
 
 #
 # End of User Configuration
@@ -12219,18 +12219,33 @@ case $option in
 	tar cf - `sort_backup $servicedir` | gzip -c > $backupdir/indimail-backup.$EXT.tar.gz
 	/bin/rm -f /root/indimail_config.txt
 	if [ -x $mysqlPrefix/bin/mariadb-dump ] ; then
+		mariadb=1
 		mysqldump=$mysqlPrefix/bin/mariadb-dump
 	else
+		mariadb=0
 		mysqldump=$mysqlPrefix/bin/mysqldump
 	fi
+	major=$(mysqld --version |awk '{print $3}'|cut -d. -f1)
 	if [ -f $HOME/.mylogin.cnf ] ; then
-		$mysqldump --login-path=admin --extended-insert \
-			--compress --add-drop-table --extended-insert --flush-logs --lock-tables \
-			--verbose -A | gzip -c > $backupdir/dbexport.$EXT.gz
+		if [ $mariadb -eq 1 ] ; then
+			$mysqldump --login-path=admin --compress --flush-logs \
+				--add-drop-table --extended-insert --lock-tables \
+				--verbose -A | gzip -c > $backupdir/dbexport.$EXT.gz
+		else
+			$mysqldump --login-path=admin --compression-algorithms=zlib \
+				--add-drop-table --extended-insert --lock-tables \
+				--verbose -A | gzip -c > $backupdir/dbexport.$EXT.gz
+		fi
 	else
-		$mysqldump -u mysql -p$PRIV_PASS --extended-insert \
-			--compress --add-drop-table --extended-insert --flush-logs --lock-tables \
-			--verbose -A | gzip -c > $backupdir/dbexport.$EXT.gz
+		if [ $mariadb -eq 1 ] ; then
+			$mysqldump -u mysql -p$PRIV_PASS --compress --flush-logs \
+				--add-drop-table --extended-insert --lock-tables \
+				--verbose -A | gzip -c > $backupdir/dbexport.$EXT.gz
+		else
+			$mysqldump -u mysql -p$PRIV_PASS --compression-algorithms=zlib \
+				--add-drop-table --extended-insert --lock-tables \
+				--verbose -A | gzip -c > $backupdir/dbexport.$EXT.gz
+		fi
 	fi
 	;;