autobuild[sn-devel-144]: intermittent test failure detected

2017-06-23 Thread autobuild
The autobuild test system (on sn-devel-144) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-144/2017-06-23-1236/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-144/2017-06-23-1236/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-144/2017-06-23-1236/samba.stdout
  
The top commit at the time of the failure was:

commit 7f1ff6bc8463ac56cced5e747b6ded8572a908fc
Author: Garming Sam 
Date:   Fri Jun 16 13:05:37 2017 +1200

samba_kcc: debugging: say intrasite when we mean intrasite

Signed-off-by: Garming Sam 
Reviewed-by: Douglas Bagnall 

Autobuild-User(master): Douglas Bagnall 
Autobuild-Date(master): Fri Jun 23 06:45:47 CEST 2017 on sn-devel-144



[SCM] Samba Shared Repository - annotated tag tevent-0.9.32 created

2017-06-23 Thread Stefan Metzmacher
The annotated tag, tevent-0.9.32 has been created
at  37244b8f13ee5bdf4c7031a92d8c28678b2a2867 (tag)
   tagging  e9b4978a764839a142d9f7c166db436bdabea82c (commit)
  replaces  ldb-1.1.31
 tagged by  Stefan Metzmacher
on  Fri Jun 23 14:21:31 2017 +0200

- Log -
tevent: tag release tevent-0.9.32
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQEcBAABAgAGBQJZTQfLAAoJEEeTkWETCEAl/9YH/0IT8ngT1dKbHYFVNWI3j+q+
iX3Q91vOcgNpNQLLzP7tbh7ZV2GeOGM9hIdXFKrVx+yhOwv4cY2dnR0b9ONGmjob
u/ZlxWfu4f8vqgu+68NLhVWIH9vFwxFFi5vxsrn7a0TqYVwHMO00UU5Y5LZHyYmi
urdY1hDbnTFfcHkTSajVIJXIc7Zu5vHZmoKnt6ZN13cKXaeH8KXHKCacqeLik6MV
7ET4zV8NstkAlFX7gXDSClVSgbXPx0MXg702vZK9XkfqPb0fbMT+x2BWSWiYs9zd
j6O8wPCc7mUlNWLs3meCo9sK8N8Pjjvnz7yfgxpsj+YO/uV2w77eqbRKmyGQKds=
=7DqT
-END PGP SIGNATURE-

Amitay Isaacs (7):
  ctdb-daemon: Delete empty records from persistent database
  ctdb-recovery: Delete empty records during recovery
  ctdb-tests: Fix function names in protocol test
  ctdb-client: Add correct control names to log messages
  ctdb-locking: There are no ALLDB locks any more
  ctdb-locking: Reduce logging in case of contention
  ctdb-locking: If a record could not be locked, log the key

Andreas Schneider (4):
  selftest: Use 'ad_dc' as the default for testenv
  s3:popt_common: Reparse the username in popt_common_credentials_post()
  s3:tests: Add test for smbclient -UDOMAIN+username
  s3:winbind: Fix 'winbind normalize names' in wb_getpwsid()

Andrew Bartlett (10):
  dsdb: Cache the result of checking the parent ACL
  dsdb: Remember the last ACL we read during a search and what it expanded 
to
  selftest: Correctly print message when nbt is not up in 20 seconds
  selftest: Also wait for winbindd to start
  selftest: Fix failure message in dsdb_schema_info
  selftest: confirm that two attributes are also correctly set in the @ 
records
  dsdb: Do not run dsdb_replace() on the calculated difference between old 
and new schema
  dsdb: Do not prevent searches for @ATTRIBUTES because the DB is not set 
up yet
  dsdb: Add comment explaining requirements on 
DSDB_EXTENDED_SCHEMA_UPDATE_NOW_OID
  dsdb: Rework schema_init module to always use valid memory

Douglas Bagnall (4):
  replmd: check duplicate linked attributes
  replmd: special-case member return value in replmd_add_fix_la()
  repl_meta_data: single valued error codes depend on change type
  gitignore: ignore .gpg-* generated files (for ubuntu 16.04)

