Index: torture/mapi_common.c
===================================================================
--- torture/mapi_common.c	(revision 266)
+++ torture/mapi_common.c	(working copy)
@@ -48,7 +48,7 @@
 		return 0;
 	}
 
-	recipients = lp_parm_string(NULL, "mapi", type);
+	recipients = lp_parm_string(0, "mapi", type);
 
 	/* no recipients */
 	if (recipients == 0) {
@@ -195,7 +195,7 @@
 	const char		*profdb;
 	const char		*profname;
 
-	profdb = lp_parm_string(NULL, "mapi", "profile_store");
+	profdb = lp_parm_string(0, "mapi", "profile_store");
 	if (!profdb) {
 		profdb = talloc_asprintf(mem_ctx, DEFAULT_PROFDB_PATH, getenv("HOME"));
 		if (!profdb) {
@@ -208,7 +208,7 @@
 	mapi_errstr("MAPIInitialize", GetLastError());
 	MAPI_RETVAL_IF(retval, retval, NULL);
 
-	profname = lp_parm_string(NULL, "mapi", "profile");
+	profname = lp_parm_string(0, "mapi", "profile");
 	if (!profname) {
 		retval = GetDefaultProfile(&profname, 0);
 		MAPI_RETVAL_IF(retval, retval, NULL);
@@ -237,7 +237,7 @@
 	const char		*profname;
 	const char		*password;
 
-	profdb = lp_parm_string(NULL, "mapi", "profile_store");
+	profdb = lp_parm_string(0, "mapi", "profile_store");
 	if (!profdb) {
 		profdb = talloc_asprintf(mem_ctx, DEFAULT_PROFDB_PATH, getenv("HOME"));
 		if (!profdb) {
@@ -251,7 +251,7 @@
 	if (retval != MAPI_E_SUCCESS) return NULL;
 
 
-	profname = lp_parm_string(NULL, "mapi", "profile");
+	profname = lp_parm_string(0, "mapi", "profile");
 	if (!profname) {
 		retval = GetDefaultProfile(&profname, 0);
 		if (retval != MAPI_E_SUCCESS) {
@@ -260,7 +260,7 @@
 		}
 	}
 
-	password = lp_parm_string(NULL, "mapi", "password");
+	password = lp_parm_string(0, "mapi", "password");
 	retval = MapiLogonEx(&session, profname, password);
 	mapi_errstr("MapiLogonEx", GetLastError());
 	if (retval != MAPI_E_SUCCESS) return NULL;
Index: torture/mapi_sendcontacts.c
===================================================================
--- torture/mapi_sendcontacts.c	(revision 266)
+++ torture/mapi_sendcontacts.c	(working copy)
@@ -36,8 +36,8 @@
 	struct dcerpc_pipe	*p;
 	TALLOC_CTX		*mem_ctx;
 	bool			ret = true;
-	const char		*cardname = lp_parm_string(NULL, "mapi", "cardname");
-	const char		*fullname = lp_parm_string(NULL, "mapi", "fullname");
+	const char		*cardname = lp_parm_string(0, "mapi", "cardname");
+	const char		*fullname = lp_parm_string(0, "mapi", "fullname");
 	struct mapi_session	*session;
 	uint64_t		id_contacts;
 	mapi_object_t		obj_store;
Index: torture/mapi_sendmail.c
===================================================================
--- torture/mapi_sendmail.c	(revision 266)
+++ torture/mapi_sendmail.c	(working copy)
@@ -39,8 +39,8 @@
 	enum MAPISTATUS		retval;
 	TALLOC_CTX		*mem_ctx;
 	bool			ret = true;
-	const char		*subject = lp_parm_string(NULL, "mapi", "subject");
-	const char		*body = lp_parm_string(NULL, "mapi", "body");
+	const char		*subject = lp_parm_string(0, "mapi", "subject");
+	const char		*body = lp_parm_string(0, "mapi", "body");
 	const char		**usernames;
 	const char		**usernames_to;
 	const char		**usernames_cc;
Index: torture/exchange_createuser.c
===================================================================
--- torture/exchange_createuser.c	(revision 266)
+++ torture/exchange_createuser.c	(working copy)
@@ -319,7 +319,7 @@
 	int policy_min_pw_len = 0;
 	struct test_join *join;
 	char *random_pw;
-	const char *dc_binding = lp_parm_string(NULL, "torture", "dc_binding");
+	const char *dc_binding = lp_parm_string(0, "torture", "dc_binding");
 
 	join = talloc(NULL, struct test_join);
 	if (join == NULL) {
Index: torture/mapi_sendtasks.c
===================================================================
--- torture/mapi_sendtasks.c	(revision 266)
+++ torture/mapi_sendtasks.c	(working copy)
@@ -38,9 +38,9 @@
 	struct dcerpc_pipe	*p;
 	TALLOC_CTX		*mem_ctx;
 	bool			ret = true;
-	const char		*task = lp_parm_string(NULL, "mapi", "task");
-	uint32_t		priority = lp_parm_int(NULL, "mapi", "priority", 0);
-	uint32_t		status = lp_parm_int(NULL, "mapi", "status", 0);
+	const char		*task = lp_parm_string(0, "mapi", "task");
+	uint32_t		priority = lp_parm_int(0, "mapi", "priority", 0);
+	uint32_t		status = lp_parm_int(0, "mapi", "status", 0);
 	struct mapi_session	*session;
 	uint64_t		id_task;
 	mapi_object_t		obj_store;
Index: torture/oc_test.h
===================================================================
--- torture/oc_test.h	(revision 266)
+++ torture/oc_test.h	(working copy)
@@ -63,7 +63,7 @@
   gbl_oc_test.id_test = 0;
   gbl_oc_test.desc = 0;
 
-  path = lp_parm_string(NULL, "openchange", "oc_test_out");
+  path = lp_parm_string(0, "openchange", "oc_test_out");
   if (path == 0)
     return ;
   gbl_oc_test.f_out = fopen(path, "w");
Index: torture/mapi_createuser.c
===================================================================
--- torture/mapi_createuser.c	(revision 266)
+++ torture/mapi_createuser.c	(working copy)
@@ -37,8 +37,8 @@
 	TALLOC_CTX		*mem_ctx;
 	struct mapi_profile	*profile;
 	struct test_join        *user_ctx = (struct test_join *) NULL;
-	const char		*username = lp_parm_string(NULL, "exchange", "username");
-	const char		*user_password = lp_parm_string(NULL, "exchange", "password");
+	const char		*username = lp_parm_string(0, "exchange", "username");
+	const char		*user_password = lp_parm_string(0, "exchange", "password");
 
 	/* sanity checks */
 	if (!username) {
Index: torture/mapi_deletemail.c
===================================================================
--- torture/mapi_deletemail.c	(revision 266)
+++ torture/mapi_deletemail.c	(working copy)
@@ -39,7 +39,7 @@
 	enum MAPISTATUS		retval;
 	TALLOC_CTX		*mem_ctx;
 	bool			ret = true;
-	const char		*s_subject = lp_parm_string(NULL, "mapi", "subject");
+	const char		*s_subject = lp_parm_string(0, "mapi", "subject");
 	int			len_subject;
 	struct mapi_session	*session;
 	mapi_object_t		obj_store;
Index: torture/mapi_sendappointment.c
===================================================================
--- torture/mapi_sendappointment.c	(revision 266)
+++ torture/mapi_sendappointment.c	(working copy)
@@ -42,13 +42,13 @@
 	struct dcerpc_pipe	*p;
 	TALLOC_CTX		*mem_ctx;
 	bool			ret = true;
-	const char		*appointment = lp_parm_string(NULL, "mapi", "appointment");
-	const char		*body = lp_parm_string(NULL, "mapi", "body");
-	const char		*location = lp_parm_string(NULL, "mapi", "location");
-	const char		*start = lp_parm_string(NULL, "mapi", "start");
-	const char		*end = lp_parm_string(NULL, "mapi", "end");
-	uint32_t		busy_status = lp_parm_int(NULL, "mapi", "busystatus", 0);
-	uint32_t		label = lp_parm_int(NULL, "mapi", "label", 0);
+	const char		*appointment = lp_parm_string(0, "mapi", "appointment");
+	const char		*body = lp_parm_string(0, "mapi", "body");
+	const char		*location = lp_parm_string(0, "mapi", "location");
+	const char		*start = lp_parm_string(0, "mapi", "start");
+	const char		*end = lp_parm_string(0, "mapi", "end");
+	uint32_t		busy_status = lp_parm_int(0, "mapi", "busystatus", 0);
+	uint32_t		label = lp_parm_int(0, "mapi", "label", 0);
 	struct mapi_session	*session;
 	uint64_t		id_calendar;
 	mapi_object_t		obj_store;
Index: torture/mapi_permissions.c
===================================================================
--- torture/mapi_permissions.c	(revision 266)
+++ torture/mapi_permissions.c	(working copy)
@@ -43,10 +43,10 @@
 	struct SRowSet		SRowSet;
 	struct SPropTagArray	*proptags;
 	uint32_t		i;
-	const char		*operation = lp_parm_string(NULL, "mapi", "operation");
-	const char		*role = lp_parm_string(NULL, "mapi", "role");
+	const char		*operation = lp_parm_string(0, "mapi", "operation");
+	const char		*role = lp_parm_string(0, "mapi", "role");
 	uint32_t		permission;
-	const char		*username = lp_parm_string(NULL, "mapi", "username");
+	const char		*username = lp_parm_string(0, "mapi", "username");
 
 	/* init torture */
 	mem_ctx = talloc_init("torture_rpc_mapi_permissions");
Index: torture/mapi_sendattach.c
===================================================================
--- torture/mapi_sendattach.c	(revision 266)
+++ torture/mapi_sendattach.c	(working copy)
@@ -41,9 +41,9 @@
 	enum MAPISTATUS		retval;
 	TALLOC_CTX		*mem_ctx;
 	bool			ret = true;
-	const char		*subject = lp_parm_string(NULL, "mapi", "subject");
-	const char		*body = lp_parm_string(NULL, "mapi", "body");
-	const char		*filename = lp_parm_string(NULL, "mapi", "attachment");
+	const char		*subject = lp_parm_string(0, "mapi", "subject");
+	const char		*body = lp_parm_string(0, "mapi", "body");
+	const char		*filename = lp_parm_string(0, "mapi", "attachment");
 	const char		**usernames;
 	const char		**usernames_to;
 	const char		**usernames_cc;
Index: torture/mapi_sendmail_html.c
===================================================================
--- torture/mapi_sendmail_html.c	(revision 266)
+++ torture/mapi_sendmail_html.c	(working copy)
@@ -37,9 +37,9 @@
 	enum MAPISTATUS		retval;
 	TALLOC_CTX		*mem_ctx;
 	bool			ret = true;
-	const char		*subject = lp_parm_string(NULL, "mapi", "subject");
-	const char		*body = lp_parm_string(NULL, "mapi", "body");
-	const char		*filename = lp_parm_string(NULL, "mapi", "html");
+	const char		*subject = lp_parm_string(0, "mapi", "subject");
+	const char		*body = lp_parm_string(0, "mapi", "body");
+	const char		*filename = lp_parm_string(0, "mapi", "html");
 	const char		**usernames;
 	const char		**usernames_to;
 	const char		**usernames_cc;
Index: torture/nspi_profile.c
===================================================================
--- torture/nspi_profile.c	(revision 266)
+++ torture/nspi_profile.c	(working copy)
@@ -90,11 +90,11 @@
 	struct SPropTagArray	*SPropTagArray;
 	struct SRowSet		rowset;
 	struct SPropValue	*lpProp;
-	const char		*profname = lp_parm_string(NULL, "mapi", "profile");
-	const char		*profdb = lp_parm_string(NULL, "mapi", "profile_store");
-	uint32_t		codepage = lp_parm_int(NULL, "mapi", "codepage", 0);
-	uint32_t		language = lp_parm_int(NULL, "mapi", "language", 0);
-	uint32_t		method = lp_parm_int(NULL, "mapi", "method", 0);
+	const char		*profname = lp_parm_string(0, "mapi", "profile");
+	const char		*profdb = lp_parm_string(0, "mapi", "profile_store");
+	uint32_t		codepage = lp_parm_int(0, "mapi", "codepage", 0);
+	uint32_t		language = lp_parm_int(0, "mapi", "language", 0);
+	uint32_t		method = lp_parm_int(0, "mapi", "method", 0);
 
 	mem_ctx = talloc_init("torture_rpc_nspi_profile");
 	
@@ -127,7 +127,7 @@
 		{
 			const char *workstation = cli_credentials_get_workstation(cmdline_credentials);
 			const char *domain = cli_credentials_get_domain(cmdline_credentials);
-			const char *binding = lp_parm_string(NULL, "torture", "binding");
+			const char *binding = lp_parm_string(0, "torture", "binding");
 			struct dcerpc_binding *dcerpc_binding;
 			char *p_codepage = talloc_asprintf(mem_ctx, "0x%x", codepage);
 			char *p_language = talloc_asprintf(mem_ctx, "0x%x", language);
Index: torture/nspi_resolvenames.c
===================================================================
--- torture/nspi_resolvenames.c	(revision 266)
+++ torture/nspi_resolvenames.c	(working copy)
@@ -48,9 +48,9 @@
 	struct FlagList		*flaglist = NULL;
 	const char		*profdb;
 	const char		*profname;
-	const char		*username = lp_parm_string(NULL, "exchange", "resolvename");
-	const char		*password = lp_parm_string(NULL, "mapi", "password");
-	uint32_t		unicode = lp_parm_int(NULL, "mapi", "unicode", 0);
+	const char		*username = lp_parm_string(0, "exchange", "resolvename");
+	const char		*password = lp_parm_string(0, "mapi", "password");
+	uint32_t		unicode = lp_parm_int(0, "mapi", "unicode", 0);
 	char *tmp;
 	char **usernames;
 	int j;
@@ -70,7 +70,7 @@
 	}
 
 	/* init mapi */
-	profdb = lp_parm_string(NULL, "mapi", "profile_store");
+	profdb = lp_parm_string(0, "mapi", "profile_store");
 	if (!profdb) {
 		profdb = talloc_asprintf(mem_ctx, DEFAULT_PROFDB_PATH, getenv("HOME"));
 		if (!profdb) {
@@ -83,7 +83,7 @@
 	if (retval != MAPI_E_SUCCESS) return false;
 
 	/* profile name */
-	profname = lp_parm_string(NULL, "mapi", "profile");
+	profname = lp_parm_string(0, "mapi", "profile");
 	if (!profname) {
 		retval = GetDefaultProfile(&profname, 0);
 		if (retval != MAPI_E_SUCCESS) {
Index: server/dcesrv_exchange.c
===================================================================
--- server/dcesrv_exchange.c	(revision 266)
+++ server/dcesrv_exchange.c	(working copy)
@@ -442,7 +442,7 @@
 		       struct NspiBind *r)
 {
 	struct GUID		*guid = (struct GUID *) NULL;
-	const char		*exchange_GUID = lp_parm_string(NULL, "exchange", "GUID");
+	const char		*exchange_GUID = lp_parm_string(0, "exchange", "GUID");
 	struct emsabp_ctx	*emsabp_context;
 	struct dcesrv_handle	*handle;
 	struct policy_handle	wire_handle;
Index: providers/emsabp.c
===================================================================
--- providers/emsabp.c	(revision 266)
+++ providers/emsabp.c	(working copy)
@@ -181,7 +181,7 @@
 	struct GUID	*guid;
 	const char	*guid_str;
 
-	guid_str = lp_parm_string(NULL, "exchange", "GUID");
+	guid_str = lp_parm_string(0, "exchange", "GUID");
 	guid = talloc(mem_ctx, struct GUID);
 	GUID_from_string(guid_str, guid);