Attachment 11496 Details for Bug 11530 – invert condition for pw_gecos/pw_dir/pw_shell

[patch] invert condition for pw_gecos/pw_dir/pw_shell

samba-4.3-segfault.patch (text/plain), 987 bytes, created by Luca Olivetti on 2015-10-15 10:09:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Luca Olivetti

Created: 2015-10-15 10:09:48 UTC

Size: 987 bytes

patch

obsolete

>diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
>index c65fb08..13713fc 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, "");
> 		}
>

Actions: View

Attachments on bug 11530: 11496 | 12095 | 12096