Garming Sam (3):
  replmd: check single values in replmd_add_fix_la
  dsdb: Add a samdb_dns_host_name which avoids searching
  dnsserver/common: Use cached dnsHostName to reduce database reads

Gary Lockyer (5):
  Tests lsa.String: add String constructor, str and repr
  lsa.String: add String constructor, str and repr
  pycredentials: add function to return the netr_Authenticator
  s4/dcerpc_netlogon: Logging for dcesrv_netr_LogonGetDomainInfo
  pycredentials: Add support for netr_crypt_password

Jeremy Allison (18):
  libcli: smb: Add smbXcli_tcon_copy().
  libcli: smb: Add smb2cli_tcon_set_id().
  s3: libsmb: Add cli_state_save_tcon() / cli_state_restore_tcon().
  s3: smbtorture: Show correct use of cli_state_save_tcon() / 
cli_state_restore_tcon().
  s3: libsmb: Widen cli_state_get_tid() / cli_state_set_tid() to 32-bits.
  s3: libsmb: Fix cli_state_has_tcon() to cope with SMB2 connections.
  s3: libsmb: Correctly do lifecycle management on cli->smb1.tcon and 
cli->smb2.tcon.
  s3: libsmb: Correctly save and restore connection tcon in smbclient, 
smbcacls and smbtorture3.
  s3: VFS: Remove old traces of smb_vfs_call_llistxattr().
  s3: VFS: Change SMB_VFS_MKNOD to use const struct smb_filename * instead 
of const char *.
  s3: VFS: Change SMB_VFS_CHFLAGS to use const struct smb_filename * 
instead of const char *.
  s3: VFS: Change SMB_VFS_DISK_FREE to use const struct smb_filename * 
instead of const char *.
  s3: VFS: Change SMB_VFS_GET_QUOTA to use const struct smb_filename * 
instead of const char *.
  s3: VFS: Change SMB_VFS_LINK to use const struct smb_filename * instead 
of const char *.
  s3: VFS: Change SMB_VFS_STATVFS to use const struct smb_filename * 
instead of const char *.
  s3: VFS: Change SMB_VFS_READLINK to use const struct smb_filename * 
instead of const char *.
  s3: VFS: Change SMB_VFS_SYMLINK to use const struct smb_filename * 
instead of const char *.
  s3: smbd: When deleting an fsp pointer ensure we don't keep any 
references to it around.

Stefan Metzmacher (44):
  auth3: call is_trusted_domain() as the last condition make_user_info_map()
  auth3: prepare the logic for "map untrusted to domain = auto"
  docs-xml: improve documentation of "map untrusted to domain"
  docs-xml: document "map untrusted to domain = auto"

[SCM] Samba Shared Repository - branch v4-6-test updated

2017-06-23 Thread Karolin Seeger
The branch, v4-6-test has been updated
   via  9670a0d Bug 15852. There are valid paths where 
conn->lsa_pipe_tcp->transport is NULL. Protect against this.
   via  8a7d05e s3:tests: Add test for smbclient -UDOMAIN+username
   via  282560e s3:popt_common: Reparse the username in 
popt_common_credentials_post()
   via  8dc2be5 s3:smb2_sesssetup: allow a compound request after a 
SessionSetup
   via  6e6fb56d s3:smb2_tcon: allow a compound request after a TreeConnect
  from  29c2411 s3:libsmb: add cli_state_update_after_sesssetup() helper 
function

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-6-test


- Log -
commit 9670a0d9973757f3be1a071f347eec03802bb57b
Author: Richard Sharpe 
Date:   Tue Jun 20 12:40:39 2017 -0700

Bug 15852. There are valid paths where conn->lsa_pipe_tcp->transport is 
NULL. Protect against this.

Based on a suggestion from Metze.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12852

