From fd57ce267c4083fe98242caa31075d2bd62903bf Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sat, 16 Apr 2022 17:34:30 +0200
Subject: services: dicod: Use 'make-inetd-constructor'.

* gnu/services/dict.scm (dicod-shepherd-service): Use
'make-inetd-constructor' in the 'start' method when available.
---
 gnu/services/dict.scm | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/gnu/services/dict.scm b/gnu/services/dict.scm
index 62b21f8d53..109917c05c 100644
--- a/gnu/services/dict.scm
+++ b/gnu/services/dict.scm
@@ -146,6 +146,7 @@ database {
 
 (define (dicod-shepherd-service config)
   (let* ((dicod.conf (dicod-configuration-file config))
+         (interfaces (dicod-configuration-interfaces config))
          (dicod      (least-authority-wrapper
                       (file-append (dicod-configuration-dico config)
                                    "/bin/dicod")
@@ -165,10 +166,19 @@ database {
            (provision '(dicod))
            (requirement '(user-processes))
            (documentation "Run the dicod daemon.")
-           (start #~(make-forkexec-constructor
-                     (list #$dicod "--foreground"
-                           (string-append "--config=" #$dicod.conf))
-                     #:user "dicod" #:group "dicod"))
+           (start #~(if (and (defined? 'make-inetd-constructor)
+                             #$(= 1 (length interfaces))) ;XXX
+                        (make-inetd-constructor
+                         (list #$dicod "--inetd" "--foreground"
+                               (string-append "--config=" #$dicod.conf))
+                         (addrinfo:addr
+                          (car (getaddrinfo #$(first interfaces) "dict")))
+                         #:user "dicod" #:group "dicod"
+                         #:service-name-stem "dicod")
+                        (make-forkexec-constructor
+                         (list #$dicod "--foreground"
+                               (string-append "--config=" #$dicod.conf))
+                         #:user "dicod" #:group "dicod")))
            (stop #~(make-kill-destructor))))))
 
 (define dicod-service-type
-- 
cgit v1.2.3

99'>root</a>/<a href='/guix/log/gnu?id=298d878d20a92d1c0b3e908adda70a9f2daf8199'>gnu</a>/<a href='/guix/log/gnu/system?id=298d878d20a92d1c0b3e908adda70a9f2daf8199'>system</a>/<a href='/guix/log/gnu/system/pam.scm?id=298d878d20a92d1c0b3e908adda70a9f2daf8199'>pam.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/system/pam.scm?id=298d878d20a92d1c0b3e908adda70a9f2daf8199&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-09-22 00:05:08 +0200'>2017-09-22</span></td><td><a href='/guix/commit/gnu/system/pam.scm?id=fbc31dc1247d3a494246e69f3cf28476af9eb9d6'>services: Move 'session-environment-service-type' to pam.scm.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/base.scm (environment-variables-&gt;environment-file)
(session-environment-service-type)
(session-environment-service): Move to...
* gnu/system/pam.scm: ... here.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-05-08 23:11:01 +0200'>2017-05-08</span></td><td><a href='/guix/commit/gnu/system/pam.scm?id=e586257b550918fefaab3970f2c314d6285f54ab'>system: Allow root to run "su" without password.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/system/pam.scm (unix-pam-service): Add pam-entry for "pam_rootok.so" to
auth field when ALLOW-ROOT? is #T.
(base-pam-services): Allow root to run "su" without authentication.
</span></span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2016-11-06 19:56:43 +0100'>2016-11-06</span></td><td><a href='/guix/commit/gnu/system/pam.scm?id=290ad2243c0ce2919918f64fec5652b5a60466a8'>gnu: Remove comment which is factually incorrect.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/system/pam.scm: Remove incorrect comment.
</span></span></td><td>John Darrington</td></tr>
<tr><td><span title='2016-07-19 23:50:03 +0200'>2016-07-19</span></td><td><a href='/guix/commit/gnu/system/pam.scm?id=909147e43f8c9f8c9b9d33597d5dd83facca699c'>services: Add pam-limits-service.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/system/pam.scm (&lt;pam-limits-entry&gt;): New record type.
(pam-limits-entry, pam-limits-entry-&gt;string): New procedures.
* gnu/services/base.scm (pam-limits-service-type): New variable.
(pam-limits-service): New procedure.
* doc/guix.texi (Base Services): Document it.
</span></span></td><td>Ricardo Wurmus</td></tr>