From 41611f474e8cf755f5b74fb98ef33ab8d830d081 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Thu, 30 Jun 2016 11:08:57 +0200
Subject: offer again to add user to admin group (mga#17720)

default security level is 1 those days
we should probably only keep "adm" & "wheel" (eg: rip "xgrp" & the like)
---
 perl-install/any.pm       | 4 ++--
 perl-install/install/NEWS | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/perl-install/any.pm b/perl-install/any.pm
index a9ea0d3ac..956349364 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -932,9 +932,9 @@ sub ask_user_and_root {
           { label => N("Shell"), val => \$u->{shell}, list => [ shells() ], advanced => 1 },
 	  { label => N("User ID"), val => \$u->{uid}, advanced => 1, validate => sub { $validate_uid_gid->('uid') } },
 	  { label => N("Group ID"), val => \$u->{gid}, advanced => 1, validate => sub { $validate_uid_gid->('gid') } },
-	    if_($security > 3,
+	    if_($security >= 1,
                 map {
-                    { label => $_, val => \$groups{$_}, text => $high_security_groups{$_}, type => 'bool' };
+                    { label => $_, val => \$groups{$_}, text => $high_security_groups{$_}, type => 'bool', advanced => 1 };
                 } keys %high_security_groups,
                ),
 	  ],
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index e20e96087..720fadf43 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- users:
+  o offer again to add user to admin group (mga#17720)
+
 Version 17.46 - 24 June 2016
 
 - library:
-- 
cgit v1.2.1