Changeset 652

Timestamp:

Oct 13, 2007 10:07:41 AM (6 years ago)

Author:

jrollins

Message:

cereal: couple of minor tweaks/cleanup.

Location:

trunk/cereal/fs/usr

Files:

• sbin/cereal-admin (modified) (4 diffs)
• share/cereal/common (modified) (2 diffs)
• share/man/man8/cereal-admin.8 (modified) (1 diff)

trunk/cereal/fs/usr/sbin/cereal-admin

@@ -106 +106 @@
 # start_check
 start_check() {
-    chpst -u "$USER:$GROUP" bash -c "test -r $TTY && test -w $TTY"
+    check_tty_rw "$USER" "$GROUP" "$TTY"
 }
 export -f start_check
@@ -134 +134 @@
         elif is_linked "$SESSION" ; then
             error "Session '$SESSION' is already running." 1
+        elif [ ! -w "$SERVICEDIR" ] ; then
+            error "You do not have permission to start session '$SESSION'." 2
         elif ! chpst -e "$SESSIONDIR/$SESSION/env/" sh -c start_check ; then
-            error "Session '$SESSION' not properly configured, or you do not have permission to start session." 2
+            error "Session '$SESSION' not properly configured." 2
         else
             if start_session "$SESSION" ; then
@@ -171 +173 @@
         elif ! is_linked "$SESSION" ; then
             error "Session '$SESSION' not linked." 1
+        elif ! is_controllable "$SESSION" ; then
+            error "You do not have permission to stop session '$SESSION'." 2
         else
             if stop_session "$SESSION" ; then
@@ -206 +210 @@
         if ! is_session "$SESSION" ; then
             echo "Session '$SESSION' not found."
-            continue
         elif ! is_linked "$SESSION" ; then
             start "$SESSION"
+        elif ! is_controllable "$SESSION" ; then
+            error "You do not have permission to restart session '$SESSION'." 2
         else
             if restart_session "$SESSION" ; then

trunk/cereal/fs/usr/share/cereal/common

@@ -104 +104 @@
 export -f is_running
 
+# check if user can control session
+# is_controllable SESSION
+is_controllable() {
+    sv status "$SERVICE.$1" > /dev/null
+}
+export -f is_controllable
+
 # can_attach SESSION [USER]
 can_attach() {
-    USER=${2:-"$USER"}
+    local USER=${2:-"$USER"}
     [ "$USER" = $(cat "$SESSIONDIR/$1/env/USER") ]
 }
@@ -120 +127 @@
     local LOGUSER=$(cat "$SESSIONDIR/$1/env/LOGUSER")
     local LOGGROUP=$(cat "$SESSIONDIR/$1/env/LOGGROUP")
-    USER=${2:-"$USER"}
+    local USER=${2:-"$USER"}
     [ "$USER" = "$LOGUSER" ] || in_group "$USER" "$LOGGROUP" || [ $(id -u "$USER") = '0' ]
 }

trunk/cereal/fs/usr/share/man/man8/cereal-admin.8

@@ -64 +64 @@
 Logs are handled by
 .BR svlogd.
-For information on how to control session log handling, please see the
-svlogd man page, or the howto included with the documentation included
-with this package.
+For information on how to control session log handling, please see
+svlogd(8), or the howto included with the documentation included with
+this package.
 .PD
 .SH FILES