summaryrefslogtreecommitdiff
path: root/source4/auth/auth_server.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-03 21:25:17 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:47:47 +0100
commitb83a7a135f3247f553cb04173646b2d871b97235 (patch)
tree4b2ea9eab1a603a6324e78bc98f91e9f3150a348 /source4/auth/auth_server.c
parent1f69adddc54d3b4b91df0ce639b3faccb85b2eb7 (diff)
downloadsamba-b83a7a135f3247f553cb04173646b2d871b97235.tar.gz
samba-b83a7a135f3247f553cb04173646b2d871b97235.tar.bz2
samba-b83a7a135f3247f553cb04173646b2d871b97235.zip
r26268: Avoid more use of global_loadparm - put lp_ctx in smb_server and wbsrv_connection.
(This used to be commit 7c008664238ed966cb82adf5b25b22157bb50730)
Diffstat (limited to 'source4/auth/auth_server.c')
-rw-r--r--source4/auth/auth_server.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/auth/auth_server.c b/source4/auth/auth_server.c
index 1e25702671..b5fcda15b3 100644
--- a/source4/auth/auth_server.c
+++ b/source4/auth/auth_server.c
@@ -24,7 +24,7 @@
Support for server level security.
****************************************************************************/
-static struct smbcli_state *server_cryptkey(TALLOC_CTX *mem_ctx, bool unicode, int maxprotocol)
+static struct smbcli_state *server_cryptkey(TALLOC_CTX *mem_ctx, bool unicode, int maxprotocol, const char **name_resolve_order)
{
struct smbcli_state *cli = NULL;
fstring desthost;
@@ -45,7 +45,7 @@ static struct smbcli_state *server_cryptkey(TALLOC_CTX *mem_ctx, bool unicode, i
while(next_token( &p, desthost, LIST_SEP, sizeof(desthost))) {
strupper(desthost);
- if(!resolve_name( desthost, &dest_ip, 0x20, lp_name_resolve_order(global_loadparm))) {
+ if(!resolve_name( desthost, &dest_ip, 0x20, name_resolve_order)) {
DEBUG(1,("server_cryptkey: Can't resolve address for %s\n",desthost));
continue;
}
@@ -215,7 +215,7 @@ static NTSTATUS check_smbserver_security(const struct auth_context *auth_context
if (cli) {
} else {
- cli = server_cryptkey(mem_ctx, lp_unicode(auth_context->lp_ctx), lp_cli_maxprotocol(auth_context->lp_ctx));
+ cli = server_cryptkey(mem_ctx, lp_unicode(auth_context->lp_ctx), lp_cli_maxprotocol(auth_context->lp_ctx), lp_name_resolve_order(auth_context->lp_ctx));
locally_made_cli = true;
}