[PATCHES] Fix smb.conf build

[Bjoern Baumbach]

Hi!

The one patch adds some missing pathconfig xml entities to the fallback
table that was introduced with commit
53522ac9946c78b00d4beb081777c80190b2f100.
Without this patch the docs do not build due to the missing entities.

The other one sets the WINBINDD_SOCKET_DIR from "ncalrpc" to "winbindd"

Björn

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de

**************************************************************
SerNet auf der CeBIT: 10. - 14. März 2014, Halle 6, Stand G10
Das Neueste rund um SAMBA, verinice, Firewalls und Linux!
Kostenlose Tickets anfordern per Mail an cebit at sernet.de.
**************************************************************
-------------- next part --------------
From c4e2788a5aa12ef0d02e294f9adc615c84d5ec47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb at sernet.de>
Date: Wed, 26 Feb 2014 15:26:28 +0100
Subject: [PATCH 1/2] docs-smbdotconf: Fix build - add missing XML entities
 (config paths)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Björn Baumbach <bb at sernet.de>
---
 docs-xml/smbdotconf/generate-file-list.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/docs-xml/smbdotconf/generate-file-list.sh b/docs-xml/smbdotconf/generate-file-list.sh
index a03ed11..2c911a8 100755
--- a/docs-xml/smbdotconf/generate-file-list.sh
+++ b/docs-xml/smbdotconf/generate-file-list.sh
@@ -5,14 +5,17 @@
 # the full correct path for the system.
 #
 echo "<!DOCTYPE section [
-<!ENTITY pathconfig.SCRIPTSBINDIR       '\${prefix}/sbin'>
-<!ENTITY pathconfig.LOCKDIR             '\${prefix}/var/lock'>
-<!ENTITY pathconfig.NCALRPCDIR          '\${prefix}/var/run/ncalrpc'>
-<!ENTITY pathconfig.PIDDIR              '\${prefix}/var/run'>
-<!ENTITY pathconfig.STATEDIR            '\${prefix}/var/locks'>
-<!ENTITY pathconfig.PRIVATE_DIR         '\${prefix}/private'>
-<!ENTITY pathconfig.SMB_PASSWD_FILE     '\${prefix}/private/smbpasswd'>
-<!ENTITY pathconfig.WINBINDD_SOCKET_DIR '\${prefix}/var/run/ncalrpc'>
+<!ENTITY pathconfig.SCRIPTSBINDIR        '\${prefix}/sbin'>
+<!ENTITY pathconfig.LOCKDIR              '\${prefix}/var/lock'>
+<!ENTITY pathconfig.NCALRPCDIR           '\${prefix}/var/run/ncalrpc'>
+<!ENTITY pathconfig.PIDDIR               '\${prefix}/var/run'>
+<!ENTITY pathconfig.STATEDIR             '\${prefix}/var/locks'>
+<!ENTITY pathconfig.PRIVATE_DIR          '\${prefix}/private'>
+<!ENTITY pathconfig.SMB_PASSWD_FILE      '\${prefix}/private/smbpasswd'>
+<!ENTITY pathconfig.WINBINDD_SOCKET_DIR  '\${prefix}/var/run/ncalrpc'>
+<!ENTITY pathconfig.WINBINDD_PRIVILEGED_SOCKET_DIR '\${prefix}/var/lib/winbindd_privileged'>
+<!ENTITY pathconfig.CACHEDIR             '\${prefix}/var/cache'>
+<!ENTITY pathconfig.NTP_SIGND_SOCKET_DIR '\${prefix}/var/lib/ntp_signd'>
 ]>"
 
 DIR=.
-- 
1.8.3.2


From 54197f71710daa30d5eb3bd693e4e3ccb4cc3d2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb at sernet.de>
Date: Wed, 26 Feb 2014 15:31:55 +0100
Subject: [PATCH 2/2] docs-smbdotconf: fix WINBINDD_SOCKET_DIR path in fallback
 table
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Björn Baumbach <bb at sernet.de>
---
 docs-xml/smbdotconf/generate-file-list.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs-xml/smbdotconf/generate-file-list.sh b/docs-xml/smbdotconf/generate-file-list.sh
index 2c911a8..6125908 100755
--- a/docs-xml/smbdotconf/generate-file-list.sh
+++ b/docs-xml/smbdotconf/generate-file-list.sh
@@ -12,7 +12,7 @@ echo "<!DOCTYPE section [
 <!ENTITY pathconfig.STATEDIR             '\${prefix}/var/locks'>
 <!ENTITY pathconfig.PRIVATE_DIR          '\${prefix}/private'>
 <!ENTITY pathconfig.SMB_PASSWD_FILE      '\${prefix}/private/smbpasswd'>
-<!ENTITY pathconfig.WINBINDD_SOCKET_DIR  '\${prefix}/var/run/ncalrpc'>
+<!ENTITY pathconfig.WINBINDD_SOCKET_DIR  '\${prefix}/var/run/winbindd'>
 <!ENTITY pathconfig.WINBINDD_PRIVILEGED_SOCKET_DIR '\${prefix}/var/lib/winbindd_privileged'>
 <!ENTITY pathconfig.CACHEDIR             '\${prefix}/var/cache'>
 <!ENTITY pathconfig.NTP_SIGND_SOCKET_DIR '\${prefix}/var/lib/ntp_signd'>
-- 
1.8.3.2