s/util.h/samba_util.h/ following rename in Samba

diff --git a/README b/README
index 7e063d6548272564c3f006cc7d7b83d7c3917ab9..0e1f1b473e99c45705fa74f4996f757c0b3cd656 100644 (file)
--- a/README
+++ b/README
@@ -31,6 +31,9 @@ Credits
 -------
 Written by Andrzej Hajda <andrzej.hajda@wp.pl>
 
+Contributions by:
+* Thomas Hood, RAAF Technology <thomas@raaftech.nl>
+
 License
 -------
 Please see the COPYING file for the text of the GNU GPL version 3.

diff --git a/samba b/samba
index 60d91f2c561fb3467a2cc73377f9ba9204ddd496..5494856294384df4360d85e68abc03c43dc16e06 160000 (submodule)
--- a/samba
+++ b/samba
@@ -1 +1 @@
-Subproject commit 60d91f2c561fb3467a2cc73377f9ba9204ddd496
+Subproject commit 5494856294384df4360d85e68abc03c43dc16e06

diff --git a/source/svcinstall.c b/source/svcinstall.c
index 862aeb59456cf62738f3d067bbe2d3114f49394a..7dc9709e87b5b812c725129c0ea6e5c321f3205f 100644 (file)
--- a/source/svcinstall.c
+++ b/source/svcinstall.c
@@ -25,7 +25,7 @@
 #include "system/filesys.h"
 #include "libcli/libcli.h"
 #include "libcli/smb_composite/smb_composite.h"
-#include "lib/util/util.h"
+#include "lib/util/samba_util.h"
 
 #include "svcinstall.h"