[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Wed May 18 09:23:02 MDT 2011
The branch, master has been updated
via f19ab5d lib/util/charset: Remove unused strcasecmp_w and strncasecmp_w
via 2a12424 s3-selftest Remove unused and unimplemented info3cache test
via 57f41ef lib/util/charset use talloc_stackframe() rather than talloc_tos()
via fa3e2fc selftest: Re-enable strings.py from source3/stf as a python subunit test
via 06435ac s3-testparm Warn more on incorrect use of 'password server'
via 3c8de7d lib/util/charset Don't allow invalid 'dos charset = utf8'
via 035dbce s3-selftest Remove unused sambalib.py from comfychair test system
via da662b8 s3-lib Replace StrnCaseCmp() with strncasecmp_m()
via c615ebe s3-lib Replace StrCaseCmp() with strcasecmp_m()
via 7a11e5d s3-param: Remove unused snum2params_static
via b3258ad s3-param: remove unused share_iterator functions
via c6cc22a s4-libnet: Remove libnet_Join and create libnet_Join_member
via c47b078 build: Add 'cap' as a dependency of samba3core
via 75faa9e build: Make POPT_SAMBA3 a library
via 41b3c38 librpc/ndr Merge ndr_print_sockaddr_storage() into common code
via 8d7be8a build: Make util_reg subsystem in libcli/registry a library
via fc46628 build: Add rpc_client grouping library
via d17367b build: Add depenencies needed by Samba3 subsystems
via a2ff3e7 build: Make auth_sam_reply a library
via baad855 build: Make msrpc3 a library
via 30979f3 build: Expand dcerpc-samba grouping library
via 2fc342c waf-build: Add more libraries to avoid duplicate symbols
via d13fb8d s4-selftest: gensec test is finished, don't skip
via 3dd76f2 selftest: Don't skip Samba3 tests in the top level build
from d97faae s3-smbtorture: fix build warning (shadowed NTSTATUS variable).
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f19ab5d334e3fb15761fb009e5de876dfc6ea785
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 18 23:57:10 2011 +1000
lib/util/charset: Remove unused strcasecmp_w and strncasecmp_w
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Wed May 18 17:22:15 CEST 2011 on sn-devel-104
commit 2a12424e4b6da8fb3cd0ad50e14f75f0bc5132e0
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 18 14:13:18 2011 +1000
s3-selftest Remove unused and unimplemented info3cache test
commit 57f41ef150b82523aeb23cde63c1f8731a061edb
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 18 13:57:26 2011 +1000
lib/util/charset use talloc_stackframe() rather than talloc_tos()
This is common code, and we can't assume a talloc_stackframe() so we
must create it.
Andrew Bartlett
commit fa3e2fc8bb3e935c65b7043382cad1d649cb68a6
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 18 12:06:25 2011 +1000
selftest: Re-enable strings.py from source3/stf as a python subunit test
commit 06435acf3b9afa94019f7654cda4ad9386c6384b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 18 11:53:34 2011 +1000
s3-testparm Warn more on incorrect use of 'password server'
commit 3c8de7dd66390c00542118ec3aaa84e1e20956cb
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 18 11:51:37 2011 +1000
lib/util/charset Don't allow invalid 'dos charset = utf8'
No DOS client used UTF8, and this creates subtle, difficult to
disagnose breakage of schannel (domain membership).
Andrew Bartlett
commit 035dbce3adcbf36afee5e9cc59912c4f07fe0f5e
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed May 18 10:34:03 2011 +1000
s3-selftest Remove unused sambalib.py from comfychair test system
The test binary t_snprintf has moved to lib/replace
commit da662b82b87cdbe07762974b1f9e825ef15951bd
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri May 13 20:23:36 2011 +0200
s3-lib Replace StrnCaseCmp() with strncasecmp_m()
strncasecmp_m() never needs to call to talloc, and via next_codepoint()
still has an ASCII fast-path bypassing iconv() calls.
Andrew Bartlett
commit c615ebed6e3d273a682806b952d543e834e5630d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri May 13 20:21:30 2011 +0200
s3-lib Replace StrCaseCmp() with strcasecmp_m()
strcasecmp_m() never needs to call to talloc, and via next_codepoint()
still has an ASCII fast-path bypassing iconv() calls.
Andrew Bartlett
commit 7a11e5de395c928e4a37c58a7a7ac21a314449fe
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 16 22:27:28 2011 +1000
s3-param: Remove unused snum2params_static
commit b3258addb4bc861d8d0cf8842397c209ec2d3704
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 16 22:26:00 2011 +1000
s3-param: remove unused share_iterator functions
commit c6cc22adc059aeb6de50305b8a40d513d8f05bbc
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 16 22:55:29 2011 +1000
s4-libnet: Remove libnet_Join and create libnet_Join_member
libnet_Join conflicts with a function in the source3 netapi of the
same name, and the ability to join as a DC via this particular method
is unused.
Andrew Bartlett
commit c47b078ec339343732da21212e04a5b7cf548e8c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 16 21:57:27 2011 +1000
build: Add 'cap' as a dependency of samba3core
commit 75faa9eec5fecfc033bd4941427da28e4471a516
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 16 21:20:36 2011 +1000
build: Make POPT_SAMBA3 a library
This avoids some duplicate symbols when libnet and libsmbclient are
linked into the same binary (smbtorture4).
Andrew Bartlett
commit 41b3c38587f1153d49c1805869aa186b66501f7a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 16 21:18:25 2011 +1000
librpc/ndr Merge ndr_print_sockaddr_storage() into common code
There is no longer a reason to leave this source3 specific, and this
brings it into a library (avoiding duplicate symbols).
Andrew Bartlett
commit 8d7be8af794830c25d9d41eb53ad22b7b4ab7a9b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 16 21:14:48 2011 +1000
build: Make util_reg subsystem in libcli/registry a library
commit fc466282f8bb6a6fa7285b2dbc4e06d31015dc5a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 16 21:08:20 2011 +1000
build: Add rpc_client grouping library
commit d17367bd6874ccc2d0e84b478ea3e12d91a9bd99
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 16 21:08:06 2011 +1000
build: Add depenencies needed by Samba3 subsystems
commit a2ff3e7c6118d77699b94b81d9333ca7ea274f52
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon May 16 21:06:22 2011 +1000
build: Make auth_sam_reply a library
commit baad855bcaad28d341867ae03c67e68e520a743a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sat May 14 21:54:57 2011 +0200
build: Make msrpc3 a library
commit 30979f3ea1df7f81c44fb1d8b6a1a61777c8c72d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sat May 14 19:55:57 2011 +0200
build: Expand dcerpc-samba grouping library
This is possible in common now because the generated RPC code does not
rely on a particular dcerpc layer.
Andrew Bartlett
commit 2fc342c20ab455a5961b1b2b507aa7b62ecabf1f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu May 12 20:12:07 2011 +0200
waf-build: Add more libraries to avoid duplicate symbols
The new source of duplicates is calling libnetapi from inside smbtorture.
Andrew Bartlett
commit d13fb8ddd0613f8704b2657e85ccb559706b3e13
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 17 19:39:25 2011 +1000
s4-selftest: gensec test is finished, don't skip
commit 3dd76f2f56760ec0073b90b57615f92ca99598e9
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue May 17 19:26:40 2011 +1000
selftest: Don't skip Samba3 tests in the top level build
The regular expressions here were not specific enough, they matched
the samba3. names from the source3/selftest/tests.py
Found by Andreas Schneider
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
auth/wscript_build | 11 +-
lib/util/charset/codepoints.c | 5 +
lib/util/charset/util_str.c | 24 ++--
lib/util/charset/util_unistr_w.c | 32 ----
libcli/cldap/wscript_build | 11 +-
libcli/registry/wscript_build | 5 +-
libcli/smb/wscript_build | 6 +-
librpc/ndr/libndr.h | 3 +
{source3/librpc => librpc}/ndr/util.c | 11 +-
librpc/wscript_build | 89 +++++-----
nsswitch/wins.c | 4 +-
source3/Makefile.in | 2 +-
source3/auth/wscript_build | 1 +
source3/groupdb/mapping_tdb.c | 14 +-
source3/include/proto.h | 6 -
source3/include/smb.h | 4 -
source3/lib/adt_tree.c | 4 +-
source3/lib/filename_util.c | 2 +-
source3/lib/ms_fnmatch.c | 2 +-
source3/lib/smbldap.c | 4 +-
source3/lib/substitute.c | 2 +-
source3/lib/tldap.c | 2 +-
source3/lib/tldap_util.c | 2 +-
source3/lib/util.c | 4 +-
source3/lib/util_str.c | 147 +---------------
source3/libads/ldap.c | 2 +-
source3/libads/ldap_printer.c | 2 +-
source3/libnet/libnet_join.c | 4 +-
source3/librpc/rpc/dcerpc_ep.c | 4 +-
source3/libsmb/libsmb_xattr.c | 194 ++++++++++----------
source3/modules/onefs_streams.c | 2 +-
source3/modules/vfs_dirsort.c | 2 +-
source3/modules/vfs_streams_depot.c | 2 +-
source3/modules/vfs_streams_xattr.c | 2 +-
source3/nmbd/nmbd_elections.c | 2 +-
source3/param/loadparm.c | 60 ------
source3/passdb/pdb_smbpasswd.c | 6 +-
source3/printing/nt_printing.c | 2 +-
source3/registry/reg_api.c | 2 +-
source3/registry/reg_backend_db.c | 2 +-
source3/registry/reg_parse_internal.c | 2 +-
source3/registry/regfio.c | 2 +-
source3/rpc_server/lsa/srv_lsa_nt.c | 8 +-
source3/rpc_server/rpc_ep_setup.c | 66 ++++----
source3/rpc_server/rpc_ncacn_np.c | 6 +-
source3/rpc_server/spoolss/srv_spoolss_nt.c | 22 +-
source3/rpc_server/srv_pipe_hnd.c | 2 +-
source3/rpc_server/wscript_build | 5 +-
source3/rpcclient/cmd_samr.c | 4 +-
source3/rpcclient/cmd_spoolss.c | 4 +-
source3/rpcclient/rpcclient.c | 2 +-
source3/smbd/lanman.c | 6 +-
source3/smbd/server.c | 4 +-
source3/smbd/trans2.c | 4 +-
source3/stf/info3cache.py | 54 ------
source3/stf/sambalib.py | 39 ----
source3/torture/t_strcmp.c | 6 +-
source3/torture/torture.c | 2 +-
source3/utils/eventlogadm.c | 6 +-
source3/utils/net_ads.c | 12 +-
source3/utils/net_conf.c | 2 +-
source3/utils/net_file.c | 2 +-
source3/utils/net_group.c | 2 +-
source3/utils/net_groupmap.c | 34 ++--
source3/utils/net_help.c | 2 +-
source3/utils/net_join.c | 2 +-
source3/utils/net_lookup.c | 2 +-
source3/utils/net_rpc.c | 6 +-
source3/utils/net_rpc_rights.c | 2 +-
source3/utils/net_rpc_samsync.c | 18 +-
source3/utils/net_share.c | 2 +-
source3/utils/net_user.c | 2 +-
source3/utils/net_util.c | 2 +-
source3/utils/ntlm_auth.c | 2 +-
source3/utils/testparm.c | 25 +++-
source3/winbindd/idmap_adex/cell_util.c | 4 +-
source3/winbindd/idmap_adex/provider_unified.c | 2 +-
source3/wscript_build | 45 +++--
source4/lib/registry/wscript_build | 2 +-
source4/libcli/wscript_build | 5 +-
source4/libnet/libnet_join.c | 36 +---
source4/libnet/libnet_join.h | 3 +-
source4/libnet/py_net.c | 16 +-
source4/scripting/python/pyglue.c | 32 ++++
source4/scripting/python/samba/__init__.py | 2 +
source4/scripting/python/samba/netcmd/join.py | 15 +-
.../scripting/python/samba/tests}/strings.py | 121 ++++---------
.../scripting/python/samba/tests}/unicodenames.py | 6 +-
source4/selftest/skip | 119 +++++++------
source4/selftest/tests.py | 1 +
90 files changed, 565 insertions(+), 890 deletions(-)
rename {source3/librpc => librpc}/ndr/util.c (94%)
delete mode 100755 source3/stf/info3cache.py
delete mode 100644 source3/stf/sambalib.py
rename {source3/stf => source4/scripting/python/samba/tests}/strings.py (50%)
mode change 100755 => 100644
rename {source3/stf => source4/scripting/python/samba/tests}/unicodenames.py (99%)
Changeset truncated at 500 lines:
diff --git a/auth/wscript_build b/auth/wscript_build
index 75580fd..0472a20 100644
--- a/auth/wscript_build
+++ b/auth/wscript_build
@@ -1,7 +1,8 @@
#!/usr/bin/env python
-bld.SAMBA_SUBSYSTEM('auth_sam_reply',
- source='auth_sam_reply.c',
- deps='talloc',
- autoproto='auth_sam_reply.h'
- )
+bld.SAMBA_LIBRARY('auth_sam_reply',
+ source='auth_sam_reply.c',
+ deps='talloc security samba-util',
+ autoproto='auth_sam_reply.h',
+ private_library=True
+ )
diff --git a/lib/util/charset/codepoints.c b/lib/util/charset/codepoints.c
index 5e8ac64..71611bf 100644
--- a/lib/util/charset/codepoints.c
+++ b/lib/util/charset/codepoints.c
@@ -290,6 +290,11 @@ _PUBLIC_ struct smb_iconv_handle *smb_iconv_handle_reinit(TALLOC_CTX *mem_ctx,
talloc_set_destructor(ret, close_iconv_handle);
+ if (strcasecmp(dos_charset, "UTF8") == 0 || strcasecmp(dos_charset, "UTF-8") == 0) {
+ DEBUG(0,("ERROR: invalid DOS charset: 'dos charset' must not be UTF8, using (default value) CP850 instead\n"));
+ dos_charset = "CP850";
+ }
+
ret->dos_charset = talloc_strdup(ret->child_ctx, dos_charset);
ret->unix_charset = talloc_strdup(ret->child_ctx, unix_charset);
ret->display_charset = talloc_strdup(ret->child_ctx, display_charset);
diff --git a/lib/util/charset/util_str.c b/lib/util/charset/util_str.c
index e76c1db..80e5bde 100644
--- a/lib/util/charset/util_str.c
+++ b/lib/util/charset/util_str.c
@@ -487,9 +487,10 @@ char *strstr_m(const char *src, const char *findstr)
const char *s;
char *s2;
char *retp;
-
size_t converted_size, findstr_len = 0;
+ TALLOC_CTX *frame; /* Only set up in the iconv case */
+
/* for correctness */
if (!findstr[0]) {
return discard_const_p(char, src);
@@ -524,35 +525,34 @@ char *strstr_m(const char *src, const char *findstr)
s = src;
#endif
- if (!push_ucs2_talloc(talloc_tos(), &src_w, src, &converted_size)) {
+ frame = talloc_stackframe();
+
+ if (!push_ucs2_talloc(frame, &src_w, src, &converted_size)) {
DEBUG(0,("strstr_m: src malloc fail\n"));
+ TALLOC_FREE(frame);
return NULL;
}
- if (!push_ucs2_talloc(talloc_tos(), &find_w, findstr, &converted_size)) {
- TALLOC_FREE(src_w);
+ if (!push_ucs2_talloc(frame, &find_w, findstr, &converted_size)) {
DEBUG(0,("strstr_m: find malloc fail\n"));
+ TALLOC_FREE(frame);
return NULL;
}
p = strstr_w(src_w, find_w);
if (!p) {
- TALLOC_FREE(src_w);
- TALLOC_FREE(find_w);
+ TALLOC_FREE(frame);
return NULL;
}
*p = 0;
- if (!pull_ucs2_talloc(talloc_tos(), &s2, src_w, &converted_size)) {
- TALLOC_FREE(src_w);
- TALLOC_FREE(find_w);
+ if (!pull_ucs2_talloc(frame, &s2, src_w, &converted_size)) {
+ TALLOC_FREE(frame);
DEBUG(0,("strstr_m: dest malloc fail\n"));
return NULL;
}
retp = discard_const_p(char, (s+strlen(s2)));
- TALLOC_FREE(src_w);
- TALLOC_FREE(find_w);
- TALLOC_FREE(s2);
+ TALLOC_FREE(frame);
return retp;
}
diff --git a/lib/util/charset/util_unistr_w.c b/lib/util/charset/util_unistr_w.c
index 5b61d52..3fbed7f 100644
--- a/lib/util/charset/util_unistr_w.c
+++ b/lib/util/charset/util_unistr_w.c
@@ -234,38 +234,6 @@ static int strncmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b, size_t len)
return (len - n)?(*(COPY_UCS2_CHAR(&cpa,a)) - *(COPY_UCS2_CHAR(&cpb,b))):0;
}
-/*******************************************************************
- Case insensitive string comparison.
-********************************************************************/
-
-int strcasecmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b)
-{
- smb_ucs2_t cpa, cpb;
-
- while ((*COPY_UCS2_CHAR(&cpb,b)) && toupper_m(*(COPY_UCS2_CHAR(&cpa,a))) == toupper_m(cpb)) {
- a++;
- b++;
- }
- return (tolower_m(*(COPY_UCS2_CHAR(&cpa,a))) - tolower_m(*(COPY_UCS2_CHAR(&cpb,b))));
-}
-
-/*******************************************************************
- Case insensitive string comparison, length limited.
-********************************************************************/
-
-int strncasecmp_w(const smb_ucs2_t *a, const smb_ucs2_t *b, size_t len)
-{
- smb_ucs2_t cpa, cpb;
- size_t n = 0;
-
- while ((n < len) && *COPY_UCS2_CHAR(&cpb,b) && (toupper_m(*(COPY_UCS2_CHAR(&cpa,a))) == toupper_m(cpb))) {
- a++;
- b++;
- n++;
- }
- return (len - n)?(tolower_m(*(COPY_UCS2_CHAR(&cpa,a))) - tolower_m(*(COPY_UCS2_CHAR(&cpb,b)))):0;
-}
-
/*
The *_wa() functions take a combination of 7 bit ascii
and wide characters They are used so that you can use string
diff --git a/libcli/cldap/wscript_build b/libcli/cldap/wscript_build
index d0c00d7..9dd94c6 100644
--- a/libcli/cldap/wscript_build
+++ b/libcli/cldap/wscript_build
@@ -1,9 +1,10 @@
#!/usr/bin/env python
-bld.SAMBA_SUBSYSTEM('LIBCLI_CLDAP',
- source='cldap.c',
- public_deps='cli-ldap',
- deps='LIBTSOCKET samba-util UTIL_TEVENT ldb LIBCLI_NETLOGON'
- )
+bld.SAMBA_LIBRARY('LIBCLI_CLDAP',
+ source='cldap.c',
+ public_deps='cli-ldap',
+ deps='LIBTSOCKET samba-util UTIL_TEVENT ldb LIBCLI_NETLOGON',
+ private_library=True
+ )
diff --git a/libcli/registry/wscript_build b/libcli/registry/wscript_build
index b9c73aa..ec3fdd3 100644
--- a/libcli/registry/wscript_build
+++ b/libcli/registry/wscript_build
@@ -1,4 +1,5 @@
-bld.SAMBA_SUBSYSTEM('util_reg',
+bld.SAMBA_LIBRARY('util_reg',
source='util_reg.c',
- deps='ndr')
+ deps='ndr',
+ private_library=True)
diff --git a/libcli/smb/wscript_build b/libcli/smb/wscript_build
index 36d9d10..0d74e26 100644
--- a/libcli/smb/wscript_build
+++ b/libcli/smb/wscript_build
@@ -1,9 +1,9 @@
#!/usr/bin/env python
-bld.SAMBA_SUBSYSTEM('LIBCLI_SMB_COMMON',
+bld.SAMBA_LIBRARY('LIBCLI_SMB_COMMON',
source='smb2_create_blob.c util.c',
autoproto='smb_common_proto.h',
- public_deps='talloc'
+ public_deps='talloc samba-util',
+ private_library=True
)
-
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index 8c59bb9..cbe9b40 100644
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -374,6 +374,8 @@ struct ndr_interface_list {
const struct ndr_interface_table *table;
};
+struct sockaddr_storage;
+
/*********************************************************************
Map an NT error code from a NDR error code.
*********************************************************************/
@@ -395,6 +397,7 @@ enum ndr_err_code ndr_pull_dom_sid0(struct ndr_pull *ndr, int ndr_flags, struct
void ndr_print_dom_sid0(struct ndr_print *ndr, const char *name, const struct dom_sid *sid);
size_t ndr_size_dom_sid0(const struct dom_sid *sid, int flags);
void ndr_print_GUID(struct ndr_print *ndr, const char *name, const struct GUID *guid);
+void ndr_print_sockaddr_storage(struct ndr_print *ndr, const char *name, const struct sockaddr_storage *ss);
bool ndr_syntax_id_equal(const struct ndr_syntax_id *i1, const struct ndr_syntax_id *i2);
enum ndr_err_code ndr_push_struct_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, const void *p, ndr_push_flags_fn_t fn);
enum ndr_err_code ndr_push_union_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p, uint32_t level, ndr_push_flags_fn_t fn);
diff --git a/source3/librpc/ndr/util.c b/librpc/ndr/util.c
similarity index 94%
rename from source3/librpc/ndr/util.c
rename to librpc/ndr/util.c
index 6bbe054..b2df28d 100644
--- a/source3/librpc/ndr/util.c
+++ b/librpc/ndr/util.c
@@ -1,27 +1,28 @@
-/*
+/*
Unix SMB/CIFS implementation.
libndr interface
Copyright (C) Andrew Tridgell 2003
-
+
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/>.
*/
#include "includes.h"
#include "../librpc/ndr/libndr.h"
-#include "librpc/ndr/util.h"
+#include "system/network.h"
+#include "lib/util/util_net.h"
_PUBLIC_ void ndr_print_sockaddr_storage(struct ndr_print *ndr, const char *name, const struct sockaddr_storage *ss)
{
diff --git a/librpc/wscript_build b/librpc/wscript_build
index a180c38..d8b3fe7 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -345,114 +345,114 @@ bld.SAMBA_SUBSYSTEM('NDR_FILE_ID',
bld.SAMBA_SUBSYSTEM('RPC_NDR_XATTR',
source='gen_ndr/ndr_xattr_c.c',
- public_deps='NDR_XATTR dcerpc'
+ public_deps='NDR_XATTR rpccommon'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_ROT',
source='gen_ndr/ndr_rot_c.c',
- public_deps='NDR_ROT dcerpc'
+ public_deps='NDR_ROT rpccommon'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_ATSVC',
source='gen_ndr/ndr_atsvc_c.c',
- public_deps='dcerpc NDR_ATSVC'
+ public_deps='rpccommon NDR_ATSVC'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_AUDIOSRV',
source='gen_ndr/ndr_audiosrv_c.c',
- public_deps='NDR_AUDIOSRV dcerpc'
+ public_deps='NDR_AUDIOSRV rpccommon'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_ECHO',
source='gen_ndr/ndr_echo_c.c',
- public_deps='dcerpc NDR_ECHO'
+ public_deps='rpccommon NDR_ECHO'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_DSBACKUP',
source='gen_ndr/ndr_dsbackup_c.c',
- public_deps='dcerpc NDR_DSBACKUP'
+ public_deps='rpccommon NDR_DSBACKUP'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_EFS',
source='gen_ndr/ndr_efs_c.c',
- public_deps='dcerpc NDR_EFS'
+ public_deps='rpccommon NDR_EFS'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_LSA',
source='gen_ndr/ndr_lsa_c.c',
- public_deps='dcerpc ndr-standard'
+ public_deps='rpccommon ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_SAMR',
source='gen_ndr/ndr_samr_c.c',
- public_deps='dcerpc NDR_SAMR'
+ public_deps='rpccommon NDR_SAMR'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_DFS',
source='gen_ndr/ndr_dfs_c.c',
- public_deps='dcerpc ndr-standard'
+ public_deps='rpccommon ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_FRSAPI',
source='gen_ndr/ndr_frsapi_c.c',
- public_deps='dcerpc NDR_FRSAPI'
+ public_deps='rpccommon NDR_FRSAPI'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_DRSUAPI',
source='gen_ndr/ndr_drsuapi_c.c',
- public_deps='dcerpc NDR_DRSUAPI'
+ public_deps='rpccommon NDR_DRSUAPI'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_DRSBLOBS',
source='gen_ndr/ndr_drsblobs_c.c',
- public_deps='dcerpc NDR_DRSBLOBS'
+ public_deps='rpccommon NDR_DRSBLOBS'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_POLICYAGENT',
source='gen_ndr/ndr_policyagent_c.c',
- public_deps='dcerpc NDR_POLICYAGENT'
+ public_deps='rpccommon NDR_POLICYAGENT'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_UNIXINFO',
source='gen_ndr/ndr_unixinfo_c.c',
- public_deps='dcerpc NDR_UNIXINFO'
+ public_deps='rpccommon NDR_UNIXINFO'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_BROWSER',
source='gen_ndr/ndr_browser_c.c',
- public_deps='dcerpc NDR_BROWSER'
+ public_deps='rpccommon NDR_BROWSER'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_SPOOLSS',
source='gen_ndr/ndr_spoolss_c.c',
- public_deps='dcerpc NDR_SPOOLSS'
+ public_deps='rpccommon NDR_SPOOLSS'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_NBT',
source='gen_ndr/ndr_nbt_c.c',
- public_deps='dcerpc NDR_NBT'
+ public_deps='rpccommon NDR_NBT'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_WKSSVC',
source='gen_ndr/ndr_wkssvc_c.c',
- public_deps='dcerpc ndr-standard'
+ public_deps='rpccommon ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_SRVSVC',
source='gen_ndr/ndr_srvsvc_c.c',
- public_deps='dcerpc NDR_SRVSVC'
+ public_deps='rpccommon NDR_SRVSVC'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_SVCCTL',
source='gen_ndr/ndr_svcctl_c.c',
- public_deps='dcerpc ndr-standard',
+ public_deps='rpccommon ndr-standard',
public_headers='gen_ndr/ndr_svcctl_c.h ndr/ndr_svcctl.h',
header_path=[ ('gen_ndr*', 'gen_ndr'), ('ndr*', 'ndr')]
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_EVENTLOG',
source='gen_ndr/ndr_eventlog_c.c',
- public_deps='dcerpc ndr-standard'
+ public_deps='rpccommon ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_EPMAPPER',
@@ -462,27 +462,27 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_EPMAPPER',
bld.SAMBA_SUBSYSTEM('RPC_NDR_DBGIDL',
source='gen_ndr/ndr_dbgidl_c.c',
- public_deps='dcerpc NDR_DBGIDL'
+ public_deps='rpccommon NDR_DBGIDL'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_DSSETUP',
source='gen_ndr/ndr_dssetup_c.c',
- public_deps='dcerpc NDR_DSSETUP'
+ public_deps='rpccommon NDR_DSSETUP'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_MSGSVC',
source='gen_ndr/ndr_msgsvc_c.c',
- public_deps='dcerpc NDR_MSGSVC'
+ public_deps='rpccommon NDR_MSGSVC'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_WINREG',
source='gen_ndr/ndr_winreg_c.c',
- public_deps='dcerpc ndr-standard'
+ public_deps='rpccommon ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_INITSHUTDOWN',
source='gen_ndr/ndr_initshutdown_c.c',
- public_deps='dcerpc ndr-standard'
+ public_deps='rpccommon ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_MGMT',
@@ -492,32 +492,32 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_MGMT',
bld.SAMBA_SUBSYSTEM('RPC_NDR_OXIDRESOLVER',
source='gen_ndr/ndr_oxidresolver_c.c',
- public_deps='dcerpc NDR_OXIDRESOLVER'
+ public_deps='rpccommon NDR_OXIDRESOLVER'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_REMACT',
source='gen_ndr/ndr_remact_c.c',
- public_deps='dcerpc NDR_REMACT'
+ public_deps='rpccommon NDR_REMACT'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_WZCSVC',
source='gen_ndr/ndr_wzcsvc_c.c',
- public_deps='dcerpc NDR_WZCSVC'
+ public_deps='rpccommon NDR_WZCSVC'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_W32TIME',
source='gen_ndr/ndr_w32time_c.c',
- public_deps='dcerpc NDR_W32TIME'
+ public_deps='rpccommon NDR_W32TIME'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_SCERPC',
source='gen_ndr/ndr_scerpc_c.c',
- public_deps='dcerpc NDR_SCERPC'
+ public_deps='rpccommon NDR_SCERPC'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_NTSVCS',
source='gen_ndr/ndr_ntsvcs_c.c',
- public_deps='dcerpc ndr-standard'
+ public_deps='rpccommon ndr-standard'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_NETLOGON',
@@ -527,22 +527,22 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_NETLOGON',
bld.SAMBA_SUBSYSTEM('RPC_NDR_TRKWKS',
source='gen_ndr/ndr_trkwks_c.c',
- public_deps='dcerpc NDR_TRKWKS'
+ public_deps='rpccommon NDR_TRKWKS'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_KEYSVC',
source='gen_ndr/ndr_keysvc_c.c',
- public_deps='dcerpc NDR_KEYSVC'
+ public_deps='rpccommon NDR_KEYSVC'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_BACKUPKEY',
source='gen_ndr/ndr_backupkey_c.c',
- public_deps='dcerpc NDR_BACKUPKEY'
+ public_deps='rpccommon NDR_BACKUPKEY'
)
bld.SAMBA_SUBSYSTEM('RPC_NDR_DNSP',
source='gen_ndr/ndr_dnsp_c.c',
- public_deps='dcerpc NDR_DNSP'
+ public_deps='rpccommon NDR_DNSP'
)
# a grouping library for NDR subsystems that may be used by more than one target
@@ -555,14 +555,17 @@ bld.SAMBA_LIBRARY('ndr-samba',
# a grouping library for RPC_NDR subsystems that may be used by more than one target
bld.SAMBA_LIBRARY('dcerpc-samba',
- source=[],
- deps='RPC_NDR_DRSUAPI RPC_NDR_LSA RPC_NDR_WINREG',
- private_library=True,
- grouping_library=True
- )
+ source='',
--
Samba Shared Repository
More information about the samba-cvs
mailing list