let's assume GECOS data is utf-8 encoded (#4296)

1 files changed, 6 insertions, 2 deletions

diff --git a/userdrake b/userdrake
index 8ee848a..c307a19 100755
--- a/userdrake
+++ b/userdrake
@@ -213,7 +213,9 @@ sub RefreshUsersFull {
     foreach my $l (@UserReal) {
 	$a = $l->Gid($GetValue); $group = $ctx->LookupGroupById($a); $groupnm = ''; $expr = ComputeLockExpire($l);
 	$group and $groupnm = $group->GroupName($GetValue); 
-	$utree_model->append_set([ 0 => $l->UserName($GetValue), 1 => $l->Uid($GetValue), 2 => $groupnm, 3 => $l->Gecos($GetValue), 4 => $l->LoginShell($GetValue), 5 => $l->HomeDir($GetValue), 6 => $expr ]);
+	my $s = $l->Gecos($GetValue);
+	c::set_tagged_utf8($s);
+	$utree_model->append_set([ 0 => $l->UserName($GetValue), 1 => $l->Uid($GetValue), 2 => $groupnm, 3 => $s, 4 => $l->LoginShell($GetValue), 5 => $l->HomeDir($GetValue), 6 => $expr ]);
     }
 }
 sub RefreshGroupsFull {
@@ -484,7 +486,9 @@ sub GetNameEntFromIter {
 }
 sub FillUserInfo {
     my $ent = shift;
-    $us->{o}{fullname}->set_text($ent->Gecos($GetValue));
+    my $s = $ent->Gecos($GetValue);
+    c::set_tagged_utf8($s);
+    $us->{o}{fullname}->set_text($s);
     $us->{o}{passwd}->set_text('     ');
     $us->{o}{confpasswd}->set_text('     ');
     $us->{o}{shells}->entry->set_text($ent->LoginShell($GetValue));