summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-03-11 02:09:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:15:15 -0500
commitdd728b4712fbb3111f325617dc90d27b41205600 (patch)
tree40dc0bb5df040b4e7c26d92eb03aa59fab413777
parent5a1c225c18ee778490c2d6f789afc3fad3a34703 (diff)
downloadsamba-dd728b4712fbb3111f325617dc90d27b41205600.tar.gz
samba-dd728b4712fbb3111f325617dc90d27b41205600.tar.bz2
samba-dd728b4712fbb3111f325617dc90d27b41205600.zip
r14182: Ensure we know that dom_sid cannot be null.
Jeremy. (This used to be commit e3a28bf4c8064f7053b7d1a25a2f087ac2095fcd)
-rw-r--r--source3/rpc_server/srv_lsa_nt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index bdfb742f7a..80c86a3079 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -120,7 +120,7 @@ static int init_dom_ref(DOM_R_REF *ref, const char *dom_name, DOM_SID *dom_sid)
ref->max_entries = MAX_REF_DOMAINS;
ref->num_ref_doms_2 = num+1;
- ref->hdr_ref_dom[num].ptr_dom_sid = dom_sid != NULL ? 1 : 0;
+ ref->hdr_ref_dom[num].ptr_dom_sid = 1; /* dom sid cannot be NULL. */
init_unistr2(&ref->ref_dom[num].uni_dom_name, dom_name, UNI_FLAGS_NONE);
init_uni_hdr(&ref->hdr_ref_dom[num].hdr_dom_name, &ref->ref_dom[num].uni_dom_name);