svn commit: samba r26300 - in branches/SAMBA_4_0/source/rpc_server/common: .

[abartlet at samba.org]

Author: abartlet
Date: 2007-12-05 01:20:53 +0000 (Wed, 05 Dec 2007)
New Revision: 26300

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26300

Log:
Don't segfault when called from the ntptr libs.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/rpc_server/common/server_info.c


Changeset:
Modified: branches/SAMBA_4_0/source/rpc_server/common/server_info.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/common/server_info.c	2007-12-05 00:56:11 UTC (rev 26299)
+++ branches/SAMBA_4_0/source/rpc_server/common/server_info.c	2007-12-05 01:20:53 UTC (rev 26300)
@@ -66,19 +66,19 @@
 /* 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! */