fix various leaks

diff --git a/servers/slapd/back-ldap/config.c b/servers/slapd/back-ldap/config.c
index 1cff2f1cc22872ff1666b39d4d28495d9ce2434a..0145e1a12e26fa864d0f84eb8a229323a1637012 100644 (file)
--- a/servers/slapd/back-ldap/config.c
+++ b/servers/slapd/back-ldap/config.c
@@ -72,7 +72,7 @@ static ConfigTable ldapcfg[] = {
                        "SINGLE-VALUE )",
                NULL, NULL },
        { "tls", "what", 2, 2, 0,
-               ARG_BERVAL|ARG_MAGIC|LDAP_BACK_CFG_TLS,
+               ARG_MAGIC|LDAP_BACK_CFG_TLS,
                ldap_back_cf_gen, "( OLcfgDbAt:3.1 "
                        "NAME 'olcDbStartTLS' "
                        "DESC 'StartTLS' "
@@ -93,7 +93,7 @@ static ConfigTable ldapcfg[] = {
                ARG_DN|ARG_MAGIC|LDAP_BACK_CFG_ACL_AUTHCDN,
                ldap_back_cf_gen, NULL, NULL, NULL },
        { "acl-passwd", "cred", 2, 2, 0,
-               ARG_BERVAL|ARG_MAGIC|LDAP_BACK_CFG_ACL_PASSWD,
+               ARG_MAGIC|LDAP_BACK_CFG_ACL_PASSWD,
                ldap_back_cf_gen, "( OLcfgDbAt:3.3 "
                        "NAME 'olcDbACLPasswd' "
                        "DESC 'Remote ACL administrative identity credentials' "
@@ -103,11 +103,11 @@ static ConfigTable ldapcfg[] = {
                NULL, NULL },
        /* deprecated, will be removed; aliases "acl-passwd" */
        { "bindpw", "cred", 2, 2, 0,
-               ARG_BERVAL|ARG_MAGIC|LDAP_BACK_CFG_ACL_PASSWD,
+               ARG_MAGIC|LDAP_BACK_CFG_ACL_PASSWD,
                ldap_back_cf_gen, NULL, NULL, NULL },
        /* deprecated, will be removed; aliases "acl-bind" */
        { "acl-method", "args", 2, 0, 0,
-               ARG_BERVAL|ARG_MAGIC|LDAP_BACK_CFG_ACL_METHOD,
+               ARG_MAGIC|LDAP_BACK_CFG_ACL_METHOD,
                ldap_back_cf_gen, NULL, NULL, NULL },
        { "acl-bind", "args", 2, 0, 0,
                ARG_MAGIC|LDAP_BACK_CFG_ACL_BIND,
@@ -131,7 +131,7 @@ static ConfigTable ldapcfg[] = {
                ARG_DN|ARG_MAGIC|LDAP_BACK_CFG_IDASSERT_AUTHCDN,
                ldap_back_cf_gen, NULL, NULL, NULL },
        { "idassert-passwd", "cred", 2, 2, 0,
-               ARG_BERVAL|ARG_MAGIC|LDAP_BACK_CFG_IDASSERT_PASSWD,
+               ARG_MAGIC|LDAP_BACK_CFG_IDASSERT_PASSWD,
                ldap_back_cf_gen, "( OLcfgDbAt:3.6 "
                        "NAME 'olcDbIDAssertPasswd' "
                        "DESC 'Remote Identity Assertion administrative identity credentials' "
@@ -141,7 +141,7 @@ static ConfigTable ldapcfg[] = {
                NULL, NULL },
        /* deprecated, will be removed; partially aliases "idassert-passwd" */
        { "proxyauthzpw", "cred", 2, 2, 0,
-               ARG_BERVAL|ARG_MAGIC|LDAP_BACK_CFG_IDASSERT_PASSWD,
+               ARG_MAGIC|LDAP_BACK_CFG_IDASSERT_PASSWD,
                ldap_back_cf_gen, NULL, NULL, NULL },
        { "idassert-bind", "args", 2, 0, 0,
                ARG_MAGIC|LDAP_BACK_CFG_IDASSERT_BIND,
@@ -152,7 +152,7 @@ static ConfigTable ldapcfg[] = {
                        "SINGLE-VALUE )",
                NULL, NULL },
        { "idassert-method", "args", 2, 0, 0,
-               ARG_BERVAL|ARG_MAGIC|LDAP_BACK_CFG_IDASSERT_METHOD,
+               ARG_MAGIC|LDAP_BACK_CFG_IDASSERT_METHOD,
                ldap_back_cf_gen, NULL, NULL, NULL },
        { "idassert-mode", "mode>|u:<user>|[dn:]<DN", 2, 0, 0,
                ARG_STRING|ARG_MAGIC|LDAP_BACK_CFG_IDASSERT_MODE,
@@ -164,7 +164,7 @@ static ConfigTable ldapcfg[] = {
                        "SINGLE-VALUE)",
                NULL, NULL },
        { "idassert-authzFrom", "authzRule", 2, 2, 0,
-               ARG_BERVAL|ARG_MAGIC|LDAP_BACK_CFG_IDASSERT_AUTHZFROM,
+               ARG_MAGIC|LDAP_BACK_CFG_IDASSERT_AUTHZFROM,
                ldap_back_cf_gen, "( OLcfgDbAt:3.9 "
                        "NAME 'olcDbIDAssertAuthzFrom' "
                        "DESC 'Remote Identity Assertion authz rules' "
@@ -172,7 +172,7 @@ static ConfigTable ldapcfg[] = {
                        "X-ORDERED 'VALUES' )",
                NULL, NULL },
        { "rebind-as-user", "NO|yes", 1, 2, 0,
-               ARG_BERVAL|ARG_MAGIC|LDAP_BACK_CFG_REBIND,
+               ARG_MAGIC|LDAP_BACK_CFG_REBIND,
                ldap_back_cf_gen, "( OLcfgDbAt:3.10 "
                        "NAME 'olcDbRebindAsUser' "
                        "DESC 'Rebind as user' "
@@ -180,7 +180,7 @@ static ConfigTable ldapcfg[] = {
                        "SINGLE-VALUE )",
                NULL, NULL },
        { "chase-referrals", "YES|no", 2, 2, 0,
-               ARG_BERVAL|ARG_MAGIC|LDAP_BACK_CFG_CHASE,
+               ARG_MAGIC|LDAP_BACK_CFG_CHASE,
                ldap_back_cf_gen, "( OLcfgDbAt:3.11 "
                        "NAME 'olcDbChaseReferrals' "
                        "DESC 'Chase referrals' "
@@ -188,7 +188,7 @@ static ConfigTable ldapcfg[] = {
                        "SINGLE-VALUE )",
                NULL, NULL },
        { "t-f-support", "NO|yes|discover", 2, 2, 0,
-               ARG_BERVAL|ARG_MAGIC|LDAP_BACK_CFG_T_F,
+               ARG_MAGIC|LDAP_BACK_CFG_T_F,
                ldap_back_cf_gen, "( OLcfgDbAt:3.12 "
                        "NAME 'olcDbTFSupport' "
                        "DESC 'Absolute filters support' "
@@ -196,7 +196,7 @@ static ConfigTable ldapcfg[] = {
                        "SINGLE-VALUE )",
                NULL, NULL },
        { "proxy-whoami", "NO|yes", 1, 2, 0,
-               ARG_BERVAL|ARG_MAGIC|LDAP_BACK_CFG_WHOAMI,
+               ARG_MAGIC|LDAP_BACK_CFG_WHOAMI,
                ldap_back_cf_gen, "( OLcfgDbAt:3.13 "
                        "NAME 'olcDbProxyWhoAmI' "
                        "DESC 'Proxy whoAmI exop' "
@@ -301,7 +301,7 @@ ldap_back_cf_gen( ConfigArgs *c )
                                rc = 1;
 
                        } else {
-                               c->value_bv = bv;
+                               value_add_one( &c->rvalue_vals, &bv );
                        }
                        break;
 
@@ -472,7 +472,7 @@ ldap_back_cf_gen( ConfigArgs *c )
                                rc = 1;
 
                        } else {
-                               c->value_bv = bv;
+                               value_add_one( &c->rvalue_vals, &bv );
                        }
                        break;
 
@@ -484,7 +484,7 @@ ldap_back_cf_gen( ConfigArgs *c )
                                rc = 1;
 
                        } else {
-                               c->value_bv = bv;
+                               value_add_one( &c->rvalue_vals, &bv );
                        }
                        break;
 
@@ -496,7 +496,7 @@ ldap_back_cf_gen( ConfigArgs *c )
                                rc = 1;
 
                        } else {
-                               c->value_bv = bv;
+                               value_add_one( &c->rvalue_vals, &bv );
                        }
                        break;
 
@@ -508,7 +508,7 @@ ldap_back_cf_gen( ConfigArgs *c )
                                rc = 1;
 
                        } else {
-                               c->value_bv = bv;
+                               value_add_one( &c->rvalue_vals, &bv );
                        }
                        break;
 
@@ -542,6 +542,9 @@ ldap_back_cf_gen( ConfigArgs *c )
                        break;
 
                case LDAP_BACK_CFG_TLS:
+                       rc = 1;
+                       break;
+
                case LDAP_BACK_CFG_ACL_AUTHCDN:
                case LDAP_BACK_CFG_ACL_PASSWD:
                case LDAP_BACK_CFG_ACL_METHOD:
@@ -896,9 +899,12 @@ ldap_back_cf_gen( ConfigArgs *c )
                li->idassert_passwd = c->value_bv;
                break;
 
-       case LDAP_BACK_CFG_IDASSERT_AUTHZFROM:
-               ber_bvarray_add( &li->idassert_authz, &c->value_bv );
-               break;
+       case LDAP_BACK_CFG_IDASSERT_AUTHZFROM: {
+               struct berval   bv;
+
+               ber_str2bv( c->argv[1], 0, 1, &bv );
+               ber_bvarray_add( &li->idassert_authz, &bv );
+               } break;
 
        case LDAP_BACK_CFG_IDASSERT_METHOD:
                /* no longer supported */

diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index 49837a167f62d8b6334e5295d2b108dbac3d2916..1b56c94c38ba13083fe5e2b9c62e084f6a8af651 100644 (file)
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -284,6 +284,10 @@ ldap_back_db_destroy(
                        ch_free( li->idassert_sasl_realm.bv_val );
                        BER_BVZERO( &li->idassert_sasl_realm );
                }
+               if ( li->idassert_authz != NULL ) {
+                       ber_bvarray_free( li->idassert_authz );
+                       li->idassert_authz = NULL;
+               }
                 if ( li->conntree ) {
                        avl_free( li->conntree, ldap_back_conn_free );
                }

diff --git a/servers/slapd/overlays/glue.c b/servers/slapd/overlays/glue.c
index a832597f1631c5f6bcc6e9831897dc4ef8070bba..74fee3f652e371cfcd4b24646f5e8b4f221851ee 100644 (file)
--- a/servers/slapd/overlays/glue.c
+++ b/servers/slapd/overlays/glue.c
@@ -788,9 +788,9 @@ glue_db_config(
        SLAP_DBFLAGS( be ) |= SLAP_DBFLAG_GLUE_INSTANCE;
 
        if ( strcasecmp( argv[0], "glue-sub" ) == 0 ) {
-               int i, async = 0, advertise = 0;
-               BackendDB *b2;
-               struct berval bv, dn;
+               int             i, async = 0, advertise = 0;
+               BackendDB       *b2;
+               struct berval   bv, dn = BER_BVNULL;
 
                if ( argc < 2 ) {
                        fprintf( stderr, "%s: line %d: too few arguments in "
@@ -815,6 +815,7 @@ glue_db_config(
                        return -1;
                }
                b2 = select_backend( &dn, 0, 1 );
+               ber_memfree( dn.bv_val );
                if ( !b2 ) {
                        fprintf( stderr, "%s: line %d: unknown suffix \"%s\"\n",
                                fname, lineno, argv[1] );