From 3f312211c0ef8275e11e8bb8d03100452da6d58f Mon Sep 17 00:00:00 2001 From: Andrew McNab Date: Fri, 10 Jun 2005 09:43:14 +0000 Subject: [PATCH] Tidy up for tag --- org.gridsite.core/CHANGES | 4 ++++ org.gridsite.core/VERSION | 2 +- org.gridsite.core/project/version.properties | 2 +- org.gridsite.core/src/gridsite.spec | 2 +- org.gridsite.core/src/gsexec.c | 8 ++++---- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/org.gridsite.core/CHANGES b/org.gridsite.core/CHANGES index 6959075..cd9cd56 100644 --- a/org.gridsite.core/CHANGES +++ b/org.gridsite.core/CHANGES @@ -1,3 +1,7 @@ +* Fri Jun 10 2005 Andrew McNab +- Tidy up gsexec vs GridSiteDiskPerms +* Fri Jun 10 2005 Andrew McNab +- ==== GridSite version 1.1.10 ==== * Wed Jun 8 2005 Andrew McNab - Add GridSiteDiskMode Apache directive to set file permissions. diff --git a/org.gridsite.core/VERSION b/org.gridsite.core/VERSION index cbe0f27..13a3b5c 100644 --- a/org.gridsite.core/VERSION +++ b/org.gridsite.core/VERSION @@ -1,4 +1,4 @@ MAJOR_VERSION=1 MINOR_VERSION=1.1 -PATCH_VERSION=1.1.9 +PATCH_VERSION=1.1.10 VERSION=$(PATCH_VERSION) diff --git a/org.gridsite.core/project/version.properties b/org.gridsite.core/project/version.properties index bd21a63..45a3acb 100644 --- a/org.gridsite.core/project/version.properties +++ b/org.gridsite.core/project/version.properties @@ -1,2 +1,2 @@ -module.version=1.1.9 +module.version=1.1.10 module.age=1 diff --git a/org.gridsite.core/src/gridsite.spec b/org.gridsite.core/src/gridsite.spec index 6e9c191..f55c349 100644 --- a/org.gridsite.core/src/gridsite.spec +++ b/org.gridsite.core/src/gridsite.spec @@ -97,5 +97,5 @@ rm -f %(echo ${MYPREFIX:-/usr})/share/doc/gridsite %attr(-, root, root) %(echo ${MYPREFIX:-/usr})/share/man/man1/htmkdir.1.gz %files gsexec -%attr(-, root, root) %(echo ${MYPREFIX:-/usr})/sbin/gsexec +%attr(4510, root, apache) %(echo ${MYPREFIX:-/usr})/sbin/gsexec %attr(-, root, root) %(echo ${MYPREFIX:-/usr})/share/man/man8/gsexec.8.gz diff --git a/org.gridsite.core/src/gsexec.c b/org.gridsite.core/src/gsexec.c index e67c91a..292dcf3 100644 --- a/org.gridsite.core/src/gsexec.c +++ b/org.gridsite.core/src/gsexec.c @@ -994,7 +994,7 @@ int main(int argc, char *argv[]) if (diskmode_env != NULL) { diskmode_apr = 0; - sscanf(diskmode_env, "%d", &diskmode_apr); + sscanf(diskmode_env, "%i", &diskmode_apr); diskmode_t = S_IRUSR | S_IWUSR; @@ -1003,7 +1003,9 @@ int main(int argc, char *argv[]) if (diskmode_apr & APR_WREAD ) diskmode_t |= S_IROTH; diskmode_t &= (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH); - + +// log_err("diskmode_env=%s diskmode_apr=%x diskmode_t=%o ~diskmode_t=%o\n", diskmode_env, diskmode_apr, diskmode_t, ~diskmode_t); + umask(~diskmode_t); } #ifdef AP_SUEXEC_UMASK @@ -1012,8 +1014,6 @@ int main(int argc, char *argv[]) else umask(~(S_IRUSR | S_IWUSR)); #endif /* AP_SUEXEC_UMASK */ - - /* * Be sure to close the log file so the CGI can't * mess with it. If the exec fails, it will be reopened -- 1.8.2.3