[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Mon Jun 20 20:42:02 MDT 2011
The branch, master has been updated
via 233a622 s4-param Autogenerate the loadparm_globals and loadparm_service tables
via 79b1a10 selftest: Run tests for libsmbclient and libnetapi
via a6f31f1 s4-torture Enable libnetapi and libsmbclient tests using combined build
via 577034b build: disable -Wl,--as-needed to try and fix the build
via 179a353 s4-cmdline: Rename popt tables to avoid symbol conflicts
via 5db74b9 lib/util Remove samba-util-common!
via d18491a lib/util: allow parmlist.c to compile under s3 includes.h
via f83fca1 lib/util: Use common d_printf() in the whole codebase
via ea006ab s3-param Put &Globals in the FN_ macros, rather than in each entry
via 5db2041 s4-param Add my authorship to this script
via f3d6b74 lib/util Make unused d_vfprintf() static
from 994abd2 s3: Fix a winbind message
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 233a6223b2ff84dcd965d0f295fbe88ba50ce5c5
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jun 20 15:48:12 2011 +1000
s4-param Autogenerate the loadparm_globals and loadparm_service tables
This makes it much easier and less error prone to add new parameters
as we merge the s3 and s4 loadparm systems.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Tue Jun 21 04:41:54 CEST 2011 on sn-devel-104
commit 79b1a1092dbbb45bb8839c71e48479d1c6037b48
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 10 22:14:34 2011 +0200
selftest: Run tests for libsmbclient and libnetapi
This adds the known failure for the one test (netbios browsing) that
fails.
Andrew Bartlett
commit a6f31f13ec6c7eb65f2d3fc39038453bb14aa17b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 10 22:12:52 2011 +0200
s4-torture Enable libnetapi and libsmbclient tests using combined build
Because we now always build the source3 code, we can link directly
against a private libnetapi and libsmbclient to test the behaviour of
these important APIs.
We use a private libnetapi_net_init(), and by using this interface
rather than the public one, we can ensure that the correct smb.conf is
loaded (as smbtorture4 is a Samba4 semantics binary).
The #include of the source3 includes.h is required to do the manual
lp_load().
Andrew Bartlett
commit 577034b3cd18c518140b91ade6b94487734ed92a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jun 20 21:22:59 2011 +1000
build: disable -Wl,--as-needed to try and fix the build
The issue here is that the source3 components now built as part of the
top level build do not have their depenencies fully specified, and
this causes the build to fail for many of our users.
When we fix that, we can restore this flag, so we again find that kind
of bug, which will show up for our Gentoo users regardless.
Andrew Bartlett
commit 179a3530d7aace977c6847f165033d9c6b6adba8
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jun 20 20:57:41 2011 +1000
s4-cmdline: Rename popt tables to avoid symbol conflicts
These same names are use in the source3 popt code, which is called from
in libsmbclient and libnet. These are then included in the smbtorture
binary for testing
Andrew Bartlett
commit 5db74b9607f4a5fc5ecaa8be0d744222cd55153c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jun 20 20:36:46 2011 +1000
lib/util Remove samba-util-common!
All of this code is now in common, so we don't need the second
'-common' library any more!
Andrew Bartlett
commit d18491a7bdad69b8035eb7cda4d203cb792742f6
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jun 20 20:43:42 2011 +1000
lib/util: allow parmlist.c to compile under s3 includes.h
commit f83fca1c576e094e2a852cc466bd9110c05fe731
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jun 20 19:56:50 2011 +1000
lib/util: Use common d_printf() in the whole codebase
This removes the lang_tdb based varient, the only user of the lang_tdb
code is SWAT, which calls that directly.
'net' and 'pam_winbind' are internationalised using gettext.
Andrew Bartlett
commit ea006ab8b2cdcde0d808aa042e143da9d641753a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jun 20 17:57:24 2011 +1000
s3-param Put &Globals in the FN_ macros, rather than in each entry
This global replace allows an easier comparison between the source3
and source4 loadparm systems.
Andrew Bartlett
commit 5db2041511fa2921c709889c371b676e4647d4ba
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jun 20 15:51:18 2011 +1000
s4-param Add my authorship to this script
commit f3d6b742b18589306e0f19cc52e06f108fc1268e
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Jun 20 15:02:46 2011 +1000
lib/util Make unused d_vfprintf() static
-----------------------------------------------------------------------
Summary of changes:
lib/util/dprintf.c | 46 +-
lib/util/parmlist.c | 2 +
lib/util/util.h | 4 -
lib/util/wscript_build | 56 +--
libcli/util/wscript_build | 2 +-
libds/common/wscript_build | 2 +-
source3/Makefile.in | 2 +-
source3/auth/wscript_build | 14 +-
source3/include/includes.h | 2 -
source3/lib/dprintf.c | 128 ------
source3/libgpo/gpext/wscript_build | 2 +-
source3/modules/wscript_build | 72 ++--
source3/param/loadparm.c | 508 +++++++++++-----------
source3/passdb/wscript_build | 6 +-
source3/rpc_server/wscript_build | 24 +-
source3/selftest/knownfail | 2 +
source3/selftest/tests.py | 4 +-
source3/winbindd/wscript_build | 18 +-
source3/wscript_build | 62 ++--
source4/lib/cmdline/popt_common.c | 6 +-
source4/lib/cmdline/popt_common.h | 16 +-
source4/lib/cmdline/popt_credentials.c | 2 +-
source4/param/loadparm.c | 183 +-------
source4/param/wscript_build | 10 +
source4/script/{mks3param.pl => mkparamdefs.pl} | 60 ++-
source4/script/mks3param.pl | 5 +-
source4/selftest/knownfail | 1 +
source4/selftest/tests.py | 6 +-
source4/torture/libnetapi/libnetapi.c | 30 +-
source4/torture/libnetapi/wscript_build | 3 +-
source4/torture/libsmbclient/wscript_build | 5 +-
source4/torture/torture.c | 14 -
wscript | 9 +-
33 files changed, 523 insertions(+), 783 deletions(-)
delete mode 100644 source3/lib/dprintf.c
copy source4/script/{mks3param.pl => mkparamdefs.pl} (66%)
Changeset truncated at 500 lines:
diff --git a/lib/util/dprintf.c b/lib/util/dprintf.c
index e9a15dc..c79989b 100644
--- a/lib/util/dprintf.c
+++ b/lib/util/dprintf.c
@@ -33,22 +33,15 @@
#include "includes.h"
#include "system/locale.h"
-#include "param/param.h"
static smb_iconv_t display_cd = (smb_iconv_t)-1;
-void d_set_iconv(smb_iconv_t cd)
-{
- if (display_cd != (smb_iconv_t)-1)
- talloc_free(display_cd);
-
- display_cd = cd;
-}
-
-_PUBLIC_ int d_vfprintf(FILE *f, const char *format, va_list ap)
+static int d_vfprintf(FILE *f, const char *format, va_list ap)
{
char *p, *p2;
- int ret, clen;
+ int ret;
+ size_t clen;
+ bool cret;
va_list ap2;
/* If there's nothing to convert, take a shortcut */
@@ -56,15 +49,14 @@ _PUBLIC_ int d_vfprintf(FILE *f, const char *format, va_list ap)
return vfprintf(f, format, ap);
}
- /* do any message translations */
va_copy(ap2, ap);
ret = vasprintf(&p, format, ap2);
va_end(ap2);
if (ret <= 0) return ret;
- clen = iconv_talloc(NULL, display_cd, p, ret, (void **)&p2);
- if (clen == -1) {
+ cret = convert_string_talloc(NULL, CH_UTF8, CH_DISPLAY, p, ret, (void **)&p2, &clen);
+ if (!cret) {
/* the string can't be converted - do the best we can,
filling in non-printing chars with '?' */
int i;
@@ -100,15 +92,25 @@ _PUBLIC_ int d_fprintf(FILE *f, const char *format, ...)
return ret;
}
-_PUBLIC_ int d_printf(const char *format, ...)
+static FILE *outfile;
+
+_PUBLIC_ int d_printf(const char *format, ...)
{
int ret;
- va_list ap;
-
- va_start(ap, format);
- ret = d_vfprintf(stdout, format, ap);
- va_end(ap);
-
- return ret;
+ va_list ap;
+
+ if (!outfile) outfile = stdout;
+
+ va_start(ap, format);
+ ret = d_vfprintf(outfile, format, ap);
+ va_end(ap);
+
+ return ret;
}
+/* interactive programs need a way of tell d_*() to write to stderr instead
+ of stdout */
+void display_set_stderr(void)
+{
+ outfile = stderr;
+}
diff --git a/lib/util/parmlist.c b/lib/util/parmlist.c
index 6658fa7..0f2f3af 100644
--- a/lib/util/parmlist.c
+++ b/lib/util/parmlist.c
@@ -20,6 +20,8 @@
#include "../lib/util/dlinklist.h"
#include "../lib/util/parmlist.h"
+#undef strcasecmp
+
struct parmlist_entry *parmlist_get(struct parmlist *ctx, const char *name)
{
struct parmlist_entry *e;
diff --git a/lib/util/util.h b/lib/util/util.h
index e50cc38..c715440 100644
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -211,14 +211,10 @@ _PUBLIC_ char** generate_unique_strs(TALLOC_CTX *mem_ctx, size_t len,
uint32_t num);
/* The following definitions come from lib/util/dprintf.c */
-#if _SAMBA_BUILD_ == 4
-_PUBLIC_ void d_set_iconv(smb_iconv_t);
-_PUBLIC_ int d_vfprintf(FILE *f, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0);
_PUBLIC_ int d_fprintf(FILE *f, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
_PUBLIC_ int d_printf(const char *format, ...) PRINTF_ATTRIBUTE(1,2);
_PUBLIC_ void display_set_stderr(void);
-#endif
/* The following definitions come from lib/util/util_str.c */
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index a094fa3..bdc9d10 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -1,57 +1,25 @@
#!/usr/bin/env python
-common_util_sources = '''talloc_stack.c smb_threads.c xfile.c data_blob.c
+bld.SAMBA_LIBRARY('samba-util',
+ source='''talloc_stack.c smb_threads.c xfile.c data_blob.c
util_file.c time.c rbtree.c rfc1738.c select.c
genrand.c fsusage.c blocking.c become_daemon.c
signal.c system.c params.c util.c util_id.c util_net.c
util_strlist.c util_paths.c idtree.c debug.c fault.c base64.c
util_str.c util_str_common.c substitute.c ms_fnmatch.c
- server_id.c'''
-
-common_util_headers = 'debug.h'
-common_util_public_deps = 'talloc pthread LIBCRYPTO CHARSET'
-s4_util_sources = '''dprintf.c parmlist.c'''
-s4_util_deps = 'DYNCONFIG'
-s4_util_public_deps = 'talloc execinfo uid_wrapper'
-s4_util_public_headers = 'attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h string_wrappers.h'
-s4_util_header_path = [ ('dlinklist.h util.h', '.'), ('*', 'util') ]
-
-if bld.env._SAMBA_BUILD_ == 3:
- # as we move files into common between samba-util and samba-util3, move them here.
- # Both samba-util and samba-util3 depend on this private library
- bld.SAMBA_LIBRARY('samba-util-common',
- source=common_util_sources,
- public_deps=common_util_public_deps,
- # until we get all the dependencies in this library in common
- # we need to allow this library to be built with unresolved symbols
- allow_undefined_symbols=True,
- local_include=False,
- public_headers=common_util_headers,
- header_path= [('*', 'util') ],
- private_library=True
- )
-
-else:
- bld.SAMBA_LIBRARY('samba-util',
- source=s4_util_sources + " " + common_util_sources,
- deps=s4_util_deps,
- public_deps=s4_util_public_deps + ' ' + common_util_public_deps,
- public_headers=s4_util_public_headers + ' ' + common_util_headers,
- header_path= s4_util_header_path,
- local_include=False,
- vnum='0.0.1',
- pc_files='samba-util.pc'
- )
-
- # dummy subsystem for avoid wider deps changes.
- bld.SAMBA_SUBSYSTEM('samba-util-common',
- source=[],
- deps='samba-util',
- local_include=False,)
+ server_id.c dprintf.c parmlist.c''',
+ deps='DYNCONFIG',
+ public_deps='talloc execinfo uid_wrapper pthread LIBCRYPTO CHARSET',
+ public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h string_wrappers.h',
+ header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ],
+ local_include=False,
+ vnum='0.0.1',
+ pc_files='samba-util.pc'
+ )
bld.SAMBA_LIBRARY('asn1util',
source='asn1.c',
- deps='talloc samba-util-common',
+ deps='talloc samba-util',
private_library=True,
local_include=False)
diff --git a/libcli/util/wscript_build b/libcli/util/wscript_build
index a364d30..43c6cec 100644
--- a/libcli/util/wscript_build
+++ b/libcli/util/wscript_build
@@ -5,7 +5,7 @@ bld.SAMBA_LIBRARY('errors',
public_headers='error.h ntstatus.h doserr.h werror.h',
header_path='core',
source='doserr.c errormap.c nterr.c errmap_unix.c',
- public_deps='talloc samba-util-common',
+ public_deps='talloc samba-util',
private_library=True
)
diff --git a/libds/common/wscript_build b/libds/common/wscript_build
index 33190bb..d7f8acb 100644
--- a/libds/common/wscript_build
+++ b/libds/common/wscript_build
@@ -4,4 +4,4 @@ bld.SAMBA_LIBRARY('flag_mapping',
source='flag_mapping.c',
private_library=True,
public_headers='roles.h',
- deps='samba-util-common')
+ deps='samba-util')
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 5b36fe2..7a471dd 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -455,7 +455,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \
lib/username.o \
../libds/common/flag_mapping.o \
lib/access.o lib/smbrun.o \
- lib/bitmap.o lib/dprintf.o $(UTIL_REG_OBJ) \
+ lib/bitmap.o ../lib/util/dprintf.o $(UTIL_REG_OBJ) \
lib/wins_srv.o lib/string_init.o \
lib/util_str.o ../lib/util/util_str_common.o \
../lib/util/util_str.o \
diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build
index 0583f33..74d870f 100644
--- a/source3/auth/wscript_build
+++ b/source3/auth/wscript_build
@@ -16,7 +16,7 @@ AUTH_SRC = '''auth.c
bld.SAMBA3_SUBSYSTEM('TOKEN_UTIL',
source='token_util.c',
- deps='samba-util-common',
+ deps='samba-util',
vars=locals())
bld.SAMBA3_SUBSYSTEM('USER_UTIL',
@@ -40,7 +40,7 @@ bld.SAMBA3_SUBSYSTEM('auth',
bld.SAMBA3_MODULE('auth_sam',
subsystem='auth',
source=AUTH_SAM_SRC,
- deps='samba-util-common',
+ deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_sam'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_sam'))
@@ -48,7 +48,7 @@ bld.SAMBA3_MODULE('auth_sam',
bld.SAMBA3_MODULE('auth_unix',
subsystem='auth',
source=AUTH_UNIX_SRC,
- deps='samba-util-common',
+ deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_unix'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_unix'))
@@ -56,7 +56,7 @@ bld.SAMBA3_MODULE('auth_unix',
bld.SAMBA3_MODULE('auth_winbind',
subsystem='auth',
source=AUTH_WINBIND_SRC,
- deps='samba-util-common',
+ deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_winbind'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_winbind'))
@@ -64,7 +64,7 @@ bld.SAMBA3_MODULE('auth_winbind',
bld.SAMBA3_MODULE('auth_wbc',
subsystem='auth',
source=AUTH_WBC_SRC,
- deps='samba-util-common',
+ deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_wbc'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_wbc'))
@@ -72,7 +72,7 @@ bld.SAMBA3_MODULE('auth_wbc',
bld.SAMBA3_MODULE('auth_server',
subsystem='auth',
source=AUTH_SERVER_SRC,
- deps='samba-util-common',
+ deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_server'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_server'))
@@ -88,7 +88,7 @@ bld.SAMBA3_MODULE('auth_domain',
bld.SAMBA3_MODULE('auth_builtin',
subsystem='auth',
source=AUTH_BUILTIN_SRC,
- deps='samba-util-common',
+ deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_builtin'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_builtin'))
diff --git a/source3/include/includes.h b/source3/include/includes.h
index e6b70c7..08d5d96 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -608,8 +608,6 @@ void sys_adminlog(int priority, const char *format_str, ...) PRINTF_ATTRIBUTE(2,
/* PRINTFLIKE2 */
int fstr_sprintf(fstring s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
-int d_vfprintf(FILE *f, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0);
-
int smb_xvasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0);
int asprintf_strupper_m(char **strp, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
diff --git a/source3/lib/dprintf.c b/source3/lib/dprintf.c
deleted file mode 100644
index ad3c79a..0000000
--- a/source3/lib/dprintf.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- display print functions
- Copyright (C) Andrew Tridgell 2001
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-/*
- this module provides functions for printing internal strings in the "display charset"
- This charset may be quite different from the chosen unix charset
-
- Eventually these functions will need to take care of column count constraints
-
- The d_ prefix on print functions in Samba refers to the display character set
- conversion
-*/
-
-#include "includes.h"
-#include "intl/lang_tdb.h"
-
- int d_vfprintf(FILE *f, const char *format, va_list ap)
-{
- char *p = NULL, *p2 = NULL;
- int ret, maxlen, clen;
- size_t size = 0;
- const char *msgstr;
- va_list ap2;
-
- va_copy(ap2, ap);
-
- /* do any message translations */
- msgstr = lang_msg(format);
- if (!msgstr) {
- ret = -1;
- goto out;
- }
-
- ret = vasprintf(&p, msgstr, ap2);
-
- lang_msg_free(msgstr);
-
- if (ret <= 0) {
- ret = -1;
- goto out;
- }
-
- /* now we have the string in unix format, convert it to the display
- charset, but beware of it growing */
- maxlen = ret*2;
-again:
- p2 = (char *)SMB_MALLOC(maxlen);
- if (!p2) {
- ret = -1;
- goto out;
- }
-
- if (!convert_string(CH_UNIX, CH_DISPLAY, p, ret, p2, maxlen, &size)) {
- ret = -1;
- goto out;
- }
- clen = size;
-
- if (clen >= maxlen) {
- /* it didn't fit - try a larger buffer */
- maxlen *= 2;
- SAFE_FREE(p2);
- goto again;
- }
-
- /* good, its converted OK */
- ret = fwrite(p2, 1, clen, f);
-out:
-
- SAFE_FREE(p);
- SAFE_FREE(p2);
- va_end(ap2);
-
- return ret;
-}
-
-
- int d_fprintf(FILE *f, const char *format, ...)
-{
- int ret;
- va_list ap;
-
- va_start(ap, format);
- ret = d_vfprintf(f, format, ap);
- va_end(ap);
-
- return ret;
-}
-
-static FILE *outfile;
-
- int d_printf(const char *format, ...)
-{
- int ret;
- va_list ap;
-
- if (!outfile) outfile = stdout;
-
- va_start(ap, format);
- ret = d_vfprintf(outfile, format, ap);
- va_end(ap);
-
- return ret;
-}
-
-/* interactive programs need a way of tell d_*() to write to stderr instead
- of stdout */
-void display_set_stderr(void)
-{
- outfile = stderr;
-}
diff --git a/source3/libgpo/gpext/wscript_build b/source3/libgpo/gpext/wscript_build
index 67f1518..3c835dd 100644
--- a/source3/libgpo/gpext/wscript_build
+++ b/source3/libgpo/gpext/wscript_build
@@ -8,7 +8,7 @@ GPEXT_SRC = '''../../../libgpo/gpext/gpext.c'''
bld.SAMBA3_SUBSYSTEM('gpext',
source=GPEXT_SRC,
- deps='samba-util-common',
+ deps='samba-util',
vars=locals())
bld.SAMBA3_MODULE('gpext_registry',
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index 9a6a6c3..8ccc4ca 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -54,7 +54,7 @@ VFS_TIME_AUDIT_SRC = 'vfs_time_audit.c'
bld.SAMBA3_SUBSYSTEM('NFS4_ACLS',
source='nfs4_acls.c',
- deps='samba-util-common')
+ deps='samba-util')
bld.SAMBA3_SUBSYSTEM('VFS_AIXACL_UTIL',
source='vfs_aixacl_util.c',
@@ -68,7 +68,7 @@ bld.SAMBA3_SUBSYSTEM('vfs',
bld.SAMBA3_MODULE('vfs_default',
subsystem='vfs',
source=VFS_DEFAULT_SRC,
- deps='samba-util-common',
+ deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_default'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_default'))
@@ -76,7 +76,7 @@ bld.SAMBA3_MODULE('vfs_default',
bld.SAMBA3_MODULE('vfs_audit',
subsystem='vfs',
source=VFS_AUDIT_SRC,
- deps='samba-util-common',
+ deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_audit'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_audit'))
@@ -84,7 +84,7 @@ bld.SAMBA3_MODULE('vfs_audit',
bld.SAMBA3_MODULE('vfs_extd_audit',
subsystem='vfs',
source=VFS_EXTD_AUDIT_SRC,
- deps='samba-util-common',
+ deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_extd_audit'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_extd_audit'))
@@ -92,7 +92,7 @@ bld.SAMBA3_MODULE('vfs_extd_audit',
bld.SAMBA3_MODULE('vfs_full_audit',
subsystem='vfs',
source=VFS_FULL_AUDIT_SRC,
- deps='samba-util-common',
+ deps='samba-util',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_full_audit'),
--
Samba Shared Repository
More information about the samba-cvs
mailing list