[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  1b5a6d8 docs-smbdotconf: fix WINBINDD_SOCKET_DIR path in fallback table
       via  a5e5547 docs-smbdotconf: Fix build - add missing XML entities (config paths)
      from  04e4346 s3: smbd - smb1 - fix read of deleted memory in reply_writeclose().

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1b5a6d8d786be152c2225da1bbd795e0c833f128
Author: Björn Baumbach <bb at sernet.de>
Date:   Wed Feb 26 15:31:55 2014 +0100

    docs-smbdotconf: fix WINBINDD_SOCKET_DIR path in fallback table
    
    Signed-off-by: Björn Baumbach <bb at sernet.de>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Mon Mar  3 23:42:22 CET 2014 on sn-devel-104

commit a5e5547ad46905a0a32912e489a8c09a5bac1629
Author: Björn Baumbach <bb at sernet.de>
Date:   Wed Feb 26 15:26:28 2014 +0100

    docs-smbdotconf: Fix build - add missing XML entities (config paths)
    
    Signed-off-by: Björn Baumbach <bb at sernet.de>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/smbdotconf/generate-file-list.sh |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/generate-file-list.sh b/docs-xml/smbdotconf/generate-file-list.sh
index a03ed11..6125908 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/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'>
 ]>"
 
 DIR=.


-- 
Samba Shared Repository