Fix an error in acl pattern and limit the icon sizes

2 files changed, 4 insertions, 3 deletions

diff --git a/src/msec/config.py b/src/msec/config.py
index e77e9fd..0da2389 100755
--- a/src/msec/config.py
+++ b/src/msec/config.py
@@ -433,8 +433,8 @@ class PermConfig(MsecConfig):
         except:
             self.log.error(_("Unable to load configuration file %s: %s") % (self.config, sys.exc_info()[1]))
             return False
-        # Look up for pattern: user1:acl,user2:acl
-        acl_re = re.compile(r'^([A-Za-z][A-Za-z0-9._-]+:[^:,]+)(,([A-Za-z][A-Za-z0-9._-]*)+:[^:,]+)*$')
+        # Look up acl pattern: user1:rwx,user2:x
+        acl_re = re.compile(r'^[a-z][a-z0-9_-]+:(?:[rwx]{1,3})(?:,[a-z][a-z0-9_-]+:[rwx]{1,3})*$')
         for line in fd.readlines():
             line = line.strip()
             if not line:
diff --git a/src/msec/msecgui.py b/src/msec/msecgui.py
index 05d11a5..cc20452 100755
--- a/src/msec/msecgui.py
+++ b/src/msec/msecgui.py
@@ -604,7 +604,8 @@ class MsecGui(Gtk.Window):
                 try:
                     # logo
                     image = Gtk.Image()
-                    pixbuf = GdkPixbuf.Pixbuf.new_from_file(icon)
+                    # use a fixed size for icons to avoid oveload
+                    pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(icon, 32, 32)
                     image.set_from_pixbuf(pixbuf)
                     image.set_hexpand(False)
                     grid.attach(image, 0, row, 1, 1)