Merge pull request #12 from jsuchome/master

set the value of CHARACTER_CLASS, read from /etc/login.defs
yast · Mar 28, 2013 · 50c75ed · 50c75ed
2 parents cc72e53 + 6cd8515
commit 50c75ed
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.23.4
+2.23.5
diff --git a/package/yast2-users.changes b/package/yast2-users.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Mar 28 14:38:56 CET 2013 - jsuchome@suse.cz
+
+- set the value of CHARACTER_CLASS, read from /etc/login.defs
+  (bnc#810482)
+- 2.23.5
+
 -------------------------------------------------------------------
 Tue Feb 26 13:07:33 CET 2013 - jsuchome@suse.cz
 

diff --git a/src/Users.pm b/src/Users.pm
@@ -1345,6 +1345,7 @@ sub ReadSystemDefaults {
     my $login_defs	= SCR->Dir (".etc.login_defs");
     if (contains ($login_defs, "CHARACTER_CLASS")) {
 	$character_class= SCR->Read (".etc.login_defs.CHARACTER_CLASS");
+        UsersSimple->SetCharacterClass ($character_class);
     }
 
     my %max_lengths		= %{Security->PasswordMaxLengths ()};

diff --git a/src/UsersSimple.pm b/src/UsersSimple.pm
@@ -240,6 +240,14 @@ sub bool {
     return $param;
 }
 
+##------------------------------------
+# set new value for $character_class
+BEGIN { $TYPEINFO{SetCharacterClass} = ["function", "void", "string"];}
+sub SetCharacterClass {
+    my $self            = shift;
+    $character_class    = shift;
+}
+
 ##------------------------------------
 # set new cracklib dictionary path
 BEGIN { $TYPEINFO{SetCrackLibDictPath} = ["function", "void", "string"];}