[SCM] Samba Shared Repository - branch master updated
Andrew Tridgell
tridge at samba.org
Wed Apr 6 00:59:02 MDT 2011
The branch, master has been updated
via 6d0be9e s4-test: fixed a problem with very verbose NDR debug
via 49ab2df lib/crypto: rename the SHA256_ functions to samba_SHA256_
via 5adf85e tstream: make npa_tstream a private library
via a8da13c lib: make asn1_util a private library
via 15576da lib: moved data_blob.c into samba-util-common
from 48220b8 This reverts commit 378c4b221a6be75e1d32cb6fb3a773ce5de6dbda.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6d0be9e3d10e53ef91618d556505e09db64da84b
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed Apr 6 15:34:22 2011 +1000
s4-test: fixed a problem with very verbose NDR debug
lp.get("log level") returns a string, not an integer. It needs to be
cast to an integer for comparison with a number
Autobuild-User: Andrew Tridgell <tridge at samba.org>
Autobuild-Date: Wed Apr 6 08:58:05 CEST 2011 on sn-devel-104
commit 49ab2df28a9399fef8d37677404304ac88115b45
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed Apr 6 14:36:21 2011 +1000
lib/crypto: rename the SHA256_ functions to samba_SHA256_
this prevents a symbol duplication with the openssl library, which may
be linked in via a secondary library dependency
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
commit 5adf85e6afa949f8e636327bb3446aa4f41948a7
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed Apr 6 14:29:34 2011 +1000
tstream: make npa_tstream a private library
this prevents symbol duplication of the npa_tstream symbols
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
commit a8da13cd5c7b5fa7cf3c6f9b3afce066f085e67c
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed Apr 6 14:28:28 2011 +1000
lib: make asn1_util a private library
this prevents symbol duplication of the asn1 symbols in the service
and ntvfs subsystems
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
commit 15576da63a35bdd6486dab1816cc12ee92764dab
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed Apr 6 14:26:00 2011 +1000
lib: moved data_blob.c into samba-util-common
this avoids a duplication of the data_blob symbols some binaries
(eg. smbtorture)
Pair-Programmed-With: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/crypto/hmacsha256.c | 22 ++++++++--------
lib/crypto/sha256.c | 8 +++---
lib/crypto/sha256.h | 6 ++--
lib/util/wscript_build | 13 +++++----
libcli/auth/wscript_build | 2 +-
libcli/ldap/wscript_build | 2 +-
libcli/named_pipe_auth/wscript_build | 9 ++++---
librpc/wscript_build | 2 +-
source3/modules/vfs_acl_common.c | 6 ++--
source3/pam_smbpass/wscript_build | 2 +-
source3/wscript_build | 34 +++++++++++--------------
source4/auth/gensec/wscript_build | 2 +-
source4/auth/kerberos/wscript_build | 2 +-
source4/ntvfs/wscript_build | 2 +-
source4/scripting/bin/samba_spnupdate | 2 +-
source4/scripting/python/samba/join.py | 4 +-
source4/scripting/python/samba/netcmd/drs.py | 2 +-
source4/smbd/wscript_build | 2 +-
source4/torture/drs/wscript_build | 2 +-
source4/utils/oLschema2ldif.c | 6 ++--
20 files changed, 64 insertions(+), 66 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/crypto/hmacsha256.c b/lib/crypto/hmacsha256.c
index 1a31441..36e321a 100644
--- a/lib/crypto/hmacsha256.c
+++ b/lib/crypto/hmacsha256.c
@@ -42,9 +42,9 @@ _PUBLIC_ void hmac_sha256_init(const uint8_t *key, size_t key_len, struct HMACSH
{
SHA256_CTX tctx;
- SHA256_Init(&tctx);
- SHA256_Update(&tctx, key, key_len);
- SHA256_Final(tk, &tctx);
+ samba_SHA256_Init(&tctx);
+ samba_SHA256_Update(&tctx, key, key_len);
+ samba_SHA256_Final(tk, &tctx);
key = tk;
key_len = SHA256_DIGEST_LENGTH;
@@ -63,8 +63,8 @@ _PUBLIC_ void hmac_sha256_init(const uint8_t *key, size_t key_len, struct HMACSH
ctx->k_opad[i] ^= 0x5c;
}
- SHA256_Init(&ctx->ctx);
- SHA256_Update(&ctx->ctx, ctx->k_ipad, 64);
+ samba_SHA256_Init(&ctx->ctx);
+ samba_SHA256_Update(&ctx->ctx, ctx->k_ipad, 64);
}
/***********************************************************************
@@ -72,7 +72,7 @@ _PUBLIC_ void hmac_sha256_init(const uint8_t *key, size_t key_len, struct HMACSH
***********************************************************************/
_PUBLIC_ void hmac_sha256_update(const uint8_t *data, size_t data_len, struct HMACSHA256Context *ctx)
{
- SHA256_Update(&ctx->ctx, data, data_len); /* then text of datagram */
+ samba_SHA256_Update(&ctx->ctx, data, data_len); /* then text of datagram */
}
/***********************************************************************
@@ -82,10 +82,10 @@ _PUBLIC_ void hmac_sha256_final(uint8_t digest[SHA256_DIGEST_LENGTH], struct HMA
{
SHA256_CTX ctx_o;
- SHA256_Final(digest, &ctx->ctx);
+ samba_SHA256_Final(digest, &ctx->ctx);
- SHA256_Init(&ctx_o);
- SHA256_Update(&ctx_o, ctx->k_opad, 64);
- SHA256_Update(&ctx_o, digest, SHA256_DIGEST_LENGTH);
- SHA256_Final(digest, &ctx_o);
+ samba_SHA256_Init(&ctx_o);
+ samba_SHA256_Update(&ctx_o, ctx->k_opad, 64);
+ samba_SHA256_Update(&ctx_o, digest, SHA256_DIGEST_LENGTH);
+ samba_SHA256_Final(digest, &ctx_o);
}
diff --git a/lib/crypto/sha256.c b/lib/crypto/sha256.c
index 42ab236..02e2259 100644
--- a/lib/crypto/sha256.c
+++ b/lib/crypto/sha256.c
@@ -80,7 +80,7 @@ static const uint32_t constant_256[64] = {
};
void
-SHA256_Init (SHA256_CTX *m)
+samba_SHA256_Init (SHA256_CTX *m)
{
m->sz[0] = 0;
m->sz[1] = 0;
@@ -187,7 +187,7 @@ struct x32{
};
void
-SHA256_Update (SHA256_CTX *m, const void *v, size_t len)
+samba_SHA256_Update (SHA256_CTX *m, const void *v, size_t len)
{
const unsigned char *p = (const unsigned char *)v;
size_t old_sz = m->sz[0];
@@ -222,7 +222,7 @@ SHA256_Update (SHA256_CTX *m, const void *v, size_t len)
}
void
-SHA256_Final (void *res, SHA256_CTX *m)
+samba_SHA256_Final (void *res, SHA256_CTX *m)
{
unsigned char zeros[72];
unsigned offset = (m->sz[0] / 8) % 64;
@@ -238,7 +238,7 @@ SHA256_Final (void *res, SHA256_CTX *m)
zeros[dstart+2] = (m->sz[1] >> 8) & 0xff;
zeros[dstart+1] = (m->sz[1] >> 16) & 0xff;
zeros[dstart+0] = (m->sz[1] >> 24) & 0xff;
- SHA256_Update (m, zeros, dstart + 8);
+ samba_SHA256_Update (m, zeros, dstart + 8);
{
int i;
unsigned char *r = (unsigned char*)res;
diff --git a/lib/crypto/sha256.h b/lib/crypto/sha256.h
index 4a5f2cb..7ee8fac 100644
--- a/lib/crypto/sha256.h
+++ b/lib/crypto/sha256.h
@@ -84,8 +84,8 @@ struct hc_sha256state {
typedef struct hc_sha256state SHA256_CTX;
-void SHA256_Init (SHA256_CTX *);
-void SHA256_Update (SHA256_CTX *, const void *, size_t);
-void SHA256_Final (void *, SHA256_CTX *);
+void samba_SHA256_Init (SHA256_CTX *);
+void samba_SHA256_Update (SHA256_CTX *, const void *, size_t);
+void samba_SHA256_Final (void *, SHA256_CTX *);
#endif /* HEIM_SHA_H */
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index e39af54..11bb40a 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -3,7 +3,7 @@
# 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='''talloc_stack.c smb_threads.c xfile.c
+ 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
@@ -20,7 +20,7 @@ bld.SAMBA_LIBRARY('samba-util-common',
if bld.env._SAMBA_BUILD_ == 4:
bld.SAMBA_LIBRARY('samba-util',
- source='''dprintf.c data_blob.c
+ source='''dprintf.c
ms_fnmatch.c parmlist.c substitute.c util_str.c
''',
deps='samba-util-common',
@@ -33,10 +33,11 @@ if bld.env._SAMBA_BUILD_ == 4:
)
-bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
- source='asn1.c',
- deps='talloc',
- local_include=False)
+bld.SAMBA_LIBRARY('asn1util',
+ source='asn1.c',
+ deps='talloc samba-util-common',
+ private_library=True,
+ local_include=False)
bld.SAMBA_SUBSYSTEM('UNIX_PRIVS',
diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build
index 0f0e22b..436ca61 100644
--- a/libcli/auth/wscript_build
+++ b/libcli/auth/wscript_build
@@ -37,4 +37,4 @@ bld.SAMBA_SUBSYSTEM('PAM_ERRORS',
bld.SAMBA_SUBSYSTEM('SPNEGO_PARSE',
source='spnego_parse.c',
- deps='ASN1_UTIL')
+ deps='asn1util')
diff --git a/libcli/ldap/wscript_build b/libcli/ldap/wscript_build
index 5efb683..feab651 100644
--- a/libcli/ldap/wscript_build
+++ b/libcli/ldap/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_MESSAGE',
source='ldap_message.c',
public_deps='errors talloc ldb',
public_headers='ldap_message.h ldap_errors.h',
- deps='samba-util ASN1_UTIL'
+ deps='samba-util asn1util'
)
diff --git a/libcli/named_pipe_auth/wscript_build b/libcli/named_pipe_auth/wscript_build
index c97893b..53fbd84 100644
--- a/libcli/named_pipe_auth/wscript_build
+++ b/libcli/named_pipe_auth/wscript_build
@@ -1,8 +1,9 @@
#!/usr/bin/env python
-bld.SAMBA_SUBSYSTEM('NAMED_PIPE_AUTH_TSTREAM',
- source='npa_tstream.c',
- public_deps='NDR_NAMED_PIPE_AUTH tevent LIBTSOCKET'
- )
+bld.SAMBA_LIBRARY('npa_tstream',
+ source='npa_tstream.c',
+ private_library=True,
+ public_deps='NDR_NAMED_PIPE_AUTH tevent LIBTSOCKET'
+ )
diff --git a/librpc/wscript_build b/librpc/wscript_build
index b71a3ae..d6f0f6d 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -282,7 +282,7 @@ bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
bld.SAMBA_SUBSYSTEM('NDR_DRSUAPI',
source='ndr/ndr_drsuapi.c gen_ndr/ndr_drsuapi.c',
- public_deps='ndr NDR_COMPRESSION NDR_SECURITY ndr-standard ASN1_UTIL'
+ public_deps='ndr NDR_COMPRESSION NDR_SECURITY ndr-standard asn1util'
)
bld.SAMBA_SUBSYSTEM('NDR_DRSBLOBS',
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 827c954..6e11ffc 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -61,9 +61,9 @@ static NTSTATUS hash_sd_sha256(struct security_descriptor *psd,
return status;
}
- SHA256_Init(&tctx);
- SHA256_Update(&tctx, blob.data, blob.length);
- SHA256_Final(hash, &tctx);
+ samba_SHA256_Init(&tctx);
+ samba_SHA256_Update(&tctx, blob.data, blob.length);
+ samba_SHA256_Final(hash, &tctx);
return NT_STATUS_OK;
}
diff --git a/source3/pam_smbpass/wscript_build b/source3/pam_smbpass/wscript_build
index 80aa0fb..0d200c6 100644
--- a/source3/pam_smbpass/wscript_build
+++ b/source3/pam_smbpass/wscript_build
@@ -6,7 +6,7 @@ if bld.CONFIG_SET('WITH_PAM_MODULES'):
pam_smb_passwd.c
pam_smb_acct.c
support.c''',
- deps='''tdb talloc pam PAM_ERRORS wbclient cap ASN1_UTIL param LIB_NONSMBD passdb SMBLDAP
+ deps='''tdb talloc pam PAM_ERRORS wbclient cap asn1util param LIB_NONSMBD passdb SMBLDAP
LIBNTLMSSP LIBTSOCKET''',
cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
realname='pam_smbpass.so',
diff --git a/source3/wscript_build b/source3/wscript_build
index af03e4c..b709b5f 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -720,7 +720,7 @@ bld.SAMBA3_SUBSYSTEM('GROUPDB',
bld.SAMBA3_SUBSYSTEM('TLDAP',
source=TLDAP_SRC,
- deps='ASN1_UTIL LIBTSOCKET')
+ deps='asn1util LIBTSOCKET')
bld.SAMBA3_LIBRARY('passdb',
source=PASSDB_SRC,
@@ -776,7 +776,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
bld.SAMBA3_LIBRARY('samba3core',
source=LIB_SRC,
- deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 samba-util3 CHARSET3 UTIL_TDB UTIL_PW SAMBA_VERSION krb5 flag_mapping util_reg',
+ deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 CHARSET3 UTIL_TDB UTIL_PW SAMBA_VERSION krb5 flag_mapping util_reg',
private_library=True,
vars=locals())
@@ -860,7 +860,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY3 REGFIO
LIB_SMBCONF REG_FULL FNAME_UTIL
LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
- RPC_NDR_SRVSVC NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON INIT_SAMR
+ RPC_NDR_SRVSVC npa_tstream INIT_NETLOGON INIT_SAMR
LIBCLI_SMB_COMMON RPC_SERVER
''',
private_library=True,
@@ -966,10 +966,6 @@ bld.SAMBA3_SUBSYSTEM('CHARSET3',
public_deps='ICONV_WRAPPER CODEPOINTS',
deps='DYNCONFIG')
-bld.SAMBA3_SUBSYSTEM('samba-util3',
- source='../lib/util/data_blob.c',
- deps='talloc CHARSET3 samba-util-common')
-
bld.SAMBA3_SUBSYSTEM('ldb3',
source='lib/ldb_compat.c')
@@ -1034,7 +1030,7 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info
TOKEN_UTIL
LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON
- RPC_NDR_DSSETUP NAMED_PIPE_AUTH_TSTREAM INIT_NETLOGON
+ RPC_NDR_DSSETUP npa_tstream INIT_NETLOGON
RPC_NCACN_NP RPC_PIPE_REGISTER RPC_SAMR RPC_LSARPC
PAM_ERRORS WB_REQTRANS AUTH_COMMON
''',
@@ -1094,13 +1090,13 @@ bld.SAMBA3_BINARY('profiles',
bld.SAMBA3_BINARY('smbspool',
source=CUPS_SRC,
deps='''talloc tdb tevent resolv cap wbclient POPT_SAMBA3 param LIBSMB LIB_NONSMBD samba3core
- KRBCLIENT ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''',
+ KRBCLIENT asn1util LIBTSOCKET NDR_SAMR NDR_LSA''',
vars=locals())
bld.SAMBA3_BINARY('testparm',
source=TESTPARM_SRC,
deps='''talloc tevent ldap cap
- wbclient ASN1_UTIL LIBTSOCKET passdb param LIB_NONSMBD
+ wbclient asn1util LIBTSOCKET passdb param LIB_NONSMBD
LIBSMB_ERR POPT_SAMBA3''',
vars=locals())
@@ -1155,7 +1151,7 @@ bld.SAMBA3_BINARY('nmblookup' + bld.env.suffix3,
bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
source=SMBTORTURE_SRC,
deps='''talloc tdb tevent cap resolv wbclient param LIBSMB KRBCLIENT TLDAP
- LIB_NONSMBD POPT_SAMBA3 ASN1_UTIL LIBTSOCKET NDR_LSA msrpc3 LIBMSRPC_GEN RPC_NDR_ECHO WB_REQTRANS''',
+ LIB_NONSMBD POPT_SAMBA3 asn1util LIBTSOCKET NDR_LSA msrpc3 LIBMSRPC_GEN RPC_NDR_ECHO WB_REQTRANS''',
vars=locals())
bld.SAMBA3_BINARY('smbconftort',
@@ -1171,7 +1167,7 @@ bld.SAMBA3_BINARY('replacetort',
bld.SAMBA3_BINARY('masktest' + bld.env.suffix3,
source=MASKTEST_SRC,
deps='''talloc tdb cap resolv wbclient param LIB_NONSMBD LIBSMB KRBCLIENT
- ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA''',
+ asn1util LIBTSOCKET NDR_SAMR NDR_LSA''',
vars=locals())
bld.SAMBA3_BINARY('msgtest',
@@ -1207,7 +1203,7 @@ bld.SAMBA3_BINARY('sharesec',
bld.SAMBA3_BINARY('locktest' + bld.env.suffix3,
source=LOCKTEST_SRC,
deps='''talloc tdb tevent cap resolv wbclient param KRBCLIENT LIBSMB LIB_NONSMBD
- ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
+ asn1util LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
vars=locals())
bld.SAMBA3_BINARY('pdbtest',
@@ -1234,7 +1230,7 @@ bld.SAMBA3_BINARY('log2pcap',
bld.SAMBA3_BINARY('locktest2',
source=LOCKTEST2_SRC,
deps='''talloc tdb tevent cap resolv wbclient param KRBCLIENT LIBSMB LIB_NONSMBD
- ASN1_UTIL LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
+ asn1util LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
vars=locals())
bld.SAMBA3_BINARY('debug2html',
@@ -1244,7 +1240,7 @@ bld.SAMBA3_BINARY('debug2html',
bld.SAMBA3_BINARY('smbfilter',
source=SMBFILTER_SRC,
- deps='''talloc tevent cap resolv wbclient param LIBSMB LIB_NONSMBD KRBCLIENT ASN1_UTIL LIBTSOCKET
+ deps='''talloc tevent cap resolv wbclient param LIBSMB LIB_NONSMBD KRBCLIENT asn1util LIBTSOCKET
NDR_SAMR NDR_LSA''',
vars=locals())
@@ -1256,14 +1252,14 @@ bld.SAMBA3_BINARY('versiontest',
bld.SAMBA3_BINARY('wbinfo' + bld.env.suffix3,
source=WBINFO_SRC,
deps='''talloc wbclient tevent cap
- ASN1_UTIL LIBTSOCKET passdb ldap param LIB_NONSMBD
+ asn1util LIBTSOCKET passdb ldap param LIB_NONSMBD
LIBNTLMSSP POPT_SAMBA3 LIBAFS_SETTOKEN''',
vars=locals())
bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3,
source=NTLM_AUTH_SRC,
deps='''tdb talloc cap resolv krb5 k5crypto com_err wbclient param LIB_NONSMBD
- samba3core LIBNTLMSSP POPT_SAMBA3 ASN1_UTIL LIBTSOCKET
+ samba3core LIBNTLMSSP POPT_SAMBA3 asn1util LIBTSOCKET
passdb SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER
NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR LIBNMB SLCACHE SPNEGO_PARSE KRBCLIENT''',
vars=locals())
@@ -1275,7 +1271,7 @@ bld.SAMBA3_BINARY('timelimit',
bld.SAMBA3_BINARY('rpc_open_tcp',
source=RPC_OPEN_TCP_SRC,
deps='''talloc tdb tevent resolv cap wbclient KRBCLIENT param samba3core LIBSMB LIB_NONSMBD
- LIBSMB_ERR ASN1_UTIL LIBTSOCKET LIBMSRPC_GEN msrpc3''',
+ LIBSMB_ERR asn1util LIBTSOCKET LIBMSRPC_GEN msrpc3''',
vars=locals())
bld.SAMBA3_BINARY('test_lp_load',
@@ -1317,7 +1313,7 @@ if not bld.env.toplevel_build:
bld.SAMBA3_SUBSYSTEM('POPT_SAMBA', source='', deps='POPT_SAMBA3')
bld.SAMBA3_SUBSYSTEM('tdb-wrap', source='', deps='tdb-wrap3')
bld.SAMBA3_SUBSYSTEM('errors', source='', deps='errors3')
- bld.SAMBA3_SUBSYSTEM('samba-util', source='', deps='samba-util3')
+ bld.SAMBA3_SUBSYSTEM('samba-util', source='')
bld.SAMBA3_SUBSYSTEM('CHARSET', source='', deps='CHARSET3')
bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3')
bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT')
diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
index 8f8a6e8..42d7dc5 100644
--- a/source4/auth/gensec/wscript_build
+++ b/source4/auth/gensec/wscript_build
@@ -41,7 +41,7 @@ bld.SAMBA_MODULE('gensec_spnego',
autoproto='spnego_proto.h',
subsystem='gensec',
init_function='gensec_spnego_init',
- deps='ASN1_UTIL credentials SPNEGO_PARSE'
+ deps='asn1util credentials SPNEGO_PARSE'
)
diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build
index 5d29f6a..1b4804e 100644
--- a/source4/auth/kerberos/wscript_build
+++ b/source4/auth/kerberos/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_LIBRARY('authkrb5',
source='kerberos.c clikrb5.c kerberos_heimdal.c kerberos_pac.c gssapi_parse.c krb5_init_context.c keytab_copy.c',
autoproto='proto.h',
public_deps='krb5 ndr-krb5pac samba_socket LIBCLI_RESOLVE com_err asn1',
- deps='ASN1_UTIL auth_sam_reply tevent LIBPACKET ndr ldb',
+ deps='asn1util auth_sam_reply tevent LIBPACKET ndr ldb',
private_library=True
)
diff --git a/source4/ntvfs/wscript_build b/source4/ntvfs/wscript_build
index d020465..43a6cd6 100644
--- a/source4/ntvfs/wscript_build
+++ b/source4/ntvfs/wscript_build
@@ -52,7 +52,7 @@ bld.SAMBA_MODULE('ntvfs_ipc',
autoproto='ipc/proto.h',
subsystem='ntvfs',
init_function='ntvfs_ipc_init',
- deps='NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM gssapi credentials DCERPC_SHARE'
+ deps='NDR_NAMED_PIPE_AUTH npa_tstream gssapi credentials DCERPC_SHARE'
)
diff --git a/source4/scripting/bin/samba_spnupdate b/source4/scripting/bin/samba_spnupdate
index 169c12a..1794f2b 100755
--- a/source4/scripting/bin/samba_spnupdate
+++ b/source4/scripting/bin/samba_spnupdate
@@ -196,7 +196,7 @@ def call_rodc_update(d):
server = cldap_ret.pdc_dns_name
try:
binding_options = "seal"
- if lp.get("log level") >= 5:
+ if int(lp.get("log level")) >= 5:
binding_options += ",print"
drs = drsuapi.drsuapi('ncacn_ip_tcp:%s[%s]' % (server, binding_options), lp, creds)
(drs_handle, supported_extensions) = drs_utils.drs_DsBind(drs)
diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py
index 401f262..c0aee71 100644
--- a/source4/scripting/python/samba/join.py
+++ b/source4/scripting/python/samba/join.py
@@ -236,7 +236,7 @@ class dc_join(object):
def drsuapi_connect(ctx):
'''make a DRSUAPI connection to the server'''
binding_options = "seal"
- if ctx.lp.get("log level") >= 5:
+ if int(ctx.lp.get("log level")) >= 5:
binding_options += ",print"
binding_string = "ncacn_ip_tcp:%s[%s]" % (ctx.server, binding_options)
ctx.drsuapi = drsuapi.drsuapi(binding_string, ctx.lp, ctx.creds)
@@ -455,7 +455,7 @@ class dc_join(object):
repl_creds = ctx.creds
binding_options = "seal"
- if ctx.lp.get("debug level") >= 5:
+ if int(ctx.lp.get("log level")) >= 5:
binding_options += ",print"
repl = drs_utils.drs_Replicate(
"ncacn_ip_tcp:%s[%s]" % (ctx.server, binding_options),
diff --git a/source4/scripting/python/samba/netcmd/drs.py b/source4/scripting/python/samba/netcmd/drs.py
index 69e164e..56c0e39 100644
--- a/source4/scripting/python/samba/netcmd/drs.py
+++ b/source4/scripting/python/samba/netcmd/drs.py
@@ -38,7 +38,7 @@ import common
def drsuapi_connect(ctx):
'''make a DRSUAPI connection to the server'''
binding_options = "seal"
- if ctx.lp.get("log level") >= 5:
+ if int(ctx.lp.get("log level")) >= 5:
binding_options += ",print"
binding_string = "ncacn_ip_tcp:%s[%s]" % (ctx.server, binding_options)
try:
diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
index 9d66889..082ab6d 100644
--- a/source4/smbd/wscript_build
+++ b/source4/smbd/wscript_build
@@ -3,7 +3,7 @@
bld.SAMBA_LIBRARY('service',
source='service.c service_stream.c service_named_pipe.c service_task.c',
autoproto='service_proto.h',
- deps='tevent MESSAGING samba_socket RPC_NDR_IRPC NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM gssapi credentials LIBTSOCKET LIBSAMBA_TSOCKET process_model',
+ deps='tevent MESSAGING samba_socket RPC_NDR_IRPC NDR_NAMED_PIPE_AUTH npa_tstream gssapi credentials LIBTSOCKET LIBSAMBA_TSOCKET process_model',
private_library=True
)
diff --git a/source4/torture/drs/wscript_build b/source4/torture/drs/wscript_build
index 90b6b2f..51dd098 100644
--- a/source4/torture/drs/wscript_build
+++ b/source4/torture/drs/wscript_build
@@ -5,7 +5,7 @@ bld.SAMBA_MODULE('TORTURE_DRS',
autoproto='proto.h',
subsystem='smbtorture',
init_function='torture_drs_init',
- deps='samba-util ldb POPT_SAMBA errors torture ldbsamba talloc dcerpc ndr NDR_DRSUAPI gensec samba-hostconfig RPC_NDR_DRSUAPI DSDB_MODULE_HELPERS ASN1_UTIL samdb NDR_DRSBLOBS credentials samdb-common LIBCLI_RESOLVE LP_RESOLVE torturemain',
+ deps='samba-util ldb POPT_SAMBA errors torture ldbsamba talloc dcerpc ndr NDR_DRSUAPI gensec samba-hostconfig RPC_NDR_DRSUAPI DSDB_MODULE_HELPERS asn1util samdb NDR_DRSBLOBS credentials samdb-common LIBCLI_RESOLVE LP_RESOLVE torturemain',
internal_module=True
)
diff --git a/source4/utils/oLschema2ldif.c b/source4/utils/oLschema2ldif.c
index 29ed3bd..ae69db1 100644
--- a/source4/utils/oLschema2ldif.c
+++ b/source4/utils/oLschema2ldif.c
@@ -392,9 +392,9 @@ static struct ldb_message *process_entry(TALLOC_CTX *mem_ctx, const char *entry)
MSG_ADD_STRING("governsID", s);
}
- SHA256_Init(&sha256_context);
--
Samba Shared Repository
More information about the samba-cvs
mailing list