Attachment 12095 Details for Bug 11530 – Patch for 4.3

[patch] Patch for 4.3

0001-pdb-Fix-segfault-in-pdb_ldap-for-missing-gecos.patch (text/plain), 1.65 KB, created by Garming Sam on 2016-05-11 01:18:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Garming Sam

Created: 2016-05-11 01:18:19 UTC

Size: 1.65 KB

patch

obsolete

>From 43b6041443507f4e84e5405b9564d26dc09b51c5 Mon Sep 17 00:00:00 2001
>From: Luca Olivetti <luca@wetron.es>
>Date: Fri, 5 Feb 2016 12:02:51 +0100
>Subject: [PATCH] pdb: Fix segfault in pdb_ldap for missing gecos
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=11530
>Signed-off-by: Luca Olivetti <luca@wetron.es>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>Reviewed-by: Alexander Bokovoy <ab@samba.org>
>
>Autobuild-User(master): Volker Lendecke <vl@samba.org>
>Autobuild-Date(master): Fri Feb  5 16:47:00 CET 2016 on sn-devel-144
>
>(cherry picked from commit 5d759bd0d4bf7cae8b54b69af5ecacb7987c2a0f)
>---
> source3/passdb/pdb_ldap.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
>index c65fb08..50ab3a7 100644
>--- a/source3/passdb/pdb_ldap.c
>+++ b/source3/passdb/pdb_ldap.c
>@@ -1005,7 +1005,7 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state,
> 				entry,
> 				"gecos",
> 				ctx);
>-		if (unix_pw.pw_gecos) {
>+		if (unix_pw.pw_gecos == NULL) {
> 			unix_pw.pw_gecos = fullname;
> 		}
> 		unix_pw.pw_dir = smbldap_talloc_single_attribute(
>@@ -1013,7 +1013,7 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state,
> 				entry,
> 				"homeDirectory",
> 				ctx);
>-		if (unix_pw.pw_dir) {
>+		if (unix_pw.pw_dir == NULL) {
> 			unix_pw.pw_dir = discard_const_p(char, "");
> 		}
> 		unix_pw.pw_shell = smbldap_talloc_single_attribute(
>@@ -1021,7 +1021,7 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state,
> 				entry,
> 				"loginShell",
> 				ctx);
>-		if (unix_pw.pw_shell) {
>+		if (unix_pw.pw_shell == NULL) {
> 			unix_pw.pw_shell = discard_const_p(char, "");
> 		}
> 
>-- 
>1.9.1
>

Flags:

abartlet: review+

Actions: View

Attachments on bug 11530: 11496 | 12095 | 12096