[389-commits] 2 commits - VERSION.sh ldap/servers

[Noriko Hosoi]

 VERSION.sh              |    4 ++--
 ldap/servers/slapd/pw.c |    8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 1a1db0fff81f1cec7aaeeeefd1dc3422e9ab3079
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com&gt;
Date:   Wed Feb 13 14:45:00 2013 -0800

    bump version to 1.3.1.pre.a1

diff --git a/VERSION.sh b/VERSION.sh
index d786b37..d9ddd32 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -10,11 +10,11 @@ vendor="389 Project"
 # PACKAGE_VERSION is constructed from these
 VERSION_MAJOR=1
 VERSION_MINOR=3
-VERSION_MAINT=0
+VERSION_MAINT=1
 # if this is a PRERELEASE, set VERSION_PREREL
 # otherwise, comment it out
 # be sure to include the dot prefix in the prerel
-VERSION_PREREL=.rc1
+VERSION_PREREL=.pre.a1
 # NOTES on VERSION_PREREL
 # use aN for an alpha release e.g. a1, a2, etc.
 # use rcN for a release candidate e.g. rc1, rc2, etc.


commit d559d4665b18702b51161a25737b62799d8ef430
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com&gt;
Date:   Wed Feb 13 14:13:56 2013 -0800

    Ticket #584 - Existence of an entry is not checked when its password is to be deleted
    
    Bug description: When attempting to delete a password from an
    entry, a password syntax checking api check_pw_syntax_ext missed
    a check if the target entry exists or not.  Note: add and replace
    checks it and handles the case correctly.
    
    Fix description: In this patch the check is added to the delete
    case, as well.
    
    Reviewed by Rich (Thank you!!)

diff --git a/ldap/servers/slapd/pw.c b/ldap/servers/slapd/pw.c
index 671a230..b95a19d 100644
--- a/ldap/servers/slapd/pw.c
+++ b/ldap/servers/slapd/pw.c
@@ -770,7 +770,7 @@ int
 check_pw_syntax_ext ( Slapi_PBlock *pb, const Slapi_DN *sdn, Slapi_Value **vals,
 			char **old_pw, Slapi_Entry *e, int mod_op, Slapi_Mods *smods)
 {
-   	Slapi_Attr		*attr;
+	Slapi_Attr		*attr;
 	int 			i, pwresponse_req = 0;
 	int				is_replication = 0;
 	int				internal_op = 0;
@@ -787,6 +787,12 @@ check_pw_syntax_ext ( Slapi_PBlock *pb, const Slapi_DN *sdn,
Slapi_Value **vals,
 	 * PASS == 0.
 	 */
 	if (LDAP_MOD_DELETE == (mod_op & LDAP_MOD_OP)) {
+		/* check if the entry exists or not */
+		e = get_entry(pb, dn);
+		if (e == NULL) {
+			return -1;
+		}
+		slapi_entry_free(e); 
 		return 0;
 	}
 	if (NULL == vals) {