Remove two obsolete patches from F19 branch

This commit is contained in:
Jakub Hrozek 2013-02-04 16:39:42 +01:00
parent 9507d125c2
commit 94fb015ff9
2 changed files with 0 additions and 66 deletions

View File

@ -1,26 +0,0 @@
From 78fb6ec085ba14e513361e42ed9285888ac319e3 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Mon, 15 Oct 2012 17:39:14 +0200
Subject: [PATCH] LDAP: Check validity of naming_context
https://fedorahosted.org/sssd/ticket/1581
If the namingContext attribute had no values or multiple values, then
our code would dereference a NULL pointer.
diff --git a/src/providers/ldap/sdap.c b/src/providers/ldap/sdap.c
index cdc8b1f18cb38b43a83d734bb5237d5379831b53..f5b1f95f0eaa8e6b5ea9d77c1d7226c05d366104 100644
--- a/src/providers/ldap/sdap.c
+++ b/src/providers/ldap/sdap.c
@@ -746,7 +746,7 @@ static char *get_naming_context(TALLOC_CTX *mem_ctx,
* a zero-length namingContexts value in some situations. In this
* case, we should return it as NULL so things fail gracefully.
*/
- if (naming_context[0] == '\0') {
+ if (naming_context && naming_context[0] == '\0') {
talloc_zfree(naming_context);
}
--
1.7.12.1

View File

@ -1,40 +0,0 @@
From 10e08f08a64fff15a914598f4561cdb14203dc37 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Fri, 19 Oct 2012 18:10:43 +0200
Subject: [PATCH] Fix two errors in the nss responder
One is a copy-and-paste error which was introduce by
1774ee9a61b9d691dadd1a0538f32bcdcc84f72f.
The second fixes a missing explicit setting of the return value. In the
case where we want fully qualified names ret contains the number of
characters from the last snprintf() which is almost ever not 0.
---
src/responder/nss/nsssrv_cmd.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/responder/nss/nsssrv_cmd.c b/src/responder/nss/nsssrv_cmd.c
index ec25611237f89ec7c6466a1a0e321d4067e45147..036e88f4c0428dd592b8067d7ec341728ef38ddb 100644
--- a/src/responder/nss/nsssrv_cmd.c
+++ b/src/responder/nss/nsssrv_cmd.c
@@ -1869,6 +1869,8 @@ static int fill_members(struct sss_packet *packet,
memnum++;
}
+ ret = 0;
+
done:
*_memnum = memnum;
*_rzero = rzero;
@@ -2689,7 +2691,7 @@ static void nss_cmd_getgrgid_cb(struct tevent_req *req)
ret = nss_cmd_getgrgid_search(dctx);
if (ret == EOK) {
/* we have results to return */
- ret = nss_cmd_getpw_send_reply(dctx, true);
+ ret = nss_cmd_getgr_send_reply(dctx, true);
}
done:
--
1.7.12.1