Changeset 594 for vendor/current/source3/smbd

Timestamp:

Jul 1, 2011, 4:02:23 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.8

Location:

vendor/current/source3/smbd

Files:

• conn.c (modified) (4 diffs)
• dosmode.c (modified) (4 diffs)
• msdfs.c (modified) (3 diffs)
• nttrans.c (modified) (4 diffs)
• open.c (modified) (12 diffs)
• password.c (modified) (1 diff)
• posix_acls.c (modified) (9 diffs)
• process.c (modified) (2 diffs)
• uid.c (modified) (1 diff)
• vfs.c (modified) (4 diffs)

vendor/current/source3/smbd/conn.c

@@ -198 +198 @@
         pipes_struct *plist = NULL;
         connection_struct *conn;
+        bool ret = true;
 
         if (deadtime <= 0)
@@ -210 +211 @@
                         conn->lastused = t;
                         conn->lastused_count = t;
+                        age = 0;
                 }
 
@@ -218 +220 @@
 
                 if (conn->num_files_open > 0 || age < deadtime) {
-                        return False;
+                        ret = false;
                 }
         }
@@ -230 +232 @@
              plist = get_next_internal_pipe(plist)) {
                 if (num_pipe_handles(plist->pipe_handles) != 0) {
-                        return False;
+                        ret = false;
+                        break;
                 }
         }
         
-        return True;
+        return ret;
 }
 

vendor/current/source3/smbd/dosmode.c

@@ -412 +412 @@
                  */
 
