mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2024-12-23 15:40:01 -06:00
Fix build warnings
Some are actual bugs.
This commit is contained in:
parent
1b4eab0411
commit
e261c55626
@ -103,7 +103,7 @@ ipaenrollement_secure(Slapi_PBlock *pb, char **errMesg)
|
||||
|
||||
if (NULL == realm) {
|
||||
*errMesg = "Kerberos realm is not set.\n";
|
||||
LOG_FATAL("%s", errMesg);
|
||||
LOG_FATAL("%s", *errMesg);
|
||||
rc = LDAP_OPERATIONS_ERROR;
|
||||
goto done;
|
||||
}
|
||||
|
@ -343,15 +343,15 @@ static int ipalockout_postop(Slapi_PBlock *pb)
|
||||
time_now = time(NULL);
|
||||
if (lastfail != NULL) {
|
||||
struct tm tm;
|
||||
int ret = 0;
|
||||
int res = 0;
|
||||
|
||||
memset(&tm, 0, sizeof(struct tm));
|
||||
ret = sscanf(lastfail,
|
||||
res = sscanf(lastfail,
|
||||
"%04u%02u%02u%02u%02u%02u",
|
||||
&tm.tm_year, &tm.tm_mon, &tm.tm_mday,
|
||||
&tm.tm_hour, &tm.tm_min, &tm.tm_sec);
|
||||
|
||||
if (ret == 6) {
|
||||
if (res == 6) {
|
||||
tm.tm_year -= 1900;
|
||||
tm.tm_mon -= 1;
|
||||
|
||||
@ -562,21 +562,23 @@ static int ipalockout_preop(Slapi_PBlock *pb)
|
||||
unlock_time = slapi_entry_attr_get_charptr(target_entry, "krbLastAdminUnlock");
|
||||
if (lastfail != NULL) {
|
||||
struct tm tm;
|
||||
int ret = 0;
|
||||
int res = 0;
|
||||
|
||||
memset(&tm, 0, sizeof(struct tm));
|
||||
ret = sscanf(lastfail,
|
||||
res = sscanf(lastfail,
|
||||
"%04u%02u%02u%02u%02u%02u",
|
||||
&tm.tm_year, &tm.tm_mon, &tm.tm_mday,
|
||||
&tm.tm_hour, &tm.tm_min, &tm.tm_sec);
|
||||
|
||||
if (ret == 6) {
|
||||
if (res == 6) {
|
||||
tm.tm_year -= 1900;
|
||||
tm.tm_mon -= 1;
|
||||
|
||||
last_failed = timegm(&tm);
|
||||
LOG("%d > %d ?\n", time_now, last_failed + failcnt_interval);
|
||||
LOG("diff %d\n", (last_failed + failcnt_interval) - time_now);
|
||||
LOG("%ld > %ld ?\n",
|
||||
(long)time_now, (long)last_failed + failcnt_interval);
|
||||
LOG("diff %ld\n",
|
||||
(long)((last_failed + failcnt_interval) - time_now));
|
||||
if (time_now > last_failed + failcnt_interval) {
|
||||
failedcount = 0;
|
||||
}
|
||||
@ -585,12 +587,12 @@ static int ipalockout_preop(Slapi_PBlock *pb)
|
||||
time_t unlock;
|
||||
|
||||
memset(&tm, 0, sizeof(struct tm));
|
||||
ret = sscanf(lastfail,
|
||||
res = sscanf(lastfail,
|
||||
"%04u%02u%02u%02u%02u%02u",
|
||||
&tm.tm_year, &tm.tm_mon, &tm.tm_mday,
|
||||
&tm.tm_hour, &tm.tm_min, &tm.tm_sec);
|
||||
|
||||
if (ret == 6) {
|
||||
if (res == 6) {
|
||||
tm.tm_year -= 1900;
|
||||
tm.tm_mon -= 1;
|
||||
|
||||
|
@ -1082,7 +1082,7 @@ int ipapwd_get_cur_kvno(Slapi_Entry *target)
|
||||
LOG_TRACE("Error retrieving berval from Slapi_Value\n");
|
||||
goto next;
|
||||
}
|
||||
be = ber_init(cbval);
|
||||
be = ber_init(discard_const(cbval));
|
||||
if (!be) {
|
||||
LOG_TRACE("ber_init() failed!\n");
|
||||
goto next;
|
||||
@ -1292,7 +1292,7 @@ Slapi_Value **ipapwd_setPasswordHistory(Slapi_Mods *smods,
|
||||
count = 0;
|
||||
err = slapi_attr_get_numvalues(passwordHistory, &count);
|
||||
/* if we have one */
|
||||
if (count > 0 && data->pwHistoryLen > 0) {
|
||||
if (err == 0 && count > 0 && data->pwHistoryLen > 0) {
|
||||
pH = calloc(count + 2, sizeof(Slapi_Value *));
|
||||
if (!pH) {
|
||||
LOG_OOM();
|
||||
|
@ -278,7 +278,7 @@ static int create_keys(krb5_context krbctx,
|
||||
struct krb_key_salt *ksdata;
|
||||
krb5_error_code krberr;
|
||||
krb5_data key_password;
|
||||
krb5_data *realm;
|
||||
krb5_data *realm = NULL;
|
||||
int i, nkeys;
|
||||
int ret;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user