From 14dd63bf5d7db220457903234056e882b6ecd711 Mon Sep 17 00:00:00 2001 From: skeezix Date: Fri, 5 Mar 2010 23:31:05 -0500 Subject: [PATCH] Only merge overrides if the caller specifies override searchpath --- lib/pnd_discovery.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/pnd_discovery.c b/lib/pnd_discovery.c index d32a591..4087086 100644 --- a/lib/pnd_discovery.c +++ b/lib/pnd_discovery.c @@ -173,7 +173,9 @@ static int pnd_disco_callback ( const char *fpath, const struct stat *sb, } // look for any overrides, if requested - pnd_pxml_merge_override ( pxmlh, disco_overrides ); + if ( disco_overrides ) { + pnd_pxml_merge_override ( pxmlh, disco_overrides ); + } // check for validity and add to resultset if it looks executable if ( pnd_is_pxml_valid_app ( pxmlh ) ) { -- 2.39.5