|
 |
dc8c34 |
From 9278a336aecae7a2d31e7d8dc942f27797cea339 Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Noriko Hosoi <nhosoi@redhat.com>
|
|
|
dc8c34 |
Date: Fri, 15 Aug 2014 12:38:24 -0700
|
|
|
dc8c34 |
Subject: [PATCH 247/251] Ticket #415 - winsync doesn't sync DN valued
|
|
|
dc8c34 |
attributes if DS DN value doesn't exist
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Description:
|
|
|
dc8c34 |
Once we had a NULL vs checking (Ticket #415):
|
|
|
dc8c34 |
commit 737169e0afd0547b6de0a61081508314d076cc6a,
|
|
|
dc8c34 |
but it was accidentally removed by the next commit (Ticket 346):
|
|
|
dc8c34 |
commit 890fc22687821279f3862fc0862a4e8d93c00291.
|
|
|
dc8c34 |
|
|
|
dc8c34 |
This patch adds the NULL checking for vs.
|
|
|
dc8c34 |
(cherry picked from commit 19e4ea683835ec9a40317e1c9b30fe87229aea39)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/servers/slapd/valueset.c | 2 +-
|
|
|
dc8c34 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/servers/slapd/valueset.c b/ldap/servers/slapd/valueset.c
|
|
|
dc8c34 |
index 5c1ae36..52c04b8 100644
|
|
|
dc8c34 |
--- a/ldap/servers/slapd/valueset.c
|
|
|
dc8c34 |
+++ b/ldap/servers/slapd/valueset.c
|
|
|
dc8c34 |
@@ -713,7 +713,7 @@ Slapi_Value *
|
|
|
dc8c34 |
slapi_valueset_find(const Slapi_Attr *a, const Slapi_ValueSet *vs, const Slapi_Value *v)
|
|
|
dc8c34 |
{
|
|
|
dc8c34 |
Slapi_Value *r= NULL;
|
|
|
dc8c34 |
- if(vs->num > 0) {
|
|
|
dc8c34 |
+ if(vs && (vs->num > 0)) {
|
|
|
dc8c34 |
if (vs->sorted) {
|
|
|
dc8c34 |
r = valueset_find_sorted(a,vs,v,NULL);
|
|
|
dc8c34 |
} else {
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
1.8.1.4
|
|
|
dc8c34 |
|