Merge branch 'master' of ssh://git.samba.org/data/git/samba into libcli-auth-merge-without-netlogond

2 files changed, 7 insertions, 12 deletions

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index effbb92266..d114152f64 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -4128,25 +4128,21 @@ static WERROR construct_printer_info1(TALLOC_CTX *mem_ctx,
 				      struct spoolss_PrinterInfo1 *r,
 				      int snum)
 {
-	char *chaine = NULL;
 	r->flags		= flags;
 
+	r->description		= talloc_asprintf(mem_ctx, "%s,%s,%s",
+						  ntprinter->info_2->printername,
+						  ntprinter->info_2->drivername,
+						  ntprinter->info_2->location);
+	W_ERROR_HAVE_NO_MEMORY(r->description);
+
 	if (*ntprinter->info_2->comment == '\0') {
 		r->comment	= talloc_strdup(mem_ctx, lp_comment(snum));
-		chaine = talloc_asprintf(mem_ctx,
-				"%s,%s,%s", ntprinter->info_2->printername,
-				ntprinter->info_2->drivername, lp_comment(snum));
 	} else {
 		r->comment	= talloc_strdup(mem_ctx, ntprinter->info_2->comment); /* saved comment */
-		chaine = talloc_asprintf(mem_ctx,
-				"%s,%s,%s", ntprinter->info_2->printername,
-				ntprinter->info_2->drivername, ntprinter->info_2->comment);
 	}
-	W_ERROR_HAVE_NO_MEMORY(chaine);
 	W_ERROR_HAVE_NO_MEMORY(r->comment);
 
-	r->description		= talloc_strdup(mem_ctx, chaine);
-	W_ERROR_HAVE_NO_MEMORY(r->description);
 	r->name			= talloc_strdup(mem_ctx, ntprinter->info_2->printername);
 	W_ERROR_HAVE_NO_MEMORY(r->name);
 
diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c
index 0b0ef83bee..d73f73f9ec 100644
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/source3/rpc_server/srv_svcctl_nt.c
@@ -464,9 +464,8 @@ WERROR _svcctl_EnumServicesStatusW(pipes_struct *p,
 		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 			return ntstatus_to_werror(ndr_map_error2ntstatus(ndr_err));
 		}
-
 		blob = ndr_push_blob(ndr);
-		memcpy(r->out.service, blob.data, r->in.offered);
+		memcpy(r->out.service, blob.data, MIN(blob.length, r->in.offered));
 	}
 
 	*r->out.needed			= (buffer_size > r->in.offered) ? buffer_size : r->in.offered;