[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  f2e1ab5 s3:winbind: Remove unused struct getpwent_user
       via  3605f68 s3:winbind: Use correct struct member for size calculation
       via  649deb6 tldap: Allow dropping messages in tldap_search()
      from  ad758cb ctdb-readonly: Avoid a tight loop waiting for revoke to complete

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


- Log -----------------------------------------------------------------
commit f2e1ab5d05dbcaf7e93687eef0e303b1c1c2d4e5
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Mar 17 13:35:39 2017 +0100

    s3:winbind: Remove unused struct getpwent_user
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Sat Mar 18 08:59:01 CET 2017 on sn-devel-144

commit 3605f68cead4c7c0552b4ad40ea7f2025299fc08
Author: Andreas Schneider <asn at samba.org>
Date:   Fri Mar 17 13:24:13 2017 +0100

    s3:winbind: Use correct struct member for size calculation
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

commit 649deb63c5a2b034ff45bdafc9c8ef64535821f0
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jan 27 16:03:03 2017 +0100

    tldap: Allow dropping messages in tldap_search()
    
    For probing whether a connection is a live a rootdse search might be
    interesting where we don't really care for the result, only success or
    failure of the operation.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 source3/lib/tldap.c            |  6 ++++--
 source3/winbindd/wb_getpwsid.c |  2 +-
 source3/winbindd/winbindd.h    | 11 -----------
 3 files changed, 5 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/tldap.c b/source3/lib/tldap.c
index 5fcb43c..40064fd 100644
--- a/source3/lib/tldap.c
+++ b/source3/lib/tldap.c
@@ -1995,7 +1995,7 @@ TLDAPRC tldap_search(struct tldap_context *ld,
 		rc = TLDAP_OPERATIONS_ERROR;
 		goto fail;
 	}
-	rc = tldap_search_all_recv(req, mem_ctx, &msgs, &result);
+	rc = tldap_search_all_recv(req, frame, &msgs, &result);
 	TALLOC_FREE(req);
 	if (!TLDAP_RC_IS_SUCCESS(rc)) {
 		goto fail;
@@ -2004,7 +2004,9 @@ TLDAPRC tldap_search(struct tldap_context *ld,
 	TALLOC_FREE(ld->last_msg);
 	ld->last_msg = talloc_move(ld, &result);
 
-	*pmsgs = msgs;
+	if (pmsgs != NULL) {
+		*pmsgs = talloc_move(mem_ctx, &msgs);
+	}
 fail:
 	TALLOC_FREE(frame);
 	return rc;
diff --git a/source3/winbindd/wb_getpwsid.c b/source3/winbindd/wb_getpwsid.c
index 8c764f7..56a6a29 100644
--- a/source3/winbindd/wb_getpwsid.c
+++ b/source3/winbindd/wb_getpwsid.c
@@ -107,7 +107,7 @@ static void wb_getpwsid_queryuser_done(struct tevent_req *subreq)
 	if (tevent_req_nomem(tmp, req)) {
 		return;
 	}
-	strlcpy(pw->pw_shell, tmp, sizeof(pw->pw_dir));
+	strlcpy(pw->pw_shell, tmp, sizeof(pw->pw_shell));
 	TALLOC_FREE(tmp);
 
 	strlcpy(pw->pw_passwd, "*", sizeof(pw->pw_passwd));
diff --git a/source3/winbindd/winbindd.h b/source3/winbindd/winbindd.h
index c220573..1c7e4e9 100644
--- a/source3/winbindd/winbindd.h
+++ b/source3/winbindd/winbindd.h
@@ -86,17 +86,6 @@ struct getgrent_state {
 	struct wbint_Principal *groups;
 };
 
-/* Storage for cached getpwent() user entries */
-
-struct getpwent_user {
-	fstring name;                        /* Account name */
-	fstring gecos;                       /* User information */
-	fstring homedir;                     /* User Home Directory */
-	fstring shell;                       /* User Login Shell */
-	struct dom_sid user_sid;                    /* NT user and primary group SIDs */
-	struct dom_sid group_sid;
-};
-
 /* Our connection to the DC */
 
 struct winbindd_cm_conn {


-- 
Samba Shared Repository