build.properties
by Mark Reynolds
build.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5c2623f16d0899af6bfbaf231ec7db2a6153c4f9
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Mon Nov 10 17:01:52 2014 -0500
Bump version to 1.1.8
diff --git a/build.properties b/build.properties
index 0eba3cc..573b943 100644
--- a/build.properties
+++ b/build.properties
@@ -23,7 +23,7 @@ lang=en
console.root=.
console.version=11
-console.dotversion=1.1.7
+console.dotversion=1.1.8
console.dotgenversion=1.1
theme.core=389-console
9 years, 5 months
Branch '389-ds-base-1.2.11' - ldap/servers
by German Parente
ldap/servers/slapd/entry.c | 3 +++
ldap/servers/slapd/entrywsi.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit db60b2709772320fef9c365b1992a209935131f4
Author: German Parente <gparente(a)redhat.com>
Date: Wed Oct 8 14:55:47 2014 +0200
Description: Fix for ticket 47915: replication inconsistency for add/replace/delete single valued attribute
https://fedorahosted.org/389/ticket/47915
Resolves: Ticket 47915
Bug Description:
In MMR, when deleting a single valued attribute specifying its value,
the operation is not replicated and the entry state does not reflect
the attribute deletion.
Reviewed by: Rich and Ludwig (Thanks a lot!)
Branch: 1.2.11.15
Fix Description:
The fix consists on using the diffs already present in master branch to:
- replicate the delete operation
- generate the entry state indicating attribute has been deleted
Platforms tested: rhel6.5
Flag Day: no
Doc impact: no
diff --git a/ldap/servers/slapd/entry.c b/ldap/servers/slapd/entry.c
index 8b7766e..1341296 100644
--- a/ldap/servers/slapd/entry.c
+++ b/ldap/servers/slapd/entry.c
@@ -1638,6 +1638,9 @@ entry2str_internal_put_attrlist( const Slapi_Attr *attrlist, int attr_state, int
else
{
/* There were no present values on which to place the ADCSN, so we put it on the first deleted value. */
+ if ( valueset_isempty(&a->a_deleted_values)) {
+ valueset_add_string (a,(Slapi_ValueSet *)&a->a_deleted_values, "", CSN_TYPE_VALUE_DELETED, a->a_deletioncsn);
+ }
entry2str_internal_put_valueset(a->a_type, a->a_deletioncsn, CSN_TYPE_ATTRIBUTE_DELETED, attr_state, &a->a_deleted_values, VALUE_DELETED, ecur, typebuf, typebuf_len, entry2str_ctrl);
}
}
diff --git a/ldap/servers/slapd/entrywsi.c b/ldap/servers/slapd/entrywsi.c
index 40fe39b..663d115 100644
--- a/ldap/servers/slapd/entrywsi.c
+++ b/ldap/servers/slapd/entrywsi.c
@@ -581,7 +581,7 @@ entry_delete_present_values_wsi(Slapi_Entry *e, const char *type, struct berval
there are present values with a later CSN - otherwise, even though
the value will be updated with a VDCSN which is later than the VUCSN,
the attribute will not be deleted */
- if(slapi_attr_flag_is_set(a,SLAPI_ATTR_FLAG_SINGLE) && valueset_isempty(&a->a_present_values))
+ if(slapi_attr_flag_is_set(a,SLAPI_ATTR_FLAG_SINGLE) && valuesupdated && *valuesupdated)
{
attr_set_deletion_csn(a,csn);
}
9 years, 5 months
Branch '389-ds-base-1.3.3' - ldap/servers
by Noriko Hosoi
ldap/servers/plugins/sync/sync_util.c | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
New commits:
commit d87202acad6426bee7af8753a0ffe5ad5b3082df
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Mon Nov 3 16:58:21 2014 -0800
Ticket #47939 - Malformed cookie for LDAP Sync makes DS crash
Bug Description: If a cookie sent from clients did not have the
expected form: server_signature#client_signature#change_info_number,
a NULL reference triggered a server crash in sync_cookie_isvalid.
Fix Description: If a cookie does not have the expected form,
sync_cookie_parse returns NULL, which prevents the NULL reference
in the server_signature and client_signature.
https://fedorahosted.org/389/ticket/47939
Reviewed by lkrispen(a)redhat.com (Thank you, Ludwig!!)
(cherry picked from commit 8f540a6cee09be13430ebe0b983d2affe2863365)
diff --git a/ldap/servers/plugins/sync/sync_util.c b/ldap/servers/plugins/sync/sync_util.c
index ef4a3f7..de65b99 100644
--- a/ldap/servers/plugins/sync/sync_util.c
+++ b/ldap/servers/plugins/sync/sync_util.c
@@ -552,21 +552,21 @@ Sync_Cookie *
sync_cookie_parse (char *cookie)
{
char *p, *q;
- Sync_Cookie *sc;
+ Sync_Cookie *sc = NULL;
if (cookie == NULL || *cookie == '\0' ) {
return NULL;
}
+ /*
+ * Format of cookie: server_signature#client_signature#change_info_number
+ * If the cookie is malformed, NULL is returned.
+ */
p = q = cookie;
- sc = (Sync_Cookie *)slapi_ch_malloc(sizeof(Sync_Cookie));
-
- sc->cookie_client_signature = NULL;
- sc->cookie_server_signature = NULL;
- sc->cookie_change_info = -1;
p = strchr(q, '#');
if (p) {
*p = '\0';
+ sc = (Sync_Cookie *)slapi_ch_calloc(1, sizeof(Sync_Cookie));
sc->cookie_server_signature = slapi_ch_strdup(q);
q = p + 1;
p = strchr(q, '#');
@@ -574,21 +574,32 @@ sync_cookie_parse (char *cookie)
*p = '\0';
sc->cookie_client_signature = slapi_ch_strdup(q);
sc->cookie_change_info = sync_number2int(p+1);
+ if (sc->cookie_change_info < 0) {
+ goto error_return;
+ }
+ } else {
+ goto error_return;
}
}
-
return (sc);
+error_return:
+ slapi_ch_free_string(&(sc->cookie_client_signature));
+ slapi_ch_free_string(&(sc->cookie_server_signature));
+ slapi_ch_free((void **)&sc);
+ return NULL;
}
int
sync_cookie_isvalid (Sync_Cookie *testcookie, Sync_Cookie *refcookie)
{
/* client and server info must match */
- if (strcmp(testcookie->cookie_client_signature,refcookie->cookie_client_signature) ||
- strcmp(testcookie->cookie_server_signature,refcookie->cookie_server_signature) ||
- testcookie->cookie_change_info == -1 ||
- testcookie->cookie_change_info > refcookie->cookie_change_info )
+ if ((testcookie && refcookie) &&
+ (strcmp(testcookie->cookie_client_signature,refcookie->cookie_client_signature) ||
+ strcmp(testcookie->cookie_server_signature,refcookie->cookie_server_signature) ||
+ testcookie->cookie_change_info == -1 ||
+ testcookie->cookie_change_info > refcookie->cookie_change_info)) {
return (0);
+ }
/* could add an additional check if the requested state in client cookie is still
* available. Accept any state request for now.
*/
9 years, 5 months
ldap/servers
by Noriko Hosoi
ldap/servers/plugins/sync/sync_util.c | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
New commits:
commit 8f540a6cee09be13430ebe0b983d2affe2863365
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Mon Nov 3 16:58:21 2014 -0800
Ticket #47939 - Malformed cookie for LDAP Sync makes DS crash
Bug Description: If a cookie sent from clients did not have the
expected form: server_signature#client_signature#change_info_number,
a NULL reference triggered a server crash in sync_cookie_isvalid.
Fix Description: If a cookie does not have the expected form,
sync_cookie_parse returns NULL, which prevents the NULL reference
in the server_signature and client_signature.
https://fedorahosted.org/389/ticket/47939
Reviewed by lkrispen(a)redhat.com (Thank you, Ludwig!!)
diff --git a/ldap/servers/plugins/sync/sync_util.c b/ldap/servers/plugins/sync/sync_util.c
index ef4a3f7..de65b99 100644
--- a/ldap/servers/plugins/sync/sync_util.c
+++ b/ldap/servers/plugins/sync/sync_util.c
@@ -552,21 +552,21 @@ Sync_Cookie *
sync_cookie_parse (char *cookie)
{
char *p, *q;
- Sync_Cookie *sc;
+ Sync_Cookie *sc = NULL;
if (cookie == NULL || *cookie == '\0' ) {
return NULL;
}
+ /*
+ * Format of cookie: server_signature#client_signature#change_info_number
+ * If the cookie is malformed, NULL is returned.
+ */
p = q = cookie;
- sc = (Sync_Cookie *)slapi_ch_malloc(sizeof(Sync_Cookie));
-
- sc->cookie_client_signature = NULL;
- sc->cookie_server_signature = NULL;
- sc->cookie_change_info = -1;
p = strchr(q, '#');
if (p) {
*p = '\0';
+ sc = (Sync_Cookie *)slapi_ch_calloc(1, sizeof(Sync_Cookie));
sc->cookie_server_signature = slapi_ch_strdup(q);
q = p + 1;
p = strchr(q, '#');
@@ -574,21 +574,32 @@ sync_cookie_parse (char *cookie)
*p = '\0';
sc->cookie_client_signature = slapi_ch_strdup(q);
sc->cookie_change_info = sync_number2int(p+1);
+ if (sc->cookie_change_info < 0) {
+ goto error_return;
+ }
+ } else {
+ goto error_return;
}
}
-
return (sc);
+error_return:
+ slapi_ch_free_string(&(sc->cookie_client_signature));
+ slapi_ch_free_string(&(sc->cookie_server_signature));
+ slapi_ch_free((void **)&sc);
+ return NULL;
}
int
sync_cookie_isvalid (Sync_Cookie *testcookie, Sync_Cookie *refcookie)
{
/* client and server info must match */
- if (strcmp(testcookie->cookie_client_signature,refcookie->cookie_client_signature) ||
- strcmp(testcookie->cookie_server_signature,refcookie->cookie_server_signature) ||
- testcookie->cookie_change_info == -1 ||
- testcookie->cookie_change_info > refcookie->cookie_change_info )
+ if ((testcookie && refcookie) &&
+ (strcmp(testcookie->cookie_client_signature,refcookie->cookie_client_signature) ||
+ strcmp(testcookie->cookie_server_signature,refcookie->cookie_server_signature) ||
+ testcookie->cookie_change_info == -1 ||
+ testcookie->cookie_change_info > refcookie->cookie_change_info)) {
return (0);
+ }
/* could add an additional check if the requested state in client cookie is still
* available. Accept any state request for now.
*/
9 years, 5 months
Branch '389-ds-base-1.3.3' - ldap/servers
by Noriko Hosoi
ldap/servers/slapd/ssl.c | 5 -----
1 file changed, 5 deletions(-)
New commits:
commit 29a41604ce48855bd6d96bbd83cbae870deaa8d7
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Mon Oct 27 09:24:46 2014 -0700
Ticket #47928 - Disable SSL v3, by default.
Description: commit c1ecd8b659a0b8f7d84f8157cb69810c85ee26e4
introdueced a coverity defect: 12783 - Logically dead code
This patch removes the dead code.
https://fedorahosted.org/389/ticket/47928
Reviewed by rmeggins(a)redhat.com (Thank you, Rich!!)
(cherry picked from commit 77989d3bb5471542db50d66de77cc40fe4500cbd)
diff --git a/ldap/servers/slapd/ssl.c b/ldap/servers/slapd/ssl.c
index 26ef251..f81d1fb 100644
--- a/ldap/servers/slapd/ssl.c
+++ b/ldap/servers/slapd/ssl.c
@@ -1215,7 +1215,6 @@ slapd_ssl_init()
PRErrorCode errorCode;
char ** family_list;
char *val = NULL;
- int rv = 0;
PK11SlotInfo *slot;
Slapi_Entry *entry = NULL;
@@ -1334,10 +1333,6 @@ slapd_ssl_init()
* already been executed. */
_security_library_initialized = 1;
- if ( rv != 0 ) {
- return rv;
- }
-
return 0;
}
9 years, 5 months
ldap/servers
by Noriko Hosoi
ldap/servers/slapd/ssl.c | 5 -----
1 file changed, 5 deletions(-)
New commits:
commit 77989d3bb5471542db50d66de77cc40fe4500cbd
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Mon Oct 27 09:24:46 2014 -0700
Ticket #47928 - Disable SSL v3, by default.
Description: commit c1ecd8b659a0b8f7d84f8157cb69810c85ee26e4
introdueced a coverity defect: 12783 - Logically dead code
This patch removes the dead code.
https://fedorahosted.org/389/ticket/47928
Reviewed by rmeggins(a)redhat.com (Thank you, Rich!!)
diff --git a/ldap/servers/slapd/ssl.c b/ldap/servers/slapd/ssl.c
index 26ef251..f81d1fb 100644
--- a/ldap/servers/slapd/ssl.c
+++ b/ldap/servers/slapd/ssl.c
@@ -1215,7 +1215,6 @@ slapd_ssl_init()
PRErrorCode errorCode;
char ** family_list;
char *val = NULL;
- int rv = 0;
PK11SlotInfo *slot;
Slapi_Entry *entry = NULL;
@@ -1334,10 +1333,6 @@ slapd_ssl_init()
* already been executed. */
_security_library_initialized = 1;
- if ( rv != 0 ) {
- return rv;
- }
-
return 0;
}
9 years, 5 months