[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-640-g2d53463

[Günther Deschner]

The branch, v3-4-test has been updated
       via  2d53463aaf679de8ca03ae71db0e9582241cc1c7 (commit)
       via  6e7ad585196885900d465493398aea7f7665c94c (commit)
      from  02b7eeef61e0144ef6756adffbb2f4f259c06258 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 2d53463aaf679de8ca03ae71db0e9582241cc1c7
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 2 18:48:15 2009 +0200

    s3-lsa: use LSA_ROLE definitions in _lsa_QueryInfoPolicy().
    
    Guenther
    (cherry picked from commit 31ab1d6a6487fb442ccd5b2cd093b4a2b7b80291)

commit 6e7ad585196885900d465493398aea7f7665c94c
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 2 18:47:51 2009 +0200

    s3-lsa: don't SAFE_FREE talloced structs.
    
    Guenther
    (cherry picked from commit 168eb23252c14234d09f7038b9894edf86e0efe1)

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

Summary of changes:
 source3/rpc_server/srv_lsa_nt.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index 5fdcaf2..0ce2b40 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -648,14 +648,14 @@ NTSTATUS _lsa_QueryInfoPolicy(pipes_struct *p,
 				 * only a BDC is a backup controller
 				 * of the domain, it controls.
 				 */
-				info->role.role = 2;
+				info->role.role = LSA_ROLE_BACKUP;
 				break;
 			default:
 				/*
 				 * any other role is a primary
 				 * of the domain, it controls.
 				 */
-				info->role.role = 3;
+				info->role.role = LSA_ROLE_PRIMARY;
 				break;
 		}
 		break;
@@ -1434,14 +1434,14 @@ NTSTATUS _lsa_EnumAccounts(pipes_struct *p,
 		sids = TALLOC_ZERO_ARRAY(p->mem_ctx, struct lsa_SidPtr,
 					 num_entries - *r->in.resume_handle);
 		if (!sids) {
-			SAFE_FREE(sid_list);
+			talloc_free(sid_list);
 			return NT_STATUS_NO_MEMORY;
 		}
 
 		for (i = *r->in.resume_handle, j = 0; i < num_entries; i++, j++) {
 			sids[j].sid = sid_dup_talloc(p->mem_ctx, &sid_list[i]);
 			if (!sids[j].sid) {
-				SAFE_FREE(sid_list);
+				talloc_free(sid_list);
 				return NT_STATUS_NO_MEMORY;
 			}
 		}


-- 
Samba Shared Repository