[cdesktopenv-devel] [PATCH] Don't make /var group writable

[Marcin Cieslak]

* Use 0755 permissions for /var (not 0775)
  - this makes sendmail unhappy
* Don't change permissions on /var on dtlogin startup
---
 cde/programs/dtlogin/dm.c                      | 16 ++++++++--------
 cde/programs/dtsearchpath/dtappg/dtappgather.C |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cde/programs/dtlogin/dm.c b/cde/programs/dtlogin/dm.c
index 3c9fc6e..9e7b960 100644
--- a/cde/programs/dtlogin/dm.c
+++ b/cde/programs/dtlogin/dm.c
@@ -122,7 +122,7 @@ static long StorePid( void ) ;
 static void TerminateProcess( int pid, int sig) ;
 static void UnlockPidFile( void ) ;
 static void dtMakeDefaultDir( void );
-static void dtmkdir(char *dir, mode_t dir_mode);
+static void dtmkdir(char *dir, mode_t dir_mode, int force);
 
 
 
@@ -1877,15 +1877,15 @@ MarkShutdownTime( void )
 static void
 dtMakeDefaultDir( void )
 {
-    dtmkdir("/var", 0775);
-    dtmkdir("/var/dt", 0755);
-    dtmkdir("/var/dt/tmp", 0755);
-    dtmkdir("/var/dt/appconfig", 0755);
-    dtmkdir("/var/dt/appconfig/appmanager", 0755);
+    dtmkdir("/var", 0755, 0);
+    dtmkdir("/var/dt", 0755, 1);
+    dtmkdir("/var/dt/tmp", 0755, 1);
+    dtmkdir("/var/dt/appconfig", 0755, 1);
+    dtmkdir("/var/dt/appconfig/appmanager", 0755, 1);
 }
 
 static void
-dtmkdir(char *dir, mode_t dir_mode)
+dtmkdir(char *dir, mode_t dir_mode, int force)
 {
     struct stat file_status;
 
@@ -1898,7 +1898,7 @@ dtmkdir(char *dir, mode_t dir_mode)
             LogError((unsigned char *)"Unable to create dir %s\n", dir);
         }
     } else {
-        if ( (file_status.st_mode & dir_mode) != dir_mode) {
+        if ( force && (file_status.st_mode & dir_mode) != dir_mode) {
             /** try to set correct permissions **/
             if ( chmod(dir, file_status.st_mode | dir_mode) == 0) {
                 Debug("Set permissions on %s\n", dir);
diff --git a/cde/programs/dtsearchpath/dtappg/dtappgather.C 
b/cde/programs/dtsearchpath/dtappg/dtappgather.C
index ee09040..45f37eb 100644
--- a/cde/programs/dtsearchpath/dtappg/dtappgather.C
+++ b/cde/programs/dtsearchpath/dtappg/dtappgather.C
@@ -164,9 +164,9 @@ AppManagerDirectory::AppManagerDirectory
                if (!user->OS()->isDirectory(dir)) {   // does dt exist?
                    dir.replace("/dt","");
                    if (!user->OS()->isDirectory(dir)) {  // does /var exist?
-                       user->OS()->MakeDirectory(dir,0775);
+                       user->OS()->MakeDirectory(dir,0755);
                        user->OS()->changeOwnerGroup(dir,"root","other");
-                       user->OS()->changePermissions(dir,0775);
+                       user->OS()->changePermissions(dir,0755);
                    }
                    dir += "/dt";
                    user->OS()->MakeDirectory(dir,0755);
-- 
1.7.11.5


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel