-if ( $svc_acct->_password ) {
- if ( $conf->exists('showpasswords') || ! $svcnum ) {
- $password = $svc_acct->_password;
- } else {
- $password = "*HIDDEN*";
+my $password_encryption = $svc_acct->_password_encryption;
+my $password_encoding = $svc_acct->_password_encoding;
+
+if($svcnum) {
+ if($password = $svc_acct->get_cleartext_password) {
+ if (! $conf->exists('showpasswords')) {
+ $password = '*HIDDEN*';
+ }
+ }
+ elsif($svc_acct->_password and $password_encryption ne 'plain') {
+ $password = "(".uc($password_encryption)." encrypted)";
+ }
+ else {
+ $password = '';