4 files changed, 19 insertions, 0 deletions
diff --git a/source3/printing/queue_process.c b/source3/printing/queue_process.c
index 1ca186e29f..bc6c33f9a8 100644
--- a/source3/printing/queue_process.c
+++ b/source3/printing/queue_process.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "smbd/globals.h"
 #include "include/messages.h"
+#include "lib/util/util_process.h"
 #include "printing.h"
 #include "printing/pcap.h"
 #include "printing/queue_process.h"
@@ -286,6 +287,8 @@ pid_t start_background_queue(struct tevent_context *ev,
 			smb_panic("reinit_after_fork() failed");
 		}
 
+		prctl_set_comment("lpqd");
+
 		bq_reopen_logs(logfile);
 		bq_setup_sig_term_handler();
 		bq_setup_sig_hup_handler(ev, msg_ctx);
diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c
index db303a1b0b..464d12bf99 100644
--- a/source3/printing/spoolssd.c
+++ b/source3/printing/spoolssd.c
@@ -20,6 +20,8 @@
 #include "serverid.h"
 #include "smbd/smbd.h"
 
+#include "lib/util/util_process.h"
+
 #include "messages.h"
 #include "include/printing.h"
 #include "printing/nt_printing_migrate_internal.h"
@@ -293,6 +295,8 @@ static bool spoolss_child_init(struct tevent_context *ev_ctx,
 		smb_panic("reinit_after_fork() failed");
 	}
 
+	prctl_set_comment("spoolssd-child");
+
 	spoolss_child_id = child_id;
 	spoolss_reopen_logs(child_id);
 
@@ -670,6 +674,8 @@ pid_t start_spoolssd(struct tevent_context *ev_ctx,
 		smb_panic("reinit_after_fork() failed");
 	}
 
+	prctl_set_comment("spoolssd-master");
+
 	/* save the parent process id so the children can use it later */
 	parent_id = messaging_server_id(msg_ctx);
 
diff --git a/source3/rpc_server/epmd.c b/source3/rpc_server/epmd.c
index 0e7b430213..8d77c4afca 100644
--- a/source3/rpc_server/epmd.c
+++ b/source3/rpc_server/epmd.c
@@ -25,6 +25,8 @@
 #include "ntdomain.h"
 #include "messages.h"
 
+#include "lib/util/util_process.h"
+
 #include "librpc/rpc/dcerpc_ep.h"
 #include "../librpc/gen_ndr/srv_epmapper.h"
 #include "rpc_server/rpc_server.h"
@@ -168,6 +170,8 @@ void start_epmd(struct tevent_context *ev_ctx,
 		smb_panic("reinit_after_fork() failed");
 	}
 
+	prctl_set_comment("epmd");
+
 	epmd_reopen_logs();
 
 	epmd_setup_sig_term_handler(ev_ctx);
diff --git a/source3/rpc_server/lsasd.c b/source3/rpc_server/lsasd.c
index 72ad785cd5..9815ad9c1a 100644
--- a/source3/rpc_server/lsasd.c
+++ b/source3/rpc_server/lsasd.c
@@ -24,6 +24,8 @@
 #include "messages.h"
 #include "ntdomain.h"
 
+#include "lib/util/util_process.h"
+
 #include "lib/id_cache.h"
 
 #include "../lib/tsocket/tsocket.h"
@@ -253,6 +255,8 @@ static bool lsasd_child_init(struct tevent_context *ev_ctx,
 		smb_panic("reinit_after_fork() failed");
 	}
 
+	prctl_set_comment("lsasd-child");
+
 	lsasd_child_id = child_id;
 	lsasd_reopen_logs(child_id);
 
@@ -894,6 +898,8 @@ void start_lsasd(struct tevent_context *ev_ctx,
 		smb_panic("reinit_after_fork() failed");
 	}
 
+	prctl_set_comment("lsasd-master");
+
 	/* save the parent process id so the children can use it later */
 	parent_id = messaging_server_id(msg_ctx);