summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-02-26 13:12:07 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-02-26 13:12:07 +1100
commit76a0050e239b1fb9e2135f2e6cea80ed780a0ee0 (patch)
treeb44d90f3025b8251e6b2ce732f81f66c7115e719
parent59a28a22ab26bb7f2c12f9bccda9c7f585d992a7 (diff)
downloadsamba-76a0050e239b1fb9e2135f2e6cea80ed780a0ee0.tar.gz
samba-76a0050e239b1fb9e2135f2e6cea80ed780a0ee0.tar.bz2
samba-76a0050e239b1fb9e2135f2e6cea80ed780a0ee0.zip
A simple hack to avoid the segfault in #6138
Thanks to Andrew Kroeger <andrew@id10ts.net> for reporting this. This fix just for the release. A better fix will make it into the master branch soon. Andrew Bartlett
-rw-r--r--source4/rpc_server/netlogon/dcerpc_netlogon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index f1c063ed90..2efddc74fc 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -1220,7 +1220,7 @@ static WERROR dcesrv_netr_DsRGetDCNameEx2(struct dcesrv_call_state *dce_call, TA
/* Win7-beta will send the domain name in the form the user typed, so we have to cope
with both the short and long form here */
- if (strcasecmp(r->in.domain_name, lp_workgroup(dce_call->conn->dce_ctx->lp_ctx)) == 0) {
+ if (r->in.domain_name == NULL || strcasecmp(r->in.domain_name, lp_workgroup(dce_call->conn->dce_ctx->lp_ctx)) == 0) {
r->in.domain_name = lp_realm(dce_call->conn->dce_ctx->lp_ctx);
}