From bb3684d8c95a817a5f92ec4876a7e45883f11991 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Jun 27 2012 17:09:23 +0000
Subject: Trac Ticket 396 - Account Usability Control Not Working


Ticket 378 - unhashed#user#password visible after changing password
  fix typo in previous patch
(cherry picked from commit 95251fa7092aa373f3b5ee08cec674c3031a4eec)
(cherry picked from commit d695b298faa3e6347b43c5804097dce7163c4f07)

---

diff --git a/.gitignore b/.gitignore
index 20dff8e..285b66f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@
 /389-ds-base-1.2.10.3.tar.bz2
 /389-ds-base-1.2.10.4.tar.bz2
 /389-ds-base-1.2.10.11.tar.bz2
+/389-ds-base-1.2.10.12.tar.bz2
diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh
index c40c9b6..c1acfeb 100644
--- a/389-ds-base-git-local.sh
+++ b/389-ds-base-git-local.sh
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.10.11
+VERSION=1.2.10.12
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE
diff --git a/389-ds-base-git.sh b/389-ds-base-git.sh
index 9215436..4833bf0 100644
--- a/389-ds-base-git.sh
+++ b/389-ds-base-git.sh
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.10.11
+VERSION=1.2.10.12
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"
diff --git a/389-ds-base.spec b/389-ds-base.spec
index 0f6f2e7..b0f0d9c 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -17,7 +17,7 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.10.11
+Version:          1.2.10.12
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
@@ -350,6 +350,11 @@ exit 0
 %{_libdir}/%{pkgname}/libslapd.so.*
 
 %changelog
+* Wed Jun 27 2012 Rich Megginson <rmeggins@redhat.com> - 1.2.10.12-1
+- Ticket 378 - unhashed#user#password visible after changing password
+-  fix typo in previous patch
+- Trac Ticket 396 - Account Usability Control Not Working
+
 * Tue Jun 26 2012 Rich Megginson <rmeggins@redhat.com> - 1.2.10.11-1
 - rebase to 1.2.10.11 to pick up several crash + security fixes
 - Ticket 365 - passwords in clear text in the audit log
diff --git a/sources b/sources
index eb54161..dce8649 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-da1d9617afa0f2b5d815347ad960b84d  389-ds-base-1.2.10.11.tar.bz2
+ae500f0f249bf3c192ab3b3aab80956f  389-ds-base-1.2.10.12.tar.bz2