aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2009-05-09 20:36:55 +0100
committerAvatar David Leverton <levertond@googlemail.com> 2009-05-09 20:39:00 +0100
commit9795e53b53f4a6d30cb0cdae8bcc3dd7c74f8c59 (patch)
tree19251f22d6bae9aaa1ee652ed6b226e1de41f752
parentd62c4583479d6535d158b321f8b37f5e09554e8f (diff)
downloadpaludis-9795e53b53f4a6d30cb0cdae8bcc3dd7c74f8c59.tar.gz
paludis-9795e53b53f4a6d30cb0cdae8bcc3dd7c74f8c59.tar.xz
Reduced Privs doesn't belong under Paludis build information
-rw-r--r--src/clients/paludis/info.cc32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/clients/paludis/info.cc b/src/clients/paludis/info.cc
index 878c0ab..19038e9 100644
--- a/src/clients/paludis/info.cc
+++ b/src/clients/paludis/info.cc
@@ -301,22 +301,6 @@ do_info(const std::tr1::shared_ptr<const Environment> & env)
<< endl;
cout << endl;
- cout << " " << colour(cl_heading, "Reduced Privs:") << endl;
- cout << " " << std::setw(22) << std::left << "reduced_uid:" << std::setw(0) << " "
- << env->reduced_uid() << endl;
- const struct passwd * const p(getpwuid(env->reduced_uid()));
- cout << " " << std::setw(22) << std::left << "reduced_uid->name:" << std::setw(0) << " "
- << (p ? p->pw_name : "???") << endl;
- cout << " " << std::setw(22) << std::left << "reduced_uid->dir:" << std::setw(0) << " "
- << (p ? p->pw_dir : "???") << endl;
- cout << " " << std::setw(22) << std::left << "reduced_gid:" << std::setw(0) << " "
- << env->reduced_gid() << endl;
- const struct group * const g(getgrgid(env->reduced_gid()));
- cout << " " << std::setw(22) << std::left << "reduced_gid->name:" << std::setw(0) << " "
- << (g ? g->gr_name : "???") << endl;
-
- cout << endl;
-
cout << " " << colour(cl_heading, "Paths:") << endl;
cout << " " << std::setw(22) << std::left << ("DATADIR:") << std::setw(0) << " " << DATADIR << endl;
@@ -328,6 +312,22 @@ do_info(const std::tr1::shared_ptr<const Environment> & env)
cout << endl;
+ cout << colour(cl_heading, "Reduced Privs:") << endl;
+ cout << " " << std::setw(26) << std::left << "reduced_uid:" << std::setw(0) << " "
+ << env->reduced_uid() << endl;
+ const struct passwd * const p(getpwuid(env->reduced_uid()));
+ cout << " " << std::setw(26) << std::left << "reduced_uid->name:" << std::setw(0) << " "
+ << (p ? p->pw_name : "???") << endl;
+ cout << " " << std::setw(26) << std::left << "reduced_uid->dir:" << std::setw(0) << " "
+ << (p ? p->pw_dir : "???") << endl;
+ cout << " " << std::setw(26) << std::left << "reduced_gid:" << std::setw(0) << " "
+ << env->reduced_gid() << endl;
+ const struct group * const g(getgrgid(env->reduced_gid()));
+ cout << " " << std::setw(26) << std::left << "reduced_gid->name:" << std::setw(0) << " "
+ << (g ? g->gr_name : "???") << endl;
+
+ cout << endl;
+
{
cout << "Environment:" << endl;
std::set<std::tr1::shared_ptr<const MetadataKey>, MetadataKeyComparator> keys(