public/admc
1
0
Fork 0
mirror of https://github.com/altlinux/admc.git synced 2025-03-22 14:50:36 +03:00
Code Issues Projects Releases Wiki Activity

Fixed the displaying of optional attributes

Browse Source 
Fixed the displaying of optional attributes msDS-User-Account-Control-Computed and msDS-User-Password-Expyre-Time-Computed
This commit is contained in:
DimDone 2024-07-16 23:20:32 +04:00 committed by Semyon Knyazev
parent 256be83f2b
commit 536c5cf2de
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/adldap/ad_config.cpp
View File

@ -341,7 +341,6 @@ AttributeType AdConfig::get_attribute_type(const QString &attribute) const {
const QString attribute_syntax = schema.get_string(ATTRIBUTE_ATTRIBUTE_SYNTAX);
const QString om_syntax = schema.get_string(ATTRIBUTE_OM_SYNTAX);
if (type_map.contains(attribute_syntax) && type_map[attribute_syntax].contains(om_syntax)) {
return type_map[attribute_syntax][om_syntax];
} else {
@ -359,6 +358,7 @@ LargeIntegerSubtype AdConfig::get_attribute_large_integer_subtype(const QString
ATTRIBUTE_LOCKOUT_TIME,
ATTRIBUTE_BAD_PWD_TIME,
ATTRIBUTE_CREATION_TIME,
ATTRIBUTE_MSDS_USER_PASSWORD_EXPIRY_TIME_COMPUTED,
};
static const QList<QString> timespans = {
ATTRIBUTE_MAX_PWD_AGE,

2
src/adldap/ad_defines.h
View File

@ -217,6 +217,8 @@ enum SystemFlagsBit {
#define ATTRIBUTE_MS_DS_PASSWORD_SETTINGS_PRECEDENCE "msDS-PasswordSettingsPrecedence"
#define ATTRIBUTE_PSO_APPLIES_TO "msDS-PSOAppliesTo"
#define ATTRIBUTE_DEFAULT_NAMING_CONTEXT "defaultNamingContext"
#define ATTRIBUTE_MSDS_USER_PASSWORD_EXPIRY_TIME_COMPUTED "msDS-UserPasswordExpiryTimeComputed"
#define ATTRIBUTE_MSDS_USER_ACCOUNT_CONTROL_COMPUTED "msDS-User-Account-Control-Computed"
#define CLASS_GROUP "group"

4
src/adldap/ad_display.cpp
View File

@ -31,6 +31,7 @@
#include <QList>
#include <QString>
#include <algorithm>
#include <QTextStream>
const qint64 SECONDS_TO_MILLIS = 1000LL;
const qint64 MINUTES_TO_SECONDS = 60LL;
@ -63,7 +64,7 @@ QString attribute_display_value(const QString &attribute, const QByteArray &valu
return samaccounttype_to_display_value(value);
} else if (attribute == ATTRIBUTE_PRIMARY_GROUP_ID) {
return primarygrouptype_to_display_value(value);
} else if (attribute == ATTRIBUTE_GROUP_TYPE || attribute == ATTRIBUTE_SYSTEM_FLAGS) {
} else if (attribute == ATTRIBUTE_GROUP_TYPE || attribute == ATTRIBUTE_SYSTEM_FLAGS || attribute == ATTRIBUTE_MSDS_USER_ACCOUNT_CONTROL_COMPUTED) {
return attribute_hex_displayed_value(attribute, value);
} else if (attribute == ATTRIBUTE_MS_DS_SUPPORTED_ETYPES) {
return msds_supported_etypes_to_display_value(value);
@ -73,7 +74,6 @@ QString attribute_display_value(const QString &attribute, const QByteArray &valu
}
case AttributeType_LargeInteger: {
const LargeIntegerSubtype subtype = adconfig->get_attribute_large_integer_subtype(attribute);
switch (subtype) {
case LargeIntegerSubtype_Datetime: return large_integer_datetime_display_value(attribute, value, adconfig);
case LargeIntegerSubtype_Timespan: return timespan_display_value(value);