diff --git a/sssd-0.4.1-cve-2009-2410.patch b/sssd-0.4.1-cve-2009-2410.patch
new file mode 100644
index 0000000..a716f31
--- /dev/null
+++ b/sssd-0.4.1-cve-2009-2410.patch
@@ -0,0 +1,26 @@
+From 52ef221f3f5fc65c96d35ecaa7eb8a7a67ce6e4b Mon Sep 17 00:00:00 2001
+From: Stephen Gallagher <sgallagh@redhat.com>
+Date: Tue, 28 Jul 2009 09:43:57 -0400
+Subject: [PATCH] Address CVE-2009-2410
+
+Fix incorrect error code return in local_handler_callback
+---
+ server/responder/pam/pam_LOCAL_domain.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/server/responder/pam/pam_LOCAL_domain.c b/server/responder/pam/pam_LOCAL_domain.c
+index 010bd8d..48a4a81 100644
+--- a/server/responder/pam/pam_LOCAL_domain.c
++++ b/server/responder/pam/pam_LOCAL_domain.c
+@@ -327,7 +327,7 @@ static void local_handler_callback(void *pvt, int ldb_status,
+ 
+             password = ldb_msg_find_attr_as_string(res->msgs[0], SYSDB_PWD, NULL);
+             NULL_CHECK_OR_JUMP(password, ("No password stored.\n"),
+-                               lreq->error, ret, done);
++                               lreq->error, LDB_ERR_NO_SUCH_ATTRIBUTE, done);
+             DEBUG(4, ("user: [%s], password hash: [%s]\n", username, password));
+ 
+             ret = s3crypt_sha512(lreq, authtok, password, &new_hash);
+-- 
+1.6.2.5
+
diff --git a/sssd.spec b/sssd.spec
index 68e1a65..77afa7c 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -1,6 +1,6 @@
 Name: sssd
 Version: 0.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Applications/System
 Summary: System Security Services Daemon
 
@@ -16,6 +16,7 @@ Patch010: sssd-0.4.1-debug_fn.patch
 Patch011: sssd-0.4.1-conf_check.patch
 Patch012: sssd-0.4.1-reload_conf.patch
 Patch013: sssd-0.4.1-reload_conf_2.patch
+Patch014: sssd-0.4.1-cve-2009-2410.patch
 
 ### Dependencies ###
 
@@ -62,6 +63,7 @@ services for projects like FreeIPA.
 %patch011 -p1 -b .conf_check
 %patch012 -p1 -b .reload_conf
 %patch013 -p1 -b .reload_conf_2
+%patch014 -p1 -b .cve-2009-2410
 
 %build
 %configure \
@@ -135,6 +137,10 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* Wed Jul 29 2009 Jakub Hrozek <jhrozek@redhat.com> - 0.4.1-4
+- Fix for CVE-2009-2410 - Native SSSD users with no password set could log in
+  without a password. (Patch by Stephen Gallagher)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild