[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2104-gfbb1e99

[Günther Deschner]

The branch, master has been updated
       via  fbb1e990ab3915956217c2747a983e9ae0469fd3 (commit)
       via  a783b1e4dab4617e764ced86298c51ea57f6cb98 (commit)
      from  cc7b62269e4a90859dd93b8d6896390857ba17d7 (commit)

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


- Log -----------------------------------------------------------------
commit fbb1e990ab3915956217c2747a983e9ae0469fd3
Author: Günther Deschner <gd at samba.org>
Date:   Sun Jun 7 02:02:26 2009 +0200

    s3-samr: fix return code of _samr_LookupRids when run with pdb_ldap.
    
    when _samr_LookupRids is called with no rids, it needs to return
    NT_STATUS_NONE_MAPPED (not NT_STATUS_NO_MEMORY).
    
    Found by RPC-SAMR torture test.
    
    Guenther

commit a783b1e4dab4617e764ced86298c51ea57f6cb98
Author: Günther Deschner <gd at samba.org>
Date:   Sun Jun 7 02:01:13 2009 +0200

    s3-samr: SetGroupInfo level 1 should not return NT_STATUS_INVALID_INFO_CLASS.
    
    Found by RPC-SAMR torture test.
    
    Guenther

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

Summary of changes:
 source3/passdb/pdb_ldap.c        |    5 +++++
 source3/rpc_server/srv_samr_nt.c |    3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 0bebcc7..2272aed 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -3977,6 +3977,11 @@ static NTSTATUS ldapsam_lookup_rids(struct pdb_methods *methods,
 		goto done;
 	}
 
+	if (num_rids == 0) {
+		result = NT_STATUS_NONE_MAPPED;
+		goto done;
+	}
+
 	for (i=0; i<num_rids; i++)
 		attrs[i] = SID_NAME_UNKNOWN;
 
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index e2f65ae..3e5ae2a 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -5947,9 +5947,6 @@ NTSTATUS _samr_SetGroupInfo(pipes_struct *p,
 		return NT_STATUS_NO_SUCH_GROUP;
 
 	switch (r->in.level) {
-		case 1:
-			fstrcpy(map.comment, r->in.info->all.description.string);
-			break;
 		case 2:
 			/* group rename is not supported yet */
 			return NT_STATUS_NOT_SUPPORTED;


-- 
Samba Shared Repository