Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
76551b01
Commit
76551b01
authored
May 23, 2003
by
Leigh B. Stoller
Browse files
Return SHELL (u.usr_shell) to version 10 clients in doaccounts().
parent
e4f1afcf
Changes
1
Hide whitespace changes
Inline
Side-by-side
tmcd/tmcd.c
View file @
76551b01
...
...
@@ -1172,13 +1172,13 @@ COMMAND_PROTOTYPE(doaccounts)
" p.trust,g.pid,g.gid,g.unix_gid,u.admin, "
" u.emulab_pubkey,u.home_pubkey, "
" UNIX_TIMESTAMP(u.usr_modified), "
" u.usr_email "
" u.usr_email
,u.usr_shell
"
"from group_membership as p "
"left join users as u on p.uid=u.uid "
"left join groups as g on p.pid=g.pid "
"where p.trust!='none' "
" and u.status='active' order by u.uid"
,
1
3
,
reqp
->
pid
,
reqp
->
gid
);
1
4
,
reqp
->
pid
,
reqp
->
gid
);
}
else
if
(
reqp
->
islocal
||
reqp
->
isvnode
)
{
/*
...
...
@@ -1196,14 +1196,15 @@ COMMAND_PROTOTYPE(doaccounts)
" p.trust,g.pid,g.gid,g.unix_gid,u.admin, "
" u.emulab_pubkey,u.home_pubkey, "
" UNIX_TIMESTAMP(u.usr_modified), "
" u.usr_email,u.widearearoot,u.wideareajailroot "
" u.usr_email,u.usr_shell, "
" u.widearearoot,u.wideareajailroot "
"from group_membership as p "
"left join users as u on p.uid=u.uid "
"left join groups as g on p.pid=g.pid "
"where ((p.pid='%s' and p.gid='%s')) "
" and p.trust!='none' "
" and u.status='active' order by u.uid"
,
1
5
,
reqp
->
pid
,
reqp
->
gid
);
1
6
,
reqp
->
pid
,
reqp
->
gid
);
}
else
{
res
=
mydb_query
(
"select distinct "
...
...
@@ -1211,14 +1212,15 @@ COMMAND_PROTOTYPE(doaccounts)
" p.trust,g.pid,g.gid,g.unix_gid,u.admin, "
" u.emulab_pubkey,u.home_pubkey, "
" UNIX_TIMESTAMP(u.usr_modified), "
" u.usr_email,u.widearearoot,u.wideareajailroot "
" u.usr_email,u.usr_shell, "
" u.widearearoot,u.wideareajailroot "
"from group_membership as p "
"left join users as u on p.uid=u.uid "
"left join groups as g on "
" p.pid=g.pid and p.gid=g.gid "
"where ((p.pid='%s')) and p.trust!='none' "
" and u.status='active' order by u.uid"
,
1
5
,
reqp
->
pid
);
1
6
,
reqp
->
pid
);
}
}
else
if
(
reqp
->
jailflag
)
{
...
...
@@ -1231,7 +1233,8 @@ COMMAND_PROTOTYPE(doaccounts)
" p.trust,g.pid,g.gid,g.unix_gid,u.admin, "
" u.emulab_pubkey,u.home_pubkey, "
" UNIX_TIMESTAMP(u.usr_modified), "
" u.usr_email,u.widearearoot,u.wideareajailroot "
" u.usr_email,u.usr_shell, "
" u.widearearoot,u.wideareajailroot "
"from group_membership as p "
"left join users as u on p.uid=u.uid "
"left join groups as g on "
...
...
@@ -1239,7 +1242,7 @@ COMMAND_PROTOTYPE(doaccounts)
"where (p.pid='%s') and p.trust!='none' "
" and u.status='active' and u.admin=1 "
" order by u.uid"
,
1
5
,
RELOADPID
);
1
6
,
RELOADPID
);
}
else
{
/*
...
...
@@ -1257,8 +1260,8 @@ COMMAND_PROTOTYPE(doaccounts)
"m.trust,g.pid,g.gid,g.unix_gid,u.admin, "
"u.emulab_pubkey,u.home_pubkey, "
"UNIX_TIMESTAMP(u.usr_modified), "
"u.usr_email,u.
widearearoot
, "
"u.wideareajailroot "
"u.usr_email,u.
usr_shell
, "
"u.
widearearoot,u.
wideareajailroot "
"from projects as p "
"left join group_membership as m "
" on m.pid=p.pid "
...
...
@@ -1270,7 +1273,7 @@ COMMAND_PROTOTYPE(doaccounts)
" and m.trust!='none' "
" and u.status='active' "
"order by u.uid"
,
1
5
,
reqp
->
type
);
1
6
,
reqp
->
type
);
}
if
(
!
res
)
{
...
...
@@ -1354,9 +1357,9 @@ COMMAND_PROTOTYPE(doaccounts)
*/
if
(
!
reqp
->
islocal
)
{
if
(
!
reqp
->
isvnode
)
root
=
atoi
(
row
[
13
]);
else
root
=
atoi
(
row
[
14
]);
else
root
=
atoi
(
row
[
15
]);
if
(
tbadmin
)
root
=
1
;
...
...
@@ -1415,6 +1418,10 @@ COMMAND_PROTOTYPE(doaccounts)
sprintf
(
&
buf
[
strlen
(
buf
)],
" EMAIL=
\"
%s
\"
"
,
row
[
12
]);
}
if
(
vers
>=
10
)
{
sprintf
(
&
buf
[
strlen
(
buf
)],
" SHELL=%s"
,
row
[
13
]);
}
strcat
(
buf
,
"
\n
"
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment