svn commit: samba r26271 - in branches/SAMBA_4_0: .
source/auth/credentials source/cldap_server source/client
source/dsdb/repl source/dsdb/samdb/ldb_modules
source/lib/cmdline source/libcli/cldap source/libnet
source/librpc/rpc source/torture source/torture/ldap
source/torture/rpc
jelmer at samba.org
jelmer at samba.org
Mon Dec 3 23:33:19 GMT 2007
Author: jelmer
Date: 2007-12-03 23:33:16 +0000 (Mon, 03 Dec 2007)
New Revision: 26271
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26271
Log:
Remove some more uses of global_loadparm.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c
branches/SAMBA_4_0/source/cldap_server/netlogon.c
branches/SAMBA_4_0/source/client/client.c
branches/SAMBA_4_0/source/client/smbmount.c
branches/SAMBA_4_0/source/dsdb/repl/drepl_service.c
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/proxy.c
branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c
branches/SAMBA_4_0/source/libcli/cldap/cldap.c
branches/SAMBA_4_0/source/libcli/cldap/cldap.h
branches/SAMBA_4_0/source/libnet/libnet_become_dc.c
branches/SAMBA_4_0/source/libnet/libnet_site.c
branches/SAMBA_4_0/source/libnet/libnet_unbecome_dc.c
branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c
branches/SAMBA_4_0/source/torture/ldap/cldap.c
branches/SAMBA_4_0/source/torture/ldap/cldapbench.c
branches/SAMBA_4_0/source/torture/rpc/dssync.c
branches/SAMBA_4_0/source/torture/util_smb.c
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
===================================================================
--- branches/SAMBA_4_0/source/auth/credentials/credentials_files.c 2007-12-03 23:33:09 UTC (rev 26270)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials_files.c 2007-12-03 23:33:16 UTC (rev 26271)
@@ -335,7 +335,8 @@
cred->machine_account_pending = false;
filter = talloc_asprintf(cred, SECRETS_PRIMARY_DOMAIN_FILTER,
cli_credentials_get_domain(cred));
- return cli_credentials_set_secrets(cred, global_loadparm, NULL, SECRETS_PRIMARY_DOMAIN_DN,
+ return cli_credentials_set_secrets(cred, global_loadparm, NULL,
+ SECRETS_PRIMARY_DOMAIN_DN,
filter);
}
@@ -355,7 +356,8 @@
filter = talloc_asprintf(cred, SECRETS_KRBTGT_SEARCH,
cli_credentials_get_realm(cred),
cli_credentials_get_domain(cred));
- return cli_credentials_set_secrets(cred, global_loadparm, NULL, SECRETS_PRINCIPALS_DN,
+ return cli_credentials_set_secrets(cred, global_loadparm, NULL,
+ SECRETS_PRINCIPALS_DN,
filter);
}
@@ -377,8 +379,8 @@
cli_credentials_get_realm(cred),
cli_credentials_get_domain(cred),
serviceprincipal);
- return cli_credentials_set_secrets(cred, global_loadparm, NULL, SECRETS_PRINCIPALS_DN,
- filter);
+ return cli_credentials_set_secrets(cred, global_loadparm, NULL,
+ SECRETS_PRINCIPALS_DN, filter);
}
/**
Modified: branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c
===================================================================
--- branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c 2007-12-03 23:33:09 UTC (rev 26270)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c 2007-12-03 23:33:16 UTC (rev 26271)
@@ -141,7 +141,8 @@
return ENOMEM;
}
- ret = cli_credentials_get_krb5_context(cred, global_loadparm, &ccc->smb_krb5_context);
+ ret = cli_credentials_get_krb5_context(cred, global_loadparm,
+ &ccc->smb_krb5_context);
if (ret) {
talloc_free(ccc);
return ret;
@@ -215,7 +216,8 @@
return ENOMEM;
}
- ret = cli_credentials_get_krb5_context(cred, global_loadparm, &ccc->smb_krb5_context);
+ ret = cli_credentials_get_krb5_context(cred, global_loadparm,
+ &ccc->smb_krb5_context);
if (ret) {
talloc_free(ccc);
return ret;
@@ -225,7 +227,8 @@
return ENOMEM;
}
- ret = krb5_cc_resolve(ccc->smb_krb5_context->krb5_context, ccache_name, &ccc->ccache);
+ ret = krb5_cc_resolve(ccc->smb_krb5_context->krb5_context, ccache_name,
+ &ccc->ccache);
if (ret) {
DEBUG(1,("failed to generate a new krb5 ccache (%s): %s\n",
ccache_name,
Modified: branches/SAMBA_4_0/source/cldap_server/netlogon.c
===================================================================
--- branches/SAMBA_4_0/source/cldap_server/netlogon.c 2007-12-03 23:33:09 UTC (rev 26270)
+++ branches/SAMBA_4_0/source/cldap_server/netlogon.c 2007-12-03 23:33:16 UTC (rev 26271)
@@ -327,7 +327,7 @@
}
if (domain_guid == NULL && domain == NULL) {
- domain = lp_realm(global_loadparm);
+ domain = lp_realm(cldapd->task->lp_ctx);
}
if (version == -1) {
@@ -339,7 +339,7 @@
status = cldapd_netlogon_fill(cldapd, tmp_ctx, domain, domain_guid,
user, src->addr,
- version, global_loadparm, &netlogon);
+ version, cldapd->task->lp_ctx, &netlogon);
if (!NT_STATUS_IS_OK(status)) {
goto failed;
}
Modified: branches/SAMBA_4_0/source/client/client.c
===================================================================
--- branches/SAMBA_4_0/source/client/client.c 2007-12-03 23:33:09 UTC (rev 26270)
+++ branches/SAMBA_4_0/source/client/client.c 2007-12-03 23:33:16 UTC (rev 26271)
@@ -3066,7 +3066,7 @@
/****************************************************************************
handle a message operation
****************************************************************************/
-static int do_message_op(const char *netbios_name, const char *desthost, const char *destip, int name_type)
+static int do_message_op(const char *netbios_name, const char *desthost, const char *destip, int name_type, const char **name_resolve_order, int max_xmit, int max_mux)
{
struct nbt_name called, calling;
const char *server_name;
@@ -3078,7 +3078,7 @@
server_name = destip ? destip : desthost;
- if (!(cli=smbcli_state_init(NULL)) || !smbcli_socket_connect(cli, server_name, lp_name_resolve_order(global_loadparm), lp_max_xmit(global_loadparm), lp_maxmux(global_loadparm))) {
+ if (!(cli=smbcli_state_init(NULL)) || !smbcli_socket_connect(cli, server_name, name_resolve_order, max_xmit, max_mux)) {
d_printf("Connection to %s failed\n", server_name);
return 1;
}
@@ -3223,7 +3223,7 @@
}
if (message) {
- return do_message_op(lp_netbios_name(global_loadparm), desthost, dest_ip, name_type);
+ return do_message_op(lp_netbios_name(global_loadparm), desthost, dest_ip, name_type, lp_name_resolve_order(global_loadparm), lp_max_xmit(global_loadparm), lp_maxmux(global_loadparm));
}
Modified: branches/SAMBA_4_0/source/client/smbmount.c
===================================================================
--- branches/SAMBA_4_0/source/client/smbmount.c 2007-12-03 23:33:09 UTC (rev 26270)
+++ branches/SAMBA_4_0/source/client/smbmount.c 2007-12-03 23:33:16 UTC (rev 26271)
@@ -406,7 +406,9 @@
CatchSignal(SIGUSR1, &usr1_handler);
pause();
DEBUG(2,("mount.smbfs[%d]: got signal, getting new socket\n", sys_getpid()));
- c = do_connection(the_service, lp_unicode(global_loadparm), lp_cli_maxprotocol(global_loadparm));
+ c = do_connection(the_service,
+ lp_unicode(global_loadparm),
+ lp_cli_maxprotocol(global_loadparm));
}
}
Modified: branches/SAMBA_4_0/source/dsdb/repl/drepl_service.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/repl/drepl_service.c 2007-12-03 23:33:09 UTC (rev 26270)
+++ branches/SAMBA_4_0/source/dsdb/repl/drepl_service.c 2007-12-03 23:33:16 UTC (rev 26271)
@@ -37,7 +37,8 @@
{
NTSTATUS status;
- status = auth_system_session_info(service, global_loadparm, &service->system_session_info);
+ status = auth_system_session_info(service, service->task->lp_ctx,
+ &service->system_session_info);
if (!NT_STATUS_IS_OK(status)) {
return ntstatus_to_werror(status);
}
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/proxy.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/proxy.c 2007-12-03 23:33:09 UTC (rev 26270)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/proxy.c 2007-12-03 23:33:16 UTC (rev 26271)
@@ -129,7 +129,7 @@
ldb_oom(module->ldb);
goto failed;
}
- cli_credentials_guess(creds, NULL);
+ cli_credentials_guess(creds, global_loadparm);
cli_credentials_set_username(creds, username, CRED_SPECIFIED);
cli_credentials_set_password(creds, password, CRED_SPECIFIED);
Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c
===================================================================
--- branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c 2007-12-03 23:33:09 UTC (rev 26270)
+++ branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c 2007-12-03 23:33:16 UTC (rev 26271)
@@ -60,7 +60,7 @@
}
if (reason == POPT_CALLBACK_REASON_POST) {
- cli_credentials_guess(cmdline_credentials, NULL);
+ cli_credentials_guess(cmdline_credentials, global_loadparm);
if (!dont_ask) {
cli_credentials_set_cmdline_callbacks(cmdline_credentials);
Modified: branches/SAMBA_4_0/source/libcli/cldap/cldap.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/cldap/cldap.c 2007-12-03 23:33:09 UTC (rev 26270)
+++ branches/SAMBA_4_0/source/libcli/cldap/cldap.c 2007-12-03 23:33:16 UTC (rev 26271)
@@ -572,7 +572,7 @@
if (filter == NULL) goto failed;
search.in.dest_address = io->in.dest_address;
- search.in.dest_port = lp_cldap_port(global_loadparm);
+ search.in.dest_port = io->in.dest_port;
search.in.filter = filter;
search.in.attributes = attr;
search.in.timeout = 2;
Modified: branches/SAMBA_4_0/source/libcli/cldap/cldap.h
===================================================================
--- branches/SAMBA_4_0/source/libcli/cldap/cldap.h 2007-12-03 23:33:09 UTC (rev 26270)
+++ branches/SAMBA_4_0/source/libcli/cldap/cldap.h 2007-12-03 23:33:16 UTC (rev 26271)
@@ -73,6 +73,7 @@
struct cldap_socket {
struct socket_context *sock;
struct event_context *event_ctx;
+ struct loadparm_context *lp_ctx;
/* the fd event */
struct fd_event *fde;
@@ -151,6 +152,7 @@
struct cldap_netlogon {
struct {
const char *dest_address;
+ uint16_t dest_port;
const char *realm;
const char *host;
const char *user;
Modified: branches/SAMBA_4_0/source/libnet/libnet_become_dc.c
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet_become_dc.c 2007-12-03 23:33:09 UTC (rev 26270)
+++ branches/SAMBA_4_0/source/libnet/libnet_become_dc.c 2007-12-03 23:33:16 UTC (rev 26271)
@@ -738,6 +738,7 @@
struct cldap_request *req;
s->cldap.io.in.dest_address = s->source_dsa.address;
+ s->cldap.io.in.dest_port = lp_cldap_port(global_loadparm);
s->cldap.io.in.realm = s->domain.dns_name;
s->cldap.io.in.host = s->dest_dsa.netbios_name;
s->cldap.io.in.user = NULL;
Modified: branches/SAMBA_4_0/source/libnet/libnet_site.c
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet_site.c 2007-12-03 23:33:09 UTC (rev 26270)
+++ branches/SAMBA_4_0/source/libnet/libnet_site.c 2007-12-03 23:33:16 UTC (rev 26271)
@@ -51,6 +51,7 @@
/* Resolve the site name. */
ZERO_STRUCT(search);
search.in.dest_address = r->in.dest_address;
+ search.in.dest_port = lp_cldap_port(global_loadparm);
search.in.acct_control = -1;
search.in.version = 6;
Modified: branches/SAMBA_4_0/source/libnet/libnet_unbecome_dc.c
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet_unbecome_dc.c 2007-12-03 23:33:09 UTC (rev 26270)
+++ branches/SAMBA_4_0/source/libnet/libnet_unbecome_dc.c 2007-12-03 23:33:16 UTC (rev 26271)
@@ -258,6 +258,7 @@
struct cldap_request *req;
s->cldap.io.in.dest_address = s->source_dsa.address;
+ s->cldap.io.in.dest_port = lp_cldap_port(global_loadparm);
s->cldap.io.in.realm = s->domain.dns_name;
s->cldap.io.in.host = s->dest_dsa.netbios_name;
s->cldap.io.in.user = NULL;
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c 2007-12-03 23:33:09 UTC (rev 26270)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c 2007-12-03 23:33:16 UTC (rev 26271)
@@ -230,7 +230,7 @@
s->io.creds = cli_credentials_init(mem_ctx);
if (composite_nomem(s->io.creds, c)) return c;
- cli_credentials_guess(s->io.creds, NULL);
+ cli_credentials_guess(s->io.creds, global_loadparm);
}
/* send smb2 connect request */
Modified: branches/SAMBA_4_0/source/torture/ldap/cldap.c
===================================================================
--- branches/SAMBA_4_0/source/torture/ldap/cldap.c 2007-12-03 23:33:09 UTC (rev 26270)
+++ branches/SAMBA_4_0/source/torture/ldap/cldap.c 2007-12-03 23:33:16 UTC (rev 26271)
@@ -40,9 +40,9 @@
/*
test netlogon operations
*/
-static bool test_cldap_netlogon(TALLOC_CTX *mem_ctx, const char *dest)
+static bool test_cldap_netlogon(struct torture_context *tctx, const char *dest)
{
- struct cldap_socket *cldap = cldap_socket_init(mem_ctx, NULL);
+ struct cldap_socket *cldap = cldap_socket_init(tctx, NULL);
NTSTATUS status;
struct cldap_netlogon search, empty_search;
union nbt_cldap_netlogon n1;
@@ -52,6 +52,7 @@
ZERO_STRUCT(search);
search.in.dest_address = dest;
+ search.in.dest_port = lp_cldap_port(tctx->lp_ctx);
search.in.acct_control = -1;
search.in.version = 6;
@@ -59,7 +60,7 @@
printf("Trying without any attributes\n");
search = empty_search;
- status = cldap_netlogon(cldap, mem_ctx, &search);
+ status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);
n1 = search.out.netlogon;
@@ -72,7 +73,7 @@
for (i=0;i<256;i++) {
search.in.version = i;
printf("Trying netlogon level %d\n", i);
- status = cldap_netlogon(cldap, mem_ctx, &search);
+ status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);
}
@@ -80,82 +81,82 @@
for (i=0;i<31;i++) {
search.in.version = (1<<i);
printf("Trying netlogon level 0x%x\n", i);
- status = cldap_netlogon(cldap, mem_ctx, &search);
+ status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);
}
search.in.version = 6;
- status = cldap_netlogon(cldap, mem_ctx, &search);
+ status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);
printf("Trying with User=NULL\n");
search.in.user = NULL;
- status = cldap_netlogon(cldap, mem_ctx, &search);
+ status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);
printf("Trying with User=Administrator\n");
search.in.user = "Administrator";
- status = cldap_netlogon(cldap, mem_ctx, &search);
+ status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);
printf("Trying with a GUID\n");
search.in.realm = NULL;
- search.in.domain_guid = GUID_string(mem_ctx, &n1.logon5.domain_uuid);
- status = cldap_netlogon(cldap, mem_ctx, &search);
+ search.in.domain_guid = GUID_string(tctx, &n1.logon5.domain_uuid);
+ status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);
printf("Trying with a incorrect GUID\n");
guid = GUID_random();
search.in.user = NULL;
- search.in.domain_guid = GUID_string(mem_ctx, &guid);
- status = cldap_netlogon(cldap, mem_ctx, &search);
+ search.in.domain_guid = GUID_string(tctx, &guid);
+ status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_NOT_FOUND);
printf("Trying with a AAC\n");
search.in.acct_control = 0x180;
search.in.realm = n1.logon5.dns_domain;
- status = cldap_netlogon(cldap, mem_ctx, &search);
+ status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);
printf("Trying with a bad AAC\n");
search.in.acct_control = 0xFF00FF00;
search.in.realm = n1.logon5.dns_domain;
- status = cldap_netlogon(cldap, mem_ctx, &search);
+ status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);
printf("Trying with a user only\n");
search = empty_search;
search.in.user = "Administrator";
- status = cldap_netlogon(cldap, mem_ctx, &search);
+ status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);
printf("Trying with just a bad username\n");
search.in.user = "___no_such_user___";
- status = cldap_netlogon(cldap, mem_ctx, &search);
+ status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);
printf("Trying with just a bad domain\n");
search = empty_search;
search.in.realm = "___no_such_domain___";
- status = cldap_netlogon(cldap, mem_ctx, &search);
+ status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_NOT_FOUND);
printf("Trying with a incorrect domain and correct guid\n");
- search.in.domain_guid = GUID_string(mem_ctx, &n1.logon5.domain_uuid);
- status = cldap_netlogon(cldap, mem_ctx, &search);
+ search.in.domain_guid = GUID_string(tctx, &n1.logon5.domain_uuid);
+ status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);
printf("Trying with a incorrect domain and incorrect guid\n");
- search.in.domain_guid = GUID_string(mem_ctx, &guid);
- status = cldap_netlogon(cldap, mem_ctx, &search);
+ search.in.domain_guid = GUID_string(tctx, &guid);
+ status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_NOT_FOUND);
printf("Trying with a incorrect GUID and correct domain\n");
- search.in.domain_guid = GUID_string(mem_ctx, &guid);
+ search.in.domain_guid = GUID_string(tctx, &guid);
search.in.realm = n1.logon5.dns_domain;
- status = cldap_netlogon(cldap, mem_ctx, &search);
+ status = cldap_netlogon(cldap, tctx, &search);
CHECK_STATUS(status, NT_STATUS_OK);
done:
Modified: branches/SAMBA_4_0/source/torture/ldap/cldapbench.c
===================================================================
--- branches/SAMBA_4_0/source/torture/ldap/cldapbench.c 2007-12-03 23:33:09 UTC (rev 26270)
+++ branches/SAMBA_4_0/source/torture/ldap/cldapbench.c 2007-12-03 23:33:16 UTC (rev 26271)
@@ -63,6 +63,7 @@
ZERO_STRUCT(search);
search.in.dest_address = address;
+ search.in.dest_port = lp_cldap_port(tctx->lp_ctx);
search.in.acct_control = -1;
search.in.version = 6;
Modified: branches/SAMBA_4_0/source/torture/rpc/dssync.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/dssync.c 2007-12-03 23:33:09 UTC (rev 26270)
+++ branches/SAMBA_4_0/source/torture/rpc/dssync.c 2007-12-03 23:33:16 UTC (rev 26271)
@@ -284,6 +284,7 @@
ZERO_STRUCT(search);
search.in.dest_address = ctx->drsuapi_binding->host;
+ search.in.dest_port = lp_cldap_port(tctx->lp_ctx);
search.in.acct_control = -1;
search.in.version = 6;
status = cldap_netlogon(cldap, ctx, &search);
Modified: branches/SAMBA_4_0/source/torture/util_smb.c
===================================================================
--- branches/SAMBA_4_0/source/torture/util_smb.c 2007-12-03 23:33:09 UTC (rev 26270)
+++ branches/SAMBA_4_0/source/torture/util_smb.c 2007-12-03 23:33:16 UTC (rev 26271)
@@ -279,11 +279,12 @@
}
-/*
+/**
check that a wire string matches the flags specified
not 100% accurate, but close enough for testing
*/
-bool wire_bad_flags(struct smb_wire_string *str, int flags, struct smbcli_transport *transport)
+bool wire_bad_flags(struct smb_wire_string *str, int flags,
+ struct smbcli_transport *transport)
{
bool server_unicode;
int len;
More information about the samba-cvs
mailing list