[SCM] Samba Shared Repository - branch master updated - 7f36d3b55051150b9d4fa75af424898f48c48771

[Günther Deschner]

The branch, master has been updated
       via  7f36d3b55051150b9d4fa75af424898f48c48771 (commit)
      from  67018ed8bdd867f0612f2c559267cba6a67e4b2d (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7f36d3b55051150b9d4fa75af424898f48c48771
Author: Günther Deschner <gd at samba.org>
Date:   Wed Nov 12 14:27:51 2008 +0100

    pam_winbind: fix what data we put into the blobs.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/nsswitch/pam_winbind.c |   36 ++++++++++++++++++++----------------
 1 files changed, 20 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/nsswitch/pam_winbind.c b/source3/nsswitch/pam_winbind.c
index 1c92725..0c861e9 100644
--- a/source3/nsswitch/pam_winbind.c
+++ b/source3/nsswitch/pam_winbind.c
@@ -1615,14 +1615,16 @@ static int winbind_auth_request(struct pwb_context *ctx,
 	logon.username			= user;
 	logon.password			= pass;
 
-	wbc_status = wbcAddNamedBlob(&logon.num_blobs,
-				     &logon.blobs,
-				     "krb5_cc_type",
-				     0,
-				     (uint8_t *)cctype,
-				     strlen(cctype)+1);
-	if (!WBC_ERROR_IS_OK(wbc_status)) {
-		goto done;
+	if (cctype) {
+		wbc_status = wbcAddNamedBlob(&logon.num_blobs,
+					     &logon.blobs,
+					     "krb5_cc_type",
+					     0,
+					     (uint8_t *)cctype,
+					     strlen(cctype)+1);
+		if (!WBC_ERROR_IS_OK(wbc_status)) {
+			goto done;
+		}
 	}
 
 	wbc_status = wbcAddNamedBlob(&logon.num_blobs,
@@ -1645,14 +1647,16 @@ static int winbind_auth_request(struct pwb_context *ctx,
 		goto done;
 	}
 
-	wbc_status = wbcAddNamedBlob(&logon.num_blobs,
-				     &logon.blobs,
-				     "membership_of",
-				     0,
-				     (uint8_t *)membership_of,
-				     sizeof(membership_of));
-	if (!WBC_ERROR_IS_OK(wbc_status)) {
-		goto done;
+	if (member) {
+		wbc_status = wbcAddNamedBlob(&logon.num_blobs,
+					     &logon.blobs,
+					     "membership_of",
+					     0,
+					     (uint8_t *)membership_of,
+					     sizeof(membership_of));
+		if (!WBC_ERROR_IS_OK(wbc_status)) {
+			goto done;
+		}
 	}
 
 	wbc_status = wbcLogonUser(&logon, &info, &error, &policy);


-- 
Samba Shared Repository