~mdw
/
distorted-keys
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
keyfunc.sh.in, ktype.*: Make nub creation the job of `c_genkey'.
[distorted-keys]
/
userv
/
claim-dir.in
diff --git
a/userv/claim-dir.in
b/userv/claim-dir.in
index
4cc6032
..
ef8349e
100644
(file)
--- a/
userv/claim-dir.in
+++ b/
userv/claim-dir.in
@@
-4,7
+4,9
@@
if ( glob service claim-dir
& glob service-user root
if ( glob service claim-dir
& glob service-user root
- & grep calling-user-shell /etc/shells
+ & ( grep calling-user-shell /etc/shells
+ | glob calling-user-shell /dev/token-shells/userv
+ )
)
no-suppress-args
null-fd 0
)
no-suppress-args
null-fd 0
@@
-16,7
+18,7
@@
if ( glob service claim-dir
1) filsys=$1 ;; \
*) echo >&2 \"usage: $quis FILSYS\"; exit 1 ;; \
esac; \
1) filsys=$1 ;; \
*) echo >&2 \"usage: $quis FILSYS\"; exit 1 ;; \
esac; \
- foundp=nil;
\
+ foundp=nil;
mode=700;
\
while read fs dir opts; do \
case \"$fs\" in \
\\#* | \"\") continue ;; \
while read fs dir opts; do \
case \"$fs\" in \
\\#* | \"\") continue ;; \
@@
-61,6
+63,9
@@
if ( glob service claim-dir
;; \
esac \
;; \
;; \
esac \
;; \
+ mode=*) \
+ mode=$arg \
+ ;; \
mount=*) \
if ! mountpoint -q \"$dir\"; then $arg \"$dir\"; fi \
;; \
mount=*) \
if ! mountpoint -q \"$dir\"; then $arg \"$dir\"; fi \
;; \
@@
-74,7
+79,7
@@
if ( glob service claim-dir
set _ $USERV_GROUP; group=$2; \
cd \"$dir\"; \
if [ ! -d \"$user\" ]; then \
set _ $USERV_GROUP; group=$2; \
cd \"$dir\"; \
if [ ! -d \"$user\" ]; then \
- mkdir -m
700 \"$user\";
\
+ mkdir -m
$mode \"$user\";
\
chown \"$user:$group\" \"$user\"; \
fi; \
echo \"$dir/$USERV_USER\" \
chown \"$user:$group\" \"$user\"; \
fi; \
echo \"$dir/$USERV_USER\" \