s3: add iconv_convenience handle to pull/push sz helpers.

Guenther

3 files changed, 10 insertions, 10 deletions

diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c
index b41b3d1070..866d171566 100644
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -417,7 +417,7 @@ WERROR _netr_NetrEnumerateTrustedDomains(pipes_struct *p,
 		}
 	}
 
-	if (!push_reg_multi_sz(trusted_domains, &blob, trusted_domains)) {
+	if (!push_reg_multi_sz(trusted_domains, NULL, &blob, trusted_domains)) {
 		TALLOC_FREE(trusted_domains);
 		return WERR_NOMEM;
 	}
diff --git a/source3/rpc_server/srv_ntsvcs_nt.c b/source3/rpc_server/srv_ntsvcs_nt.c
index ec0c884acf..c9f7b22291 100644
--- a/source3/rpc_server/srv_ntsvcs_nt.c
+++ b/source3/rpc_server/srv_ntsvcs_nt.c
@@ -102,7 +102,7 @@ WERROR _PNP_GetDeviceList(pipes_struct *p,
 
 	multi_sz[0] = devicepath;
 
-	if (!push_reg_multi_sz(multi_sz, &blob, multi_sz)) {
+	if (!push_reg_multi_sz(multi_sz, NULL, &blob, multi_sz)) {
 		return WERR_NOMEM;
 	}
 
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 236f15a9fc..eec421f67a 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5798,7 +5798,7 @@ static WERROR update_printer(pipes_struct *p, struct policy_handle *handle,
 	 */
 
 	if (!strequal(printer->info_2->comment, old_printer->info_2->comment)) {
-		push_reg_sz(talloc_tos(), &buffer, printer->info_2->comment);
+		push_reg_sz(talloc_tos(), NULL, &buffer, printer->info_2->comment);
 		set_printer_dataex( printer, SPOOL_DSSPOOLER_KEY, "description",
 			REG_SZ, buffer.data, buffer.length);
 
@@ -5806,7 +5806,7 @@ static WERROR update_printer(pipes_struct *p, struct policy_handle *handle,
 	}
 
 	if (!strequal(printer->info_2->sharename, old_printer->info_2->sharename)) {
-		push_reg_sz(talloc_tos(), &buffer, printer->info_2->sharename);
+		push_reg_sz(talloc_tos(), NULL, &buffer, printer->info_2->sharename);
 		set_printer_dataex( printer, SPOOL_DSSPOOLER_KEY, "shareName",
 			REG_SZ, buffer.data, buffer.length);
 
@@ -5822,7 +5822,7 @@ static WERROR update_printer(pipes_struct *p, struct policy_handle *handle,
 			pname = printer->info_2->printername;
 
 
-		push_reg_sz(talloc_tos(), &buffer, pname);
+		push_reg_sz(talloc_tos(), NULL, &buffer, pname);
 		set_printer_dataex( printer, SPOOL_DSSPOOLER_KEY, "printerName",
 			REG_SZ, buffer.data, buffer.length);
 
@@ -5830,7 +5830,7 @@ static WERROR update_printer(pipes_struct *p, struct policy_handle *handle,
 	}
 
 	if (!strequal(printer->info_2->portname, old_printer->info_2->portname)) {
-		push_reg_sz(talloc_tos(), &buffer, printer->info_2->portname);
+		push_reg_sz(talloc_tos(), NULL, &buffer, printer->info_2->portname);
 		set_printer_dataex( printer, SPOOL_DSSPOOLER_KEY, "portName",
 			REG_SZ, buffer.data, buffer.length);
 
@@ -5838,7 +5838,7 @@ static WERROR update_printer(pipes_struct *p, struct policy_handle *handle,
 	}
 
 	if (!strequal(printer->info_2->location, old_printer->info_2->location)) {
-		push_reg_sz(talloc_tos(), &buffer, printer->info_2->location);
+		push_reg_sz(talloc_tos(), NULL, &buffer, printer->info_2->location);
 		set_printer_dataex( printer, SPOOL_DSSPOOLER_KEY, "location",
 			REG_SZ, buffer.data, buffer.length);
 
@@ -5848,7 +5848,7 @@ static WERROR update_printer(pipes_struct *p, struct policy_handle *handle,
 	/* here we need to update some more DsSpooler keys */
 	/* uNCName, serverName, shortServerName */
 
-	push_reg_sz(talloc_tos(), &buffer, global_myname());
+	push_reg_sz(talloc_tos(), NULL, &buffer, global_myname());
 	set_printer_dataex( printer, SPOOL_DSSPOOLER_KEY, "serverName",
 		REG_SZ, buffer.data, buffer.length);
 	set_printer_dataex( printer, SPOOL_DSSPOOLER_KEY, "shortServerName",
@@ -5856,7 +5856,7 @@ static WERROR update_printer(pipes_struct *p, struct policy_handle *handle,
 
 	slprintf( asc_buffer, sizeof(asc_buffer)-1, "\\\\%s\\%s",
                  global_myname(), printer->info_2->sharename );
-	push_reg_sz(talloc_tos(), &buffer, asc_buffer);
+	push_reg_sz(talloc_tos(), NULL, &buffer, asc_buffer);
 	set_printer_dataex( printer, SPOOL_DSSPOOLER_KEY, "uNCName",
 		REG_SZ, buffer.data, buffer.length);
 
@@ -9002,7 +9002,7 @@ WERROR _spoolss_EnumPrinterKey(pipes_struct *p,
 		}
 	}
 
-	if (!push_reg_multi_sz(p->mem_ctx, &blob, array)) {
+	if (!push_reg_multi_sz(p->mem_ctx, NULL, &blob, array)) {
 		result = WERR_NOMEM;
 		goto done;
 	}