Signed-off-by: Richard Sharpe 
Reviewed-by: Jeremy Allison 

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Thu Jun 22 23:16:46 CEST 2017 on sn-devel-144

(cherry picked from commit 03042b85c8140842633b36f3124e504b97b852a1)

Autobuild-User(v4-6-test): Karolin Seeger 
Autobuild-Date(v4-6-test): Fri Jun 23 17:29:50 CEST 2017 on sn-devel-144

commit 8a7d05ebf8d3b2542c1ff8c61ada4a7f573198bf
Author: Andreas Schneider 
Date:   Mon Jun 19 15:52:23 2017 +0200

s3:tests: Add test for smbclient -UDOMAIN+username

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12849

Signed-off-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 

Autobuild-User(master): Andreas Schneider 
Autobuild-Date(master): Tue Jun 20 14:48:33 CEST 2017 on sn-devel-144

(cherry picked from commit e60aeb6f56a26019788442247361ed516bf965af)

commit 282560e469b269e07c06e958c748207bfeafac41
Author: Andreas Schneider 
Date:   Mon Jun 19 14:50:33 2017 +0200

s3:popt_common: Reparse the username in popt_common_credentials_post()

When we parse the username in the options handling, the smb.conf file
has not been loaded yet. So we are not aware of a 'winbind separator'
set in the config file.

We need to read and set the username again in the post-processing of the
credentials.

https://bugzilla.samba.org/show_bug.cgi?id=12849

Signed-off-by: Andreas Schneider 
Reviewed-by: Stefan Metzmacher 
(cherry picked from commit 0caf40ec0196de0de016fda0d4aff0734d498d2b)

commit 8dc2be59f526a9cd77496360f1eed784b4b10411
Author: Stefan Metzmacher 
Date:   Thu Jun 15 23:01:18 2017 +0200

s3:smb2_sesssetup: allow a compound request after a SessionSetup

This is not a full fix yet as we don't allow compound requests
after going async.

With SMB 3.11 requiring signed TreeConnect requests it's pointless
to try to compound requests after a SessionSetup.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12845

Signed-off-by: Stefan Metzmacher 
Reviewed-by: Jeremy Allison 

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Sat Jun 17 10:55:25 CEST 2017 on sn-devel-144

(cherry picked from commit bb5c394fde03dc8230d5089a66fea1a2541952f5)

commit 6e6fb56da11cb30011cf46826a1bf8b76aed9ec1
Author: Stefan Metzmacher 
Date:   Thu Jun 15 23:01:18 2017 +0200

s3:smb2_tcon: allow a compound request after a TreeConnect

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12844

Signed-off-by: Stefan Metzmacher 
Reviewed-by: Jeremy Allison 
(cherry picked from commit f8974bcdbf8abe3803340dcd20206ff4de9d5079)

---

Summary of changes:
 source3/lib/popt_common.c| 15 +++
 source3/script/tests/test_smbclient_basic.sh | 62 
 source3/selftest/tests.py|  1 +
 source3/smbd/smb2_sesssetup.c|  1 +
 source3/smbd/smb2_tcon.c |  2 +
 source3/winbindd/winbindd_cm.c   |  8 ++--
 6 files changed, 86 insertions(+), 3 deletions(-)
 create mode 100755 source3/script/tests/test_smbclient_basic.sh


Changeset truncated at 500 lines:

diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c
index 3589a4f..9928c70 100644
--- a/source3/lib/popt_common.c
+++ b/source3/lib/popt_common.c
@@ -238,6 +238,7 @@ void popt_common_credentials_set_delay_post(void)
 void popt_common_credentials_post(void)
 {
struct user_auth_info *auth_info = cmdline_auth_info;
+   const char *username = NULL;
 
if (get_cmdline_auth_info_use_machine_account(auth_info) &&
!set_cmdline_auth_info_machine_account_creds(auth_info))
@@ -248,6 +249,20 @@ void popt_common_credentials_post(void)
}
 
