Changeset 560

Timestamp:

12/16/2011 18:10:23 (5 months ago)

Author:

blee

Message:

Merge fix for #110 into confman-1.9.

Fixes #110

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• confman.conf.5.in (modified) (1 diff)
• confmancommon.sh.in (modified) (1 diff)

branches/confman-1.9/confman.conf.5.in

@@ -139 +139 @@
 be treated as singularities by
 .Xr confman 8 .
+.It CONF_GROUP
+Defaults to "wheel". Specify which 
+.Xr group 5 
+should have access to various state files.
 .It CONF_WARNING
 This is the first line of confman banners for managed files.

branches/confman-1.9/confmancommon.sh.in

@@ -133 +133 @@
 fi
 
-# Test if the specified group exists before setting folder groups
+# Create and/or fix permissions on our local state directory
 if ! [ -d "$REPO_DB" ] ; then
-        if ! [ conf_checkgroup ]; then
-                $SUDO $install_cmd -d -o root -m 770 "$REPO_DB"
-        else
-                $SUDO $install_cmd -d -o root -g $CONF_GROUP -m 770 "$REPO_DB"
-        fi
-        $SUDO chmod g+s "$REPO_DB"
+    $SUDO $install_cmd -d -o root -g $CONF_GROUP -m 2770 "$REPO_DB"
 fi
+find $REPO_DB -not -group $CONF_GROUP -exec $SUDO chgrp $CONF_GROUP {} \; \
+    -exec chmod g+r {} \;
 
 # And we'll set a trap: