summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2002-09-07 04:08:03 +0000
committerSimo Sorce <idra@samba.org>2002-09-07 04:08:03 +0000
commitec4f2af04a09a50e87a95c0ad494a581b0364f03 (patch)
treecc6ab8700763d9065deac2ae7c8329cdf7891c2a /source3
parent27cc26cec83f685c6d1dc73f855e01c082a09ca2 (diff)
downloadsamba-ec4f2af04a09a50e87a95c0ad494a581b0364f03.tar.gz
samba-ec4f2af04a09a50e87a95c0ad494a581b0364f03.tar.bz2
samba-ec4f2af04a09a50e87a95c0ad494a581b0364f03.zip
configure.in:
reflect the new example/VFS/ directory organization lib/substitue.c: added helper functions needed by recycle bin (This used to be commit 29b4b9a2b5a0347d227b1a30e3f34bf40afa6de4)
Diffstat (limited to 'source3')
-rw-r--r--source3/configure.in2
-rw-r--r--source3/lib/substitute.c13
2 files changed, 14 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 32c2fe114b..b1f1c8aec7 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2828,7 +2828,7 @@ AC_SUBST(builddir)
# I added make files that are outside /source directory.
# I know this is not a good solution, will work out a better
# solution soon. --simo
-AC_OUTPUT(include/stamp-h Makefile script/findsmb ../examples/VFS/Makefile ../examples/VFS/block/Makefile ../examples/VFS/netatalk/Makefile ../examples/pdb/mysql/Makefile ../examples/pdb/xml/Makefile ../examples/sam/Makefile)
+AC_OUTPUT(include/stamp-h Makefile script/findsmb ../examples/VFS/Makefile ../examples/pdb/mysql/Makefile ../examples/pdb/xml/Makefile ../examples/sam/Makefile)
#################################################
# Print very concise instructions on building/use
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index 026df0f67f..767ca0c071 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -675,6 +675,19 @@ void standard_sub_conn(connection_struct *conn, char *str, size_t len)
conn->gid, current_user_info.smb_name, str, len);
}
+char *talloc_sub_conn(TALLOC_CTX *mem_ctx, connection_struct *conn, char *str)
+{
+ return talloc_sub_advanced(mem_ctx, SNUM(conn), conn->user,
+ conn->connectpath, conn->gid,
+ current_user_info.smb_name, str);
+}
+
+char *alloc_sub_conn(connection_struct *conn, char *str)
+{
+ return alloc_sub_advanced(SNUM(conn), conn->user, conn->connectpath,
+ conn->gid, current_user_info.smb_name, str);
+}
+
/****************************************************************************
Like standard_sub but by snum.
****************************************************************************/