diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-04-23 15:12:35 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-04-23 15:12:35 +0200 |
| commit | 53d491c9a4011a7d9ad69db52fb91d163f3f990a (patch) | |
| tree | 9d0ed3130f35142da50c2e20e8addfe8909f459f /source4/rpc_server | |
| parent | af6298a84dffb400551861c6dc34591f1473830c (diff) | |
| parent | 1722859abd169f2949b5822f97c810f2b8d162da (diff) | |
| download | samba-53d491c9a4011a7d9ad69db52fb91d163f3f990a.tar.gz samba-53d491c9a4011a7d9ad69db52fb91d163f3f990a.tar.bz2 samba-53d491c9a4011a7d9ad69db52fb91d163f3f990a.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
Diffstat (limited to 'source4/rpc_server')
| -rw-r--r-- | source4/rpc_server/lsa/dcesrv_lsa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c index 1f1f6afa6d..cbadf654fb 100644 --- a/source4/rpc_server/lsa/dcesrv_lsa.c +++ b/source4/rpc_server/lsa/dcesrv_lsa.c @@ -933,7 +933,7 @@ static NTSTATUS dcesrv_lsa_CreateTrustedDomain_base(struct dcesrv_call_state *dc if (r->in.info->trust_direction & LSA_TRUST_DIRECTION_INBOUND) { msg_user = ldb_msg_new(mem_ctx); - if (msg == NULL) { + if (msg_user == NULL) { ldb_transaction_cancel(trusted_domain_state->policy->sam_ldb); return NT_STATUS_NO_MEMORY; } |