cleanup

[openldap] / servers / slapd / back-ldap / extended.c

diff --git a/servers/slapd/back-ldap/extended.c b/servers/slapd/back-ldap/extended.c
index 398e09555cbc7dd8e20716032344cbfb1bcd4486..5e0c2682c75e7017e9d59dcb4fc126b9fc1aba8e 100644 (file)
--- a/servers/slapd/back-ldap/extended.c
+++ b/servers/slapd/back-ldap/extended.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2005 The OpenLDAP Foundation.
+ * Copyright 2003-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -143,22 +143,20 @@ retry:
                                        (char **)&rs->sr_matched,
                                        (char **)&rs->sr_text,
                                        NULL, NULL, 0 );
-#ifndef LDAP_NULL_IS_NULL
-                       if ( rs->sr_matched && rs->sr_matched[ 0 ] == '\0' ) {
-                               free( (char *)rs->sr_matched );
-                               rs->sr_matched = NULL;
-                       }
-                       if ( rs->sr_text && rs->sr_text[ 0 ] == '\0' ) {
-                               free( (char *)rs->sr_text );
-                               rs->sr_text = NULL;
-                       }
-#endif /* LDAP_NULL_IS_NULL */
+
                        if ( rc == LDAP_SUCCESS ) {
                                if ( rs->sr_err == LDAP_SUCCESS ) {
                                        struct berval   newpw;
-                                       
+
+                                       /* this never happens because 
+                                        * the frontend is generating 
+                                        * the new password, so when
+                                        * the passwd exop is proxied,
+                                        * it never delegates password
+                                        * generation to the remote server
+                                        */
                                        rc = ldap_parse_passwd( lc->lc_ld, res,
-                                                       &newpw);
+                                                       &newpw );
                                        if ( rc == LDAP_SUCCESS &&
                                                        !BER_BVISNULL( &newpw ) )
                                        {
@@ -242,16 +240,6 @@ retry:
                                        (char **)&rs->sr_matched,
                                        (char **)&rs->sr_text,
                                        NULL, NULL, 0 );
-#ifndef LDAP_NULL_IS_NULL
-                       if ( rs->sr_matched && rs->sr_matched[ 0 ] == '\0' ) {
-                               free( (char *)rs->sr_matched );
-                               rs->sr_matched = NULL;
-                       }
-                       if ( rs->sr_text && rs->sr_text[ 0 ] == '\0' ) {
-                               free( (char *)rs->sr_text );
-                               rs->sr_text = NULL;
-                       }
-#endif /* LDAP_NULL_IS_NULL */
                        if ( rc == LDAP_SUCCESS ) {
                                if ( rs->sr_err == LDAP_SUCCESS ) {
                                        rc = ldap_parse_extended_result( lc->lc_ld, res,