The branch, master has been updated
via e105570 s3: Remove smbd_server_fd from expand_msdfs_target
from 1991c2a libcli/auth/ntlm_check.c - fix parameter indentation
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e1055701ff94e7cd548fae76ce479cc7278c41e7
Author: Volker Lendecke <[email protected]>
Date: Wed Aug 18 19:57:21 2010 +0200
s3: Remove smbd_server_fd from expand_msdfs_target
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_expand_msdfs.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_expand_msdfs.c
b/source3/modules/vfs_expand_msdfs.c
index 9fe9ef4..d2d3348 100644
--- a/source3/modules/vfs_expand_msdfs.c
+++ b/source3/modules/vfs_expand_msdfs.c
@@ -19,6 +19,7 @@
#include "includes.h"
#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "smbd/globals.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_VFS
@@ -113,7 +114,6 @@ static char *expand_msdfs_target(TALLOC_CTX *ctx,
int filename_len = 0;
char *targethost = NULL;
char *new_target = NULL;
- char addr[INET6_ADDRSTRLEN];
if (filename_start == NULL) {
DEBUG(10, ("No filename start in %s\n", target));
@@ -137,8 +137,7 @@ static char *expand_msdfs_target(TALLOC_CTX *ctx,
DEBUG(10, ("Expanding from table [%s]\n", mapfilename));
targethost = read_target_host(
- ctx, client_addr(smbd_server_fd(), addr, sizeof(addr)),
- mapfilename);
+ ctx, conn->sconn->client_id.addr, mapfilename);
if (targethost == NULL) {
DEBUG(1, ("Could not expand target host from file %s\n",
mapfilename));
--
Samba Shared Repository
