|
 |
6d0b66 |
From 7345c51c68dfd90a704ccbb0e5b1e736af80f146 Mon Sep 17 00:00:00 2001
|
|
|
6d0b66 |
From: Thierry Bordaz <tbordaz@redhat.com>
|
|
|
6d0b66 |
Date: Mon, 17 May 2021 16:10:22 +0200
|
|
|
6d0b66 |
Subject: [PATCH] Issue 4725 - Fix compiler warnings
|
|
|
6d0b66 |
|
|
|
6d0b66 |
---
|
|
|
6d0b66 |
ldap/servers/slapd/proto-slap.h | 2 +-
|
|
|
6d0b66 |
ldap/servers/slapd/pw.c | 9 ++++-----
|
|
|
6d0b66 |
ldap/servers/slapd/pw_retry.c | 2 --
|
|
|
6d0b66 |
3 files changed, 5 insertions(+), 8 deletions(-)
|
|
|
6d0b66 |
|
|
|
6d0b66 |
diff --git a/ldap/servers/slapd/proto-slap.h b/ldap/servers/slapd/proto-slap.h
|
|
|
6d0b66 |
index 6ff178127..2768d5a1d 100644
|
|
|
6d0b66 |
--- a/ldap/servers/slapd/proto-slap.h
|
|
|
6d0b66 |
+++ b/ldap/servers/slapd/proto-slap.h
|
|
|
6d0b66 |
@@ -1012,7 +1012,7 @@ int add_shadow_ext_password_attrs(Slapi_PBlock *pb, Slapi_Entry **e);
|
|
|
6d0b66 |
* pw_retry.c
|
|
|
6d0b66 |
*/
|
|
|
6d0b66 |
int update_pw_retry(Slapi_PBlock *pb);
|
|
|
6d0b66 |
-int update_trp_pw_usecount(Slapi_PBlock *pb, Slapi_Entry *e, int32_t use_count);
|
|
|
6d0b66 |
+int update_tpr_pw_usecount(Slapi_PBlock *pb, Slapi_Entry *e, int32_t use_count);
|
|
|
6d0b66 |
void pw_apply_mods(const Slapi_DN *sdn, Slapi_Mods *mods);
|
|
|
6d0b66 |
void pw_set_componentID(struct slapi_componentid *cid);
|
|
|
6d0b66 |
struct slapi_componentid *pw_get_componentID(void);
|
|
|
6d0b66 |
diff --git a/ldap/servers/slapd/pw.c b/ldap/servers/slapd/pw.c
|
|
|
6d0b66 |
index d98422513..2a167c8f1 100644
|
|
|
6d0b66 |
--- a/ldap/servers/slapd/pw.c
|
|
|
6d0b66 |
+++ b/ldap/servers/slapd/pw.c
|
|
|
6d0b66 |
@@ -2622,7 +2622,6 @@ int
|
|
|
6d0b66 |
slapi_check_tpr_limits(Slapi_PBlock *pb, Slapi_Entry *bind_target_entry, int send_result) {
|
|
|
6d0b66 |
passwdPolicy *pwpolicy = NULL;
|
|
|
6d0b66 |
char *dn = NULL;
|
|
|
6d0b66 |
- int tpr_maxuse;
|
|
|
6d0b66 |
char *value;
|
|
|
6d0b66 |
time_t cur_time;
|
|
|
6d0b66 |
char *cur_time_str = NULL;
|
|
|
6d0b66 |
@@ -2638,7 +2637,7 @@ slapi_check_tpr_limits(Slapi_PBlock *pb, Slapi_Entry *bind_target_entry, int sen
|
|
|
6d0b66 |
return 0;
|
|
|
6d0b66 |
}
|
|
|
6d0b66 |
|
|
|
6d0b66 |
- if (slapi_entry_attr_hasvalue(bind_target_entry, "pwdTPRReset", "TRUE") == NULL) {
|
|
|
6d0b66 |
+ if (!slapi_entry_attr_hasvalue(bind_target_entry, "pwdTPRReset", "TRUE")) {
|
|
|
6d0b66 |
/* the password was not reset by an admin while a TRP pwp was set, just returned */
|
|
|
6d0b66 |
return 0;
|
|
|
6d0b66 |
}
|
|
|
6d0b66 |
@@ -2646,7 +2645,7 @@ slapi_check_tpr_limits(Slapi_PBlock *pb, Slapi_Entry *bind_target_entry, int sen
|
|
|
6d0b66 |
/* Check entry TPR max use */
|
|
|
6d0b66 |
if (pwpolicy->pw_tpr_maxuse >= 0) {
|
|
|
6d0b66 |
uint use_count;
|
|
|
6d0b66 |
- value = slapi_entry_attr_get_ref(bind_target_entry, "pwdTPRUseCount");
|
|
|
6d0b66 |
+ value = (char *) slapi_entry_attr_get_ref(bind_target_entry, "pwdTPRUseCount");
|
|
|
6d0b66 |
if (value) {
|
|
|
6d0b66 |
/* max Use is enforced */
|
|
|
6d0b66 |
use_count = strtoull(value, 0, 0);
|
|
|
6d0b66 |
@@ -2681,7 +2680,7 @@ slapi_check_tpr_limits(Slapi_PBlock *pb, Slapi_Entry *bind_target_entry, int sen
|
|
|
6d0b66 |
|
|
|
6d0b66 |
/* Check entry TPR expiration at a specific time */
|
|
|
6d0b66 |
if (pwpolicy->pw_tpr_delay_expire_at >= 0) {
|
|
|
6d0b66 |
- value = slapi_entry_attr_get_ref(bind_target_entry, "pwdTPRExpireAt");
|
|
|
6d0b66 |
+ value = (char *) slapi_entry_attr_get_ref(bind_target_entry, "pwdTPRExpireAt");
|
|
|
6d0b66 |
if (value) {
|
|
|
6d0b66 |
/* max Use is enforced */
|
|
|
6d0b66 |
if (difftime(parse_genTime(cur_time_str), parse_genTime(value)) >= 0) {
|
|
|
6d0b66 |
@@ -2709,7 +2708,7 @@ slapi_check_tpr_limits(Slapi_PBlock *pb, Slapi_Entry *bind_target_entry, int sen
|
|
|
6d0b66 |
|
|
|
6d0b66 |
/* Check entry TPR valid after a specific time */
|
|
|
6d0b66 |
if (pwpolicy->pw_tpr_delay_valid_from >= 0) {
|
|
|
6d0b66 |
- value = slapi_entry_attr_get_ref(bind_target_entry, "pwdTPRValidFrom");
|
|
|
6d0b66 |
+ value = (char *) slapi_entry_attr_get_ref(bind_target_entry, "pwdTPRValidFrom");
|
|
|
6d0b66 |
if (value) {
|
|
|
6d0b66 |
/* validity after a specific time is enforced */
|
|
|
6d0b66 |
if (difftime(parse_genTime(value), parse_genTime(cur_time_str)) >= 0) {
|
|
|
6d0b66 |
diff --git a/ldap/servers/slapd/pw_retry.c b/ldap/servers/slapd/pw_retry.c
|
|
|
6d0b66 |
index 5d13eb636..af54aa19d 100644
|
|
|
6d0b66 |
--- a/ldap/servers/slapd/pw_retry.c
|
|
|
6d0b66 |
+++ b/ldap/servers/slapd/pw_retry.c
|
|
|
6d0b66 |
@@ -163,8 +163,6 @@ set_retry_cnt_and_time(Slapi_PBlock *pb, int count, time_t cur_time)
|
|
|
6d0b66 |
int
|
|
|
6d0b66 |
set_tpr_usecount_mods(Slapi_PBlock *pb, Slapi_Mods *smods, int count)
|
|
|
6d0b66 |
{
|
|
|
6d0b66 |
- char *timestr;
|
|
|
6d0b66 |
- time_t unlock_time;
|
|
|
6d0b66 |
char retry_cnt[16] = {0}; /* 1-65535 */
|
|
|
6d0b66 |
const char *dn = NULL;
|
|
|
6d0b66 |
Slapi_DN *sdn = NULL;
|
|
|
6d0b66 |
--
|
|
|
6d0b66 |
2.31.1
|
|
|
6d0b66 |
|