summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-12-05 01:20:53 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:48:15 +0100
commit7f015e2e2e39e5eaf08261b97df885590f109abc (patch)
tree7df4a3ee774cb6549c8ee109cb4d04b5f51b043f
parentdbf77b640516b7a412aed2597a15ec2ddf4c17b5 (diff)
downloadsamba-7f015e2e2e39e5eaf08261b97df885590f109abc.tar.gz
samba-7f015e2e2e39e5eaf08261b97df885590f109abc.tar.bz2
samba-7f015e2e2e39e5eaf08261b97df885590f109abc.zip
r26300: Don't segfault when called from the ntptr libs.
Andrew Bartlett (This used to be commit 89279d730f3fad01bd855f921b5155ba75892855)
-rw-r--r--source4/rpc_server/common/server_info.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/rpc_server/common/server_info.c b/source4/rpc_server/common/server_info.c
index 4a9d304192..aa8dd7cc33 100644
--- a/source4/rpc_server/common/server_info.c
+++ b/source4/rpc_server/common/server_info.c
@@ -66,19 +66,19 @@ const char *dcesrv_common_get_domain_name(TALLOC_CTX *mem_ctx, struct dcesrv_con
/* This hardcoded value should go into a ldb database! */
_PUBLIC_ uint32_t dcesrv_common_get_version_major(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx)
{
- return lp_parm_int(dce_ctx->lp_ctx, NULL, "server_info", "version_major", 5);
+ return lp_parm_int(dce_ctx ? dce_ctx->lp_ctx : global_loadparm, NULL, "server_info", "version_major", 5);
}
/* This hardcoded value should go into a ldb database! */
_PUBLIC_ uint32_t dcesrv_common_get_version_minor(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx)
{
- return lp_parm_int(dce_ctx->lp_ctx, NULL, "server_info", "version_minor", 2);
+ return lp_parm_int(dce_ctx ? dce_ctx->lp_ctx : global_loadparm, NULL, "server_info", "version_minor", 2);
}
/* This hardcoded value should go into a ldb database! */
_PUBLIC_ uint32_t dcesrv_common_get_version_build(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx)
{
- return lp_parm_int(dce_ctx->lp_ctx, NULL, "server_info", "version_build", 3790);
+ return lp_parm_int(dce_ctx ? dce_ctx->lp_ctx : global_loadparm, NULL, "server_info", "version_build", 3790);
}
/* This hardcoded value should go into a ldb database! */