s3: Remove smbd_server_fd from expand_msdfs_target
authorVolker Lendecke <vl@samba.org>
Wed, 18 Aug 2010 17:57:21 +0000 (19:57 +0200)
committerVolker Lendecke <vl@samba.org>
Thu, 26 Aug 2010 20:35:52 +0000 (22:35 +0200)
source3/modules/vfs_expand_msdfs.c

index 9fe9ef4a314eba719d24fe7ac25a3b2d38b32dfb..d2d334808ff160708d6dccbe4b5497fd5c1d6058 100644 (file)
@@ -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));