#40 Ignore searches that do not match any of configured tree
Merged 3 years ago by abbra. Opened 3 years ago by abbra.
abbra/slapi-nis bz1874015  into  master

file modified
+4 -1
@@ -11,7 +11,7 @@ 

  

  Name:		slapi-nis

  Version:	0.56.5

- Release:	1%{?dist}

+ Release:	3%{?dist}

  Summary:	NIS Server and Schema Compatibility plugins for Directory Server

  License:	GPLv2

  URL:		http://pagure.io/slapi-nis/
@@ -81,6 +81,9 @@ 

  %{_sbindir}/nisserver-plugin-defs

  

  %changelog

+ * Sat Sep 12 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.5-3

+ - Ignore searches which don't match any configured map

+ 

  * Mon May 04 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.5-1

  - New upstream release

  - Resolves: rhbz#1751295: (2) When sync-repl is enabled, slapi-nis can deadlock during retrochanglog trimming

file modified
+4
@@ -1790,6 +1790,10 @@ 

  			}

  		}

  		slapi_ch_free_string(&target);

+ 		if (cbdata.answer == FALSE) {

+ 			/* None of the configured trees in the sets matched the target at all, ignore search */

+ 			return 0;

+ 		}

  	}

  	cbdata.answer = FALSE;

  #endif

Resolves: rhbz#1874015
Signed-off-by: Alexander Bokovoy abokovoy@redhat.com

That looks good to me. if base is out of any map, PRE_SEARCH returns before acquiring map_lock. ACK

Pull-Request has been merged by abbra

3 years ago
Metadata