ldap/admin/src/scripts/ns-accountstatus.pl.in | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 7b7d22cd80cc827ab4c2b801fcfe3f02f1a3e690
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Tue May 3 15:51:51 2016 -0400
Ticket 48269 - ns-accountstatus status message improvement
Description: With the addition of support of account policy inactivity
limits, the inactivated messages should be more detailed.
https://fedorahosted.org/389/ticket/48269
Reviewed by: nhosoi(Thanks!)
diff --git a/ldap/admin/src/scripts/ns-accountstatus.pl.in
b/ldap/admin/src/scripts/ns-accountstatus.pl.in
index 139160b..5d92220 100644
--- a/ldap/admin/src/scripts/ns-accountstatus.pl.in
+++ b/ldap/admin/src/scripts/ns-accountstatus.pl.in
@@ -920,10 +920,10 @@ for(my $i = 0; $i <= $#entries; $i++){
if ($verbose){
printVerbose(\%info, "@suffixN", $entry, $createtime,
$modifytime, $lastlogintime,
- "inactivated through $throughRole", $limit,
+ "inactivated (indirectly through role:
$throughRole)", $limit,
$acct_policy_enabled);
} else {
- out("$entry - inactivated through $throughRole.\n");
+ out("$entry - inactivated (indirectly through role:
$throughRole).\n");
}
if($keep_processing){
next;
@@ -933,10 +933,10 @@ for(my $i = 0; $i <= $#entries; $i++){
debug("$entry locked individually\n");
if ($verbose){
printVerbose(\%info, "@suffixN", $entry, $createtime,
- $modifytime, $lastlogintime, "inactivated", $limit,
+ $modifytime, $lastlogintime, "inactivated (directly
locked)", $limit,
$acct_policy_enabled);
} else {
- out("$entry - inactivated.\n");
+ out("$entry - inactivated (directly locked).\n");
}
if($keep_processing){
next;
@@ -1025,10 +1025,10 @@ for(my $i = 0; $i <= $#entries; $i++){
}
if($verbose){
printVerbose(\%info, "@suffixN", $entry, $createtime,
- $modifytime, $lastlogintime, "inactivated", $limit,
+ $modifytime, $lastlogintime, "inactivated (directly
locked)", $limit,
$acct_policy_enabled);
} else {
- out("$entry - inactivated.\n");
+ out("$entry - inactivated (directly locked).\n");
}
if($keep_processing){
next;