*/
#include "includes.h"
+#include "system/filesys.h"
+#include "smbd/smbd.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "smbd/globals.h"
+#include "auth.h"
+#include "../lib/tsocket/tsocket.h"
+#include "msdfs.h"
+#include "source3/lib/substitute.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_VFS
This is to redirect a DFS client to a host close to it.
***********************************************************/
-static char *read_target_host(TALLOC_CTX *ctx, const char *mapfile)
+static char *read_target_host(TALLOC_CTX *ctx, const char *mapfile,
+ const char *clientaddr)
{
- XFILE *f;
+ FILE *f;
char buf[1024];
char *space = buf;
bool found = false;
- f = x_fopen(mapfile, O_RDONLY, 0);
+ f = fopen(mapfile, "r");
if (f == NULL) {
DEBUG(0,("can't open IP map %s. Error %s\n",
DEBUG(10, ("Scanning mapfile [%s]\n", mapfile));
- while (x_fgets(buf, sizeof(buf), f) != NULL) {
- char addr[INET6_ADDRSTRLEN];
+ while (fgets(buf, sizeof(buf), f) != NULL) {
if ((strlen(buf) > 0) && (buf[strlen(buf)-1] == '\n'))
buf[strlen(buf)-1] = '\0';
*space = '\0';
- if (strncmp(client_addr(get_client_fd(),addr,sizeof(addr)),
- buf, strlen(buf)) == 0) {
+ if (strncmp(clientaddr, buf, strlen(buf)) == 0) {
found = true;
break;
}
}
- x_fclose(f);
+ fclose(f);
if (!found) {
return NULL;
connection_struct *conn,
char *target)
{
+ const struct loadparm_substitution *lp_sub =
+ loadparm_s3_global_substitution();
char *mapfilename = NULL;
char *filename_start = strchr_m(target, '@');
char *filename_end = NULL;
int filename_len = 0;
char *targethost = NULL;
char *new_target = NULL;
+ char *raddr;
if (filename_start == NULL) {
DEBUG(10, ("No filename start in %s\n", target));
}
mapfilename[filename_len] = '\0';
+ /*
+ * dfs links returned have had '/' characters replaced with '\'.
+ * Return them to '/' so we can have absolute path mapfilenames.
+ */
+ string_replace(mapfilename, '\\', '/');
+
DEBUG(10, ("Expanding from table [%s]\n", mapfilename));
- if ((targethost = read_target_host(ctx, mapfilename)) == NULL) {
+ raddr = tsocket_address_inet_addr_string(conn->sconn->remote_address,
+ ctx);
+ if (raddr == NULL) {
+ return NULL;
+ }
+
+ targethost = read_target_host(ctx, mapfilename, raddr);
+ if (targethost == NULL) {
DEBUG(1, ("Could not expand target host from file %s\n",
mapfilename));
return NULL;
}
- targethost = talloc_sub_advanced(ctx,
- lp_servicename(SNUM(conn)),
- conn->server_info->unix_name,
+ targethost = talloc_sub_full(ctx,
+ lp_servicename(talloc_tos(), lp_sub, SNUM(conn)),
+ conn->session_info->unix_info->unix_name,
conn->connectpath,
- conn->server_info->utok.gid,
- conn->server_info->sanitized_username,
- conn->server_info->info3->base.domain.string,
+ conn->session_info->unix_token->gid,
+ conn->session_info->unix_info->sanitized_username,
+ conn->session_info->info->domain_name,
targethost);
DEBUG(10, ("Expanded targethost to %s\n", targethost));
return new_target;
}
-static int expand_msdfs_readlink(struct vfs_handle_struct *handle,
- const char *path, char *buf, size_t bufsiz)
+static NTSTATUS expand_read_dfs_pathat(struct vfs_handle_struct *handle,
+ TALLOC_CTX *mem_ctx,
+ struct files_struct *dirfsp,
+ struct smb_filename *smb_fname,
+ struct referral **ppreflist,
+ size_t *preferral_count)
{
- TALLOC_CTX *ctx = talloc_tos();
- int result;
- char *target = TALLOC_ARRAY(ctx, char, PATH_MAX+1);
- size_t len;
-
- if (!target) {
- errno = ENOMEM;
- return -1;
- }
- if (bufsiz == 0) {
- errno = EINVAL;
- return -1;
+ NTSTATUS status;
+ size_t i;
+ struct referral *reflist = NULL;
+ size_t count = 0;
+ TALLOC_CTX *frame = talloc_stackframe();
+
+ /*
+ * Always call the NEXT function first, then
+ * modify the return if needed.
+ */
+ status = SMB_VFS_NEXT_READ_DFS_PATHAT(handle,
+ mem_ctx,
+ dirfsp,
+ smb_fname,
+ ppreflist,
+ preferral_count);
+
+ if (!NT_STATUS_IS_OK(status)) {
+ TALLOC_FREE(frame);
+ return status;
}
- result = SMB_VFS_NEXT_READLINK(handle, path, target,
- PATH_MAX);
-
- if (result <= 0)
- return result;
-
- target[result] = '\0';
+ /*
+ * This function can be called to check if a pathname
+ * is an MSDFS link, but not return the values of it.
+ * In this case ppreflist and preferral_count are NULL,
+ * so don't bother trying to look at any returns.
+ */
+ if (ppreflist == NULL || preferral_count == NULL) {
+ TALLOC_FREE(frame);
+ return status;
+ }
- if ((strncmp(target, "msdfs:", 6) == 0) &&
- (strchr_m(target, '@') != NULL)) {
- target = expand_msdfs_target(ctx, handle->conn, target);
- if (!target) {
- errno = ENOENT;
- return -1;
+ /*
+ * We are always returning the values returned
+ * returned by the NEXT call, but we might mess
+ * with the reflist[i].alternate_path values,
+ * so use local pointers to minimise indirections.
+ */
+ count = *preferral_count;
+ reflist = *ppreflist;
+
+ for (i = 0; i < count; i++) {
+ if (strchr_m(reflist[i].alternate_path, '@') != NULL) {
+ char *new_altpath = expand_msdfs_target(frame,
+ handle->conn,
+ reflist[i].alternate_path);
+ if (new_altpath == NULL) {
+ TALLOC_FREE(*ppreflist);
+ *preferral_count = 0;
+ TALLOC_FREE(frame);
+ return NT_STATUS_NO_MEMORY;
+ }
+ reflist[i].alternate_path = talloc_move(reflist,
+ &new_altpath);
}
}
-
- len = MIN(bufsiz, strlen(target));
-
- memcpy(buf, target, len);
-
- TALLOC_FREE(target);
- return len;
+ TALLOC_FREE(frame);
+ return status;
}
static struct vfs_fn_pointers vfs_expand_msdfs_fns = {
- .vfs_readlink = expand_msdfs_readlink
+ .read_dfs_pathat_fn = expand_read_dfs_pathat,
};
-NTSTATUS vfs_expand_msdfs_init(void);
-NTSTATUS vfs_expand_msdfs_init(void)
+static_decl_vfs;
+NTSTATUS vfs_expand_msdfs_init(TALLOC_CTX *ctx)
{
return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "expand_msdfs",
&vfs_expand_msdfs_fns);
git.samba.org / samba.git / blobdiff