upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-27 09:09:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix various leaks

Browse source
This commit is contained in:
Pierangelo Masarati 2005-08-01 23:32:14 +00:00
parent 9a64785e4d
commit c8a5fd2df2
3 changed files with 34 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
servers/slapd/back-ldap/config.c
View file

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

4
servers/slapd/back-ldap/init.c
View file

@ -284,6 +284,10 @@ ldap_back_db_destroy(
ch_free( li->idassert_sasl_realm.bv_val ); ch_free( li->idassert_sasl_realm.bv_val );
BER_BVZERO( &li->idassert_sasl_realm ); BER_BVZERO( &li->idassert_sasl_realm );
} }
if ( li->idassert_authz != NULL ) {
ber_bvarray_free( li->idassert_authz );
li->idassert_authz = NULL;
}
if ( li->conntree ) { if ( li->conntree ) {
avl_free( li->conntree, ldap_back_conn_free ); avl_free( li->conntree, ldap_back_conn_free );
} }

7
servers/slapd/overlays/glue.c
View file

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