- 2.4.7 - lets release it and merge pending patches

Changed files:
    Makefile -> 1.9
    etc/fstab -> 1.11
    etc/group -> 1.27
    etc/profile.d/tmp-dir.csh -> 1.4
    etc/profile.d/tmp-dir.sh -> 1.5

diff --git a/Makefile b/Makefile
index e14d18bb9543ef84c35df21d2d4e9d64cf0ac437..33f57f77e681ddb4369aaaea475f40fcb8354ab7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Very basic and very simple Makefile. Maybe it would be nice to make it
 # in ac/am.... but I'm too lazy ;)
 # 
-VERSION                = 2.4.6
+VERSION                = 2.4.7
 
 CC             = gcc
 OPT_FLAGS      = -O2 -g

diff --git a/etc/fstab b/etc/fstab
index 0893fc254ea03d3487960aa0e27ed437e4e05f45..1628d77da40134530bf0e80d15c9af928036eed8 100644 (file)
--- a/etc/fstab
+++ b/etc/fstab
@@ -9,7 +9,7 @@ none            /dev/pts                devpts  gid=5,mode=620          0 0
 #none          /dev/shm                tmpfs   mode=1777,nosuid,nodev,noexec           0 0
 
 /dev/fd0       /media/floppy           auto    user,noauto             0 0
-/dev/cdrom     /media/cdrom            auto    user,noauto             0 0
+/dev/cdrom     /media/cdrom            auto    users,noauto            0 0
 
 # Examples for mount vfat and ntfs patritions using fsctrl group
 #/dev/hdXX     /mnt/ntfs       ntfs    user,noauto,umask=002,uid=0,gid=28,iocharset=iso8859-2 0 0

diff --git a/etc/group b/etc/group
index 47f8095625ac8fb20de277eb6c929982e0c10a77..5b5c3960bfec3eb603ee1ca863c2ab3b5eb8a432 100644 (file)
--- a/etc/group
+++ b/etc/group
@@ -31,6 +31,7 @@ http::51:
 nobody::99:
 stats::123:
 logs::124:stats
+fileshare::138:
 users::1000:
 tpexec::65500:
 nosock::65501:

diff --git a/etc/profile.d/tmp-dir.csh b/etc/profile.d/tmp-dir.csh
index 388011ac888fcaf12dbf411b06ecca344a7cd2fa..498d44328bcf99d0b414ea486eefb696aeca4d33 100644 (file)
--- a/etc/profile.d/tmp-dir.csh
+++ b/etc/profile.d/tmp-dir.csh
@@ -1,4 +1,4 @@
-if ( ! -d ~/tmp ) then
+if ( `/bin/id -u` >= 500 && ! -d ~/tmp ) then
        mkdir -p ~/tmp >& /dev/null
-       chmod -f og-rwx ~/tmp
+       chmod -f og-rwx ~/tmp >& /dev/null
 endif

diff --git a/etc/profile.d/tmp-dir.sh b/etc/profile.d/tmp-dir.sh
index a5a64fae2711f9240625e4c9f90c3e477e78ed8e..368e8d272c0dd8c437cb0b02c282d1452ace6ae5 100644 (file)
--- a/etc/profile.d/tmp-dir.sh
+++ b/etc/profile.d/tmp-dir.sh
@@ -1,4 +1,4 @@
-if [ ! -d ~/tmp ]; then
+if [ $(/bin/id -u) -ge 500 -a ! -d ~/tmp ]; then
        mkdir -p ~/tmp > /dev/null 2>&1
-       chmod -f og-rwx ~/tmp
+       chmod -f og-rwx ~/tmp 2>/dev/null
 fi