diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm index 532376b..2c4b15e 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm @@ -25,6 +25,8 @@ use esmith::AccountsDB::UTF8; use esmith::util; use File::Basename; use File::Find; +# Set to avoid using link counts as it may not work for cifs shares. +$File::Find::dont_use_nlink = 1; use File::Path qw(make_path remove_tree); use esmith::Backup; use esmith::BackupHistoryDB; #no UTF8 and not in use @@ -1670,7 +1672,7 @@ sub get_Backupset_options () { my $err; $mntdir = "/$smbshare" if ($VFSType eq 'usb'); my $setbackuplist = sub { - + $c->app->log->info("File presented: $_"); if ($_ =~ /\.dar/) { my $dir = $File::Find::dir; my $backupref; @@ -1696,6 +1698,7 @@ sub get_Backupset_options () { } # Finding existing backups + find { wanted => \&$setbackuplist, untaint => 1, untaint_pattern => qr|^([-+@\w\s./]+)$| }, $mntbkdir; my %blabels = (); my @list; @@ -1703,6 +1706,7 @@ sub get_Backupset_options () { foreach $key (sort keys %backupfiles) { my $labkey = $mntbkdir . '/' . $backupfiles{$key}[0] . '/' . $backupfiles{$key}[1]; $blabels{$labkey} = $backupfiles{$key}[1] . " (" . $backupfiles{$key}[0] . ")"; + $c->app->log->info("Pushing $blabels{$labkey} to $labkey"); push @list, [ "$blabels{$labkey}" => "$labkey" ]; } ## end foreach $key (sort keys %backupfiles) $error_message .= $c->bunmount($mntdir, $VFSType); @@ -2129,4 +2133,4 @@ sub vmount { return (qx(/bin/mount -t nfs -o nolock,timeo=30,retrans=1,retry=0 "$host:/$share" $mountdir 2>&1)); } } ## end sub vmount -1; +1; \ No newline at end of file diff --git a/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Roundcubepanel/roundcubepanel_en.lex b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Roundcubepanel/roundcubepanel_en.lex new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Roundcubepanel/roundcubepanel_en.lex @@ -0,0 +1 @@ + diff --git a/smeserver-manager.spec b/smeserver-manager.spec index 2c31416..be52e17 100644 --- a/smeserver-manager.spec +++ b/smeserver-manager.spec @@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} %define version 11.0.0 -%define release 109 +%define release 110 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -146,6 +146,10 @@ true %defattr(-,root,root) %changelog +* Sat Jul 26 2025 Brian Read 11.0.0-110.sme +- Get cifs workstation backup restore to show backup sets [SME: 12645] + Add lex file for roundcubepanel to provide lex environment for lex strings + * Wed Jul 16 2025 Brian Read 11.0.0-109.sme - A few more error message corrections [SME: 13078]