-                if (!NT_STATUS_IS_OK(open_file_fchmod(NULL, conn, smb_fname,
+                if (!NT_STATUS_IS_OK(open_file_fchmod(conn, smb_fname,
                                                       &fsp)))
                         return ret;
@@ -422 +422 @@
                 }
                 unbecome_root();
-                close_file_fchmod(NULL, fsp);
+                close_file(NULL, fsp, NORMAL_CLOSE);
                 return ret;
         }
@@ -821 +821 @@
                  * still in our current user context. This ensures we
                  * are not violating security in doing the fchmod.
-                 * This file open does *not* break any oplocks we are
-                 * holding. We need to review this.... may need to
-                 * break batch oplocks open by others. JRA.
                  */
                 files_struct *fsp;
-                if (!NT_STATUS_IS_OK(open_file_fchmod(NULL, conn, smb_fname,
+                if (!NT_STATUS_IS_OK(open_file_fchmod(conn, smb_fname,
                                      &fsp)))
                         return -1;
@@ -832 +829 @@
                 ret = SMB_VFS_FCHMOD(fsp, unixmode);
                 unbecome_root();
-                close_file_fchmod(NULL, fsp);
+                close_file(NULL, fsp, NORMAL_CLOSE);
                 if (!newfile) {
                         notify_fname(conn, NOTIFY_ACTION_MODIFIED,

vendor/current/source3/smbd/msdfs.c

@@ -796 +796 @@
 
 NTSTATUS get_referred_path(TALLOC_CTX *ctx,
+                        struct auth_serversupplied_info *server_info,
                         const char *dfs_path,
                         struct junction_map *jucn,
@@ -917 +918 @@
 
         status = create_conn_struct(ctx, &conn, snum, lp_pathname(snum),
-                                    NULL, &oldpath);
+                                    server_info, &oldpath);
         if (!NT_STATUS_IS_OK(status)) {
                 TALLOC_FREE(pdp);
@@ -1222 +1223 @@
 
         /* The following call can change cwd. */
-        *pstatus = get_referred_path(ctx, pathnamep, junction,
-                        &consumedcnt, &self_referral);
+        *pstatus = get_referred_path(ctx, orig_conn->server_info,
+                                     pathnamep, junction,
+                                     &consumedcnt, &self_referral);
         if (!NT_STATUS_IS_OK(*pstatus)) {
                 vfs_ChDir(orig_conn,orig_conn->connectpath);

vendor/current/source3/smbd/nttrans.c

@@ -834 +834 @@
         NTSTATUS status;
 
-        if (sd_len == 0 || !lp_nt_acl_support(SNUM(fsp->conn))) {
+        if (sd_len == 0) {
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        if (!CAN_WRITE(fsp->conn)) {
+                return NT_STATUS_ACCESS_DENIED;
+        }
+
+        if (!lp_nt_acl_support(SNUM(fsp->conn))) {
                 return NT_STATUS_OK;
         }
@@ -851 +859 @@
         }
 
-        /* Convert all the generic bits. */
-        security_acl_map_generic(psd->dacl, &file_generic_mapping);
-        security_acl_map_generic(psd->sacl, &file_generic_mapping);
+        /* Ensure we have at least one thing set. */
+        if ((security_info_sent & (SECINFO_OWNER|SECINFO_GROUP|SECINFO_DACL|SECINFO_SACL)) == 0) {
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        /* Ensure we have the rights to do this. */
+        if (security_info_sent & SECINFO_OWNER) {
+                if (!(fsp->access_mask & SEC_STD_WRITE_OWNER)) {
+                        return NT_STATUS_ACCESS_DENIED;
+                }
+        }
+
+        if (security_info_sent & SECINFO_GROUP) {
+                if (!(fsp->access_mask & SEC_STD_WRITE_OWNER)) {
+                        return NT_STATUS_ACCESS_DENIED;
+                }
+        }
+
+        if (security_info_sent & SECINFO_DACL) {
+                if (!(fsp->access_mask & SEC_STD_WRITE_DAC)) {
+                        return NT_STATUS_ACCESS_DENIED;
+                }
+                /* Convert all the generic bits. */
+                if (psd->dacl) {
+                        security_acl_map_generic(psd->dacl, &file_generic_mapping);
+                }
+        }
+
+        if (security_info_sent & SECINFO_SACL) {
+                if (!(fsp->access_mask & SEC_FLAG_SYSTEM_SECURITY)) {
+                        return NT_STATUS_ACCESS_DENIED;
+                }
+                /* Convert all the generic bits. */
+                if (psd->sacl) {
+                        security_acl_map_generic(psd->sacl, &file_generic_mapping);
+                }
+        }
 
         if (DEBUGLEVEL >= 10) {
@@ -1796 +1838 @@
          */
 
+        if ((security_info_wanted & SECINFO_SACL) &&
+                        !(fsp->access_mask & SEC_FLAG_SYSTEM_SECURITY)) {
+                reply_nterror(req,  NT_STATUS_ACCESS_DENIED);
+                return;
+        }
+
+        if ((security_info_wanted & (SECINFO_DACL|SECINFO_OWNER|SECINFO_GROUP)) &&
+                        !(fsp->access_mask & SEC_STD_READ_CONTROL)) {
+                reply_nterror(req, NT_STATUS_ACCESS_DENIED);
+                return;
+        }
+
         if (!lp_nt_acl_support(SNUM(conn))) {
                 status = get_null_nt_acl(talloc_tos(), &psd);
@@ -1805 +1859 @@
                 reply_nterror(req, status);
                 return;
+        }
+
+        if (!(security_info_wanted & SECINFO_OWNER)) {
+                psd->owner_sid = NULL;
+        }
+        if (!(security_info_wanted & SECINFO_GROUP)) {
+                psd->group_sid = NULL;
+        }
+        if (!(security_info_wanted & SECINFO_DACL)) {
+                psd->dacl = NULL;
+        }
+        if (!(security_info_wanted & SECINFO_SACL)) {
+                psd->sacl = NULL;
         }
 

vendor/current/source3/smbd/open.c

@@ -23 +23 @@
 #include "smbd/globals.h"
 
+extern struct current_user current_user;
 extern const struct generic_mapping file_generic_mapping;
 
@@ -1479 +1480 @@
         ZERO_STRUCT(id);
 
+        /* Windows allows a new file to be created and
+           silently removes a FILE_ATTRIBUTE_DIRECTORY
+           sent by the client. Do the same. */
+
+        new_dos_attributes &= ~FILE_ATTRIBUTE_DIRECTORY;
+
         if (conn->printer) {
                 /*
@@ -1961 +1968 @@
         if ((flags2 & O_CREAT) && lp_inherit_acls(SNUM(conn)) &&
             (def_acl = directory_has_default_acl(conn, parent_dir))) {
-                unx_mode = 0777;
+                unx_mode = (0777 & lp_create_mask(SNUM(conn)));
         }
 
@@ -2265 +2272 @@
 ****************************************************************************/
 
-NTSTATUS open_file_fchmod(struct smb_request *req, connection_struct *conn,
+NTSTATUS open_file_fchmod(connection_struct *conn,
                           struct smb_filename *smb_fname,
                           files_struct **result)
 {
-        files_struct *fsp = NULL;
-        NTSTATUS status;
-
         if (!VALID_STAT(smb_fname->st)) {
                 return NT_STATUS_INVALID_PARAMETER;
         }
 
-        status = file_new(req, conn, &fsp);
-        if(!NT_STATUS_IS_OK(status)) {
-                return status;
-        }
-
-        status = SMB_VFS_CREATE_FILE(
+        return SMB_VFS_CREATE_FILE(
                 conn,                                   /* conn */
                 NULL,                                   /* req */
@@ -2292 +2291 @@
                 0,                                      /* create_options */
                 0,                                      /* file_attributes */
-                0,                                      /* oplock_request */
+                INTERNAL_OPEN_ONLY,                     /* oplock_request */
                 0,                                      /* allocation_size */
                 NULL,                                   /* sd */
                 NULL,                                   /* ea_list */
-                &fsp,                                   /* result */
+                result,                                 /* result */
                 NULL);                                  /* pinfo */
-
-        /*
-         * This is not a user visible file open.
-         * Don't set a share mode.
-         */
-
-        if (!NT_STATUS_IS_OK(status)) {
-                file_free(req, fsp);
-                return status;
-        }
-
-        *result = fsp;
-        return NT_STATUS_OK;
-}
-
-/****************************************************************************
- Close the fchmod file fd - ensure no locks are lost.
-****************************************************************************/
-
-NTSTATUS close_file_fchmod(struct smb_request *req, files_struct *fsp)
-{
-        NTSTATUS status = fd_close(fsp);
-        file_free(req, fsp);
-        return status;
 }
 
@@ -2440 +2415 @@
         SMB_ASSERT(!is_ntfs_stream_smb_fname(smb_dname));
 
+        /* Ensure we have a directory attribute. */
+        file_attributes |= FILE_ATTRIBUTE_DIRECTORY;
+
         DEBUG(5,("open_directory: opening directory %s, access_mask = 0x%x, "
                  "share_access = 0x%x create_options = 0x%x, "
@@ -2468 +2446 @@
         }
 
-        /* We need to support SeSecurityPrivilege for this. */
-        if (access_mask & SEC_FLAG_SYSTEM_SECURITY) {
+        if ((access_mask & SEC_FLAG_SYSTEM_SECURITY) &&
+                        !user_has_privileges(current_user.nt_user_token, &se_security)) {
                 DEBUG(10, ("open_directory: open on %s "
                         "failed - SEC_FLAG_SYSTEM_SECURITY denied.\n",
@@ -2978 +2956 @@
         }
 
-#if 0
-        /* We need to support SeSecurityPrivilege for this. */
         if ((access_mask & SEC_FLAG_SYSTEM_SECURITY) &&
-            !user_has_privileges(current_user.nt_user_token,
-                                 &se_security)) {
+                        !user_has_privileges(current_user.nt_user_token, &se_security)) {
+                DEBUG(10, ("create_file_unixpath:: open on %s "
+                        "failed - SEC_FLAG_SYSTEM_SECURITY denied.\n",
+                        smb_fname_str_dbg(smb_fname)));
                 status = NT_STATUS_PRIVILEGE_NOT_HELD;
                 goto fail;
         }
-#else
-        /* We need to support SeSecurityPrivilege for this. */
-        if (access_mask & SEC_FLAG_SYSTEM_SECURITY) {
-                status = NT_STATUS_PRIVILEGE_NOT_HELD;
-                goto fail;
-        }
-        /* Don't allow a SACL set from an NTtrans create until we
-         * support SeSecurityPrivilege. */
-        if (!VALID_STAT(smb_fname->st) &&
-                        lp_nt_acl_support(SNUM(conn)) &&
-                        sd && (sd->sacl != NULL)) {
-                status = NT_STATUS_PRIVILEGE_NOT_HELD;
-                goto fail;
-        }
-#endif
 
         if ((conn->fs_capabilities & FILE_NAMED_STREAMS)
@@ -3271 +3234 @@
                                    struct smb_request *req,
                                    uint16_t root_dir_fid,
-                                   struct smb_filename *smb_fname)
+                                   const struct smb_filename *smb_fname,
+                                   struct smb_filename **smb_fname_out)
 {
         files_struct *dir_fsp;
@@ -3359 +3323 @@
         }
 
-        new_base_name = talloc_asprintf(smb_fname, "%s%s", parent_fname,
+        new_base_name = talloc_asprintf(talloc_tos(), "%s%s", parent_fname,
                                         smb_fname->base_name);
         if (new_base_name == NULL) {
@@ -3366 +3330 @@
         }
 
-        TALLOC_FREE(smb_fname->base_name);
-        smb_fname->base_name = new_base_name;
-        status = NT_STATUS_OK;
+        status = filename_convert(req,
+                                conn,
+                                req->flags2 & FLAGS2_DFS_PATHNAMES,
+                                new_base_name,
+                                0,
+                                NULL,
+                                smb_fname_out);
+        if (!NT_STATUS_IS_OK(status)) {
+                goto out;
+        }
 
  out:
@@ -3415 +3386 @@
 
         if (root_dir_fid != 0) {
+                struct smb_filename *smb_fname_out = NULL;
                 status = get_relative_fid_filename(conn, req, root_dir_fid,
-                                                   smb_fname);
+                                                   smb_fname, &smb_fname_out);
                 if (!NT_STATUS_IS_OK(status)) {
                         goto fail;
                 }
+                smb_fname = smb_fname_out;
         }
 

vendor/current/source3/smbd/password.c

@@ -211 +211 @@
         }
 
-        pwd = getpwnam_alloc(talloc_tos(), username);
+        pwd = Get_Pwnam_alloc(talloc_tos(), username);
 
         if ((pwd == NULL) || (pwd->pw_dir[0] == '\0')) {

vendor/current/source3/smbd/posix_acls.c

@@ -1746 +1746 @@
                                            sid_string_dbg(&psa->trustee)));
                                 SAFE_FREE(current_ace);
+                                continue;
+                        }
+
+                        if (lp_force_unknown_acl_user(SNUM(fsp->conn))) {
+                                DEBUG(10, ("create_canon_ace_lists: ignoring "
+                                        "unknown or foreign SID %s\n",
+                                        sid_string_dbg(&psa->trustee)));
+                                        SAFE_FREE(current_ace);
                                 continue;
                         }
@@ -3592 +3600 @@
         }
 
-        if (!NT_STATUS_IS_OK(open_file_fchmod(NULL, conn, smb_fname, &fsp))) {
+        if (!NT_STATUS_IS_OK(open_file_fchmod(conn, smb_fname, &fsp))) {
                 return -1;
         }
@@ -3611 +3619 @@
         unbecome_root();
 
-        close_file_fchmod(NULL, fsp);
+        close_file(NULL, fsp, NORMAL_CLOSE);
 
         return ret;
@@ -3823 +3831 @@
 ****************************************************************************/
 
-NTSTATUS set_nt_acl(files_struct *fsp, uint32 security_info_sent, const SEC_DESC *psd)
+NTSTATUS set_nt_acl(files_struct *fsp, uint32 security_info_sent, const SEC_DESC *psd_orig)
 {
         connection_struct *conn = fsp->conn;
@@ -3838 +3846 @@
         bool acl_set_support = false;
         bool ret = false;
+        SEC_DESC *psd = NULL;
 
         DEBUG(10,("set_nt_acl: called for file %s\n",
@@ -3847 +3856 @@
         }
 
+        if (!psd_orig) {
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        psd = dup_sec_desc(talloc_tos(), psd_orig);
+        if (!psd) {
+                return NT_STATUS_NO_MEMORY;
+        }
+
         /*
          * Get the current state of the file.
@@ -3862 +3880 @@
          * Unpack the user/group/world id's.
          */
+
+        /* POSIX can't cope with missing owner/group. */
+        if ((security_info_sent & SECINFO_OWNER) && (psd->owner_sid == NULL)) {
+                security_info_sent &= ~SECINFO_OWNER;
+        }
+        if ((security_info_sent & SECINFO_GROUP) && (psd->group_sid == NULL)) {
+                security_info_sent &= ~SECINFO_GROUP;
+        }
 
         status = unpack_nt_owners( SNUM(conn), &user, &grp, security_info_sent, psd);
@@ -3912 +3938 @@
 
         create_file_sids(&fsp->fsp_name->st, &file_owner_sid, &file_grp_sid);
+
+        if((security_info_sent & SECINFO_DACL) &&
+                        (psd->type & SEC_DESC_DACL_PRESENT) &&
+                        (psd->dacl == NULL)) {
+                SEC_ACE ace[3];
+
+                /* We can't have NULL DACL in POSIX.
+                   Use owner/group/Everyone -> full access. */
+
+                init_sec_ace(&ace[0],
+                                &file_owner_sid,
+                                SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                GENERIC_ALL_ACCESS,
+                                0);
+                init_sec_ace(&ace[1],
+                                &file_grp_sid,
+                                SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                GENERIC_ALL_ACCESS,
+                                0);
+                init_sec_ace(&ace[2],
+                                &global_sid_World,
+                                SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                GENERIC_ALL_ACCESS,
+                                0);
+                psd->dacl = make_sec_acl(talloc_tos(),
+                                        NT4_ACL_REVISION,
+                                        3,
+                                        ace);
+                if (psd->dacl == NULL) {
+                        return NT_STATUS_NO_MEMORY;
+                }
+                security_acl_map_generic(psd->dacl, &file_generic_mapping);
+        }
 
         acl_perms = unpack_canon_ace(fsp, &fsp->fsp_name->st, &file_owner_sid,
@@ -4757 +4816 @@
         return ret_sd;
 }
+
+/* Stolen shamelessly from pvfs_default_acl() in source4 :-). */
+
+NTSTATUS make_default_filesystem_acl(TALLOC_CTX *ctx,
+                                        const char *name,
+                                        SMB_STRUCT_STAT *psbuf,
+                                        SEC_DESC **ppdesc)
+{
+        struct dom_sid owner_sid, group_sid;
+        size_t size = 0;
+        SEC_ACE aces[4];
+        uint32_t access_mask = 0;
+        mode_t mode = psbuf->st_ex_mode;
+        SEC_ACL *new_dacl = NULL;
+        int idx = 0;
+
+        DEBUG(10,("make_default_filesystem_acl: file %s mode = 0%o\n",
+                name, (int)mode ));
+
+        uid_to_sid(&owner_sid, psbuf->st_ex_uid);
+        gid_to_sid(&group_sid, psbuf->st_ex_gid);
+
+        /*
+         We provide up to 4 ACEs
+                - Owner
+                - Group
+                - Everyone
+                - NT System
+        */
+
+        if (mode & S_IRUSR) {
+                if (mode & S_IWUSR) {
+                        access_mask |= SEC_RIGHTS_FILE_ALL;
+                } else {
+                        access_mask |= SEC_RIGHTS_FILE_READ | SEC_FILE_EXECUTE;
+                }
+        }
+        if (mode & S_IWUSR) {
+                access_mask |= SEC_RIGHTS_FILE_WRITE | SEC_STD_DELETE;
+        }
+
+        init_sec_ace(&aces[idx],
+                        &owner_sid,
+                        SEC_ACE_TYPE_ACCESS_ALLOWED,
+                        access_mask,
+                        0);
+        idx++;
+
+        access_mask = 0;
+        if (mode & S_IRGRP) {
+                access_mask |= SEC_RIGHTS_FILE_READ | SEC_FILE_EXECUTE;
+        }
+        if (mode & S_IWGRP) {
+                /* note that delete is not granted - this matches posix behaviour */
+                access_mask |= SEC_RIGHTS_FILE_WRITE;
+        }
+        if (access_mask) {
+                init_sec_ace(&aces[idx],
+                        &group_sid,
+                        SEC_ACE_TYPE_ACCESS_ALLOWED,
+                        access_mask,
+                        0);
+                idx++;
+        }
+
+        access_mask = 0;
+        if (mode & S_IROTH) {
+                access_mask |= SEC_RIGHTS_FILE_READ | SEC_FILE_EXECUTE;
+        }
+        if (mode & S_IWOTH) {
+                access_mask |= SEC_RIGHTS_FILE_WRITE;
+        }
+        if (access_mask) {
+                init_sec_ace(&aces[idx],
+                        &global_sid_World,
+                        SEC_ACE_TYPE_ACCESS_ALLOWED,
+                        access_mask,
+                        0);
+                idx++;
+        }
+
+        init_sec_ace(&aces[idx],
+                        &global_sid_System,
+                        SEC_ACE_TYPE_ACCESS_ALLOWED,
+                        SEC_RIGHTS_FILE_ALL,
+                        0);
+        idx++;
+
+        new_dacl = make_sec_acl(ctx,
+                        NT4_ACL_REVISION,
+                        idx,
+                        aces);
+
+        if (!new_dacl) {
+                return NT_STATUS_NO_MEMORY;
+        }
+
+        *ppdesc = make_sec_desc(ctx,
+                        SECURITY_DESCRIPTOR_REVISION_1,
+                        SEC_DESC_SELF_RELATIVE|SEC_DESC_DACL_PRESENT,
+                        &owner_sid,
+                        &group_sid,
+                        NULL,
+                        new_dacl,
+                        &size);
+        if (!*ppdesc) {
+                return NT_STATUS_NO_MEMORY;
+        }
+        return NT_STATUS_OK;
+}

vendor/current/source3/smbd/process.c

@@ -836 +836 @@
                 END_PROFILE(smbd_idle);
                 errno = sav;
+        }
+
+        if (selrtn == -1 && errno != EINTR) {
+                return map_nt_error_from_unix(errno);
         }
 
@@ -1857 +1861 @@
                  * may have updated them.
                  */
-                SCVAL(req->chain_outbuf, smb_tid, CVAL(req->outbuf, smb_tid));
-                SCVAL(req->chain_outbuf, smb_uid, CVAL(req->outbuf, smb_uid));
+                SSVAL(req->chain_outbuf, smb_tid, SVAL(req->outbuf, smb_tid));
+                SSVAL(req->chain_outbuf, smb_uid, SVAL(req->outbuf, smb_uid));
 
                 if (!smb_splice_chain(&req->chain_outbuf,

vendor/current/source3/smbd/uid.c

@@ -32 +32 @@
         struct passwd *pass;
 
-        pass = getpwnam_alloc(talloc_autofree_context(), lp_guestaccount());
+        pass = Get_Pwnam_alloc(talloc_autofree_context(), lp_guestaccount());
         if (!pass) {
                 return false;

vendor/current/source3/smbd/vfs.c

@@ -583 +583 @@
         }
 
+#ifdef S_ISFIFO
+        if (S_ISFIFO(st.st_ex_mode)) {
+                return 0;
+        }
+#endif
+
         DEBUG(10,("vfs_fill_sparse: write zeros in file %s from len %.0f to "
                   "len %.0f (%.0f bytes)\n", fsp_str_dbg(fsp),
@@ -591 +597 @@
 
         flush_write_cache(fsp, SIZECHANGE_FLUSH);
+
+
+        offset = st.st_ex_size;
+        num_to_write = len - st.st_ex_size;
+
+        /* Only do this on non-stream file handles. */
+        if (fsp->base_fsp == NULL) {
+                /* for allocation try posix_fallocate first. This can fail on some
+                 * platforms e.g. when the filesystem doesn't support it and no
+                 * emulation is being done by the libc (like on AIX with JFS1). In that
+                 * case we do our own emulation. posix_fallocate implementations can
+                 * return ENOTSUP or EINVAL in cases like that. */
+                ret = sys_posix_fallocate(fsp->fh->fd, offset, num_to_write);
+                if (ret == ENOSPC) {
+                        errno = ENOSPC;
+                        ret = -1;
+                        goto out;
+                }
+                if (ret == 0) {
+                        set_filelen_write_cache(fsp, len);
+                        goto out;
+                }
+
+                DEBUG(10,("vfs_fill_sparse: sys_posix_fallocate failed with "
+                        "error %d. Falling back to slow manual allocation\n", ret));
+        }
 
         if (!sparse_buf) {
@@ -601 +633 @@
         }
 
-        offset = st.st_ex_size;
-        num_to_write = len - st.st_ex_size;
         total = 0;
 
@@ -929 +959 @@
                         }
                         default:
-                                DEBUG(1,("check_reduced_name: couldn't get "
+                                DEBUG(3,("check_reduced_name: couldn't get "
                                          "realpath for %s\n", fname));
                                 return map_nt_error_from_unix(errno);