Skip to content
This repository has been archived by the owner on Sep 22, 2022. It is now read-only.

Commit

Permalink
contrib-modules: hotfix - remove obsolete ad-hoc of copy register_at().
Browse files Browse the repository at this point in the history
Change-Id: Iaff75b6a24fb1310fd354760177e845c03921318
  • Loading branch information
erthink committed Jun 30, 2016
1 parent e511cf8 commit 3834792
Showing 1 changed file with 0 additions and 46 deletions.
46 changes: 0 additions & 46 deletions contrib/slapd-modules/allowed/allowed.c
Original file line number Diff line number Diff line change
Expand Up @@ -441,52 +441,6 @@ done_ce:;

static slap_overinst aa;

#if LDAP_VENDOR_VERSION_MINOR != X && LDAP_VENDOR_VERSION_MINOR <= 3
/* backport register_at() from HEAD, to allow building with OL <= 2.3 */
static int
register_at( char *def, AttributeDescription **rad, int dupok )
{
LDAPAttributeType *at;
int code, freeit = 0;
const char *err;
AttributeDescription *ad = NULL;

at = ldap_str2attributetype( def, &code, &err, LDAP_SCHEMA_ALLOW_ALL );
if ( !at ) {
Debug( LDAP_DEBUG_ANY,
"register_at: AttributeType \"%s\": %s, %s\n",
def, ldap_scherr2str(code), err );
return code;
}

code = at_add( at, 0, NULL, NULL, &err );
if ( code ) {
if ( code == SLAP_SCHERR_ATTR_DUP && dupok ) {
freeit = 1;

} else {
ldap_attributetype_free( at );
Debug( LDAP_DEBUG_ANY,
"register_at: AttributeType \"%s\": %s, %s\n",
def, scherr2str(code), err );
return code;
}
}
code = slap_str2ad( at->at_names[0], &ad, &err );
if ( freeit || code ) {
ldap_attributetype_free( at );
} else {
ldap_memfree( at );
}
if ( code ) {
Debug( LDAP_DEBUG_ANY, "register_at: AttributeType \"%s\": %s\n",
def, err );
}
if ( rad ) *rad = ad;
return code;
}
#endif

#if SLAPD_OVER_ALLOWED == SLAPD_MOD_DYNAMIC
static
#endif /* SLAPD_OVER_ALLOWED == SLAPD_MOD_DYNAMIC */
Expand Down

2 comments on commit 3834792

@erthink
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity ReOpenLDAP :: master Build 63 is now running

@erthink
Copy link
Owner Author

@erthink erthink commented on 3834792 Jul 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity ReOpenLDAP :: master Build 63 outcome was SUCCESS
Summary: Tests passed Build time: 01:49:44

Please sign in to comment.