diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-04-03 08:28:22 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-04-03 08:28:22 +1100 |
| commit | 2f04b7d29a9e93152ff40a04afa50d3755ff0a25 (patch) | |
| tree | ccef6bba0937d61bd461335e510db9813b5c24ce /source3/rpc_server/srv_lsa_nt.c | |
| parent | 354ba5e2e35c0adb2dd04f81a6ce7d1d721f31dc (diff) | |
| parent | 31ab1d6a6487fb442ccd5b2cd093b4a2b7b80291 (diff) | |
| download | samba-2f04b7d29a9e93152ff40a04afa50d3755ff0a25.tar.gz samba-2f04b7d29a9e93152ff40a04afa50d3755ff0a25.tar.bz2 samba-2f04b7d29a9e93152ff40a04afa50d3755ff0a25.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
Diffstat (limited to 'source3/rpc_server/srv_lsa_nt.c')
| -rw-r--r-- | source3/rpc_server/srv_lsa_nt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c index 5fdcaf2d4a..0ce2b40f65 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; } } |