external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Don't make /var group writable

Browse source 
* Use 0755 permissions for /var (not 0775)
  - this makes sendmail unhappy
* Don't change permissions on /var on dtlogin startup
This commit is contained in:
Marcin Cieslak 2012-09-25 16:50:23 +02:00 • committed by Jon Trulson
parent 663c251125
commit c697b943d4
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cde/programs/dtlogin/dm.c
View file

@ -122,7 +122,7 @@ static long StorePid( void ) ;
static void TerminateProcess( int pid, int sig) ; static void TerminateProcess( int pid, int sig) ;
static void UnlockPidFile( void ) ; static void UnlockPidFile( void ) ;
static void dtMakeDefaultDir( 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 static void
dtMakeDefaultDir( void ) dtMakeDefaultDir( void )
{ {
dtmkdir("/var", 0775); dtmkdir("/var", 0755, 0);
dtmkdir("/var/dt", 0755); dtmkdir("/var/dt", 0755, 1);
dtmkdir("/var/dt/tmp", 0755); dtmkdir("/var/dt/tmp", 0755, 1);
dtmkdir("/var/dt/appconfig", 0755); dtmkdir("/var/dt/appconfig", 0755, 1);
dtmkdir("/var/dt/appconfig/appmanager", 0755); dtmkdir("/var/dt/appconfig/appmanager", 0755, 1);
} }
static void static void
dtmkdir(char *dir, mode_t dir_mode) dtmkdir(char *dir, mode_t dir_mode, int force)
{ {
struct stat file_status; 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); LogError((unsigned char *)"Unable to create dir %s\n", dir);
} }
} else { } 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 **/ /** try to set correct permissions **/
if ( chmod(dir, file_status.st_mode | dir_mode) == 0) { if ( chmod(dir, file_status.st_mode | dir_mode) == 0) {
Debug("Set permissions on %s\n", dir); Debug("Set permissions on %s\n", dir);

4
cde/programs/dtsearchpath/dtappg/dtappgather.C
View file

@ -164,9 +164,9 @@ AppManagerDirectory::AppManagerDirectory
if (!user->OS()->isDirectory(dir)) { // does dt exist? if (!user->OS()->isDirectory(dir)) { // does dt exist?
dir.replace("/dt",""); dir.replace("/dt","");
if (!user->OS()->isDirectory(dir)) { // does /var exist? 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()->changeOwnerGroup(dir,"root","other");
user->OS()->changePermissions(dir,0775); user->OS()->changePermissions(dir,0755);
} }
dir += "/dt"; dir += "/dt";
user->OS()->MakeDirectory(dir,0755); user->OS()->MakeDirectory(dir,0755);