From 57140e8f087bb4a6bb3c5246f86e014f5ec3b1a6 Mon Sep 17 00:00:00 2001 From: Jan Synacek Date: Fri, 14 Jun 2013 14:35:35 +0200 Subject: [PATCH] fix previous commit A wrong patch was added during the previous commit. --- openldap-loglevel2bvarray.patch | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/openldap-loglevel2bvarray.patch b/openldap-loglevel2bvarray.patch index cf56894..1a0e766 100644 --- a/openldap-loglevel2bvarray.patch +++ b/openldap-loglevel2bvarray.patch @@ -1,25 +1,27 @@ -From 4261aa541cc2a35812a06042a386b795e2064bfb Mon Sep 17 00:00:00 2001 +From 4313b91b0bc2fe6585656cd69a03f9755b5af3c4 Mon Sep 17 00:00:00 2001 From: Jan Synacek -Date: Fri, 14 Jun 2013 12:36:48 +0200 -Subject: [PATCH] Fix config_build_schema_inc +Date: Wed, 29 May 2013 10:21:40 +0200 +Subject: [PATCH] Fix loglevel2bvarray --- - servers/slapd/bconfig.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + servers/slapd/bconfig.c | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c -index def6daf..3c3d3e9 100644 +index 4e1f1b5..def6daf 100644 --- a/servers/slapd/bconfig.c +++ b/servers/slapd/bconfig.c -@@ -6758,7 +6758,7 @@ config_build_schema_inc( ConfigArgs *c, CfEntryInfo *ceparent, +@@ -3622,6 +3622,10 @@ loglevel2bvarray( int l, BerVarray *bva ) + loglevel_init(); + } + ++ if ( l == 0 ) { ++ return value_add_one( bva, ber_bvstr( "0" ) ); ++ } ++ + return mask_to_verbs( loglevel_ops, l, bva ); + } - for (; cf; cf=cf->c_sibs, c->depth++) { - if ( !cf->c_at_head && !cf->c_cr_head && !cf->c_oc_head && -- !cf->c_om_head && !cf->c_syn_head ) continue; -+ !cf->c_om_head && !cf->c_syn_head && !cf->c_kids ) continue; - c->value_dn.bv_val = c->log; - LUTIL_SLASHPATH( cf->c_file.bv_val ); - bv.bv_val = strrchr(cf->c_file.bv_val, LDAP_DIRSEP[0]); -- 1.8.1.4