summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyungwook Tak <k.tak@samsung.com>2017-02-08 15:29:03 +0900
committersangwan.kwon <sangwan.kwon@samsung.com>2017-04-04 16:43:23 +0900
commit666a3b290cdcd5f2e1ed7ea20604e7e958e0bf83 (patch)
tree3d73b11f5627e4f78b229a17db12ad06023455c6
parent718aa802cd986c826c4a823e4484b671435a1b54 (diff)
downloadauth-fw-666a3b290cdcd5f2e1ed7ea20604e7e958e0bf83.tar.gz
auth-fw-666a3b290cdcd5f2e1ed7ea20604e7e958e0bf83.tar.bz2
auth-fw-666a3b290cdcd5f2e1ed7ea20604e7e958e0bf83.zip
Change-Id: Ic25b8fd8e3b42d4d88bbf0aefad1324035e1508b Signed-off-by: Kyungwook Tak <k.tak@samsung.com> (cherry picked from commit 9045342e744ff84180f64ee185ed5f7d19d7d1ea) Signed-off-by: sangwan.kwon <sangwan.kwon@samsung.com>
-rw-r--r--src/server/main/generic-socket-manager.cpp2
-rw-r--r--src/server/main/include/socket-manager.h2
-rw-r--r--src/server/main/socket-manager.cpp1
-rw-r--r--src/server/service/policy-manager.cpp30
4 files changed, 16 insertions, 19 deletions
diff --git a/src/server/main/generic-socket-manager.cpp b/src/server/main/generic-socket-manager.cpp
index 2a2cd39..5058ad4 100644
--- a/src/server/main/generic-socket-manager.cpp
+++ b/src/server/main/generic-socket-manager.cpp
@@ -59,7 +59,7 @@ public:
private:
msghdr m_hdr;
iovec m_iov;
- cmsghdr *m_cmsg;
+ cmsghdr *m_cmsg = nullptr;
unsigned char m_cmsgbuf[CMSG_SPACE(sizeof(int))];
int m_resultCode;
int m_fileDesc;
diff --git a/src/server/main/include/socket-manager.h b/src/server/main/include/socket-manager.h
index 4c63e02..ea60fc6 100644
--- a/src/server/main/include/socket-manager.h
+++ b/src/server/main/include/socket-manager.h
@@ -91,6 +91,8 @@ protected:
, useSendMsg(false)
, interfaceID(-1)
, service(NULL)
+ , timeout(0)
+ , counter(0)
{}
};
diff --git a/src/server/main/socket-manager.cpp b/src/server/main/socket-manager.cpp
index 6bd63df..aa12a7e 100644
--- a/src/server/main/socket-manager.cpp
+++ b/src/server/main/socket-manager.cpp
@@ -150,6 +150,7 @@ SocketManager::CreateDefaultReadSocketDescription(int sock, bool timeout,
SocketManager::SocketManager() :
m_maxDesc(0),
+ m_working(false),
m_counter(0)
{
FD_ZERO(&m_readSet);
diff --git a/src/server/service/policy-manager.cpp b/src/server/service/policy-manager.cpp
index e6139b3..150fd6d 100644
--- a/src/server/service/policy-manager.cpp
+++ b/src/server/service/policy-manager.cpp
@@ -27,8 +27,8 @@
#include <iostream>
#include <iterator>
#include <algorithm>
-
-#include <limits.h>
+#include <cassert>
+#include <climits>
#include <dpl/log/log.h>
@@ -126,7 +126,9 @@ int PolicyManager::setPolicy(Policy policy)
PolicyFileMap::iterator itPolicy = m_policyFile.find(policy.uid);
// check if policies are correct
- for (int i = POLICY_TYPE_FIRST ; i < POLICY_TYPE_LAST + 1 ; i++) {
+ assert(POLICY_TYPE_FIRST == POLICY_MAX_ATTEMPTS);
+ assert(POLICY_TYPE_LAST == POLICY_FORBIDDEN_PASSWDS);
+ for (int i = POLICY_TYPE_FIRST; i < POLICY_TYPE_LAST + 1; i++) {
if (!policy.isFlagOn(static_cast<password_policy_type>(i)))
continue;
@@ -185,9 +187,6 @@ int PolicyManager::setPolicy(Policy policy)
break;
- case POLICY_FORBIDDEN_PASSWDS:
- break;
-
case POLICY_QUALITY_TYPE:
if (policy.qualityType > AUTH_PWD_QUALITY_LAST) {
LogError("Incorrect input param.");
@@ -204,14 +203,13 @@ int PolicyManager::setPolicy(Policy policy)
break;
- default:
- LogError("Not supported policy type.");
- return AUTH_PASSWD_API_ERROR_INPUT_PARAM;
+ default: // POLICY_FORBIDDEN_PASSWDS
+ break;
}
}
// update policies
- for (int i = POLICY_TYPE_FIRST ; i < POLICY_TYPE_LAST + 1 ; i++) {
+ for (int i = POLICY_TYPE_FIRST; i < POLICY_TYPE_LAST + 1; i++) {
if (!policy.isFlagOn(static_cast<password_policy_type>(i)))
continue;
@@ -248,11 +246,6 @@ int PolicyManager::setPolicy(Policy policy)
itPolicy->second.setMaxNumSeqLength(policy.maxNumSeqLength);
break;
- case POLICY_FORBIDDEN_PASSWDS:
- LogSecureDebug("forbiddenPasswds number: " << policy.forbiddenPasswds.size());
- itPolicy->second.setForbiddenPasswds(policy.forbiddenPasswds);
- break;
-
case POLICY_QUALITY_TYPE:
LogSecureDebug("qualityType: " << policy.qualityType);
itPolicy->second.setQualityType(policy.qualityType);
@@ -263,9 +256,10 @@ int PolicyManager::setPolicy(Policy policy)
itPolicy->second.setPattern(policy.pattern);
break;
- default:
- LogError("Not supported policy type.");
- return AUTH_PASSWD_API_ERROR_INPUT_PARAM;
+ default: // POLICY_FORBIDDEN_PASSWDS
+ LogSecureDebug("forbiddenPasswds number: " << policy.forbiddenPasswds.size());
+ itPolicy->second.setForbiddenPasswds(policy.forbiddenPasswds);
+ break;
}
}