Merge branch 'master' of git://git.samba.org/samba into minschema

19 files changed, 399 insertions, 449 deletions

diff --git a/source3/utils/net.c b/source3/utils/net.c
index d483198a9e..7823a98219 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -272,7 +272,7 @@ static bool search_maxrid(struct pdb_search *search, const char *type,
 	num_entries = pdb_search_entries(search, 0, 0xffffffff, &entries);
 	for (i=0; i<num_entries; i++)
 		*max_rid = MAX(*max_rid, entries[i].rid);
-	pdb_search_destroy(search);
+	TALLOC_FREE(search);
 	return true;
 }
 
@@ -280,13 +280,14 @@ static uint32 get_maxrid(void)
 {
 	uint32 max_rid = 0;
 
-	if (!search_maxrid(pdb_search_users(0), "users", &max_rid))
+	if (!search_maxrid(pdb_search_users(talloc_tos(), 0), "users", &max_rid))
 		return 0;
 
-	if (!search_maxrid(pdb_search_groups(), "groups", &max_rid))
+	if (!search_maxrid(pdb_search_groups(talloc_tos()), "groups", &max_rid))
 		return 0;
 
-	if (!search_maxrid(pdb_search_aliases(get_global_sam_sid()),
+	if (!search_maxrid(pdb_search_aliases(talloc_tos(),
+					      get_global_sam_sid()),
 			   "aliases", &max_rid))
 		return 0;
 
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 58bbb70ce6..2a66619438 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -1662,7 +1662,7 @@ static int net_ads_printer_publish(struct net_context *c, int argc, const char *
 	SAFE_FREE(srv_cn_escaped);
 	SAFE_FREE(printername_escaped);
 
-	nt_status = cli_rpc_pipe_open_noauth(cli, &syntax_spoolss, &pipe_hnd);
+	nt_status = cli_rpc_pipe_open_noauth(cli, &ndr_table_spoolss.syntax_id, &pipe_hnd);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		d_fprintf(stderr, "Unable to open a connnection to the spoolss pipe on %s\n",
 			 servername);
diff --git a/source3/utils/net_conf.c b/source3/utils/net_conf.c
index 05b552c00d..38a2553e53 100644
--- a/source3/utils/net_conf.c
+++ b/source3/utils/net_conf.c
@@ -331,12 +331,6 @@ static int net_conf_import(struct net_context *c, struct smbconf_ctx *conf_ctx,
 			 "would import the following configuration:\n\n");
 	}
 
-	werr = smbconf_transaction_start(conf_ctx);
-	if (!W_ERROR_IS_OK(werr)) {
-		d_printf("error starting transaction: %s\n", win_errstr(werr));
-		goto done;
-	}
-
 	if (servicename != NULL) {
 		struct smbconf_service *service = NULL;
 
@@ -366,12 +360,45 @@ static int net_conf_import(struct net_context *c, struct smbconf_ctx *conf_ctx,
 				goto cancel;
 			}
 		}
+
+		/*
+		 * Wrap the importing of shares into a transaction,
+		 * but only 100 at a time, in order to serve memory.
+		 * The allocated memory accumulates across the actions
+		 * within the transaction, and for me, some 1500
+		 * imported shares, the MAX_TALLOC_SIZE of 256 MB
+		 * was exceeded.
+		 */
+		werr = smbconf_transaction_start(conf_ctx);
+		if (!W_ERROR_IS_OK(werr)) {
+			d_printf("error starting transaction: %s\n",
+				 win_errstr(werr));
+			goto done;
+		}
+
 		for (sidx = 0; sidx < num_shares; sidx++) {
 			werr = import_process_service(c, conf_ctx,
 						      services[sidx]);
 			if (!W_ERROR_IS_OK(werr)) {
 				goto cancel;
 			}
+
+			if (sidx % 100) {
+				continue;
+			}
+
+			werr = smbconf_transaction_commit(conf_ctx);
+			if (!W_ERROR_IS_OK(werr)) {
+				d_printf("error committing transaction: %s\n",
+					 win_errstr(werr));
+				goto done;
+			}
+			werr = smbconf_transaction_start(conf_ctx);
+			if (!W_ERROR_IS_OK(werr)) {
+				d_printf("error starting transaction: %s\n",
+					 win_errstr(werr));
+				goto done;
+			}
 		}
 	}
 
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index c54d479413..d83fb44aba 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -55,7 +55,7 @@ NTSTATUS net_get_remote_domain_sid(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 				   const char **domain_name)
 {
 	struct rpc_pipe_client *lsa_pipe;
-	POLICY_HND pol;
+	struct policy_handle pol;
 	NTSTATUS result = NT_STATUS_OK;
 	union lsa_PolicyInformation *info = NULL;
 
@@ -470,7 +470,7 @@ NTSTATUS rpc_info_internals(struct net_context *c,
 			int argc,
 			const char **argv)
 {
-	POLICY_HND connect_pol, domain_pol;
+	struct policy_handle connect_pol, domain_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	union samr_DomainInfo *info = NULL;
 	fstring sid_str;
@@ -989,10 +989,10 @@ static NTSTATUS rpc_sh_handle_user(struct net_context *c,
 					   TALLOC_CTX *mem_ctx,
 					   struct rpc_sh_ctx *ctx,
 					   struct rpc_pipe_client *pipe_hnd,
-					   POLICY_HND *user_hnd,
+					   struct policy_handle *user_hnd,
 					   int argc, const char **argv))
 {
-	POLICY_HND connect_pol, domain_pol, user_pol;
+	struct policy_handle connect_pol, domain_pol, user_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	DOM_SID sid;
 	uint32 rid;
@@ -1073,7 +1073,7 @@ static NTSTATUS rpc_sh_user_show_internals(struct net_context *c,
 					   TALLOC_CTX *mem_ctx,
 					   struct rpc_sh_ctx *ctx,
 					   struct rpc_pipe_client *pipe_hnd,
-					   POLICY_HND *user_hnd,
+					   struct policy_handle *user_hnd,
 					   int argc, const char **argv)
 {
 	NTSTATUS result;
@@ -1124,7 +1124,7 @@ static NTSTATUS rpc_sh_user_str_edit_internals(struct net_context *c,
 					       TALLOC_CTX *mem_ctx,
 					       struct rpc_sh_ctx *ctx,
 					       struct rpc_pipe_client *pipe_hnd,
-					       POLICY_HND *user_hnd,
+					       struct policy_handle *user_hnd,
 					       int argc, const char **argv)
 {
 	NTSTATUS result;
@@ -1209,7 +1209,7 @@ static NTSTATUS rpc_sh_user_flag_edit_internals(struct net_context *c,
 						TALLOC_CTX *mem_ctx,
 						struct rpc_sh_ctx *ctx,
 						struct rpc_pipe_client *pipe_hnd,
-						POLICY_HND *user_hnd,
+						struct policy_handle *user_hnd,
 						int argc, const char **argv)
 {
 	NTSTATUS result;
@@ -1386,7 +1386,7 @@ static NTSTATUS rpc_group_delete_internals(struct net_context *c,
 					int argc,
 					const char **argv)
 {
-	POLICY_HND connect_pol, domain_pol, group_pol, user_pol;
+	struct policy_handle connect_pol, domain_pol, group_pol, user_pol;
 	bool group_is_primary = false;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	uint32_t group_rid;
@@ -1658,7 +1658,7 @@ static NTSTATUS get_sid_from_name(struct cli_state *cli,
 	DOM_SID *sids = NULL;
 	enum lsa_SidType *types = NULL;
 	struct rpc_pipe_client *pipe_hnd;
-	POLICY_HND lsa_pol;
+	struct policy_handle lsa_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 
 	result = cli_rpc_pipe_open_noauth(cli, &ndr_table_lsarpc.syntax_id,
@@ -1710,10 +1710,10 @@ static NTSTATUS rpc_add_groupmem(struct rpc_pipe_client *pipe_hnd,
 				const DOM_SID *group_sid,
 				const char *member)
 {
-	POLICY_HND connect_pol, domain_pol;
+	struct policy_handle connect_pol, domain_pol;
 	NTSTATUS result;
 	uint32 group_rid;
-	POLICY_HND group_pol;
+	struct policy_handle group_pol;
 
 	struct samr_Ids rids, rid_types;
 	struct lsa_String lsa_acct_name;
@@ -1784,10 +1784,10 @@ static NTSTATUS rpc_add_aliasmem(struct rpc_pipe_client *pipe_hnd,
 				const DOM_SID *alias_sid,
 				const char *member)
 {
-	POLICY_HND connect_pol, domain_pol;
+	struct policy_handle connect_pol, domain_pol;
 	NTSTATUS result;
 	uint32 alias_rid;
-	POLICY_HND alias_pol;
+	struct policy_handle alias_pol;
 
 	DOM_SID member_sid;
 	enum lsa_SidType member_type;
@@ -1918,10 +1918,10 @@ static NTSTATUS rpc_del_groupmem(struct net_context *c,
 				const DOM_SID *group_sid,
 				const char *member)
 {
-	POLICY_HND connect_pol, domain_pol;
+	struct policy_handle connect_pol, domain_pol;
 	NTSTATUS result;
 	uint32 group_rid;
-	POLICY_HND group_pol;
+	struct policy_handle group_pol;
 
 	struct samr_Ids rids, rid_types;
 	struct lsa_String lsa_acct_name;
@@ -1986,10 +1986,10 @@ static NTSTATUS rpc_del_aliasmem(struct rpc_pipe_client *pipe_hnd,
 				const DOM_SID *alias_sid,
 				const char *member)
 {
-	POLICY_HND connect_pol, domain_pol;
+	struct policy_handle connect_pol, domain_pol;
 	NTSTATUS result;
 	uint32 alias_rid;
-	POLICY_HND alias_pol;
+	struct policy_handle alias_pol;
 
 	DOM_SID member_sid;
 	enum lsa_SidType member_type;
@@ -2136,7 +2136,7 @@ static NTSTATUS rpc_group_list_internals(struct net_context *c,
 					int argc,
 					const char **argv)
 {
-	POLICY_HND connect_pol, domain_pol;
+	struct policy_handle connect_pol, domain_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	uint32 start_idx=0, max_entries=250, num_entries, i, loop_count = 0;
 	struct samr_SamArray *groups = NULL;
@@ -2259,7 +2259,7 @@ static NTSTATUS rpc_group_list_internals(struct net_context *c,
 
 			if (c->opt_long_list_entries) {
 
-				POLICY_HND alias_pol;
+				struct policy_handle alias_pol;
 				union samr_AliasInfo *info = NULL;
 
 				if ((NT_STATUS_IS_OK(rpccli_samr_OpenAlias(pipe_hnd, mem_ctx,
@@ -2318,7 +2318,7 @@ static NTSTATUS rpc_group_list_internals(struct net_context *c,
 
 			if (c->opt_long_list_entries) {
 
-				POLICY_HND alias_pol;
+				struct policy_handle alias_pol;
 				union samr_AliasInfo *info = NULL;
 
 				if ((NT_STATUS_IS_OK(rpccli_samr_OpenAlias(pipe_hnd, mem_ctx,
@@ -2362,11 +2362,11 @@ static NTSTATUS rpc_list_group_members(struct net_context *c,
 					TALLOC_CTX *mem_ctx,
 					const char *domain_name,
 					const DOM_SID *domain_sid,
-					POLICY_HND *domain_pol,
+					struct policy_handle *domain_pol,
 					uint32 rid)
 {
 	NTSTATUS result;
-	POLICY_HND group_pol;
+	struct policy_handle group_pol;
 	uint32 num_members, *group_rids;
 	int i;
 	struct samr_RidTypeArray *rids = NULL;
@@ -2437,12 +2437,12 @@ static NTSTATUS rpc_list_group_members(struct net_context *c,
 static NTSTATUS rpc_list_alias_members(struct net_context *c,
 					struct rpc_pipe_client *pipe_hnd,
 					TALLOC_CTX *mem_ctx,
-					POLICY_HND *domain_pol,
+					struct policy_handle *domain_pol,
 					uint32 rid)
 {
 	NTSTATUS result;
 	struct rpc_pipe_client *lsa_pipe;
-	POLICY_HND alias_pol, lsa_pol;
+	struct policy_handle alias_pol, lsa_pol;
 	uint32 num_members;
 	DOM_SID *alias_sids;
 	char **domains;
@@ -2545,7 +2545,7 @@ static NTSTATUS rpc_group_members_internals(struct net_context *c,
 					const char **argv)
 {
 	NTSTATUS result;
-	POLICY_HND connect_pol, domain_pol;
+	struct policy_handle connect_pol, domain_pol;
 	struct samr_Ids rids, rid_types;
 	struct lsa_String lsa_acct_name;
 
@@ -3299,7 +3299,7 @@ static bool sync_files(struct copy_clistate *cp_clistate, const char *mask)
 
 	DEBUG(3,("calling cli_list with mask: %s\n", mask));
 
-	if ( !cli_resolve_path(talloc_tos(), "", cp_clistate->cli_share_src,
+	if ( !cli_resolve_path(talloc_tos(), "", NULL, cp_clistate->cli_share_src,
 				mask, &targetcli, &targetpath ) ) {
 		d_fprintf(stderr, "cli_resolve_path %s failed with error: %s\n", 
 			mask, cli_errstr(cp_clistate->cli_share_src));
@@ -3752,13 +3752,13 @@ static void push_alias(TALLOC_CTX *mem_ctx, struct full_alias *alias)
 
 static NTSTATUS rpc_fetch_domain_aliases(struct rpc_pipe_client *pipe_hnd,
 					TALLOC_CTX *mem_ctx,
-					POLICY_HND *connect_pol,
+					struct policy_handle *connect_pol,
 					const DOM_SID *domain_sid)
 {
 	uint32 start_idx, max_entries, num_entries, i;
 	struct samr_SamArray *groups = NULL;
 	NTSTATUS result;
-	POLICY_HND domain_pol;
+	struct policy_handle domain_pol;
 
 	/* Get domain policy handle */
 
@@ -3782,7 +3782,7 @@ static NTSTATUS rpc_fetch_domain_aliases(struct rpc_pipe_client *pipe_hnd,
 						       &num_entries);
 		for (i = 0; i < num_entries; i++) {
 
-			POLICY_HND alias_pol;
+			struct policy_handle alias_pol;
 			struct full_alias alias;
 			struct lsa_SidArray sid_array;
 			int j;
@@ -3847,7 +3847,7 @@ static NTSTATUS rpc_aliaslist_dump(struct net_context *c,
 {
 	int i;
 	NTSTATUS result;
-	POLICY_HND lsa_pol;
+	struct policy_handle lsa_pol;
 
 	result = rpccli_lsa_open_policy(pipe_hnd, mem_ctx, true,
 				     SEC_RIGHTS_MAXIMUM_ALLOWED,
@@ -3912,7 +3912,7 @@ static NTSTATUS rpc_aliaslist_internals(struct net_context *c,
 					const char **argv)
 {
 	NTSTATUS result;
-	POLICY_HND connect_pol;
+	struct policy_handle connect_pol;
 
 	result = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
 				      pipe_hnd->desthost,
@@ -5149,7 +5149,7 @@ static NTSTATUS rpc_trustdom_add_internals(struct net_context *c,
 						int argc,
 						const char **argv)
 {
-	POLICY_HND connect_pol, domain_pol, user_pol;
+	struct policy_handle connect_pol, domain_pol, user_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	char *acct_name;
 	struct lsa_String lsa_acct_name;
@@ -5306,7 +5306,7 @@ static NTSTATUS rpc_trustdom_del_internals(struct net_context *c,
 					int argc,
 					const char **argv)
 {
-	POLICY_HND connect_pol, domain_pol, user_pol;
+	struct policy_handle connect_pol, domain_pol, user_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	char *acct_name;
 	DOM_SID trust_acct_sid;
@@ -5495,7 +5495,7 @@ static int rpc_trustdom_establish(struct net_context *c, int argc,
 	struct cli_state *cli = NULL;
 	struct sockaddr_storage server_ss;
 	struct rpc_pipe_client *pipe_hnd = NULL;
-	POLICY_HND connect_hnd;
+	struct policy_handle connect_hnd;
 	TALLOC_CTX *mem_ctx;
 	NTSTATUS nt_status;
 	DOM_SID *domain_sid;
@@ -5731,7 +5731,7 @@ static void print_trusted_domain(DOM_SID *dom_sid, const char *trusted_dom_name)
 
 static NTSTATUS vampire_trusted_domain(struct rpc_pipe_client *pipe_hnd,
 				      TALLOC_CTX *mem_ctx,
-				      POLICY_HND *pol,
+				      struct policy_handle *pol,
 				      DOM_SID dom_sid,
 				      const char *trusted_dom_name)
 {
@@ -5797,7 +5797,7 @@ static int rpc_trustdom_vampire(struct net_context *c, int argc,
 	NTSTATUS nt_status;
 	const char *domain_name = NULL;
 	DOM_SID *queried_dom_sid;
-	POLICY_HND connect_hnd;
+	struct policy_handle connect_hnd;
 	union lsa_PolicyInformation *info = NULL;
 
 	/* trusted domains listing variables */
@@ -5950,7 +5950,7 @@ static int rpc_trustdom_list(struct net_context *c, int argc, const char **argv)
 	DOM_SID *queried_dom_sid;
 	fstring padding;
 	int ascii_dom_name_len;
-	POLICY_HND connect_hnd;
+	struct policy_handle connect_hnd;
 	union lsa_PolicyInformation *info = NULL;
 
 	/* trusted domains listing variables */
@@ -5960,7 +5960,7 @@ static int rpc_trustdom_list(struct net_context *c, int argc, const char **argv)
 	fstring pdc_name;
 
 	/* trusting domains listing variables */
-	POLICY_HND domain_hnd;
+	struct policy_handle domain_hnd;
 	struct samr_SamArray *trusts = NULL;
 
 	if (c->display_usage) {
@@ -6421,30 +6421,30 @@ static int rpc_printer_migrate_all(struct net_context *c, int argc,
 		return -1;
 	}
 
-	ret = run_rpc_command(c, NULL, &syntax_spoolss, 0,
+	ret = run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
 			      rpc_printer_migrate_printers_internals, argc,
 			      argv);
 	if (ret)
 		return ret;
 
-	ret = run_rpc_command(c, NULL, &syntax_spoolss, 0,
+	ret = run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
 			      rpc_printer_migrate_drivers_internals, argc,
 			      argv);
 	if (ret)
 		return ret;
 
-	ret = run_rpc_command(c, NULL, &syntax_spoolss, 0,
+	ret = run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
 			      rpc_printer_migrate_forms_internals, argc, argv);
 	if (ret)
 		return ret;
 
-	ret = run_rpc_command(c, NULL, &syntax_spoolss, 0,
+	ret = run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
 			      rpc_printer_migrate_settings_internals, argc,
 			      argv);
 	if (ret)
 		return ret;
 
-	return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+	return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
 			       rpc_printer_migrate_security_internals, argc,
 			       argv);
 
@@ -6475,7 +6475,7 @@ static int rpc_printer_migrate_drivers(struct net_context *c, int argc,
 		return -1;
 	}
 
-	return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+	return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
 			       rpc_printer_migrate_drivers_internals,
 			       argc, argv);
 }
@@ -6505,7 +6505,7 @@ static int rpc_printer_migrate_forms(struct net_context *c, int argc,
 		return -1;
 	}
 
-	return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+	return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
 			       rpc_printer_migrate_forms_internals,
 			       argc, argv);
 }
@@ -6535,7 +6535,7 @@ static int rpc_printer_migrate_printers(struct net_context *c, int argc,
 		return -1;
 	}
 
-	return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+	return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
 			       rpc_printer_migrate_printers_internals,
 			       argc, argv);
 }
@@ -6565,7 +6565,7 @@ static int rpc_printer_migrate_security(struct net_context *c, int argc,
 		return -1;
 	}
 
-	return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+	return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
 			       rpc_printer_migrate_security_internals,
 			       argc, argv);
 }
@@ -6595,7 +6595,7 @@ static int rpc_printer_migrate_settings(struct net_context *c, int argc,
 		return -1;
 	}
 
-	return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+	return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
 			       rpc_printer_migrate_settings_internals,
 			       argc, argv);
 }
@@ -6691,7 +6691,7 @@ static int rpc_printer_list(struct net_context *c, int argc, const char **argv)
 		return 0;
 	}
 
-	return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+	return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
 			       rpc_printer_list_internals,
 			       argc, argv);
 }
@@ -6716,7 +6716,7 @@ static int rpc_printer_driver_list(struct net_context *c, int argc,
 		return 0;
 	}
 
-	return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+	return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
 			       rpc_printer_driver_list_internals,
 			       argc, argv);
 }
@@ -6741,7 +6741,7 @@ static int rpc_printer_publish_publish(struct net_context *c, int argc,
 		return 0;
 	}
 
-	return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+	return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
 			       rpc_printer_publish_publish_internals,
 			       argc, argv);
 }
@@ -6765,7 +6765,7 @@ static int rpc_printer_publish_update(struct net_context *c, int argc, const cha
 		return 0;
 	}
 
-	return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+	return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
 			       rpc_printer_publish_update_internals,
 			       argc, argv);
 }
@@ -6790,7 +6790,7 @@ static int rpc_printer_publish_unpublish(struct net_context *c, int argc,
 		return 0;
 	}
 
-	return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+	return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
 			       rpc_printer_publish_unpublish_internals,
 			       argc, argv);
 }
@@ -6815,7 +6815,7 @@ static int rpc_printer_publish_list(struct net_context *c, int argc,
 		return 0;
 	}
 
-	return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+	return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
 			       rpc_printer_publish_list_internals,
 			       argc, argv);
 }
@@ -6880,7 +6880,7 @@ static int rpc_printer_publish(struct net_context *c, int argc,
 			net_display_usage_from_functable(func);
 			return 0;
 		}
-		return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+		return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
 			       rpc_printer_publish_list_internals,
 			       argc, argv);
 	}
@@ -6983,7 +6983,7 @@ int net_rpc_printer(struct net_context *c, int argc, const char **argv)
 			net_display_usage_from_functable(func);
 			return 0;
 		}
-		return run_rpc_command(c, NULL, &syntax_spoolss, 0,
+		return run_rpc_command(c, NULL, &ndr_table_spoolss.syntax_id, 0,
 			       rpc_printer_list_internals,
 			       argc, argv);
 	}
diff --git a/source3/utils/net_rpc_audit.c b/source3/utils/net_rpc_audit.c
index dc4c796c17..aa7fc7c394 100644
--- a/source3/utils/net_rpc_audit.c
+++ b/source3/utils/net_rpc_audit.c
@@ -70,7 +70,7 @@ static NTSTATUS rpc_audit_get_internal(struct net_context *c,
 				       int argc,
 				       const char **argv)
 {
-	POLICY_HND pol;
+	struct policy_handle pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	union lsa_PolicyInformation *info = NULL;
 	int i;
@@ -138,7 +138,7 @@ static NTSTATUS rpc_audit_set_internal(struct net_context *c,
 				       int argc,
 				       const char **argv)
 {
-	POLICY_HND pol;
+	struct policy_handle pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	union lsa_PolicyInformation *info = NULL;
 	uint32_t audit_policy, audit_category;
@@ -224,7 +224,7 @@ static NTSTATUS rpc_audit_enable_internal_ext(struct rpc_pipe_client *pipe_hnd,
 					      const char **argv,
 					      bool enable)
 {
-	POLICY_HND pol;
+	struct policy_handle pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	union lsa_PolicyInformation *info = NULL;
 
@@ -308,7 +308,7 @@ static NTSTATUS rpc_audit_list_internal(struct net_context *c,
 					int argc,
 					const char **argv)
 {
-	POLICY_HND pol;
+	struct policy_handle pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	union lsa_PolicyInformation *info = NULL;
 	int i;
diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index 1c45d0c515..7f3515ce75 100644
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -141,7 +141,7 @@ int net_rpc_join_newstyle(struct net_context *c, int argc, const char **argv)
 
 	/* rpc variables */
 
-	POLICY_HND lsa_pol, sam_pol, domain_pol, user_pol;
+	struct policy_handle lsa_pol, sam_pol, domain_pol, user_pol;
 	DOM_SID *domain_sid;
 	uint32 user_rid;
 
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 8116764d9b..b25c897770 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -1,7 +1,7 @@
 /*
    Samba Unix/Linux SMB client library
    Distributed SMB/CIFS Server Management Utility
-   Copyright (C) 2004 Guenther Deschner (gd@samba.org)
+   Copyright (C) 2004,2009 Guenther Deschner (gd@samba.org)
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -77,62 +77,6 @@ static void display_print_driver3(struct spoolss_DriverInfo3 *r)
 	printf("\tDefaultdatatype: [%s]\n\n", r->default_datatype);
 }
 
-static void display_print_driver_3(DRIVER_INFO_3 *i1)
-{
-	fstring name = "";
-	fstring architecture = "";
-	fstring driverpath = "";
-	fstring datafile = "";
-	fstring configfile = "";
-	fstring helpfile = "";
-	fstring dependentfiles = "";
-	fstring monitorname = "";
-	fstring defaultdatatype = "";
-
-	int length=0;
-	bool valid = true;
-
-	if (i1 == NULL)
-		return;
-
-	rpcstr_pull(name, i1->name.buffer, sizeof(name), -1, STR_TERMINATE);
-	rpcstr_pull(architecture, i1->architecture.buffer, sizeof(architecture), -1, STR_TERMINATE);
-	rpcstr_pull(driverpath, i1->driverpath.buffer, sizeof(driverpath), -1, STR_TERMINATE);
-	rpcstr_pull(datafile, i1->datafile.buffer, sizeof(datafile), -1, STR_TERMINATE);
-	rpcstr_pull(configfile, i1->configfile.buffer, sizeof(configfile), -1, STR_TERMINATE);
-	rpcstr_pull(helpfile, i1->helpfile.buffer, sizeof(helpfile), -1, STR_TERMINATE);
-	rpcstr_pull(monitorname, i1->monitorname.buffer, sizeof(monitorname), -1, STR_TERMINATE);
-	rpcstr_pull(defaultdatatype, i1->defaultdatatype.buffer, sizeof(defaultdatatype), -1, STR_TERMINATE);
-
-	d_printf ("Printer Driver Info 3:\n");
-	d_printf ("\tVersion: [%x]\n", i1->version);
-	d_printf ("\tDriver Name: [%s]\n",name);
-	d_printf ("\tArchitecture: [%s]\n", architecture);
-	d_printf ("\tDriver Path: [%s]\n", driverpath);
-	d_printf ("\tDatafile: [%s]\n", datafile);
-	d_printf ("\tConfigfile: [%s]\n", configfile);
-	d_printf ("\tHelpfile: [%s]\n\n", helpfile);
-
-	while (valid) {
-		rpcstr_pull(dependentfiles, i1->dependentfiles+length, sizeof(dependentfiles), -1, STR_TERMINATE);
-
-		length+=strlen(dependentfiles)+1;
-
-		if (strlen(dependentfiles) > 0) {
-			d_printf ("\tDependentfiles: [%s]\n", dependentfiles);
-		} else {
-			valid = false;
-		}
-	}
-
-	printf ("\n");
-
-	d_printf ("\tMonitorname: [%s]\n", monitorname);
-	d_printf ("\tDefaultdatatype: [%s]\n\n", defaultdatatype);
-
-	return;
-}
-
 static void display_reg_value(const char *subkey, REGISTRY_VALUE value)
 {
 	char *text;
@@ -713,14 +657,19 @@ static bool net_spoolss_enum_printers(struct rpc_pipe_client *pipe_hnd,
 					uint32 flags,
 					uint32 level,
 					uint32 *num_printers,
-					PRINTER_INFO_CTR *ctr)
+					union spoolss_PrinterInfo **info)
 {
 	WERROR result;
 
 	/* enum printers */
-	result = rpccli_spoolss_enum_printers(pipe_hnd, mem_ctx, name, flags,
-		level, num_printers, ctr);
 
+	result = rpccli_spoolss_enumprinters(pipe_hnd, mem_ctx,
+					     flags,
+					     name,
+					     level,
+					     0,
+					     num_printers,
+					     info);
 	if (!W_ERROR_IS_OK(result)) {
 		printf("cannot enum printers: %s\n", win_errstr(result));
 		return false;
@@ -734,7 +683,7 @@ static bool net_spoolss_open_printer_ex(struct rpc_pipe_client *pipe_hnd,
 					const char *printername,
 					uint32 access_required,
 					const char *username,
-					POLICY_HND *hnd)
+					struct policy_handle *hnd)
 {
 	WERROR result;
 	fstring printername2;
@@ -773,7 +722,7 @@ static bool net_spoolss_open_printer_ex(struct rpc_pipe_client *pipe_hnd,
 
 static bool net_spoolss_getprinter(struct rpc_pipe_client *pipe_hnd,
 				TALLOC_CTX *mem_ctx,
-				POLICY_HND *hnd,
+				struct policy_handle *hnd,
 				uint32 level,
 				union spoolss_PrinterInfo *info)
 {
@@ -795,7 +744,7 @@ static bool net_spoolss_getprinter(struct rpc_pipe_client *pipe_hnd,
 
 static bool net_spoolss_setprinter(struct rpc_pipe_client *pipe_hnd,
 				TALLOC_CTX *mem_ctx,
-				POLICY_HND *hnd,
+				struct policy_handle *hnd,
 				uint32 level,
 				union spoolss_PrinterInfo *info)
 {
@@ -866,14 +815,23 @@ static bool net_spoolss_setprinter(struct rpc_pipe_client *pipe_hnd,
 
 
 static bool net_spoolss_setprinterdata(struct rpc_pipe_client *pipe_hnd,
-					TALLOC_CTX *mem_ctx,
-					POLICY_HND *hnd,
-					REGISTRY_VALUE *value)
+				       TALLOC_CTX *mem_ctx,
+				       struct policy_handle *hnd,
+				       const char *value_name,
+				       enum winreg_Type type,
+				       union spoolss_PrinterData data)
 {
 	WERROR result;
+	NTSTATUS status;
 
 	/* setprinterdata call */
-	result = rpccli_spoolss_setprinterdata(pipe_hnd, mem_ctx, hnd, value);
+	status = rpccli_spoolss_SetPrinterData(pipe_hnd, mem_ctx,
+					       hnd,
+					       value_name,
+					       type,
+					       data,
+					       0, /* autocalculated */
+					       &result);
 
 	if (!W_ERROR_IS_OK(result)) {
 		printf ("unable to set printerdata: %s\n", win_errstr(result));
@@ -886,14 +844,14 @@ static bool net_spoolss_setprinterdata(struct rpc_pipe_client *pipe_hnd,
 
 static bool net_spoolss_enumprinterkey(struct rpc_pipe_client *pipe_hnd,
 					TALLOC_CTX *mem_ctx,
-					POLICY_HND *hnd,
+					struct policy_handle *hnd,
 					const char *keyname,
-					uint16 **keylist)
+					const char ***keylist)
 {
 	WERROR result;
 
 	/* enumprinterkey call */
-	result = rpccli_spoolss_enumprinterkey(pipe_hnd, mem_ctx, hnd, keyname, keylist, NULL);
+	result = rpccli_spoolss_enumprinterkey(pipe_hnd, mem_ctx, hnd, keyname, keylist, 0);
 
 	if (!W_ERROR_IS_OK(result)) {
 		printf("enumprinterkey failed: %s\n", win_errstr(result));
@@ -906,14 +864,20 @@ static bool net_spoolss_enumprinterkey(struct rpc_pipe_client *pipe_hnd,
 static bool net_spoolss_enumprinterdataex(struct rpc_pipe_client *pipe_hnd,
 					TALLOC_CTX *mem_ctx,
 					uint32 offered,
-					POLICY_HND *hnd,
+					struct policy_handle *hnd,
 					const char *keyname,
-					REGVAL_CTR *ctr)
+					uint32_t *count,
+					struct spoolss_PrinterEnumValues **info)
 {
 	WERROR result;
 
 	/* enumprinterdataex call */
-	result = rpccli_spoolss_enumprinterdataex(pipe_hnd, mem_ctx, hnd, keyname, ctr);
+	result = rpccli_spoolss_enumprinterdataex(pipe_hnd, mem_ctx,
+						  hnd,
+						  keyname,
+						  0, /* offered */
+						  count,
+						  info);
 
 	if (!W_ERROR_IS_OK(result)) {
 		printf("enumprinterdataex failed: %s\n", win_errstr(result));
@@ -926,8 +890,8 @@ static bool net_spoolss_enumprinterdataex(struct rpc_pipe_client *pipe_hnd,
 
 static bool net_spoolss_setprinterdataex(struct rpc_pipe_client *pipe_hnd,
 					TALLOC_CTX *mem_ctx,
-					POLICY_HND *hnd,
-					char *keyname,
+					struct policy_handle *hnd,
+					const char *keyname,
 					REGISTRY_VALUE *value)
 {
 	WERROR result;
@@ -953,16 +917,20 @@ static bool net_spoolss_setprinterdataex(struct rpc_pipe_client *pipe_hnd,
 
 static bool net_spoolss_enumforms(struct rpc_pipe_client *pipe_hnd,
 				TALLOC_CTX *mem_ctx,
-				POLICY_HND *hnd,
+				struct policy_handle *hnd,
 				int level,
-				uint32 *num_forms,
-				FORM_1 **forms)
+				uint32_t *num_forms,
+				union spoolss_FormInfo **forms)
 {
 	WERROR result;
 
 	/* enumforms call */
-	result = rpccli_spoolss_enumforms(pipe_hnd, mem_ctx, hnd, level, num_forms, forms);
-
+	result = rpccli_spoolss_enumforms(pipe_hnd, mem_ctx,
+					  hnd,
+					  level,
+					  0,
+					  num_forms,
+					  forms);
 	if (!W_ERROR_IS_OK(result)) {
 		printf("could not enum forms: %s\n", win_errstr(result));
 		return false;
@@ -974,16 +942,19 @@ static bool net_spoolss_enumforms(struct rpc_pipe_client *pipe_hnd,
 static bool net_spoolss_enumprinterdrivers (struct rpc_pipe_client *pipe_hnd,
 					TALLOC_CTX *mem_ctx,
 					uint32 level, const char *env,
-					uint32 *num_drivers,
-					PRINTER_DRIVER_CTR *ctr)
+					uint32 *count,
+					union spoolss_DriverInfo **info)
 {
 	WERROR result;
 
 	/* enumprinterdrivers call */
-	result = rpccli_spoolss_enumprinterdrivers(
-			pipe_hnd, mem_ctx, level,
-			env, num_drivers, ctr);
-
+	result = rpccli_spoolss_enumprinterdrivers(pipe_hnd, mem_ctx,
+						   pipe_hnd->srv_name_slash,
+						   env,
+						   level,
+						   0,
+						   count,
+						   info);
 	if (!W_ERROR_IS_OK(result)) {
 		printf("cannot enum drivers: %s\n", win_errstr(result));
 		return false;
@@ -994,7 +965,7 @@ static bool net_spoolss_enumprinterdrivers (struct rpc_pipe_client *pipe_hnd,
 
 static bool net_spoolss_getprinterdriver(struct rpc_pipe_client *pipe_hnd,
 			     TALLOC_CTX *mem_ctx,
-			     POLICY_HND *hnd, uint32 level,
+			     struct policy_handle *hnd, uint32 level,
 			     const char *env, int version,
 			     union spoolss_DriverInfo *info)
 {
@@ -1078,26 +1049,21 @@ static bool get_printer_info(struct rpc_pipe_client *pipe_hnd,
 			int argc,
 			const char **argv,
 			uint32 *num_printers,
-			PRINTER_INFO_CTR *ctr)
+			union spoolss_PrinterInfo **info_p)
 {
-
-	POLICY_HND hnd;
-	union spoolss_PrinterInfo info;
+	struct policy_handle hnd;
 
 	/* no arguments given, enumerate all printers */
 	if (argc == 0) {
 
 		if (!net_spoolss_enum_printers(pipe_hnd, mem_ctx, NULL,
 				PRINTER_ENUM_LOCAL|PRINTER_ENUM_SHARED,
-				level, num_printers, ctr))
+				level, num_printers, info_p))
 			return false;
 
 		goto out;
 	}
 
-	/* FIXME GD */
-	return false;
-
 	/* argument given, get a single printer by name */
 	if (!net_spoolss_open_printer_ex(pipe_hnd, mem_ctx, argv[0],
 					 MAXIMUM_ALLOWED_ACCESS,
@@ -1105,7 +1071,7 @@ static bool get_printer_info(struct rpc_pipe_client *pipe_hnd,
 					 &hnd))
 		return false;
 
-	if (!net_spoolss_getprinter(pipe_hnd, mem_ctx, &hnd, level, &info)) {
+	if (!net_spoolss_getprinter(pipe_hnd, mem_ctx, &hnd, level, *info_p)) {
 		rpccli_spoolss_ClosePrinter(pipe_hnd, mem_ctx, &hnd, NULL);
 		return false;
 	}
@@ -1150,26 +1116,19 @@ NTSTATUS rpc_printer_list_internals(struct net_context *c,
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
 	uint32 i, num_printers;
 	uint32 level = 2;
-	char *printername, *sharename;
-	PRINTER_INFO_CTR ctr;
+	const char *printername, *sharename;
+	union spoolss_PrinterInfo *info;
 
 	printf("listing printers\n");
 
-	if (!get_printer_info(pipe_hnd, mem_ctx, level, argc, argv, &num_printers, &ctr))
+	if (!get_printer_info(pipe_hnd, mem_ctx, level, argc, argv, &num_printers, &info))
 		return nt_status;
 
 	for (i = 0; i < num_printers; i++) {
+
 		/* do some initialization */
-		rpcstr_pull_talloc(mem_ctx,
-				&printername,
-				ctr.printers_2[i].printername.buffer,
-				-1,
-				STR_TERMINATE);
-		rpcstr_pull_talloc(mem_ctx,
-				&sharename,
-				ctr.printers_2[i].sharename.buffer,
-				-1,
-				STR_TERMINATE);
+		printername = info[i].info2.printername;
+		sharename = info[i].info2.sharename;
 
 		if (printername && sharename) {
 			d_printf("printer %d: %s, shared as: %s\n",
@@ -1209,11 +1168,9 @@ NTSTATUS rpc_printer_driver_list_internals(struct net_context *c,
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
 	uint32 i;
 	uint32 level = 3;
-	PRINTER_DRIVER_CTR drv_ctr_enum;
+	union spoolss_DriverInfo *info;
 	int d;
 
-	ZERO_STRUCT(drv_ctr_enum);
-
 	printf("listing printer-drivers\n");
 
         for (i=0; archi_table[i].long_archi!=NULL; i++) {
@@ -1223,7 +1180,7 @@ NTSTATUS rpc_printer_driver_list_internals(struct net_context *c,
 		/* enum remote drivers */
 		if (!net_spoolss_enumprinterdrivers(pipe_hnd, mem_ctx, level,
 				archi_table[i].long_archi,
-				&num_drivers, &drv_ctr_enum)) {
+				&num_drivers, &info)) {
 			nt_status = NT_STATUS_UNSUCCESSFUL;
 			goto done;
 		}
@@ -1240,7 +1197,7 @@ NTSTATUS rpc_printer_driver_list_internals(struct net_context *c,
 
 		/* do something for all drivers for architecture */
 		for (d = 0; d < num_drivers; d++) {
-			display_print_driver_3(&(drv_ctr_enum.info3[d]));
+			display_print_driver3(&info[d].info3);
 		}
 	}
 
@@ -1273,31 +1230,24 @@ static NTSTATUS rpc_printer_publish_internals_args(struct rpc_pipe_client *pipe_
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
 	uint32 i, num_printers;
 	uint32 level = 7;
-	char *printername, *sharename;
-	PRINTER_INFO_CTR ctr;
+	const char *printername, *sharename;
+	union spoolss_PrinterInfo *info_enum;
 	union spoolss_PrinterInfo info;
 	struct spoolss_SetPrinterInfoCtr info_ctr;
 	struct spoolss_DevmodeContainer devmode_ctr;
 	struct sec_desc_buf secdesc_ctr;
-	POLICY_HND hnd;
+	struct policy_handle hnd;
 	WERROR result;
 	const char *action_str;
 
-	if (!get_printer_info(pipe_hnd, mem_ctx, 2, argc, argv, &num_printers, &ctr))
+	if (!get_printer_info(pipe_hnd, mem_ctx, 2, argc, argv, &num_printers, &info_enum))
 		return nt_status;
 
 	for (i = 0; i < num_printers; i++) {
+
 		/* do some initialization */
-		rpcstr_pull_talloc(mem_ctx,
-				&printername,
-				ctr.printers_2[i].printername.buffer,
-				-1,
-				STR_TERMINATE);
-		rpcstr_pull_talloc(mem_ctx,
-				&sharename,
-				ctr.printers_2[i].sharename.buffer,
-				-1,
-				STR_TERMINATE);
+		printername = info_enum[i].info2.printername;
+		sharename = info_enum[i].info2.sharename;
 		if (!printername || !sharename) {
 			goto done;
 		}
@@ -1425,29 +1375,21 @@ NTSTATUS rpc_printer_publish_list_internals(struct net_context *c,
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
 	uint32 i, num_printers;
 	uint32 level = 7;
-	char *printername, *sharename;
-	PRINTER_INFO_CTR ctr, ctr_pub;
+	const char *printername, *sharename;
+	union spoolss_PrinterInfo *info_enum;
 	union spoolss_PrinterInfo info;
-	POLICY_HND hnd;
+	struct policy_handle hnd;
 	int state;
 
-	if (!get_printer_info(pipe_hnd, mem_ctx, 2, argc, argv, &num_printers, &ctr))
+	if (!get_printer_info(pipe_hnd, mem_ctx, 2, argc, argv, &num_printers, &info_enum))
 		return nt_status;
 
 	for (i = 0; i < num_printers; i++) {
-		ZERO_STRUCT(ctr_pub);
 
 		/* do some initialization */
-		rpcstr_pull_talloc(mem_ctx,
-				&printername,
-				ctr.printers_2[i].printername.buffer,
-				-1,
-				STR_TERMINATE);
-		rpcstr_pull_talloc(mem_ctx,
-				&sharename,
-				ctr.printers_2[i].sharename.buffer,
-				-1,
-				STR_TERMINATE);
+		printername = info_enum[i].info2.printername;
+		sharename = info_enum[i].info2.sharename;
+
 		if (!printername || !sharename) {
 			goto done;
 		}
@@ -1526,26 +1468,24 @@ NTSTATUS rpc_printer_migrate_security_internals(struct net_context *c,
 	uint32 i = 0;
 	uint32 num_printers;
 	uint32 level = 2;
-	char *printername, *sharename;
+	const char *printername, *sharename;
 	struct rpc_pipe_client *pipe_hnd_dst = NULL;
-	POLICY_HND hnd_src, hnd_dst;
-	PRINTER_INFO_CTR ctr_src, ctr_enum;
+	struct policy_handle hnd_src, hnd_dst;
+	union spoolss_PrinterInfo *info_enum;
 	struct cli_state *cli_dst = NULL;
 	union spoolss_PrinterInfo info_src, info_dst;
 
-	ZERO_STRUCT(ctr_src);
-
 	DEBUG(3,("copying printer ACLs\n"));
 
 	/* connect destination PI_SPOOLSS */
 	nt_status = connect_dst_pipe(c, &cli_dst, &pipe_hnd_dst,
-				     &syntax_spoolss);
+				     &ndr_table_spoolss.syntax_id);
 	if (!NT_STATUS_IS_OK(nt_status))
 		return nt_status;
 
 
 	/* enum source printers */
-	if (!get_printer_info(pipe_hnd, mem_ctx, level, argc, argv, &num_printers, &ctr_enum)) {
+	if (!get_printer_info(pipe_hnd, mem_ctx, level, argc, argv, &num_printers, &info_enum)) {
 		nt_status = NT_STATUS_UNSUCCESSFUL;
 		goto done;
 	}
@@ -1558,17 +1498,11 @@ NTSTATUS rpc_printer_migrate_security_internals(struct net_context *c,
 
 	/* do something for all printers */
 	for (i = 0; i < num_printers; i++) {
+
 		/* do some initialization */
-		rpcstr_pull_talloc(mem_ctx,
-				&printername,
-				ctr_enum.printers_2[i].printername.buffer,
-				-1,
-				STR_TERMINATE);
-		rpcstr_pull_talloc(mem_ctx,
-				&sharename,
-				ctr_enum.printers_2[i].sharename.buffer,
-				-1,
-				STR_TERMINATE);
+		printername = info_enum[i].info2.printername;
+		sharename = info_enum[i].info2.sharename;
+
 		if (!printername || !sharename) {
 			nt_status = NT_STATUS_UNSUCCESSFUL;
 			goto done;
@@ -1680,27 +1614,25 @@ NTSTATUS rpc_printer_migrate_forms_internals(struct net_context *c,
 	uint32 i, f;
 	uint32 num_printers;
 	uint32 level = 1;
-	char *printername, *sharename;
+	const char *printername, *sharename;
 	struct rpc_pipe_client *pipe_hnd_dst = NULL;
-	POLICY_HND hnd_src, hnd_dst;
-	PRINTER_INFO_CTR ctr_enum;
+	struct policy_handle hnd_src, hnd_dst;
+	union spoolss_PrinterInfo *info_enum;
 	union spoolss_PrinterInfo info_dst;
-	uint32 num_forms;
-	FORM_1 *forms;
+	uint32_t num_forms;
+	union spoolss_FormInfo *forms;
 	struct cli_state *cli_dst = NULL;
 
-	ZERO_STRUCT(ctr_enum);
-
 	DEBUG(3,("copying forms\n"));
 
 	/* connect destination PI_SPOOLSS */
 	nt_status = connect_dst_pipe(c, &cli_dst, &pipe_hnd_dst,
-				     &syntax_spoolss);
+				     &ndr_table_spoolss.syntax_id);
 	if (!NT_STATUS_IS_OK(nt_status))
 		return nt_status;
 
 	/* enum src printers */
-	if (!get_printer_info(pipe_hnd, mem_ctx, 2, argc, argv, &num_printers, &ctr_enum)) {
+	if (!get_printer_info(pipe_hnd, mem_ctx, 2, argc, argv, &num_printers, &info_enum)) {
 		nt_status = NT_STATUS_UNSUCCESSFUL;
 		goto done;
 	}
@@ -1713,17 +1645,11 @@ NTSTATUS rpc_printer_migrate_forms_internals(struct net_context *c,
 
 	/* do something for all printers */
 	for (i = 0; i < num_printers; i++) {
+
 		/* do some initialization */
-		rpcstr_pull_talloc(mem_ctx,
-				&printername,
-				ctr_enum.printers_2[i].printername.buffer,
-				-1,
-				STR_TERMINATE);
-		rpcstr_pull_talloc(mem_ctx,
-				&sharename,
-				ctr_enum.printers_2[i].sharename.buffer,
-				-1,
-				STR_TERMINATE);
+		printername = info_enum[i].info2.printername;
+		sharename = info_enum[i].info2.sharename;
+
 		if (!printername || !sharename) {
 			nt_status = NT_STATUS_UNSUCCESSFUL;
 			goto done;
@@ -1760,34 +1686,19 @@ NTSTATUS rpc_printer_migrate_forms_internals(struct net_context *c,
 		for (f = 0; f < num_forms; f++) {
 
 			union spoolss_AddFormInfo info;
-			struct spoolss_AddFormInfo1 info1;
-			fstring form_name;
 			NTSTATUS status;
 
 			/* only migrate FORM_PRINTER types, according to jerry
 			   FORM_BUILTIN-types are hard-coded in samba */
-			if (forms[f].flag != FORM_PRINTER)
+			if (forms[f].info1.flags != SPOOLSS_FORM_PRINTER)
 				continue;
 
-			if (forms[f].name.buffer)
-				rpcstr_pull(form_name, forms[f].name.buffer,
-					sizeof(form_name), -1, STR_TERMINATE);
-
 			if (c->opt_verbose)
 				d_printf("\tmigrating form # %d [%s] of type [%d]\n",
-					f, form_name, forms[f].flag);
+					f, forms[f].info1.form_name,
+					forms[f].info1.flags);
 
-			/* is there a more elegant way to do that ? */
-			info1.flags 		= FORM_PRINTER;
-			info1.size.width	= forms[f].width;
-			info1.size.height	= forms[f].length;
-			info1.area.left		= forms[f].left;
-			info1.area.top		= forms[f].top;
-			info1.area.right	= forms[f].right;
-			info1.area.bottom	= forms[f].bottom;
-			info1.form_name		= form_name;
-
-			info.info1 = &info1;
+			info.info1 = (struct spoolss_AddFormInfo1 *)&forms[f].info1;
 
 			/* FIXME: there might be something wrong with samba's
 			   builtin-forms */
@@ -1798,11 +1709,12 @@ NTSTATUS rpc_printer_migrate_forms_internals(struct net_context *c,
 							&result);
 			if (!W_ERROR_IS_OK(result)) {
 				d_printf("\tAddForm form %d: [%s] refused.\n",
-					f, form_name);
+					f, forms[f].info1.form_name);
 				continue;
 			}
 
-			DEBUGADD(1,("\tAddForm of [%s] succeeded\n", form_name));
+			DEBUGADD(1,("\tAddForm of [%s] succeeded\n",
+				forms[f].info1.form_name));
 		}
 
 
@@ -1862,26 +1774,23 @@ NTSTATUS rpc_printer_migrate_drivers_internals(struct net_context *c,
 	uint32 i, p;
 	uint32 num_printers;
 	uint32 level = 3;
-	char *printername, *sharename;
+	const char *printername, *sharename;
 	bool got_src_driver_share = false;
 	bool got_dst_driver_share = false;
 	struct rpc_pipe_client *pipe_hnd_dst = NULL;
-	POLICY_HND hnd_src, hnd_dst;
+	struct policy_handle hnd_src, hnd_dst;
 	union spoolss_DriverInfo drv_info_src;
-	PRINTER_INFO_CTR info_ctr_enum, info_ctr_dst;
+	union spoolss_PrinterInfo *info_enum;
 	union spoolss_PrinterInfo info_dst;
 	struct cli_state *cli_dst = NULL;
 	struct cli_state *cli_share_src = NULL;
 	struct cli_state *cli_share_dst = NULL;
 	const char *drivername = NULL;
 
-	ZERO_STRUCT(info_ctr_enum);
-	ZERO_STRUCT(info_ctr_dst);
-
 	DEBUG(3,("copying printer-drivers\n"));
 
 	nt_status = connect_dst_pipe(c, &cli_dst, &pipe_hnd_dst,
-				     &syntax_spoolss);
+				     &ndr_table_spoolss.syntax_id);
 	if (!NT_STATUS_IS_OK(nt_status))
 		return nt_status;
 
@@ -1904,7 +1813,7 @@ NTSTATUS rpc_printer_migrate_drivers_internals(struct net_context *c,
 
 
 	/* enum src printers */
-	if (!get_printer_info(pipe_hnd, mem_ctx, 2, argc, argv, &num_printers, &info_ctr_enum)) {
+	if (!get_printer_info(pipe_hnd, mem_ctx, 2, argc, argv, &num_printers, &info_enum)) {
 		nt_status = NT_STATUS_UNSUCCESSFUL;
 		goto done;
 	}
@@ -1918,17 +1827,11 @@ NTSTATUS rpc_printer_migrate_drivers_internals(struct net_context *c,
 
 	/* do something for all printers */
 	for (p = 0; p < num_printers; p++) {
+
 		/* do some initialization */
-		rpcstr_pull_talloc(mem_ctx,
-				&printername,
-				info_ctr_enum.printers_2[p].printername.buffer,
-				-1,
-				STR_TERMINATE);
-		rpcstr_pull_talloc(mem_ctx,
-				&sharename,
-				info_ctr_enum.printers_2[p].sharename.buffer,
-				-1,
-				STR_TERMINATE);
+		printername = info_enum[p].info2.printername;
+		sharename = info_enum[p].info2.sharename;
+
 		if (!printername || !sharename) {
 			nt_status = NT_STATUS_UNSUCCESSFUL;
 			goto done;
@@ -2082,11 +1985,11 @@ NTSTATUS rpc_printer_migrate_printers_internals(struct net_context *c,
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
 	uint32 i = 0, num_printers;
 	uint32 level = 2;
-	PRINTER_INFO_CTR ctr_enum;
 	union spoolss_PrinterInfo info_dst, info_src;
+	union spoolss_PrinterInfo *info_enum;
 	struct cli_state *cli_dst = NULL;
-	POLICY_HND hnd_dst, hnd_src;
-	char *printername, *sharename;
+	struct policy_handle hnd_dst, hnd_src;
+	const char *printername, *sharename;
 	struct rpc_pipe_client *pipe_hnd_dst = NULL;
 	struct spoolss_SetPrinterInfoCtr info_ctr;
 
@@ -2094,12 +1997,12 @@ NTSTATUS rpc_printer_migrate_printers_internals(struct net_context *c,
 
 	/* connect destination PI_SPOOLSS */
 	nt_status = connect_dst_pipe(c, &cli_dst, &pipe_hnd_dst,
-				     &syntax_spoolss);
+				     &ndr_table_spoolss.syntax_id);
 	if (!NT_STATUS_IS_OK(nt_status))
 		return nt_status;
 
 	/* enum printers */
-	if (!get_printer_info(pipe_hnd, mem_ctx, level, argc, argv, &num_printers, &ctr_enum)) {
+	if (!get_printer_info(pipe_hnd, mem_ctx, level, argc, argv, &num_printers, &info_enum)) {
 		nt_status = NT_STATUS_UNSUCCESSFUL;
 		goto done;
 	}
@@ -2112,17 +2015,11 @@ NTSTATUS rpc_printer_migrate_printers_internals(struct net_context *c,
 
 	/* do something for all printers */
 	for (i = 0; i < num_printers; i++) {
+
 		/* do some initialization */
-		rpcstr_pull_talloc(mem_ctx,
-				&printername,
-				ctr_enum.printers_2[i].printername.buffer,
-				-1,
-				STR_TERMINATE);
-		rpcstr_pull_talloc(mem_ctx,
-				&sharename,
-				ctr_enum.printers_2[i].sharename.buffer,
-				-1,
-				STR_TERMINATE);
+		printername = info_enum[i].info2.printername;
+		sharename = info_enum[i].info2.sharename;
+
 		if (!printername || !sharename) {
 			nt_status = NT_STATUS_UNSUCCESSFUL;
 			goto done;
@@ -2243,21 +2140,19 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c,
 	WERROR result;
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
 	uint32 i = 0, p = 0, j = 0;
-	uint32 num_printers, val_needed, data_needed;
+	uint32 num_printers;
 	uint32 level = 2;
-	char *printername, *sharename;
+	const char *printername, *sharename;
 	struct rpc_pipe_client *pipe_hnd_dst = NULL;
-	POLICY_HND hnd_src, hnd_dst;
-	PRINTER_INFO_CTR ctr_enum;
-	union spoolss_PrinterInfo info_dst_publish, info_dst;
-	REGVAL_CTR *reg_ctr;
+	struct policy_handle hnd_src, hnd_dst;
+	union spoolss_PrinterInfo *info_enum;
+	union spoolss_PrinterInfo info_dst_publish;
+	union spoolss_PrinterInfo info_dst;
 	struct cli_state *cli_dst = NULL;
 	char *devicename = NULL, *unc_name = NULL, *url = NULL;
 	const char *longname;
+	const char **keylist = NULL;
 
-	uint16 *keylist = NULL, *curkey;
-
-	ZERO_STRUCT(ctr_enum);
 	/* FIXME GD */
 	ZERO_STRUCT(info_dst_publish);
 
@@ -2265,12 +2160,12 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c,
 
 	/* connect destination PI_SPOOLSS */
 	nt_status = connect_dst_pipe(c, &cli_dst, &pipe_hnd_dst,
-				     &syntax_spoolss);
+				     &ndr_table_spoolss.syntax_id);
 	if (!NT_STATUS_IS_OK(nt_status))
 		return nt_status;
 
 	/* enum src printers */
-	if (!get_printer_info(pipe_hnd, mem_ctx, level, argc, argv, &num_printers, &ctr_enum)) {
+	if (!get_printer_info(pipe_hnd, mem_ctx, level, argc, argv, &num_printers, &info_enum)) {
 		nt_status = NT_STATUS_UNSUCCESSFUL;
 		goto done;
 	}
@@ -2291,17 +2186,17 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c,
 
 	/* do something for all printers */
 	for (i = 0; i < num_printers; i++) {
+
+		uint32_t value_offered = 0, value_needed;
+		uint32_t data_offered = 0, data_needed;
+		enum winreg_Type type;
+		uint8_t *buffer = NULL;
+		const char *value_name = NULL;
+
 		/* do some initialization */
-		rpcstr_pull_talloc(mem_ctx,
-				&printername,
-				ctr_enum.printers_2[i].printername.buffer,
-				-1,
-				STR_TERMINATE);
-		rpcstr_pull_talloc(mem_ctx,
-				&sharename,
-				ctr_enum.printers_2[i].sharename.buffer,
-				-1,
-				STR_TERMINATE);
+		printername = info_enum[i].info2.printername;
+		sharename = info_enum[i].info2.sharename;
+
 		if (!printername || !sharename) {
 			nt_status = NT_STATUS_UNSUCCESSFUL;
 			goto done;
@@ -2329,20 +2224,19 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c,
 				level, &info_dst))
 			goto done;
 
-#if 0 /* FIXME GD */
 
 		/* STEP 1: COPY DEVICE-MODE and other
 			   PRINTER_INFO_2-attributes
 		*/
 
-		info_dst.info2 = &ctr_enum.printers_2[i];
+		info_dst.info2 = info_enum[i].info2;
 
 		/* why is the port always disconnected when the printer
 		   is correctly installed (incl. driver ???) */
 		info_dst.info2.portname = SAMBA_PRINTER_PORT_NAME;
 
 		/* check if printer is published */
-		if (ctr_enum.printers_2[i].attributes & PRINTER_ATTRIBUTE_PUBLISHED) {
+		if (info_enum[i].info2.attributes & PRINTER_ATTRIBUTE_PUBLISHED) {
 
 			/* check for existing dst printer */
 			if (!net_spoolss_getprinter(pipe_hnd_dst, mem_ctx, &hnd_dst, 7, &info_dst_publish))
@@ -2356,13 +2250,10 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c,
 			DEBUG(3,("republished printer\n"));
 		}
 
-		if (ctr_enum.printers_2[i].devmode != NULL) {
+		if (info_enum[i].info2.devmode != NULL) {
 
 			/* copy devmode (info level 2) */
-			info_dst.info2.devmode = (DEVICEMODE *)
-				TALLOC_MEMDUP(mem_ctx,
-					      ctr_enum.printers_2[i].devmode,
-					      sizeof(DEVICEMODE));
+			info_dst.info2.devmode = info_enum[i].info2.devmode;
 
 			/* do not copy security descriptor (we have another
 			 * command for that) */
@@ -2384,7 +2275,7 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c,
 
 			DEBUGADD(1,("\tSetPrinter of DEVICEMODE succeeded\n"));
 		}
-#endif
+
 		/* STEP 2: COPY REGISTRY VALUES */
 
 		/* please keep in mind that samba parse_spools gives horribly
@@ -2394,32 +2285,69 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c,
 		*/
 
 		/* enumerate data on src handle */
-		result = rpccli_spoolss_enumprinterdata(pipe_hnd, mem_ctx, &hnd_src, p, 0, 0,
-			&val_needed, &data_needed, NULL);
+		nt_status = rpccli_spoolss_EnumPrinterData(pipe_hnd, mem_ctx,
+							   &hnd_src,
+							   p,
+							   value_name,
+							   value_offered,
+							   &value_needed,
+							   &type,
+							   buffer,
+							   data_offered,
+							   &data_needed,
+							   &result);
+
+		data_offered	= data_needed;
+		value_offered	= value_needed;
+		buffer		= talloc_zero_array(mem_ctx, uint8_t, data_needed);
+		value_name	= talloc_zero_array(mem_ctx, char, value_needed);
 
 		/* loop for all printerdata of "PrinterDriverData" */
-		while (W_ERROR_IS_OK(result)) {
-
-			REGISTRY_VALUE value;
-
-			result = rpccli_spoolss_enumprinterdata(
-				pipe_hnd, mem_ctx, &hnd_src, p++, val_needed,
-				data_needed, 0, 0, &value);
-
+		while (NT_STATUS_IS_OK(nt_status) && W_ERROR_IS_OK(result)) {
+
+			nt_status = rpccli_spoolss_EnumPrinterData(pipe_hnd, mem_ctx,
+								   &hnd_src,
+								   p++,
+								   value_name,
+								   value_offered,
+								   &value_needed,
+								   &type,
+								   buffer,
+								   data_offered,
+								   &data_needed,
+								   &result);
 			/* loop for all reg_keys */
-			if (W_ERROR_IS_OK(result)) {
+			if (NT_STATUS_IS_OK(nt_status) && W_ERROR_IS_OK(result)) {
+
+				REGISTRY_VALUE v;
+				DATA_BLOB blob;
+				union spoolss_PrinterData printer_data;
 
 				/* display_value */
-				if (c->opt_verbose)
-					display_reg_value(SPOOL_PRINTERDATA_KEY, value);
+				if (c->opt_verbose) {
+					fstrcpy(v.valuename, value_name);
+					v.type = type;
+					v.size = data_offered;
+					v.data_p = buffer;
+					display_reg_value(SPOOL_PRINTERDATA_KEY, v);
+				}
+
+				result = pull_spoolss_PrinterData(mem_ctx,
+								  &blob,
+								  &printer_data,
+								  type);
+				if (!W_ERROR_IS_OK(result)) {
+					goto done;
+				}
 
 				/* set_value */
 				if (!net_spoolss_setprinterdata(pipe_hnd_dst, mem_ctx,
-								&hnd_dst, &value))
+								&hnd_dst, value_name,
+								type, printer_data))
 					goto done;
 
 				DEBUGADD(1,("\tSetPrinterData of [%s] succeeded\n",
-					value.valuename));
+					v.valuename));
 			}
 		}
 
@@ -2443,30 +2371,20 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c,
 		if (keylist == NULL)
 			continue;
 
-		curkey = keylist;
-		while (*curkey != 0) {
-			char *subkey;
-			rpcstr_pull_talloc(mem_ctx,
-					&subkey,
-					curkey,
-					-1,
-					STR_TERMINATE);
-			if (!subkey) {
-				return NT_STATUS_NO_MEMORY;
-			}
-
-			curkey += strlen(subkey) + 1;
+		for (i=0; keylist && keylist[i] != NULL; i++) {
 
-			if ( !(reg_ctr = TALLOC_ZERO_P( mem_ctx, REGVAL_CTR )) )
-				return NT_STATUS_NO_MEMORY;
+			const char *subkey = keylist[i];
+			uint32_t count;
+			struct spoolss_PrinterEnumValues *info;
 
 			/* enumerate all src subkeys */
 			if (!net_spoolss_enumprinterdataex(pipe_hnd, mem_ctx, 0,
 							   &hnd_src, subkey,
-							   reg_ctr))
+							   &count, &info)) {
 				goto done;
+			}
 
-			for (j=0; j < reg_ctr->num_values; j++) {
+			for (j=0; j < count; j++) {
 
 				REGISTRY_VALUE value;
 				UNISTR2 data;
@@ -2474,20 +2392,20 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c,
 				/* although samba replies with sane data in most cases we
 				   should try to avoid writing wrong registry data */
 
-				if (strequal(reg_ctr->values[j]->valuename, SPOOL_REG_PORTNAME) ||
-				    strequal(reg_ctr->values[j]->valuename, SPOOL_REG_UNCNAME) ||
-				    strequal(reg_ctr->values[j]->valuename, SPOOL_REG_URL) ||
-				    strequal(reg_ctr->values[j]->valuename, SPOOL_REG_SHORTSERVERNAME) ||
-				    strequal(reg_ctr->values[j]->valuename, SPOOL_REG_SERVERNAME)) {
+				if (strequal(info[j].value_name, SPOOL_REG_PORTNAME) ||
+				    strequal(info[j].value_name, SPOOL_REG_UNCNAME) ||
+				    strequal(info[j].value_name, SPOOL_REG_URL) ||
+				    strequal(info[j].value_name, SPOOL_REG_SHORTSERVERNAME) ||
+				    strequal(info[j].value_name, SPOOL_REG_SERVERNAME)) {
 
-					if (strequal(reg_ctr->values[j]->valuename, SPOOL_REG_PORTNAME)) {
+					if (strequal(info[j].value_name, SPOOL_REG_PORTNAME)) {
 
 						/* although windows uses a multi-sz, we use a sz */
 						init_unistr2(&data, SAMBA_PRINTER_PORT_NAME, UNI_STR_TERMINATE);
 						fstrcpy(value.valuename, SPOOL_REG_PORTNAME);
 					}
 
-					if (strequal(reg_ctr->values[j]->valuename, SPOOL_REG_UNCNAME)) {
+					if (strequal(info[j].value_name, SPOOL_REG_UNCNAME)) {
 
 						if (asprintf(&unc_name, "\\\\%s\\%s", longname, sharename) < 0) {
 							nt_status = NT_STATUS_NO_MEMORY;
@@ -2497,7 +2415,7 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c,
 						fstrcpy(value.valuename, SPOOL_REG_UNCNAME);
 					}
 
-					if (strequal(reg_ctr->values[j]->valuename, SPOOL_REG_URL)) {
+					if (strequal(info[j].value_name, SPOOL_REG_URL)) {
 
 						continue;
 
@@ -2512,13 +2430,13 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c,
 #endif
 					}
 
-					if (strequal(reg_ctr->values[j]->valuename, SPOOL_REG_SERVERNAME)) {
+					if (strequal(info[j].value_name, SPOOL_REG_SERVERNAME)) {
 
 						init_unistr2(&data, longname, UNI_STR_TERMINATE);
 						fstrcpy(value.valuename, SPOOL_REG_SERVERNAME);
 					}
 
-					if (strequal(reg_ctr->values[j]->valuename, SPOOL_REG_SHORTSERVERNAME)) {
+					if (strequal(info[j].value_name, SPOOL_REG_SHORTSERVERNAME)) {
 
 						init_unistr2(&data, global_myname(), UNI_STR_TERMINATE);
 						fstrcpy(value.valuename, SPOOL_REG_SHORTSERVERNAME);
@@ -2542,25 +2460,40 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c,
 
 				} else {
 
-					if (c->opt_verbose)
-						display_reg_value(subkey, *(reg_ctr->values[j]));
+					REGISTRY_VALUE v;
+					DATA_BLOB blob;
+
+					result = push_spoolss_PrinterData(mem_ctx, &blob,
+									  info[j].type,
+									  info[j].data);
+					if (!W_ERROR_IS_OK(result)) {
+						goto done;
+					}
+
+					fstrcpy(v.valuename, info[j].value_name);
+					v.type = info[j].type;
+					v.data_p = blob.data;
+					v.size = blob.length;
+
+					if (c->opt_verbose) {
+						display_reg_value(subkey, v);
+					}
 
 					/* here we have to set all subkeys on the dst server */
 					if (!net_spoolss_setprinterdataex(pipe_hnd_dst, mem_ctx, &hnd_dst,
-							subkey, reg_ctr->values[j]))
+							subkey, &v)) {
 						goto done;
+					}
 
 				}
 
 				DEBUGADD(1,("\tSetPrinterDataEx of key [%s\\%s] succeeded\n",
-						subkey, reg_ctr->values[j]->valuename));
+						subkey, info[j].value_name));
 
 			}
-
-			TALLOC_FREE( reg_ctr );
 		}
 
-		SAFE_FREE(keylist);
+		TALLOC_FREE(keylist);
 
 		/* close printer handles here */
 		if (is_valid_policy_hnd(&hnd_src)) {
diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index 00c827928e..60274728f3 100644
--- a/source3/utils/net_rpc_registry.c
+++ b/source3/utils/net_rpc_registry.c
@@ -767,7 +767,7 @@ static NTSTATUS rpc_registry_enumerate_internal(struct net_context *c,
 						int argc,
 						const char **argv )
 {
-	POLICY_HND pol_hive, pol_key;
+	struct policy_handle pol_hive, pol_key;
 	NTSTATUS status;
 	uint32 num_subkeys = 0;
 	uint32 num_values = 0;
@@ -843,7 +843,7 @@ static NTSTATUS rpc_registry_save_internal(struct net_context *c,
 					const char **argv )
 {
 	WERROR result = WERR_GENERAL_FAILURE;
-	POLICY_HND pol_hive, pol_key;
+	struct policy_handle pol_hive, pol_key;
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 	struct winreg_String filename;
 
@@ -1139,7 +1139,7 @@ static NTSTATUS rpc_registry_getsd_internal(struct net_context *c,
 					    int argc,
 					    const char **argv)
 {
-	POLICY_HND pol_hive, pol_key;
+	struct policy_handle pol_hive, pol_key;
 	NTSTATUS status;
 	enum ndr_err_code ndr_err;
 	struct KeySecurityData *sd = NULL;
diff --git a/source3/utils/net_rpc_rights.c b/source3/utils/net_rpc_rights.c
index ddcfff3685..10166b6d2b 100644
--- a/source3/utils/net_rpc_rights.c
+++ b/source3/utils/net_rpc_rights.c
@@ -28,7 +28,7 @@ static NTSTATUS sid_to_name(struct rpc_pipe_client *pipe_hnd,
 				DOM_SID *sid,
 				fstring name)
 {
-	POLICY_HND pol;
+	struct policy_handle pol;
 	enum lsa_SidType *sid_types = NULL;
 	NTSTATUS result;
 	char **domains = NULL, **names = NULL;
@@ -59,7 +59,7 @@ static NTSTATUS name_to_sid(struct rpc_pipe_client *pipe_hnd,
 			    TALLOC_CTX *mem_ctx,
 			    DOM_SID *sid, const char *name)
 {
-	POLICY_HND pol;
+	struct policy_handle pol;
 	enum lsa_SidType *sid_types;
 	NTSTATUS result;
 	DOM_SID *sids;
@@ -90,7 +90,7 @@ static NTSTATUS name_to_sid(struct rpc_pipe_client *pipe_hnd,
 
 static NTSTATUS enum_privileges(struct rpc_pipe_client *pipe_hnd,
 				TALLOC_CTX *ctx,
-				POLICY_HND *pol )
+				struct policy_handle *pol )
 {
 	NTSTATUS result;
 	uint32 enum_context = 0;
@@ -148,7 +148,7 @@ static NTSTATUS enum_privileges(struct rpc_pipe_client *pipe_hnd,
 
 static NTSTATUS check_privilege_for_user(struct rpc_pipe_client *pipe_hnd,
 					TALLOC_CTX *ctx,
-					POLICY_HND *pol,
+					struct policy_handle *pol,
 					DOM_SID *sid,
 					const char *right)
 {
@@ -183,7 +183,7 @@ static NTSTATUS check_privilege_for_user(struct rpc_pipe_client *pipe_hnd,
 
 static NTSTATUS enum_privileges_for_user(struct rpc_pipe_client *pipe_hnd,
 					TALLOC_CTX *ctx,
-					POLICY_HND *pol,
+					struct policy_handle *pol,
 					DOM_SID *sid )
 {
 	NTSTATUS result;
@@ -214,7 +214,7 @@ static NTSTATUS enum_privileges_for_user(struct rpc_pipe_client *pipe_hnd,
 
 static NTSTATUS enum_accounts_for_privilege(struct rpc_pipe_client *pipe_hnd,
 						TALLOC_CTX *ctx,
-						POLICY_HND *pol,
+						struct policy_handle *pol,
 						const char *privilege)
 {
 	NTSTATUS result;
@@ -265,7 +265,7 @@ static NTSTATUS enum_accounts_for_privilege(struct rpc_pipe_client *pipe_hnd,
 
 static NTSTATUS enum_privileges_for_accounts(struct rpc_pipe_client *pipe_hnd,
 						TALLOC_CTX *ctx,
-						POLICY_HND *pol)
+						struct policy_handle *pol)
 {
 	NTSTATUS result;
 	uint32 enum_context=0;
@@ -317,7 +317,7 @@ static NTSTATUS rpc_rights_list_internal(struct net_context *c,
 					int argc,
 					const char **argv )
 {
-	POLICY_HND pol;
+	struct policy_handle pol;
 	NTSTATUS result;
 	DOM_SID sid;
 	fstring privname;
@@ -436,7 +436,7 @@ static NTSTATUS rpc_rights_grant_internal(struct net_context *c,
 					int argc,
 					const char **argv )
 {
-	POLICY_HND dom_pol;
+	struct policy_handle dom_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	struct lsa_RightSet rights;
 	int i;
@@ -506,7 +506,7 @@ static NTSTATUS rpc_rights_revoke_internal(struct net_context *c,
 					int argc,
 					const char **argv )
 {
-	POLICY_HND dom_pol;
+	struct policy_handle dom_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	struct lsa_RightSet rights;
 	DOM_SID sid;
diff --git a/source3/utils/net_rpc_service.c b/source3/utils/net_rpc_service.c
index 236414222c..bcb1a00dab 100644
--- a/source3/utils/net_rpc_service.c
+++ b/source3/utils/net_rpc_service.c
@@ -61,11 +61,11 @@ const char *svc_status_string( uint32 state )
 
 static WERROR query_service_state(struct rpc_pipe_client *pipe_hnd,
 				TALLOC_CTX *mem_ctx,
-				POLICY_HND *hSCM,
+				struct policy_handle *hSCM,
 				const char *service,
 				uint32 *state )
 {
-	POLICY_HND hService;
+	struct policy_handle hService;
 	struct SERVICE_STATUS service_status;
 	WERROR result = WERR_GENERAL_FAILURE;
 	NTSTATUS status;
@@ -102,7 +102,7 @@ static WERROR query_service_state(struct rpc_pipe_client *pipe_hnd,
 
 static WERROR watch_service_state(struct rpc_pipe_client *pipe_hnd,
 				TALLOC_CTX *mem_ctx,
-				POLICY_HND *hSCM,
+				struct policy_handle *hSCM,
 				const char *service,
 				uint32 watch_state,
 				uint32 *final_state )
@@ -137,12 +137,12 @@ static WERROR watch_service_state(struct rpc_pipe_client *pipe_hnd,
 
 static WERROR control_service(struct rpc_pipe_client *pipe_hnd,
 				TALLOC_CTX *mem_ctx,
-				POLICY_HND *hSCM,
+				struct policy_handle *hSCM,
 				const char *service,
 				uint32 control,
 				uint32 watch_state )
 {
-	POLICY_HND hService;
+	struct policy_handle hService;
 	WERROR result = WERR_GENERAL_FAILURE;
 	NTSTATUS status;
 	struct SERVICE_STATUS service_status;
@@ -199,7 +199,7 @@ static NTSTATUS rpc_service_list_internal(struct net_context *c,
 					int argc,
 					const char **argv )
 {
-	POLICY_HND hSCM;
+	struct policy_handle hSCM;
 	struct ENUM_SERVICE_STATUSW *services = NULL;
 	WERROR result = WERR_GENERAL_FAILURE;
 	NTSTATUS status;
@@ -309,7 +309,7 @@ static NTSTATUS rpc_service_status_internal(struct net_context *c,
 						int argc,
 						const char **argv )
 {
-	POLICY_HND hSCM, hService;
+	struct policy_handle hSCM, hService;
 	WERROR result = WERR_GENERAL_FAILURE;
 	NTSTATUS status;
 	struct SERVICE_STATUS service_status;
@@ -433,7 +433,7 @@ static NTSTATUS rpc_service_stop_internal(struct net_context *c,
 					int argc,
 					const char **argv )
 {
-	POLICY_HND hSCM;
+	struct policy_handle hSCM;
 	WERROR result = WERR_GENERAL_FAILURE;
 	NTSTATUS status;
 	fstring servicename;
@@ -477,7 +477,7 @@ static NTSTATUS rpc_service_pause_internal(struct net_context *c,
 					int argc,
 					const char **argv )
 {
-	POLICY_HND hSCM;
+	struct policy_handle hSCM;
 	WERROR result = WERR_GENERAL_FAILURE;
 	NTSTATUS status;
 	fstring servicename;
@@ -521,7 +521,7 @@ static NTSTATUS rpc_service_resume_internal(struct net_context *c,
 					int argc,
 					const char **argv )
 {
-	POLICY_HND hSCM;
+	struct policy_handle hSCM;
 	WERROR result = WERR_GENERAL_FAILURE;
 	NTSTATUS status;
 	fstring servicename;
@@ -565,7 +565,7 @@ static NTSTATUS rpc_service_start_internal(struct net_context *c,
 					int argc,
 					const char **argv )
 {
-	POLICY_HND hSCM, hService;
+	struct policy_handle hSCM, hService;
 	WERROR result = WERR_GENERAL_FAILURE;
 	NTSTATUS status;
 	uint32 state = 0;
diff --git a/source3/utils/net_rpc_sh_acct.c b/source3/utils/net_rpc_sh_acct.c
index 977e1e2a0a..af0b426bbc 100644
--- a/source3/utils/net_rpc_sh_acct.c
+++ b/source3/utils/net_rpc_sh_acct.c
@@ -38,7 +38,7 @@ static NTSTATUS rpc_sh_acct_do(struct net_context *c,
 					  struct samr_DomInfo12 *i12,
 					  int argc, const char **argv))
 {
-	POLICY_HND connect_pol, domain_pol;
+	struct policy_handle connect_pol, domain_pol;
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	union samr_DomainInfo *info1 = NULL;
 	union samr_DomainInfo *info3 = NULL;
diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index e8ebb60205..eea22c0dc2 100644
--- a/source3/utils/net_sam.c
+++ b/source3/utils/net_sam.c
@@ -1269,28 +1269,31 @@ static int net_sam_do_list(struct net_context *c, int argc, const char **argv,
 		}
 	}
 
-	pdb_search_destroy(search);
+	TALLOC_FREE(search);
 	return 0;
 }
 
 static int net_sam_list_users(struct net_context *c, int argc,
 			      const char **argv)
 {
-	return net_sam_do_list(c, argc, argv, pdb_search_users(ACB_NORMAL),
+	return net_sam_do_list(c, argc, argv,
+			       pdb_search_users(talloc_tos(), ACB_NORMAL),
 			       "users");
 }
 
 static int net_sam_list_groups(struct net_context *c, int argc,
 			       const char **argv)
 {
-	return net_sam_do_list(c, argc, argv, pdb_search_groups(), "groups");
+	return net_sam_do_list(c, argc, argv, pdb_search_groups(talloc_tos()),
+			       "groups");
 }
 
 static int net_sam_list_localgroups(struct net_context *c, int argc,
 				    const char **argv)
 {
 	return net_sam_do_list(c, argc, argv,
-			       pdb_search_aliases(get_global_sam_sid()),
+			       pdb_search_aliases(talloc_tos(),
+						  get_global_sam_sid()),
 			       "localgroups");
 }
 
@@ -1298,7 +1301,8 @@ static int net_sam_list_builtin(struct net_context *c, int argc,
 				const char **argv)
 {
 	return net_sam_do_list(c, argc, argv,
-			       pdb_search_aliases(&global_sid_Builtin),
+			       pdb_search_aliases(talloc_tos(),
+						  &global_sid_Builtin),
 			       "builtin");
 }
 
@@ -1306,7 +1310,7 @@ static int net_sam_list_workstations(struct net_context *c, int argc,
 				     const char **argv)
 {
 	return net_sam_do_list(c, argc, argv,
-			       pdb_search_users(ACB_WSTRUST),
+			       pdb_search_users(talloc_tos(), ACB_WSTRUST),
 			       "workstations");
 }
 
diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c
index 7fbfdbab44..c6b6ee9e80 100644
--- a/source3/utils/net_util.c
+++ b/source3/utils/net_util.c
@@ -29,7 +29,7 @@ NTSTATUS net_rpc_lookup_name(struct net_context *c,
 			     enum lsa_SidType *ret_type)
 {
 	struct rpc_pipe_client *lsa_pipe;
-	POLICY_HND pol;
+	struct policy_handle pol;
 	NTSTATUS result = NT_STATUS_OK;
 	const char **dom_names;
 	DOM_SID *sids;
diff --git a/source3/utils/netlookup.c b/source3/utils/netlookup.c
index 14f2dddebc..dd0efa4142 100644
--- a/source3/utils/netlookup.c
+++ b/source3/utils/netlookup.c
@@ -31,7 +31,7 @@ struct con_struct {
 	NTSTATUS err;
 	struct cli_state *cli;
 	struct rpc_pipe_client *lsapipe;
-	POLICY_HND pol;
+	struct policy_handle pol;
 };
 
 static struct con_struct *cs;
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index 50cbc43d6d..a5bc0c9bd4 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -67,7 +67,7 @@ static int export_database (struct pdb_methods *in,
 
 	DEBUG(3, ("export_database: username=\"%s\"\n", username ? username : "(NULL)"));
 
-	u_search = pdb_search_init(PDB_USER_SEARCH);
+	u_search = pdb_search_init(talloc_tos(), PDB_USER_SEARCH);
 	if (u_search == NULL) {
 		DEBUG(0, ("pdb_search_init failed\n"));
 		return 1;
@@ -75,7 +75,7 @@ static int export_database (struct pdb_methods *in,
 
 	if (!in->search_users(in, u_search, 0)) {
 		DEBUG(0, ("Could not start searching users\n"));
-		pdb_search_destroy(u_search);
+		TALLOC_FREE(u_search);
 		return 1;
 	}
 
@@ -116,7 +116,7 @@ static int export_database (struct pdb_methods *in,
 			fprintf(stderr, "export_database: Memory allocation "
 				"failure!\n");
 			TALLOC_FREE( user );
-			pdb_search_destroy(u_search);
+			TALLOC_FREE(u_search);
 			return 1;
 		}
 
@@ -139,7 +139,7 @@ static int export_database (struct pdb_methods *in,
 		TALLOC_FREE( user );
 	}
 
-	pdb_search_destroy(u_search);
+	TALLOC_FREE(u_search);
 
 	return 0;
 }
@@ -352,7 +352,7 @@ static int print_users_list (struct pdb_methods *in, bool verbosity, bool smbpwd
 	struct pdb_search *u_search;
 	struct samr_displayentry userentry;
 
-	u_search = pdb_search_init(PDB_USER_SEARCH);
+	u_search = pdb_search_init(talloc_tos(), PDB_USER_SEARCH);
 	if (u_search == NULL) {
 		DEBUG(0, ("pdb_search_init failed\n"));
 		return 1;
@@ -360,7 +360,7 @@ static int print_users_list (struct pdb_methods *in, bool verbosity, bool smbpwd
 
 	if (!in->search_users(in, u_search, 0)) {
 		DEBUG(0, ("Could not start searching users\n"));
-		pdb_search_destroy(u_search);
+		TALLOC_FREE(u_search);
 		return 1;
 	}
 
@@ -391,7 +391,7 @@ static int print_users_list (struct pdb_methods *in, bool verbosity, bool smbpwd
 		print_sam_info (sam_pwent, verbosity, smbpwdstyle);
 		TALLOC_FREE(sam_pwent);
 	}
-	pdb_search_destroy(u_search);
+	TALLOC_FREE(u_search);
 
 	return 0;
 }
@@ -404,7 +404,7 @@ static int fix_users_list (struct pdb_methods *in)
 	struct pdb_search *u_search;
 	struct samr_displayentry userentry;
 
-	u_search = pdb_search_init(PDB_USER_SEARCH);
+	u_search = pdb_search_init(talloc_tos(), PDB_USER_SEARCH);
 	if (u_search == NULL) {
 		DEBUG(0, ("pdb_search_init failed\n"));
 		return 1;
@@ -412,7 +412,7 @@ static int fix_users_list (struct pdb_methods *in)
 
 	if (!in->search_users(in, u_search, 0)) {
 		DEBUG(0, ("Could not start searching users\n"));
-		pdb_search_destroy(u_search);
+		TALLOC_FREE(u_search);
 		return 1;
 	}
 
@@ -444,7 +444,7 @@ static int fix_users_list (struct pdb_methods *in)
 		}
 		TALLOC_FREE(sam_pwent);
 	}
-	pdb_search_destroy(u_search);
+	TALLOC_FREE(u_search);
 	return 0;
 }
 
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index c12778f8c7..85b7baad00 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -973,12 +973,7 @@ static struct cli_state *connect_one(struct user_auth_info *auth_info,
 		return NULL;
 	}
 
-	if (!get_cmdline_auth_info_got_pass(auth_info)) {
-		char *pass = getpass("Password: ");
-		if (pass) {
-			set_cmdline_auth_info_password(auth_info, pass);
-		}
-	}
+	set_cmdline_auth_info_getpass(auth_info);
 
 	nt_status = cli_full_connection(&c, global_myname(), server, 
 				&ss, 0,
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 6ea200bfec..fc7d0aa360 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -669,11 +669,11 @@ static bool do_printnotify(struct messaging_context *msg_ctx,
 		}
 
 		if (strcmp(argv[3], "comment") == 0) {
-			attribute = PRINTER_NOTIFY_COMMENT;
+			attribute = PRINTER_NOTIFY_FIELD_COMMENT;
 		} else if (strcmp(argv[3], "port") == 0) {
-			attribute = PRINTER_NOTIFY_PORT_NAME;
+			attribute = PRINTER_NOTIFY_FIELD_PORT_NAME;
 		} else if (strcmp(argv[3], "driver") == 0) {
-			attribute = PRINTER_NOTIFY_DRIVER_NAME;
+			attribute = PRINTER_NOTIFY_FIELD_DRIVER_NAME;
 		} else {
 			fprintf(stderr, "Invalid printer command '%s'\n",
 				argv[3]);
diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index a95394b125..78260acf76 100644
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -35,7 +35,7 @@ enum exit_values {EXIT_OK, EXIT_FAILED, EXIT_PARSE_ERROR};
 
 static struct cli_state *cli_ipc;
 static struct rpc_pipe_client *global_pipe_hnd;
-static POLICY_HND pol;
+static struct policy_handle pol;
 static bool got_policy_hnd;
 static struct user_auth_info *smbcquotas_auth_info;
 
@@ -385,12 +385,7 @@ static struct cli_state *connect_one(const char *share)
 
 	}
 
-	if (!get_cmdline_auth_info_got_pass(smbcquotas_auth_info)) {
-		char *pass = getpass("Password: ");
-		if (pass) {
-			set_cmdline_auth_info_password(smbcquotas_auth_info, pass);
-		}
-	}
+	set_cmdline_auth_info_getpass(smbcquotas_auth_info);
 
 	nt_status = cli_full_connection(&c, global_myname(), server, 
 					    &ss, 0,
diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c
index 6c69300e85..02001f0abb 100644
--- a/source3/utils/smbtree.c
+++ b/source3/utils/smbtree.c
@@ -315,12 +315,7 @@ static bool print_tree(struct user_auth_info *user_info)
 		return 1;
 	}
 
-	if (!get_cmdline_auth_info_got_pass(auth_info)) {
-		char *pass = getpass("Password: ");
-		if (pass) {
-			set_cmdline_auth_info_password(auth_info, pass);
-		}
-	}
+	set_cmdline_auth_info_getpass(auth_info);
 
 	/* Now do our stuff */