CVS commit: pkgsrc/net/samba4/files/smf

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Dec  2 10:54:15 UTC 2020

Modified Files:
        pkgsrc/net/samba4/files/smf: manifest.xml

Log Message:
samba4: Add winbind SMF instance and tidy.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/samba4/files/smf/manifest.xml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/samba4/files/smf/manifest.xml
diff -u pkgsrc/net/samba4/files/smf/manifest.xml:1.4 pkgsrc/net/samba4/files/smf/manifest.xml:1.5
--- pkgsrc/net/samba4/files/smf/manifest.xml:1.4        Wed Jun  8 10:16:55 2016
+++ pkgsrc/net/samba4/files/smf/manifest.xml    Wed Dec  2 10:54:15 2020
@@ -1,41 +1,51 @@
-<?xml version="1.0"?>
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<?xml version='1.0'?>
+<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
 <service_bundle type='manifest' name='export'>
-<service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='1'>
-       <dependency name='fs-root' grouping='require_all' restart_on='none' type='service'>
-               <service_fmri value='svc:/system/filesystem/root' />
-       </dependency>
-       <dependency name='network-service' grouping='require_all' restart_on='none' type='service'>
-               <service_fmri value='svc:/network/service'/>
-       </dependency>
-
-       <instance name='smbd' enabled='false'>
-               <exec_method name='start'   type='method' exec='@PREFIX@/sbin/smbd -D' timeout_seconds='0'/>
-               <exec_method name='stop'    type='method' exec=':kill'      timeout_seconds='30'/>
-               <exec_method name='refresh' type='method' exec=':kill -HUP' timeout_seconds='0'/>
-               <template>
-                       <common_name>
-                               <loctext xml:lang='C'>Samba SMB/CIFS services</loctext>
-                       </common_name>
-                       <documentation>
-                               <manpage title='smbd' section='8' manpath='@PREFIX@/@PKGMANDIR@'/>
-                       </documentation>
-               </template>
-       </instance>
-
-       <instance name='nmbd' enabled='false'>
-               <exec_method name='start'   type='method' exec='@PREFIX@/sbin/nmbd -D' timeout_seconds='0'/>
-               <exec_method name='stop'    type='method' exec=':kill'      timeout_seconds='30'/>
-               <exec_method name='refresh' type='method' exec=':kill -HUP' timeout_seconds='0'/>
-               <template>
-                       <common_name>
-                               <loctext xml:lang='C'>Samba NetBIOS name server</loctext>
-                       </common_name>
-                       <documentation>
-                               <manpage title='nmbd' section='8' manpath='@PREFIX@/@PKGMANDIR@'/>
-                       </documentation>
-               </template>
-       </instance>
-
-</service>
+  <service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='1'>
+    <dependency name='fs-root' grouping='require_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/system/filesystem/root'/>
+    </dependency>
+    <dependency name='network-service' grouping='require_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/network/service'/>
+    </dependency>
+    <instance name='winbind' enabled='false'>
+      <exec_method name='start' type='method' exec='@PREFIX@/sbin/winbindd' timeout_seconds='0'/>
+      <exec_method name='stop' type='method' exec=':kill' timeout_seconds='30'/>
+      <exec_method name='refresh' type='method' exec=':kill -HUP' timeout_seconds='0'/>
+      <template>
+        <common_name>
+          <loctext xml:lang='C'>Samba AD daemon for PAM/NSS</loctext>
+        </common_name>
+        <documentation>
+          <manpage title='winbindd' section='8' manpath='@PREFIX@/@PKGMANDIR@'/>
+        </documentation>
+      </template>
+    </instance>
+    <instance name='nmbd' enabled='false'>
+      <exec_method name='start' type='method' exec='@PREFIX@/sbin/nmbd -D' timeout_seconds='0'/>
+      <exec_method name='stop' type='method' exec=':kill' timeout_seconds='30'/>
+      <exec_method name='refresh' type='method' exec=':kill -HUP' timeout_seconds='0'/>
+      <template>
+        <common_name>
+          <loctext xml:lang='C'>Samba NetBIOS name server</loctext>
+        </common_name>
+        <documentation>
+          <manpage title='nmbd' section='8' manpath='@PREFIX@/@PKGMANDIR@'/>
+        </documentation>
+      </template>
+    </instance>
+    <instance name='smbd' enabled='false'>
+      <exec_method name='start' type='method' exec='@PREFIX@/sbin/smbd -D' timeout_seconds='0'/>
+      <exec_method name='stop' type='method' exec=':kill' timeout_seconds='30'/>
+      <exec_method name='refresh' type='method' exec=':kill -HUP' timeout_seconds='0'/>
+      <template>
+        <common_name>
+          <loctext xml:lang='C'>Samba SMB/CIFS services</loctext>
+        </common_name>
+        <documentation>
+          <manpage title='smbd' section='8' manpath='@PREFIX@/@PKGMANDIR@'/>
+        </documentation>
+      </template>
+    </instance>
+  </service>
 </service_bundle>