[389-commits] Branch '389-ds-base-1.3.1' - ldap/servers

ldap/servers/plugins/posix-winsync/posix-winsync.c | 85 ++++++++++++++++++---
1 file changed, 74 insertions(+), 11 deletions(-)

New commits:
commit 0dd319278267d6fd23d1af1c3cae81856190a914
Author: Noriko Hosoi <nhosoi@redhat.com>
Date: Wed Jun 11 14:27:23 2014 -0700

Ticket #47763 - winsync plugin modify is broken

Description: Thanks to Carsten Grzemba for the patch. Made minimum
changes such as replacing the direct access to the bv_len in Slapi_Value
with slapi_value_get_length.

Note: Regarding attr_compare_equal, since there is no strong reason
to switch to this new attr_compare_equal, we continue using the original
code. The newly provided code is in "#if 0".

https://fedorahosted.org/389/ticket/47763

Reviewed by rmeggins@redhat.com (Thanks, Rich!)

(cherry picked from commit b6b7199470671315d693ddec8db7c4ffbc4a1ee8)
(cherry picked from commit 7666910670755bab0453d146ff87014833c58c4e)

diff --git a/ldap/servers/plugins/posix-winsync/posix-winsync.c b/ldap/servers/plugins/posix-winsync/posix-winsync.c
index ff092b3..ac88fda 100644
--- a/ldap/servers/plugins/posix-winsync/posix-winsync.c
+++ b/ldap/servers/plugins/posix-winsync/posix-winsync.c
@@ -136,7 +136,7 @@ enum
* -1 - some sort of error
*/
static int
-check_account_lock(Slapi_Entry *ds_entry, int *isvirt)
+_check_account_lock(Slapi_Entry *ds_entry, int *isvirt)
{
int rc = 1;
Slapi_ValueSet *values = NULL;
@@ -155,7 +155,7 @@ check_account_lock(Slapi_Entry *ds_entry, int *isvirt)
}
slapi_ch_free_string(&strval);
slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
- "<-- check_account_lock - entry [%s] has real "
+ "<-- _check_account_lock - entry [%s] has real "
"attribute nsAccountLock and entry %s locked\n",
slapi_entry_get_dn_const(ds_entry), rc ? "is not" : "is");
return rc;
@@ -182,13 +182,13 @@ check_account_lock(Slapi_Entry *ds_entry, int *isvirt)
slapi_vattr_values_free(&values, &actual_type_name, attr_free_flags);
}
slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
- "<-- check_account_lock - entry [%s] has virtual "
+ "<-- _check_account_lock - entry [%s] has virtual "
"attribute nsAccountLock and entry %s locked\n",
slapi_entry_get_dn_const(ds_entry), rc ? "is not" : "is");
} else {
rc = 1; /* no attr == entry is enabled */
slapi_log_error(SLAPI_LOG_PLUGIN, posix_winsync_plugin_name,
- "<-- check_account_lock - entry [%s] does not "
+ "<-- _check_account_lock - entry [%s] does not "
"have attribute nsAccountLock - entry is not locked\n",
slapi_entry_get_dn_const(ds_entry));
}
@@ -225,7 +225,7 @@ sync_acct_disable(void *cbdata, /* the usual domain config data */
int isvirt = 0;

/* get the account lock state of the ds entry */
- if (0 == check_account_lock(ds_entry, &isvirt)) {
+ if (0 == _check_account_lock(ds_entry, &isvirt)) {
ds_is_enabled = 0;
}
if (isvirt)
@@ -372,6 +372,54 @@ sync_acct_disable(void *cbdata, /* the usual domain config data */
return;
}

+#if 0
+/*
+ * attr_compare_equal provided in
+ * https://fedorahosted.org/389/attachment/ticket/47763/0025-posix-winsync.rawentry.patch
+ * Since there is no strong reason to switch to this new attr_compare_equal,
+ * continue using the original code.
+ */
+/*
+ * Compare the first value of attr a and b.
+ *
+ * If the sizes of each value are equal AND the first values match, return TRUE.
+ * Otherwise, return FALSE.
+ *
+ * NOTE: For now only handle single values
+ */
+static int
+attr_compare_equal(Slapi_Attr *a, Slapi_Attr *b)
+{
+ /* For now only handle single values */
+ Slapi_Value *va = NULL;
+ Slapi_Value *vb = NULL;
+ int num_a = 0;
+ int num_b = 0;
+ int match = 1;
+
+ slapi_attr_get_numvalues(a, &num_a);
+ slapi_attr_get_numvalues(b, &num_b);
+
+ if (num_a == num_b) {
+ slapi_attr_first_value(a, &va);
+ slapi_attr_first_value(b, &vb);
+
+ /* If either val is less than n, then check if the length, then values are
+ * equal. If both are n or greater, then only compare the first n chars.
+ * If n is 0, then just compare the entire attribute. */
+ if (slapi_value_get_length(va) == slapi_value_get_length(vb)) {
+ if (slapi_attr_value_find(b, slapi_value_get_berval(va)) != 0) {
+ match = 0;
+ }
+ } else {
+ match = 0;
+ }
+ } else {
+ match = 0;
+ }
+ return match;
+}
+#else /* Original code */
/* Returns non-zero if the attribute value sets are identical. */
static int
attr_compare_equal(Slapi_Attr *a, Slapi_Attr *b)
@@ -389,6 +437,7 @@ attr_compare_equal(Slapi_Attr *a, Slapi_Attr *b)
}
return 1;
}
+