Commit 987c8ca6 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Some minor nits fixed.

parent 14933df1
......@@ -79,7 +79,7 @@ if (! ($head = ProjLeader($pid))) {
my (undef,undef,$uid) = getpwnam($head)
or die "$head not in passwd file";
my (undef,undef,$gid) = getgrnam($pid);
my (undef,undef,$gid) = getgrnam($pid)
or die "$pid not in group file";
#
......
......@@ -121,7 +121,7 @@ if ($user ne "root") {
" e.pid=n.pid and e.eid=n.eid ".
"left join group_membership as g on ".
" g.pid=e.pid and g.gid=e.gid ".
"where (" . join(" or ",@conds) . ") g.uid='$user';";
"where (" . join(" or ",@conds) . ") and g.uid='$user';";
print "Checking authorization for '$user': '$cmd'\n" if $verbose;
$sth = $dbh->query($cmd)
......
......@@ -552,9 +552,9 @@ function TBImageIDAccessCheck($uid, $imageid, $access_type)
# Return the Unix GID Name and Number for a group. This is distinct from
# the name we use within the Testbed system.
#
# usage: TBGroupUnixInfo($pid, $gid, &$unix_name, &$unix_gid)
# usage: TBGroupUnixInfo($pid, $gid, &$unix_gid, &$unix_name)
#
function TBGroupUnixInfo($pid, $gid, &$unix_name, &$unix_gid)
function TBGroupUnixInfo($pid, $gid, &$unix_gid, &$unix_name)
{
$query_result =
DBQueryFatal("select unix_name,unix_gid from groups ".
......
......@@ -337,7 +337,7 @@ mail($TBMAIL_APPROVAL,
"Members: $proj_members\n".
"PCs: $proj_pcs\n".
"Sharks: $proj_sharks\n".
"Unix GID: $unix_gid\n".
"Unix GID: $unix_name ($unix_gid)\n".
"Reasons:\n$proj_why\n\n".
"Please review the application and when you have\n".
"made a decision, go to $TBWWW and\n".
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment