diff --git a/ChangeLog b/ChangeLog index 2d6dc13..264a24d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ update ru.po no quote cifs password allow most UTF-8 characters in options + default udevil.conf add utf8 to default_options_iso9660,ntfs,vfat 0.3.2 2012-08-15: accept smb workgroup/user curlftpfs pass user:pass as option diff --git a/etc/udevil.conf b/etc/udevil.conf index c2c5a4a..1faab70 100644 --- a/etc/udevil.conf +++ b/etc/udevil.conf @@ -212,13 +212,13 @@ forbidden_files = # WARNING: OPTIONS PRESENT OR MISSING CAN CAUSE SERIOUS SECURITY PROBLEMS. default_options = nosuid, noexec, nodev, noatime default_options_file = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID, ro -# mount iso9660 and udf with 'ro' to prevent mount read-only warning -default_options_iso9660 = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID, ro +# mount iso9660 with 'ro' to prevent mount read-only warning +default_options_iso9660 = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID, ro, utf8 default_options_udf = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID -default_options_vfat = nosuid, noexec, nodev, noatime, fmask=0022, dmask=0022, uid=$UID, gid=$GID +default_options_vfat = nosuid, noexec, nodev, noatime, fmask=0022, dmask=0022, uid=$UID, gid=$GID, utf8 default_options_msdos = nosuid, noexec, nodev, noatime, fmask=0022, dmask=0022, uid=$UID, gid=$GID default_options_umsdos = nosuid, noexec, nodev, noatime, fmask=0022, dmask=0022, uid=$UID, gid=$GID -default_options_ntfs = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID +default_options_ntfs = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID, utf8 default_options_cifs = nosuid, noexec, nodev, uid=$UID, gid=$GID default_options_smbfs = nosuid, noexec, nodev, uid=$UID, gid=$GID default_options_sshfs = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID, nonempty, allow_other @@ -238,7 +238,7 @@ default_options_ramfs = nosuid, noexec, nodev, noatime, uid=$UID, gid=$GID # and GID. # If you want to forbid remounts, remove 'remount' from here. # WARNING: OPTIONS HERE CAN CAUSE SERIOUS SECURITY PROBLEMS - CHOOSE CAREFULLY -allowed_options = nosuid, noexec, nodev, noatime, fmask=0022, dmask=0022, uid=$UID, gid=$GID, ro, rw, sync, flush, remount +allowed_options = nosuid, noexec, nodev, noatime, fmask=0022, dmask=0022, uid=$UID, gid=$GID, ro, rw, sync, flush, iocharset=*, utf8, remount allowed_options_nfs = nosuid, noexec, nodev, noatime, ro, rw, sync, remount, port=*, rsize=*, wsize=*, hard, proto=*, timeo=*, retrans=* allowed_options_cifs = nosuid, noexec, nodev, ro, rw, remount, port=*, user=*, username=*, pass=*, password=*, guest, domain=*, uid=$UID, gid=$GID, credentials=* allowed_options_smbfs = nosuid, noexec, nodev, ro, rw, remount, port=*, user=*, username=*, pass=*, password=*, guest, domain=*, uid=$UID, gid=$GID, credentials=*