Except numbers from complex(special) character counting

plus, add 'break in switch statement

Change-Id: I1c55fc1fdd3a03af49c03fdae4991e8bdc431220
Signed-off-by: jooseong lee <jooseong.lee@samsung.com>

diff --git a/src/server/service/password.cpp b/src/server/service/password.cpp
index 85e1cba9ac4e5ad155249c6f6c0231dfc6f4e370..2175ee4487e064b5be640439ed9d30a4c1da5619 100644 (file)
--- a/src/server/service/password.cpp
+++ b/src/server/service/password.cpp
@@ -144,6 +144,7 @@ int PasswordService::processCheckFunctions(PasswordHdrs hdr, MessageBuffer &buff
                Deserialization::Deserialize(buffer, passwdType);
                Deserialization::Deserialize(buffer, challenge);
                result = m_policyManager.checkPolicy(passwdType, NO_PASSWORD, challenge, cur_user);
+               break;
        }
 
        default:

diff --git a/src/server/service/policy-file.cpp b/src/server/service/policy-file.cpp
index b7266e71131a36fa718eb9a86eef9a71a7a6fcba..5e7f15a3d8aada7342a567bb73ac369b8dd1bf7d 100644 (file)
--- a/src/server/service/policy-file.cpp
+++ b/src/server/service/policy-file.cpp
@@ -194,7 +194,7 @@ bool PolicyFile::checkMinComplexCharNumber(const std::string &password) const
        for (i = 0; i < password.size(); i++) {
                ch = password[i];
 
-               if (ch < 'A' || ('Z' < ch && ch < 'a')  || 'z' < ch)
+               if (ch < '0' || ('9' < ch && ch < 'A') || ('Z' < ch && ch < 'a')  || 'z' < ch)
                        cnt++;
        }