Removed o_suffix and o_suffixalias as they were 1) leaked and 2) unused

(suffixAliasing only maps input dn's, not output dn).

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 5170b91997d17a4ce1a1d394356fafffae8b599a..e0049038dc863b6379fe57cd14a69d61dcd67564 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -287,8 +287,6 @@ typedef struct slap_op {
        time_t          o_time;         /* time op was initiated          */
        char            *o_dn;          /* dn bound when op was initiated */
        char            *o_ndn;         /* normalized dn bound when op was initiated */
-        char            *o_suffix;      /* suffix if aliased              */
-        char            *o_suffixAliased;       /* pending suffix translation     */
        int             o_authtype;     /* auth method used to bind dn    */
                                        /* values taken from ldap.h       */
                                        /* LDAP_AUTH_*                    */

diff --git a/servers/slapd/suffixalias.c b/servers/slapd/suffixalias.c
index 31a09838cba2742725b4b0b2bd6e4d1f84aa04d7..06d182928142dfe925f78d787e569b44aaa11065 100644 (file)
--- a/servers/slapd/suffixalias.c
+++ b/servers/slapd/suffixalias.c
@@ -28,8 +28,6 @@ char *suffixAlias (char *dn, Operation *op, Backend *be)
        if(dn == NULL) return NULL;
 
        dnLength = strlen ( dn );
-        op->o_suffix = NULL;
-        op->o_suffixAliased = NULL;
         for ( i = 0;
               be->be_suffixAlias != NULL && be->be_suffixAlias[i] != NULL;
               i += 2) {
@@ -41,12 +39,10 @@ char *suffixAlias (char *dn, Operation *op, Backend *be)
                 if (!strcasecmp(be->be_suffixAlias[i], 
                                dn + (dnLength - aliasLength))) {
                         char *oldDN = dn;
-                        op->o_suffixAliased = ch_strdup ( be->be_suffixAlias[i] );
                         dn = ch_malloc ( (dnLength - aliasLength) +
                                           strlen (be->be_suffixAlias[ i+1 ]) + 1);
                         strncpy (dn, oldDN, dnLength - aliasLength);
                         strcpy  (dn + (dnLength - aliasLength), be->be_suffixAlias[ i+1 ]);
-                        op->o_suffix = ch_strdup (dn);
                         Debug( LDAP_DEBUG_ARGS, "ALIAS: converted %s to %s", oldDN, dn, 0);
                         free (oldDN);
                        break;