[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Tue May 18 03:45:48 MDT 2010
The branch, master has been updated
via c0fb7b8... s3: Fix some more iconv convenience usages.
via 390ada6... Remove more usages of iconv_convenience in files which were apparently not recompiled by waf.
via b8268cf... s3: Remove use of iconv_convenience.
via f9ca9e4... Finish removal of iconv_convenience in public API's.
from e9f5bdf... smbconf: only include smbconf headers where needed.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c0fb7b8180f7383590f24e84cc3700aa77499112
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri May 14 17:39:07 2010 +0200
s3: Fix some more iconv convenience usages.
commit 390ada6ec79b0480a44da1fa81a63dcaf5c81da7
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon May 10 14:08:38 2010 +0200
Remove more usages of iconv_convenience in files which were apparently not recompiled by waf.
commit b8268cf7b0264ea28f684cbdfbf462e68a018d83
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon May 10 00:42:06 2010 +0200
s3: Remove use of iconv_convenience.
commit f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun May 9 17:20:01 2010 +0200
Finish removal of iconv_convenience in public API's.
-----------------------------------------------------------------------
Summary of changes:
lib/tdr/tdr.c | 17 ++--
lib/tdr/tdr.h | 2 -
lib/tdr/testsuite.c | 18 ++--
libcli/auth/ntlmssp_ndr.c | 32 ++----
libcli/auth/ntlmssp_ndr.h | 6 -
libcli/auth/schannel_state.h | 3 -
libcli/auth/schannel_state_tdb.c | 17 +--
libcli/cldap/cldap.c | 7 +-
libcli/cldap/cldap.h | 3 -
libcli/ldap/ldap_ndr.c | 4 +-
libcli/named_pipe_auth/npa_tstream.c | 7 +-
libcli/named_pipe_auth/npa_tstream.h | 1 -
libcli/nbt/libnbt.h | 6 +-
libcli/nbt/nbtname.c | 6 +-
libcli/nbt/nbtsocket.c | 8 +-
libcli/nbt/pynbt.c | 12 +-
libcli/nbt/tools/nmblookup.c | 2 +-
libcli/ndr_netlogon.c | 6 +-
libcli/netlogon.c | 17 +---
libcli/netlogon_proto.h | 4 -
libcli/registry/util_reg.c | 19 ++--
libcli/samsync/decrypt.c | 2 +-
libcli/security/secace.c | 4 +-
librpc/idl/drsblobs.idl | 22 ++--
librpc/idl/drsuapi.idl | 10 +-
librpc/idl/epmapper.idl | 2 +-
librpc/idl/frsrpc.idl | 2 +-
librpc/idl/named_pipe_auth.idl | 4 +-
librpc/idl/nbt.idl | 2 +-
librpc/idl/netlogon.idl | 2 +-
librpc/idl/ntlmssp.idl | 4 +-
librpc/idl/security.idl | 6 +-
librpc/idl/spoolss.idl | 32 +++---
librpc/ndr/libndr.h | 25 ++---
librpc/ndr/ndr.c | 56 ++++-------
librpc/ndr/ndr_compression.c | 8 +-
librpc/ndr/ndr_drsuapi.c | 4 +-
librpc/ndr/ndr_drsuapi.h | 2 +-
librpc/ndr/ndr_frsrpc.c | 4 +-
librpc/ndr/ndr_frsrpc.h | 1 -
librpc/ndr/ndr_krb5pac.c | 16 ++--
librpc/ndr/ndr_ntlmssp.c | 10 +-
librpc/ndr/ndr_ntlmssp.h | 2 -
librpc/ndr/ndr_schannel.c | 4 +-
librpc/ndr/ndr_sec_helper.c | 20 ++--
librpc/ndr/ndr_spoolss_buf.c | 42 ++++----
librpc/ndr/ndr_spoolss_buf.h | 24 ++--
librpc/ndr/uuid.c | 4 +-
librpc/rpc/binding.c | 6 +-
librpc/tools/ndrdump.c | 8 +-
pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm | 4 +-
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 8 +-
pidl/lib/Parse/Pidl/Samba4/Python.pm | 4 +-
pidl/tests/ndr_string.pl | 18 +--
source3/include/includes.h | 1 -
source3/include/proto.h | 12 +--
source3/lib/eventlog/eventlog.c | 10 +-
source3/lib/messages_local.c | 5 +-
source3/lib/secdesc.c | 14 +--
source3/lib/sharesec.c | 2 +-
source3/lib/util_reg_api.c | 6 +-
source3/lib/util_sid.c | 6 +-
source3/libads/authdata.c | 20 ++---
source3/libads/cldap.c | 2 +-
source3/libads/kerberos.c | 5 +-
source3/libnet/libnet_dssync_keytab.c | 9 +-
source3/libnet/libnet_samsync.c | 2 +-
source3/librpc/ndr/util.c | 4 -
source3/libsmb/clidgram.c | 6 +-
source3/libsmb/cliquota.c | 4 +-
source3/libsmb/dsgetdcname.c | 4 +-
source3/libsmb/ntlmssp.c | 6 -
source3/libsmb/samlogon_cache.c | 4 +-
source3/modules/vfs_acl_common.c | 4 +-
source3/modules/vfs_xattr_tdb.c | 6 +-
source3/nmbd/nmbd_processlogon.c | 6 +-
source3/passdb/lookup_sid.c | 16 ++--
source3/passdb/secrets.c | 6 +-
source3/printing/nt_printing.c | 6 +-
source3/registry/reg_api.c | 2 +-
source3/registry/reg_backend_printing.c | 6 +-
source3/registry/reg_eventlog.c | 10 +-
source3/registry/reg_objects.c | 6 +-
source3/registry/reg_perfcount.c | 4 +-
source3/registry/regfio.c | 4 +-
source3/rpc_client/cli_pipe.c | 2 +-
source3/rpc_client/init_spoolss.c | 4 +-
source3/rpc_client/ndr.c | 4 +-
source3/rpc_server/srv_eventlog_nt.c | 4 +-
source3/rpc_server/srv_netlog_nt.c | 17 +--
source3/rpc_server/srv_ntsvcs_nt.c | 2 +-
source3/rpc_server/srv_pipe.c | 9 +-
source3/rpc_server/srv_pipe_hnd.c | 6 +-
source3/rpc_server/srv_spoolss_nt.c | 70 +++++++-------
source3/rpc_server/srv_spoolss_util.c | 20 ++--
source3/rpc_server/srv_srvsvc_nt.c | 2 +-
source3/rpc_server/srv_svcctl_nt.c | 21 ++--
source3/rpcclient/cmd_eventlog.c | 2 +-
source3/rpcclient/cmd_spoolss.c | 4 +-
source3/services/services_db.c | 4 +-
source3/smbd/dosmode.c | 4 +-
source3/smbd/notify_internal.c | 23 ++---
source3/smbd/nttrans.c | 2 +-
source3/smbd/smb2_create.c | 2 +-
source3/smbd/trans2.c | 2 -
source3/utils/net_eventlog.c | 6 +-
source3/utils/net_rpc_printer.c | 12 +-
source3/utils/net_rpc_registry.c | 4 +-
source3/utils/net_rpc_service.c | 2 +-
source3/winbindd/wb_group_members.c | 2 +-
source3/winbindd/winbindd_dual_ndr.c | 4 +-
source3/winbindd/winbindd_pam.c | 2 +-
source4/auth/gensec/gensec.h | 1 -
source4/auth/gensec/gensec_gssapi.c | 1 -
source4/auth/gensec/gensec_krb5.c | 1 -
source4/auth/gensec/pygensec.c | 1 -
source4/auth/gensec/schannel.c | 11 +--
source4/auth/kerberos/kerberos.h | 4 -
source4/auth/kerberos/kerberos_pac.c | 30 ++----
source4/auth/ntlm/auth_server.c | 1 -
source4/auth/ntlm/auth_winbind.c | 11 +--
source4/cldap_server/netlogon.c | 10 +--
source4/client/cifsdd.c | 6 +-
source4/client/cifsdd.h | 1 -
source4/client/cifsddio.c | 6 -
source4/client/client.c | 7 +-
source4/dsdb/common/dsdb_access.c | 2 +-
source4/dsdb/common/util.c | 12 +--
source4/dsdb/kcc/kcc_drs_replica_info.c | 2 +-
source4/dsdb/repl/drepl_partitions.c | 2 +-
source4/dsdb/samdb/ldb_modules/descriptor.c | 11 +--
source4/dsdb/samdb/ldb_modules/extended_dn_out.c | 2 +-
source4/dsdb/samdb/ldb_modules/operational.c | 4 +-
source4/dsdb/samdb/ldb_modules/password_hash.c | 16 +---
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 29 ++----
source4/dsdb/samdb/ldb_modules/ridalloc.c | 1 -
source4/dsdb/samdb/ldb_modules/samba3sam.c | 5 +-
source4/dsdb/samdb/ldb_modules/samldb.c | 2 +-
source4/dsdb/samdb/ldb_modules/schema_load.c | 1 -
source4/dsdb/schema/schema.h | 2 -
source4/dsdb/schema/schema_info_attr.c | 4 +-
source4/dsdb/schema/schema_init.c | 21 +---
source4/dsdb/schema/schema_set.c | 2 +-
source4/dsdb/schema/schema_syntax.c | 31 +++----
source4/kdc/db-glue.c | 11 +-
source4/kdc/hdb-samba4.c | 1 -
source4/kdc/kdc.c | 4 +-
source4/kdc/mit_samba.c | 3 -
source4/kdc/pac-glue.c | 12 +--
source4/kdc/pac-glue.h | 1 -
source4/kdc/samba_kdc.h | 1 -
source4/kdc/wdc-samba4.c | 1 -
source4/lib/ldb-samba/ldif_handlers.c | 15 +--
source4/lib/messaging/irpc.h | 2 -
source4/lib/messaging/messaging.c | 12 +--
source4/lib/messaging/pymessaging.c | 4 -
source4/lib/messaging/tests/irpc.c | 2 -
source4/lib/messaging/tests/messaging.c | 5 +-
source4/lib/registry/hive.c | 2 +-
source4/lib/registry/patchfile.c | 11 +--
source4/lib/registry/patchfile_dotreg.c | 9 +--
source4/lib/registry/patchfile_preg.c | 2 -
source4/lib/registry/pyregistry.c | 3 +-
source4/lib/registry/regf.c | 58 +++++------
source4/lib/registry/registry.h | 30 ++----
source4/lib/registry/tests/diff.c | 19 +---
source4/lib/registry/tests/generic.c | 24 ++--
source4/lib/registry/tests/hive.c | 3 +-
source4/lib/registry/tools/regdiff.c | 3 +-
source4/lib/registry/tools/regpatch.c | 2 +-
source4/lib/registry/tools/regshell.c | 8 +-
source4/lib/registry/tools/regtree.c | 3 +-
source4/lib/registry/util.c | 30 ++----
source4/libcli/cliconnect.c | 6 +-
source4/libcli/dgram/browse.c | 6 +-
source4/libcli/dgram/dgramsocket.c | 8 +-
source4/libcli/dgram/libdgram.h | 4 +-
source4/libcli/dgram/netlogon.c | 13 +--
source4/libcli/finddcs.c | 9 +--
source4/libcli/raw/clitransport.c | 8 +-
source4/libcli/raw/clitree.c | 2 -
source4/libcli/raw/libcliraw.h | 3 -
source4/libcli/raw/rawacl.c | 4 +-
source4/libcli/raw/rawfile.c | 2 +-
source4/libcli/raw/rawfileinfo.c | 6 +-
source4/libcli/raw/rawsetfileinfo.c | 3 +-
source4/libcli/resolve/nbtlist.c | 3 +-
source4/libcli/smb2/create.c | 3 +-
source4/libcli/smb_composite/connect.c | 2 +-
source4/libcli/smb_composite/fetchfile.c | 1 -
source4/libcli/smb_composite/fsinfo.c | 1 -
source4/libcli/smb_composite/smb_composite.h | 3 -
source4/libcli/util/clilsa.c | 3 +-
source4/libcli/wrepl/winsrepl.c | 9 +--
source4/libnet/libnet_become_dc.c | 48 ++++-----
source4/libnet/libnet_lookup.c | 15 ++--
source4/libnet/libnet_site.c | 2 +-
source4/libnet/libnet_unbecome_dc.c | 4 +-
source4/libnet/libnet_vampire.c | 2 +-
source4/librpc/idl/winsrepl.idl | 2 +-
source4/librpc/ndr/ndr_string.c | 34 +++----
source4/librpc/rpc/dcerpc.c | 35 +++----
source4/librpc/rpc/dcerpc.h | 4 +-
source4/librpc/rpc/dcerpc_connect.c | 3 +-
source4/librpc/rpc/dcerpc_secondary.c | 2 +-
source4/librpc/rpc/dcerpc_util.c | 5 +-
source4/nbt_server/dgram/request.c | 7 +-
source4/nbt_server/interfaces.c | 5 +-
source4/ntp_signd/ntp_signd.c | 9 +--
source4/ntptr/simple_ldb/ntptr_simple_ldb.c | 6 +-
source4/ntvfs/cifs/vfs_cifs.c | 1 -
source4/ntvfs/common/notify.c | 11 +--
source4/ntvfs/common/opendb_tdb.c | 4 +-
source4/ntvfs/ipc/ipc_rap.c | 12 +-
source4/ntvfs/ipc/vfs_ipc.c | 3 -
source4/ntvfs/posix/pvfs_rename.c | 16 ++--
source4/ntvfs/posix/pvfs_resolve.c | 18 ++--
source4/ntvfs/posix/pvfs_shortname.c | 6 +-
source4/ntvfs/posix/pvfs_xattr.c | 6 +-
source4/param/loadparm.c | 3 +-
source4/param/secrets.c | 2 +-
source4/rpc_server/dcerpc_server.c | 14 ++--
source4/rpc_server/dcesrv_auth.c | 8 +-
source4/rpc_server/drsuapi/getncchanges.c | 3 +-
source4/rpc_server/lsa/dcesrv_lsa.c | 13 +--
source4/rpc_server/netlogon/dcerpc_netlogon.c | 3 -
source4/rpc_server/service_rpc.c | 16 +--
source4/rpc_server/spoolss/dcesrv_spoolss.c | 32 ++----
source4/rpc_server/winreg/rpc_winreg.c | 2 +-
source4/scripting/python/modules.h | 3 -
source4/smb_server/smb/nttrans.c | 6 +-
source4/smb_server/smb2/fileinfo.c | 4 +-
source4/smb_server/smb2/fileio.c | 2 +-
source4/smbd/server.c | 4 +-
source4/smbd/service_named_pipe.c | 2 -
source4/smbd/service_stream.c | 4 +-
source4/smbd/service_task.c | 1 -
source4/torture/auth/pac.c | 16 +---
source4/torture/basic/base.c | 1 -
source4/torture/basic/misc.c | 1 -
source4/torture/basic/scanner.c | 13 +--
source4/torture/basic/utable.c | 14 ++-
source4/torture/drs/unit/prefixmap_tests.c | 6 +-
source4/torture/drs/unit/schemainfo_tests.c | 2 +-
source4/torture/gentest.c | 1 -
source4/torture/ldap/cldap.c | 51 +++++-----
source4/torture/ldap/cldapbench.c | 4 +-
source4/torture/ldap/uptodatevector.c | 4 +-
source4/torture/libnet/libnet_BecomeDC.c | 2 +-
source4/torture/locktest.c | 1 -
source4/torture/masktest.c | 3 -
source4/torture/nbt/dgram.c | 9 +-
source4/torture/nbt/nbt.c | 2 +-
source4/torture/nbt/winsbench.c | 2 +-
source4/torture/nbt/winsreplication.c | 20 ++--
source4/torture/ndr/ndr.c | 6 +-
source4/torture/ntp/ntp_signd.c | 2 -
source4/torture/rap/printing.c | 44 ++++----
source4/torture/rap/rap.c | 117 +++++++++-------------
source4/torture/rap/rpc.c | 4 +-
source4/torture/raw/composite.c | 2 -
source4/torture/raw/lockbench.c | 1 -
source4/torture/raw/oplock.c | 1 -
source4/torture/raw/qfileinfo.c | 3 +-
source4/torture/raw/tconrate.c | 1 -
source4/torture/rpc/autoidl.c | 2 +-
source4/torture/rpc/dssync.c | 7 +-
source4/torture/rpc/eventlog.c | 3 +-
source4/torture/rpc/join.c | 2 -
source4/torture/rpc/lsa.c | 2 +-
source4/torture/rpc/remote_pac.c | 6 +-
source4/torture/rpc/samba3rpc.c | 39 ++-----
source4/torture/rpc/samlogon.c | 5 +-
source4/torture/rpc/samsync.c | 2 +-
source4/torture/rpc/spoolss.c | 79 +++++++--------
source4/torture/rpc/svcctl.c | 2 +-
source4/torture/rpc/winreg.c | 6 +-
source4/torture/unix/unix_info2.c | 1 -
source4/torture/unix/whoami.c | 1 -
source4/torture/util_smb.c | 1 -
source4/utils/ntlm_auth.c | 3 +-
source4/winbind/idmap.c | 6 +-
source4/winbind/wb_dom_info.c | 1 -
source4/winbind/wb_pam_auth.c | 3 +-
source4/winbind/wb_samba3_cmd.c | 1 -
source4/wrepl_server/wrepl_in_call.c | 4 +-
source4/wrepl_server/wrepl_in_connection.c | 2 -
source4/wrepl_server/wrepl_out_helpers.c | 2 +-
288 files changed, 975 insertions(+), 1533 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tdr/tdr.c b/lib/tdr/tdr.c
index ce67003..9587104 100644
--- a/lib/tdr/tdr.c
+++ b/lib/tdr/tdr.c
@@ -163,7 +163,7 @@ NTSTATUS tdr_pull_charset(struct tdr_pull *tdr, TALLOC_CTX *ctx, const char **v,
TDR_PULL_NEED_BYTES(tdr, el_size*length);
- if (!convert_string_talloc_convenience(ctx, tdr->iconv_convenience, chset, CH_UNIX, tdr->data.data+tdr->offset, el_size*length, discard_const_p(void *, v), &ret, false)) {
+ if (!convert_string_talloc(ctx, chset, CH_UNIX, tdr->data.data+tdr->offset, el_size*length, discard_const_p(void *, v), &ret, false)) {
return NT_STATUS_INVALID_PARAMETER;
}
@@ -183,7 +183,8 @@ NTSTATUS tdr_push_charset(struct tdr_push *tdr, const char **v, uint32_t length,
required = el_size * length;
TDR_PUSH_NEED_BYTES(tdr, required);
- if (!convert_string_convenience(tdr->iconv_convenience, CH_UNIX, chset, *v, strlen(*v), tdr->data.data+tdr->data.length, required, &ret, false)) {
+ ret = convert_string(CH_UNIX, chset, *v, strlen(*v), tdr->data.data+tdr->data.length, required, false);
+ if (ret == -1) {
return NT_STATUS_INVALID_PARAMETER;
}
@@ -343,33 +344,29 @@ NTSTATUS tdr_pull_DATA_BLOB(struct tdr_pull *tdr, TALLOC_CTX *ctx, DATA_BLOB *bl
return NT_STATUS_OK;
}
-struct tdr_push *tdr_push_init(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *ic)
+struct tdr_push *tdr_push_init(TALLOC_CTX *mem_ctx)
{
struct tdr_push *push = talloc_zero(mem_ctx, struct tdr_push);
if (push == NULL)
return NULL;
- push->iconv_convenience = talloc_reference(push, ic);
-
return push;
}
-struct tdr_pull *tdr_pull_init(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *ic)
+struct tdr_pull *tdr_pull_init(TALLOC_CTX *mem_ctx)
{
struct tdr_pull *pull = talloc_zero(mem_ctx, struct tdr_pull);
if (pull == NULL)
return NULL;
- pull->iconv_convenience = talloc_reference(pull, ic);
-
return pull;
}
-NTSTATUS tdr_push_to_fd(int fd, struct smb_iconv_convenience *iconv_convenience, tdr_push_fn_t push_fn, const void *p)
+NTSTATUS tdr_push_to_fd(int fd, tdr_push_fn_t push_fn, const void *p)
{
- struct tdr_push *push = tdr_push_init(NULL, iconv_convenience);
+ struct tdr_push *push = tdr_push_init(NULL);
if (push == NULL)
return NT_STATUS_NO_MEMORY;
diff --git a/lib/tdr/tdr.h b/lib/tdr/tdr.h
index 84f3e50..c3ffd2f 100644
--- a/lib/tdr/tdr.h
+++ b/lib/tdr/tdr.h
@@ -33,13 +33,11 @@ struct tdr_pull {
DATA_BLOB data;
uint32_t offset;
int flags;
- struct smb_iconv_convenience *iconv_convenience;
};
struct tdr_push {
DATA_BLOB data;
int flags;
- struct smb_iconv_convenience *iconv_convenience;
};
struct tdr_print {
diff --git a/lib/tdr/testsuite.c b/lib/tdr/testsuite.c
index ca76b52..1db7a1d 100644
--- a/lib/tdr/testsuite.c
+++ b/lib/tdr/testsuite.c
@@ -25,7 +25,7 @@
static bool test_push_uint8(struct torture_context *tctx)
{
uint8_t v = 4;
- struct tdr_push *tdr = tdr_push_init(tctx, global_iconv_convenience);
+ struct tdr_push *tdr = tdr_push_init(tctx);
torture_assert_ntstatus_ok(tctx, tdr_push_uint8(tdr, &v), "push failed");
torture_assert_int_equal(tctx, tdr->data.length, 1, "length incorrect");
@@ -37,7 +37,7 @@ static bool test_pull_uint8(struct torture_context *tctx)
{
uint8_t d = 2;
uint8_t l;
- struct tdr_pull *tdr = tdr_pull_init(tctx, global_iconv_convenience);
+ struct tdr_pull *tdr = tdr_pull_init(tctx);
tdr->data.data = &d;
tdr->data.length = 1;
tdr->offset = 0;
@@ -52,7 +52,7 @@ static bool test_pull_uint8(struct torture_context *tctx)
static bool test_push_uint16(struct torture_context *tctx)
{
uint16_t v = 0xF32;
- struct tdr_push *tdr = tdr_push_init(tctx, global_iconv_convenience);
+ struct tdr_push *tdr = tdr_push_init(tctx);
torture_assert_ntstatus_ok(tctx, tdr_push_uint16(tdr, &v), "push failed");
torture_assert_int_equal(tctx, tdr->data.length, 2, "length incorrect");
@@ -65,7 +65,7 @@ static bool test_pull_uint16(struct torture_context *tctx)
{
uint8_t d[2] = { 782 & 0xFF, (782 & 0xFF00) / 0x100 };
uint16_t l;
- struct tdr_pull *tdr = tdr_pull_init(tctx, global_iconv_convenience);
+ struct tdr_pull *tdr = tdr_pull_init(tctx);
tdr->data.data = d;
tdr->data.length = 2;
tdr->offset = 0;
@@ -80,7 +80,7 @@ static bool test_pull_uint16(struct torture_context *tctx)
static bool test_push_uint32(struct torture_context *tctx)
{
uint32_t v = 0x100F32;
- struct tdr_push *tdr = tdr_push_init(tctx, global_iconv_convenience);
+ struct tdr_push *tdr = tdr_push_init(tctx);
torture_assert_ntstatus_ok(tctx, tdr_push_uint32(tdr, &v), "push failed");
torture_assert_int_equal(tctx, tdr->data.length, 4, "length incorrect");
@@ -95,7 +95,7 @@ static bool test_pull_uint32(struct torture_context *tctx)
{
uint8_t d[4] = { 782 & 0xFF, (782 & 0xFF00) / 0x100, 0, 0 };
uint32_t l;
- struct tdr_pull *tdr = tdr_pull_init(tctx, global_iconv_convenience);
+ struct tdr_pull *tdr = tdr_pull_init(tctx);
tdr->data.data = d;
tdr->data.length = 4;
tdr->offset = 0;
@@ -109,7 +109,7 @@ static bool test_pull_uint32(struct torture_context *tctx)
static bool test_pull_charset(struct torture_context *tctx)
{
- struct tdr_pull *tdr = tdr_pull_init(tctx, global_iconv_convenience);
+ struct tdr_pull *tdr = tdr_pull_init(tctx);
const char *l = NULL;
tdr->data.data = (uint8_t *)talloc_strdup(tctx, "bla");
tdr->data.length = 4;
@@ -131,7 +131,7 @@ static bool test_pull_charset(struct torture_context *tctx)
static bool test_pull_charset_empty(struct torture_context *tctx)
{
- struct tdr_pull *tdr = tdr_pull_init(tctx, global_iconv_convenience);
+ struct tdr_pull *tdr = tdr_pull_init(tctx);
const char *l = NULL;
tdr->data.data = (uint8_t *)talloc_strdup(tctx, "bla");
tdr->data.length = 4;
@@ -150,7 +150,7 @@ static bool test_pull_charset_empty(struct torture_context *tctx)
static bool test_push_charset(struct torture_context *tctx)
{
const char *l = "bloe";
- struct tdr_push *tdr = tdr_push_init(tctx, global_iconv_convenience);
+ struct tdr_push *tdr = tdr_push_init(tctx);
torture_assert_ntstatus_ok(tctx, tdr_push_charset(tdr, &l, 4, 1, CH_UTF8),
"push failed");
torture_assert_int_equal(tctx, 4, tdr->data.length, "offset invalid");
diff --git a/libcli/auth/ntlmssp_ndr.c b/libcli/auth/ntlmssp_ndr.c
index 53a2378..fd31e85 100644
--- a/libcli/auth/ntlmssp_ndr.c
+++ b/libcli/auth/ntlmssp_ndr.c
@@ -22,10 +22,10 @@
#include "../librpc/gen_ndr/ndr_ntlmssp.h"
#include "../libcli/auth/ntlmssp_ndr.h"
-#define NTLMSSP_PULL_MESSAGE(type, blob, mem_ctx, ic, r) \
+#define NTLMSSP_PULL_MESSAGE(type, blob, mem_ctx, r) \
do { \
enum ndr_err_code __ndr_err; \
- __ndr_err = ndr_pull_struct_blob(blob, mem_ctx, ic, r, \
+ __ndr_err = ndr_pull_struct_blob(blob, mem_ctx, r, \
(ndr_pull_flags_fn_t)ndr_pull_ ##type); \
if (!NDR_ERR_CODE_IS_SUCCESS(__ndr_err)) { \
return ndr_map_error2ntstatus(__ndr_err); \
@@ -36,10 +36,10 @@ do { \
return NT_STATUS_OK; \
} while(0);
-#define NTLMSSP_PUSH_MESSAGE(type, blob, mem_ctx, ic, r) \
+#define NTLMSSP_PUSH_MESSAGE(type, blob, mem_ctx, r) \
do { \
enum ndr_err_code __ndr_err; \
- __ndr_err = ndr_push_struct_blob(blob, mem_ctx, ic, r, \
+ __ndr_err = ndr_push_struct_blob(blob, mem_ctx, r, \
(ndr_push_flags_fn_t)ndr_push_ ##type); \
if (!NDR_ERR_CODE_IS_SUCCESS(__ndr_err)) { \
return ndr_map_error2ntstatus(__ndr_err); \
@@ -52,94 +52,82 @@ do { \
* Pull NTLMSSP NEGOTIATE_MESSAGE struct from a blob
* @param blob The plain packet blob
* @param mem_ctx A talloc context
- * @param ic Iconv convenience structure
* @param r Pointer to a NTLMSSP NEGOTIATE_MESSAGE structure
*/
NTSTATUS ntlmssp_pull_NEGOTIATE_MESSAGE(const DATA_BLOB *blob,
TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *ic,
struct NEGOTIATE_MESSAGE *r)
{
- NTLMSSP_PULL_MESSAGE(NEGOTIATE_MESSAGE, blob, mem_ctx, ic, r);
+ NTLMSSP_PULL_MESSAGE(NEGOTIATE_MESSAGE, blob, mem_ctx, r);
}
/**
* Pull NTLMSSP CHALLENGE_MESSAGE struct from a blob
* @param blob The plain packet blob
* @param mem_ctx A talloc context
- * @param ic Iconv convenience structure
* @param r Pointer to a NTLMSSP CHALLENGE_MESSAGE structure
*/
NTSTATUS ntlmssp_pull_CHALLENGE_MESSAGE(const DATA_BLOB *blob,
TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *ic,
struct CHALLENGE_MESSAGE *r)
{
- NTLMSSP_PULL_MESSAGE(CHALLENGE_MESSAGE, blob, mem_ctx, ic, r);
+ NTLMSSP_PULL_MESSAGE(CHALLENGE_MESSAGE, blob, mem_ctx, r);
}
/**
* Pull NTLMSSP AUTHENTICATE_MESSAGE struct from a blob
* @param blob The plain packet blob
* @param mem_ctx A talloc context
- * @param ic Iconv convenience structure
* @param r Pointer to a NTLMSSP AUTHENTICATE_MESSAGE structure
*/
NTSTATUS ntlmssp_pull_AUTHENTICATE_MESSAGE(const DATA_BLOB *blob,
TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *ic,
struct AUTHENTICATE_MESSAGE *r)
{
- NTLMSSP_PULL_MESSAGE(AUTHENTICATE_MESSAGE, blob, mem_ctx, ic, r);
+ NTLMSSP_PULL_MESSAGE(AUTHENTICATE_MESSAGE, blob, mem_ctx, r);
}
/**
* Push NTLMSSP NEGOTIATE_MESSAGE struct into a blob
* @param blob The plain packet blob
* @param mem_ctx A talloc context
- * @param ic Iconv convenience structure
* @param r Pointer to a NTLMSSP NEGOTIATE_MESSAGE structure
*/
NTSTATUS ntlmssp_push_NEGOTIATE_MESSAGE(DATA_BLOB *blob,
TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *ic,
const struct NEGOTIATE_MESSAGE *r)
{
- NTLMSSP_PUSH_MESSAGE(NEGOTIATE_MESSAGE, blob, mem_ctx, ic, r);
+ NTLMSSP_PUSH_MESSAGE(NEGOTIATE_MESSAGE, blob, mem_ctx, r);
}
/**
* Push NTLMSSP CHALLENGE_MESSAGE struct into a blob
* @param blob The plain packet blob
* @param mem_ctx A talloc context
- * @param ic Iconv convenience structure
* @param r Pointer to a NTLMSSP CHALLENGE_MESSAGE structure
*/
NTSTATUS ntlmssp_push_CHALLENGE_MESSAGE(DATA_BLOB *blob,
TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *ic,
const struct CHALLENGE_MESSAGE *r)
{
- NTLMSSP_PUSH_MESSAGE(CHALLENGE_MESSAGE, blob, mem_ctx, ic, r);
+ NTLMSSP_PUSH_MESSAGE(CHALLENGE_MESSAGE, blob, mem_ctx, r);
}
/**
* Push NTLMSSP AUTHENTICATE_MESSAGE struct into a blob
* @param blob The plain packet blob
* @param mem_ctx A talloc context
- * @param ic Iconv convenience structure
* @param r Pointer to a NTLMSSP AUTHENTICATE_MESSAGE structure
*/
NTSTATUS ntlmssp_push_AUTHENTICATE_MESSAGE(DATA_BLOB *blob,
TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *ic,
const struct AUTHENTICATE_MESSAGE *r)
{
- NTLMSSP_PUSH_MESSAGE(AUTHENTICATE_MESSAGE, blob, mem_ctx, ic, r);
+ NTLMSSP_PUSH_MESSAGE(AUTHENTICATE_MESSAGE, blob, mem_ctx, r);
}
diff --git a/libcli/auth/ntlmssp_ndr.h b/libcli/auth/ntlmssp_ndr.h
index 52990b2..e619231 100644
--- a/libcli/auth/ntlmssp_ndr.h
+++ b/libcli/auth/ntlmssp_ndr.h
@@ -20,25 +20,19 @@
NTSTATUS ntlmssp_pull_NEGOTIATE_MESSAGE(const DATA_BLOB *blob,
TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *ic,
struct NEGOTIATE_MESSAGE *r);
NTSTATUS ntlmssp_pull_CHALLENGE_MESSAGE(const DATA_BLOB *blob,
TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *ic,
struct CHALLENGE_MESSAGE *r);
NTSTATUS ntlmssp_pull_AUTHENTICATE_MESSAGE(const DATA_BLOB *blob,
TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *ic,
struct AUTHENTICATE_MESSAGE *r);
NTSTATUS ntlmssp_push_NEGOTIATE_MESSAGE(DATA_BLOB *blob,
TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *ic,
const struct NEGOTIATE_MESSAGE *r);
NTSTATUS ntlmssp_push_CHALLENGE_MESSAGE(DATA_BLOB *blob,
TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *ic,
const struct CHALLENGE_MESSAGE *r);
NTSTATUS ntlmssp_push_AUTHENTICATE_MESSAGE(DATA_BLOB *blob,
TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *ic,
const struct AUTHENTICATE_MESSAGE *r);
diff --git a/libcli/auth/schannel_state.h b/libcli/auth/schannel_state.h
index d378a39..017fdbe 100644
--- a/libcli/auth/schannel_state.h
+++ b/libcli/auth/schannel_state.h
@@ -24,18 +24,15 @@
#define _LIBCLI_AUTH_SCHANNEL_STATE_H__
NTSTATUS schannel_get_creds_state(TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *ic,
const char *db_priv_dir,
const char *computer_name,
struct netlogon_creds_CredentialState **creds);
NTSTATUS schannel_save_creds_state(TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *ic,
const char *db_priv_dir,
struct netlogon_creds_CredentialState *creds);
NTSTATUS schannel_check_creds_state(TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *ic,
const char *db_priv_dir,
const char *computer_name,
struct netr_Authenticator *received_authenticator,
diff --git a/libcli/auth/schannel_state_tdb.c b/libcli/auth/schannel_state_tdb.c
index 3f6618c..9e76781 100644
--- a/libcli/auth/schannel_state_tdb.c
+++ b/libcli/auth/schannel_state_tdb.c
@@ -103,7 +103,6 @@ static struct tdb_wrap *open_schannel_session_store(TALLOC_CTX *mem_ctx,
static
NTSTATUS schannel_store_session_key_tdb(struct tdb_wrap *tdb_sc,
TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *ic,
struct netlogon_creds_CredentialState *creds)
{
enum ndr_err_code ndr_err;
@@ -125,7 +124,7 @@ NTSTATUS schannel_store_session_key_tdb(struct tdb_wrap *tdb_sc,
return NT_STATUS_NO_MEMORY;
}
- ndr_err = ndr_push_struct_blob(&blob, mem_ctx, ic, creds,
+ ndr_err = ndr_push_struct_blob(&blob, mem_ctx, creds,
(ndr_push_flags_fn_t)ndr_push_netlogon_creds_CredentialState);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
talloc_free(keystr);
@@ -161,7 +160,6 @@ NTSTATUS schannel_store_session_key_tdb(struct tdb_wrap *tdb_sc,
static
NTSTATUS schannel_fetch_session_key_tdb(struct tdb_wrap *tdb_sc,
TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *ic,
const char *computer_name,
struct netlogon_creds_CredentialState **pcreds)
{
@@ -203,7 +201,7 @@ NTSTATUS schannel_fetch_session_key_tdb(struct tdb_wrap *tdb_sc,
blob = data_blob_const(value.dptr, value.dsize);
- ndr_err = ndr_pull_struct_blob(&blob, creds, ic, creds,
+ ndr_err = ndr_pull_struct_blob(&blob, creds, creds,
(ndr_pull_flags_fn_t)ndr_pull_netlogon_creds_CredentialState);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
status = ndr_map_error2ntstatus(ndr_err);
@@ -240,7 +238,6 @@ NTSTATUS schannel_fetch_session_key_tdb(struct tdb_wrap *tdb_sc,
*******************************************************************************/
NTSTATUS schannel_get_creds_state(TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *ic,
const char *db_priv_dir,
const char *computer_name,
struct netlogon_creds_CredentialState **_creds)
@@ -260,7 +257,7 @@ NTSTATUS schannel_get_creds_state(TALLOC_CTX *mem_ctx,
return NT_STATUS_ACCESS_DENIED;
}
- status = schannel_fetch_session_key_tdb(tdb_sc, tmpctx, ic,
+ status = schannel_fetch_session_key_tdb(tdb_sc, tmpctx,
computer_name, &creds);
if (NT_STATUS_IS_OK(status)) {
*_creds = talloc_steal(mem_ctx, creds);
@@ -279,7 +276,6 @@ NTSTATUS schannel_get_creds_state(TALLOC_CTX *mem_ctx,
*******************************************************************************/
NTSTATUS schannel_save_creds_state(TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *ic,
const char *db_priv_dir,
struct netlogon_creds_CredentialState *creds)
{
@@ -297,7 +293,7 @@ NTSTATUS schannel_save_creds_state(TALLOC_CTX *mem_ctx,
return NT_STATUS_ACCESS_DENIED;
}
- status = schannel_store_session_key_tdb(tdb_sc, tmpctx, ic, creds);
+ status = schannel_store_session_key_tdb(tdb_sc, tmpctx, creds);
talloc_free(tmpctx);
return status;
@@ -314,7 +310,6 @@ NTSTATUS schannel_save_creds_state(TALLOC_CTX *mem_ctx,
********************************************************************/
NTSTATUS schannel_check_creds_state(TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *ic,
const char *db_priv_dir,
const char *computer_name,
struct netr_Authenticator *received_authenticator,
@@ -348,7 +343,7 @@ NTSTATUS schannel_check_creds_state(TALLOC_CTX *mem_ctx,
* disconnects) we must update the database every time we
* update the structure */
- status = schannel_fetch_session_key_tdb(tdb_sc, tmpctx, ic,
+ status = schannel_fetch_session_key_tdb(tdb_sc, tmpctx,
computer_name, &creds);
if (!NT_STATUS_IS_OK(status)) {
tdb_transaction_cancel(tdb_sc->tdb);
@@ -363,7 +358,7 @@ NTSTATUS schannel_check_creds_state(TALLOC_CTX *mem_ctx,
goto done;
}
- status = schannel_store_session_key_tdb(tdb_sc, tmpctx, ic, creds);
+ status = schannel_store_session_key_tdb(tdb_sc, tmpctx, creds);
if (!NT_STATUS_IS_OK(status)) {
tdb_transaction_cancel(tdb_sc->tdb);
goto done;
diff --git a/libcli/cldap/cldap.c b/libcli/cldap/cldap.c
index 191d0ee..896319e 100644
--- a/libcli/cldap/cldap.c
+++ b/libcli/cldap/cldap.c
@@ -946,7 +946,6 @@ static void cldap_netlogon_state_done(struct tevent_req *subreq)
receive a cldap netlogon reply
*/
NTSTATUS cldap_netlogon_recv(struct tevent_req *req,
- struct smb_iconv_convenience *iconv_convenience,
TALLOC_CTX *mem_ctx,
struct cldap_netlogon *io)
{
@@ -974,7 +973,6 @@ NTSTATUS cldap_netlogon_recv(struct tevent_req *req,
data = state->search.out.response->attributes[0].values;
status = pull_netlogon_samlogon_response(data, mem_ctx,
- iconv_convenience,
&io->out.netlogon);
if (!NT_STATUS_IS_OK(status)) {
goto failed;
@@ -994,7 +992,6 @@ failed:
sync cldap netlogon search
*/
NTSTATUS cldap_netlogon(struct cldap_socket *cldap,
- struct smb_iconv_convenience *iconv_convenience,
TALLOC_CTX *mem_ctx,
struct cldap_netlogon *io)
{
@@ -1017,7 +1014,7 @@ NTSTATUS cldap_netlogon(struct cldap_socket *cldap,
return NT_STATUS_INTERNAL_ERROR;
}
- status = cldap_netlogon_recv(req, iconv_convenience, mem_ctx, io);
+ status = cldap_netlogon_recv(req, mem_ctx, io);
talloc_free(req);
return status;
@@ -1081,7 +1078,6 @@ NTSTATUS cldap_error_reply(struct cldap_socket *cldap,
send a netlogon reply
*/
NTSTATUS cldap_netlogon_reply(struct cldap_socket *cldap,
- struct smb_iconv_convenience *iconv_convenience,
uint32_t message_id,
struct tsocket_address *dest,
uint32_t version,
@@ -1095,7 +1091,6 @@ NTSTATUS cldap_netlogon_reply(struct cldap_socket *cldap,
DATA_BLOB blob;
status = push_netlogon_samlogon_response(&blob, tmp_ctx,
- iconv_convenience,
netlogon);
if (!NT_STATUS_IS_OK(status)) {
talloc_free(tmp_ctx);
diff --git a/libcli/cldap/cldap.h b/libcli/cldap/cldap.h
--
Samba Shared Repository
More information about the samba-cvs
mailing list