set_cmdline_auth_info_getpass(

autobuild[sn-devel-144]: intermittent test failure detected

2017-06-23 Thread autobuild
The autobuild test system (on sn-devel-144) has detected an intermittent 
failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey.sn-devel-144/2017-06-23-1838/flakey.log

The samba build logs are available here:

   
http://git.samba.org/autobuild.flakey.sn-devel-144/2017-06-23-1838/samba.stderr
   
http://git.samba.org/autobuild.flakey.sn-devel-144/2017-06-23-1838/samba.stdout
  
The top commit at the time of the failure was:

commit 7f1ff6bc8463ac56cced5e747b6ded8572a908fc
Author: Garming Sam 
Date:   Fri Jun 16 13:05:37 2017 +1200

samba_kcc: debugging: say intrasite when we mean intrasite

Signed-off-by: Garming Sam 
Reviewed-by: Douglas Bagnall 

Autobuild-User(master): Douglas Bagnall 
Autobuild-Date(master): Fri Jun 23 06:45:47 CEST 2017 on sn-devel-144



[SCM] Samba Shared Repository - branch master updated

2017-06-23 Thread Andreas Schneider
The branch, master has been updated
   via  1f0be3e s4:torture: Do not segfault in 
torture_rpc_spoolss_printer_teardown_common()
  from  7f1ff6b samba_kcc: debugging: say intrasite when we mean intrasite

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


- Log -
commit 1f0be3e1199170b599652905021a57e966ef12a9
Author: Andreas Schneider 
Date:   Thu Jun 22 10:25:09 2017 +0200

s4:torture: Do not segfault in torture_rpc_spoolss_printer_teardown_common()

Signed-off-by: Andreas Schneider 
Reviewed-by: Guenther Deschner 
Reviewed-by: Ralph Boehme 
Reviewed-by: Stefan Metzmacher 

Autobuild-User(master): Andreas Schneider 
Autobuild-Date(master): Fri Jun 23 21:00:19 CEST 2017 on sn-devel-144

---

Summary of changes:
 source4/torture/rpc/spoolss.c | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 20d2f14..14a43b9 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -8572,10 +8572,14 @@ static bool 
torture_rpc_spoolss_printer_teardown_common(struct torture_context *
 {
bool found = false;
struct dcerpc_pipe *p = t->spoolss_pipe;
-   struct dcerpc_binding_handle *b = p->binding_handle;
-   const char *printer_name = t->info2.printername;
+   struct dcerpc_binding_handle *b = NULL;
const char *server_name_slash;
 
+   if (p == NULL) {
+   return true;
+   }
+   b = p->binding_handle;
+
server_name_slash = talloc_asprintf(tctx, "%s", 
dcerpc_server_name(p));
 
if (t->added_driver) {
@@ -8594,7 +8598,8 @@ static bool 
torture_rpc_spoolss_printer_teardown_common(struct torture_context *
"failed to delete printer driver via spoolss");
}
 
-   if (p && !t->wellknown) {
+   if (!t->wellknown) {
+   const char *printer_name = t->info2.printername;
 
torture_assert(tctx,
test_DeletePrinter(tctx, b, &t->handle),


-- 
Samba Shared Repository



[SCM] Samba Shared Repository - branch master updated

2017-06-23 Thread Ralph Böhme
The branch, master has been updated
   via  06cdf8d build: fix build of vfs_posix_eadb module
   via  3a17583 waf:lib/replace: Fix building with older GCC versions
  from  1f0be3e s4:torture: Do not segfault in 
torture_rpc_spoolss_printer_teardown_common()

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


- Log -
commit 06cdf8d7c4402b52aa27631a5556dde0b22d9487
Author: Björn Baumbach 
Date:   Tue Jun 20 16:47:57 2017 +0200

build: fix build of vfs_posix_eadb module

Signed-off-by: Björn Baumbach 
Reviewed-by: Stefan Metzmacher 
Reviewed-by: Ralph Boehme 

Autobuild-User(master): Ralph Böhme 
Autobuild-Date(master): Sat Jun 24 01:20:16 CEST 2017 on sn-devel-144

commit 3a175830e579ab10231439657b2378cd5634
Author: Björn Baumbach 
Date:   Thu Jun 22 16:07:27 2017 +0200

waf:lib/replace: Fix building with older GCC versions

Using gcc 4.3.2:
cc1: error: unrecognized command line option "-Wno-format-truncation"

Signed-off-by: Björn Baumbach 
Reviewed-by: Andreas Schneider 
Reviewed-by: Ralph Boehme 

---

Summary of changes:
 lib/replace/wscript | 8 +++-
 source3/wscript | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 33f49eb..7c50e1d 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -81,6 +81,9 @@ def configure(conf):
 conf.CHECK_HEADERS('sys/atomic.h')
 conf.CHECK_HEADERS('libgen.h')
 
+if conf.CHECK_CFLAGS('-Wno-format-truncation'):
+conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1')
+
 # Check for process set name support
 conf.CHECK_CODE('''
 #include 
@@ -711,11 +714,14 @@ def build(bld):
   private_library=True,
   deps='crypt dl nsl socket rt attr' + extra_libs)
 
+replace_test_cflags="-Wno-format-zero-length"
+if bld.CONFIG_SET('HAVE_WNO_FORMAT_TRUNCATION'):
+replace_test_cflags += " -Wno-format-truncation"
 bld.SAMBA_SUBSYSTEM('replace-test',
 source='''test/testsuite.c test/strptime.c
 test/os2_delete.c test/getifaddrs.c''',
 deps='replace',
-cflags="-Wno-format-zero-length 
-Wno-format-truncation")
+cflags=replace_test_cflags)
 
 if bld.env.standalone_replace:
 bld.SAMBA_BINARY('replace_testsuite',
diff --git a/source3/wscript b/source3/wscript
index 5a3749c..8fa51fb 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1706,7 +1706,7 @@ main() {
 
 if conf.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
 default_static_modules.extend(TO_LIST('pdb_samba_dsdb auth_samba4 
vfs_dfs_samba4'))
-default_shared_modules.extend('vfs_posix_eadb')
+default_shared_modules.extend(TO_LIST('vfs_posix_eadb'))
 
 if conf.CONFIG_SET('HAVE_FREEBSD_SUNACL_H'):
 default_shared_modules.extend(TO_LIST('vfs_zfsacl'))


-- 
Samba Shared Repository



[SCM] Samba Shared Repository - branch master updated

2017-06-23 Thread Jeremy Allison
The branch, master has been updated
   via  38581bc lib: Use ctdb_protocol instead of ctdb_private
   via  a433f1a lib: Give util_paths.c its own header
   via  5757d9b net: Dump data for net_g_lock dump
  from  06cdf8d build: fix build of vfs_posix_eadb module

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


- Log -
commit 38581bc116ebf9d622d99988ca785c2d353c75d6
Author: Volker Lendecke 
Date:   Fri Jun 9 08:48:21 2017 +0200

lib: Use ctdb_protocol instead of ctdb_private

ctdb_private is much broader. Right now we implement the protocol
ourselves. In the future, we might switch to the native ctdb
client implementation defined in ctdb_client.h, but that's a
different project :-)

Signed-off-by: Volker Lendecke 
Reviewed-by: Jeremy Allison 

Autobuild-User(master): Jeremy Allison 
Autobuild-Date(master): Sat Jun 24 05:33:41 CEST 2017 on sn-devel-144

commit a433f1a75793b192612043147c9cb1ba1eb28b3f
Author: Volker Lendecke 
Date:   Thu Jun 22 16:10:52 2017 +0200

lib: Give util_paths.c its own header

Signed-off-by: Volker Lendecke 
Reviewed-by: Jeremy Allison 

commit 5757d9bf75a5f3ade82c00c98e01c5a8e38aaa28
Author: Volker Lendecke 
Date:   Thu Jun 8 12:51:19 2017 +0200

net: Dump data for net_g_lock dump

4d404f2 added user-data for a g_lock. Print it in net g_lock dump.

Signed-off-by: Volker Lendecke 
Reviewed-by: Jeremy Allison 

---

Summary of changes:
 lib/ldb-samba/ldb_wrap.c   |  1 +
 lib/util/modules.c |  1 +
 lib/util/samba_util.h  | 25 ---
 lib/util/util_paths.c  |  1 +
 source3/lib/util_procid.h => lib/util/util_paths.h | 37 --
 libgpo/gpext/gpext.c   |  1 +
 source3/intl/lang_tdb.c|  1 +
 source3/lib/ctdbd_conn.c   |  3 +-
 source3/lib/dbwrap/dbwrap_ctdb.c   |  2 +-
 source3/utils/net_g_lock.c |  1 +
 source4/torture/drs/rpc/dssync.c   |  1 +
 source4/torture/drs/rpc/msds_intid.c   |  1 +
 source4/torture/rpc/dsgetinfo.c|  1 +
 13 files changed, 38 insertions(+), 38 deletions(-)
 copy source3/lib/util_procid.h => lib/util/util_paths.h (54%)


Changeset truncated at 500 lines:

diff --git a/lib/ldb-samba/ldb_wrap.c b/lib/ldb-samba/ldb_wrap.c
index 838306f..9959b04 100644
--- a/lib/ldb-samba/ldb_wrap.c
+++ b/lib/ldb-samba/ldb_wrap.c
@@ -35,6 +35,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "param/param.h"
 #include "../lib/util/dlinklist.h"
+#include "lib/util/util_paths.h"
 #include 
 
 #undef DBGC_CLASS
diff --git a/lib/util/modules.c b/lib/util/modules.c
index cf52594..5d49ed9 100644
--- a/lib/util/modules.c
+++ b/lib/util/modules.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "dynconfig/dynconfig.h"
 #include "lib/util/samba_modules.h"
+#include "lib/util/util_paths.h"
 #include "system/filesys.h"
 #include "system/dir.h"
 
diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h
index 7a74617..0bb04b3 100644
--- a/lib/util/samba_util.h
+++ b/lib/util/samba_util.h
@@ -696,31 +696,6 @@ int samba_runcmd_recv(struct tevent_req *req, int *perrno);
 void samba_start_debugger(void);
 #endif
 
-/**
- * @brief Returns an absolute path to a file in the Samba modules directory.
- *
- * @param name File to find, relative to MODULESDIR.
- *
- * @retval Pointer to a string containing the full path.
- **/
-char *modules_path(TALLOC_CTX *mem_ctx, const char *name);
-
-/**
- * @brief Returns an absolute path to a file in the Samba data directory.
- *
- * @param name File to find, relative to CODEPAGEDIR.
- *
- * @retval Pointer to a talloc'ed string containing the full path.
- **/
-char *data_path(TALLOC_CTX *mem_ctx, const char *name);
-
-/**
- * @brief Returns the platform specific shared library extension.
- *
- * @retval Pointer to a const char * containing the extension.
- **/
-const char *shlib_ext(void);
-
 /*
  * Samba code should use samba_tevent_context_init() instead of
  * tevent_context_init() in order to get the debug output.
diff --git a/lib/util/util_paths.c b/lib/util/util_paths.c
index 0baa680..0473557 100644
--- a/lib/util/util_paths.c
+++ b/lib/util/util_paths.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "dynconfig/dynconfig.h"
+#include "lib/util/util_paths.h"
 
 /**
  * @brief Returns an absolute path to a file in the Samba modules directory.
diff --git a/source3/lib/util_procid.h b/lib/util/util_paths.h
similarity index 54%
copy from source3/lib/util_procid.h
copy to lib/util/util_paths.h
index 9637363..80e8aaa 100644
--- a/source3/lib/util_procid.h
+++ b/lib/util/util_paths.h
@@ -21,17 +21,34 @@
  * along with this pro