Changeset 232 for branches/samba-3.2.x/source/smbd

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

Location:

branches/samba-3.2.x/source/smbd

Files:

• build_options.c (modified) (5 diffs)
• close.c (modified) (1 diff)
• dosmode.c (modified) (2 diffs)
• nttrans.c (modified) (2 diffs)
• open.c (modified) (7 diffs)
• oplock.c (modified) (5 diffs)
• password.c (modified) (5 diffs)
• posix_acls.c (modified) (7 diffs)
• process.c (modified) (1 diff)
• reply.c (modified) (9 diffs)
• server.c (modified) (2 diffs)
• service.c (modified) (1 diff)
• trans2.c (modified) (9 diffs)

branches/samba-3.2.x/source/smbd/build_options.c

@@ -2002 +2002 @@
         output(screen, "   HAVE_STAT_ST_ATIMENSEC\n");
 #endif
+#ifdef HAVE_STAT_ST_ATIMESPEC
+        output(screen, "   HAVE_STAT_ST_ATIMESPEC\n");
+#endif
+#ifdef HAVE_STAT_ST_ATIME_N
+        output(screen, "   HAVE_STAT_ST_ATIME_N\n");
+#endif
 #ifdef HAVE_STAT_ST_BIRTHTIME
         output(screen, "   HAVE_STAT_ST_BIRTHTIME\n");
@@ -2023 +2029 @@
         output(screen, "   HAVE_STAT_ST_CTIMENSEC\n");
 #endif
+#ifdef HAVE_STAT_ST_CTIMESPEC
+        output(screen, "   HAVE_STAT_ST_CTIMESPEC\n");
+#endif
+#ifdef HAVE_STAT_ST_CTIME_N
+        output(screen, "   HAVE_STAT_ST_CTIME_N\n");
+#endif
 #ifdef HAVE_STAT_ST_FLAGS
         output(screen, "   HAVE_STAT_ST_FLAGS\n");
@@ -2031 +2043 @@
 #ifdef HAVE_STAT_ST_MTIMENSEC
         output(screen, "   HAVE_STAT_ST_MTIMENSEC\n");
+#endif
+#ifdef HAVE_STAT_ST_MTIMESPEC
+        output(screen, "   HAVE_STAT_ST_MTIMESPEC\n");
+#endif
+#ifdef HAVE_STAT_ST_MTIME_N
+        output(screen, "   HAVE_STAT_ST_MTIME_N\n");
+#endif
+#ifdef HAVE_STAT_ST_UATIME
+        output(screen, "   HAVE_STAT_ST_UATIME\n");
+#endif
+#ifdef HAVE_STAT_ST_UCTIME
+        output(screen, "   HAVE_STAT_ST_UCTIME\n");
+#endif
+#ifdef HAVE_STAT_ST_UMTIME
+        output(screen, "   HAVE_STAT_ST_UMTIME\n");
 #endif
 #ifdef HAVE_STRCASECMP
@@ -2529 +2556 @@
         output(screen, "\n Build Options:\n");
 
+#ifdef AC_APPLE_UNIVERSAL_BUILD
+        output(screen, "   AC_APPLE_UNIVERSAL_BUILD\n");
+#endif
 #ifdef AIX
         output(screen, "   AIX\n");
@@ -2900 +2930 @@
 #ifdef WITH_WINBIND
         output(screen, "   WITH_WINBIND\n");
-#endif
-#ifdef WORDS_BIGENDIAN
-        output(screen, "   WORDS_BIGENDIAN\n");
 #endif
 #ifdef XATTR_ADD_OPT

branches/samba-3.2.x/source/smbd/close.c

@@ -68 +68 @@
         }
 
-        chmod(fsp->fsp_name,0755);
-        ret = smbrun(fsp->fsp_name,&tmp_fd);
+        /* Ensure we don't depend on user's PATH. */
+        p = talloc_asprintf(ctx, "./%s", fsp->fsp_name);
+        if (!p) {
+                TALLOC_FREE(ctx);
+                return;
+        }
+
+        if (chmod(fsp->fsp_name,0755) == -1) {
+                TALLOC_FREE(ctx);
+                return;
+        }
+        ret = smbrun(p,&tmp_fd);
         DEBUG(3,("Invoking magic command %s gave %d\n",
-                fsp->fsp_name,ret));
+                p,ret));
 
         unlink(fsp->fsp_name);

branches/samba-3.2.x/source/smbd/dosmode.c

@@ -214 +214 @@
         sizeret = SMB_VFS_GETXATTR(conn, path, SAMBA_XATTR_DOS_ATTRIB, attrstr, sizeof(attrstr));
         if (sizeret == -1) {
-#if defined(ENOTSUP) && defined(ENOATTR)
-                if ((errno != ENOTSUP) && (errno != ENOATTR) && (errno != EACCES) && (errno != EPERM)) {
+                if (errno == ENOSYS
+#if defined(ENOTSUP)
+                        || errno == ENOTSUP) {
+#else
+                                ) {
+#endif
                         DEBUG(1,("get_ea_dos_attributes: Cannot get attribute from EA on file %s: Error = %s\n",
                                 path, strerror(errno) ));
                         set_store_dos_attributes(SNUM(conn), False);
                 }
-#endif
                 return False;
         }
@@ -274 +277 @@
                                 ) {
 #endif
+                                DEBUG(1,("set_ea_dos_attributes: Cannot set attribute EA on file %s: Error = %s\n",
+                                        path, strerror(errno) ));
                                 set_store_dos_attributes(SNUM(conn), False);
                         }

branches/samba-3.2.x/source/smbd/nttrans.c

@@ -1306 +1306 @@
         }
 
-        if( is_ntfs_stream_name(oldname)) {
-                /* Can't rename a stream. */
-                reply_nterror(req, NT_STATUS_ACCESS_DENIED);
-                END_PROFILE(SMBntrename);
-                return;
-        }
-
         if (ms_has_wild(oldname)) {
                 reply_nterror(req, NT_STATUS_OBJECT_PATH_SYNTAX_BAD);
@@ -1357 +1350 @@
                 }
                 reply_nterror(req, status);
+                END_PROFILE(SMBntrename);
+                return;
+        }
+
+        /* The new name must begin with a ':' if the old name is a stream. */
+        if (is_ntfs_stream_name(oldname) && (newname[0] != ':')) {
+                reply_nterror(req, NT_STATUS_INVALID_PARAMETER);
                 END_PROFILE(SMBntrename);
                 return;

branches/samba-3.2.x/source/smbd/open.c

@@ -668 +668 @@
 
 /*
- * 1) No files open at all or internal open: Grant whatever the client wants.
- *
- * 2) Exclusive (or batch) oplock around: If the requested access is a delete
- *    request, break if the oplock around is a batch oplock. If it's another
- *    requested access type, break.
- * 
- * 3) Only level2 around: Grant level2 and do nothing else.
+ * Send a break message to the oplock holder and delay the open for
+ * our client.
  */
 
-static bool delay_for_oplocks(struct share_mode_lock *lck,
-                              files_struct *fsp,
-                              uint16 mid,
-                              int pass_number,
-                              int oplock_request)
+static NTSTATUS send_break_message(files_struct *fsp,
+                                        struct share_mode_entry *exclusive,
+                                        uint16 mid,
+                                        int oplock_request)
 {
-        int i;
-        struct share_mode_entry *exclusive = NULL;
-        bool valid_entry = False;
-        bool delay_it = False;
-        bool have_level2 = False;
         NTSTATUS status;
         char msg[MSG_SMB_SHARE_MODE_ENTRY_SIZE];
-
-        if (oplock_request & INTERNAL_OPEN_ONLY) {
-                fsp->oplock_type = NO_OPLOCK;
-        }
-
-        if ((oplock_request & INTERNAL_OPEN_ONLY) || is_stat_open(fsp->access_mask)) {
-                return False;
-        }
-
-        for (i=0; i<lck->num_share_modes; i++) {
-
-                if (!is_valid_share_mode_entry(&lck->share_modes[i])) {
-                        continue;
-                }
-
-                /* At least one entry is not an invalid or deferred entry. */
-                valid_entry = True;
-
-                if (pass_number == 1) {
-                        if (BATCH_OPLOCK_TYPE(lck->share_modes[i].op_type)) {
-                                SMB_ASSERT(exclusive == NULL);                  
-                                exclusive = &lck->share_modes[i];
-                        }
-                } else {
-                        if (EXCLUSIVE_OPLOCK_TYPE(lck->share_modes[i].op_type)) {
-                                SMB_ASSERT(exclusive == NULL);                  
-                                exclusive = &lck->share_modes[i];
-                        }
-                }
-
-                if (lck->share_modes[i].op_type == LEVEL_II_OPLOCK) {
-                        SMB_ASSERT(exclusive == NULL);                  
-                        have_level2 = True;
-                }
-        }
-
-        if (!valid_entry) {
-                /* All entries are placeholders or deferred.
-                 * Directly grant whatever the client wants. */
-                if (fsp->oplock_type == NO_OPLOCK) {
-                        /* Store a level2 oplock, but don't tell the client */
-                        fsp->oplock_type = FAKE_LEVEL_II_OPLOCK;
-                }
-                return False;
-        }
-
-        if (exclusive != NULL) { /* Found an exclusive oplock */
-                SMB_ASSERT(!have_level2);
-                delay_it = is_delete_request(fsp) ?
-                        BATCH_OPLOCK_TYPE(exclusive->op_type) : True;
-        }
-
-        if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
-                /* We can at most grant level2 as there are other
-                 * level2 or NO_OPLOCK entries. */
-                fsp->oplock_type = LEVEL_II_OPLOCK;
-        }
-
-        if ((fsp->oplock_type == NO_OPLOCK) && have_level2) {
-                /* Store a level2 oplock, but don't tell the client */
-                fsp->oplock_type = FAKE_LEVEL_II_OPLOCK;
-        }
-
-        if (!delay_it) {
-                return False;
-        }
-
-        /*
-         * Send a break message to the oplock holder and delay the open for
-         * our client.
-         */
 
         DEBUG(10, ("Sending break request to PID %s\n",
@@ -785 +703 @@
         }
 
-        return True;
+        return status;
+}
+
+/*
+ * 1) No files open at all or internal open: Grant whatever the client wants.
+ *
+ * 2) Exclusive (or batch) oplock around: If the requested access is a delete
+ *    request, break if the oplock around is a batch oplock. If it's another
+ *    requested access type, break.
+ *
+ * 3) Only level2 around: Grant level2 and do nothing else.
+ */
+
+static bool delay_for_oplocks(struct share_mode_lock *lck,
+                              files_struct *fsp,
+                              uint16 mid,
+                              int pass_number,
+                              int oplock_request)
+{
+        extern uint32 global_client_caps;
+        int i;
+        struct share_mode_entry *exclusive = NULL;
+        bool valid_entry = false;
+        bool have_level2 = false;
+        bool have_a_none_oplock = false;
+        bool allow_level2 = (global_client_caps & CAP_LEVEL_II_OPLOCKS) &&
+                            lp_level2_oplocks(SNUM(fsp->conn));
+
+        if (oplock_request & INTERNAL_OPEN_ONLY) {
+                fsp->oplock_type = NO_OPLOCK;
+        }
+
+        if ((oplock_request & INTERNAL_OPEN_ONLY) || is_stat_open(fsp->access_mask)) {
+                return false;
+        }
+
+        for (i=0; i<lck->num_share_modes; i++) {
+
+                if (!is_valid_share_mode_entry(&lck->share_modes[i])) {
+                        continue;
+                }
+
+                /* At least one entry is not an invalid or deferred entry. */
+                valid_entry = true;
+
+                if (pass_number == 1) {
+                        if (BATCH_OPLOCK_TYPE(lck->share_modes[i].op_type)) {
+                                SMB_ASSERT(exclusive == NULL);
+                                exclusive = &lck->share_modes[i];
+                        }
+                } else {
+                        if (EXCLUSIVE_OPLOCK_TYPE(lck->share_modes[i].op_type)) {
+                                SMB_ASSERT(exclusive == NULL);
+                                exclusive = &lck->share_modes[i];
+                        }
+                }
+
+                if (LEVEL_II_OPLOCK_TYPE(lck->share_modes[i].op_type)) {
+                        SMB_ASSERT(exclusive == NULL);
+                        have_level2 = true;
+                }
+
+                if (lck->share_modes[i].op_type == NO_OPLOCK) {
+                        have_a_none_oplock = true;
+                }
+        }
+
+        if (exclusive != NULL) { /* Found an exclusive oplock */
+                bool delay_it = is_delete_request(fsp) ?
+                                BATCH_OPLOCK_TYPE(exclusive->op_type) : true;
+                SMB_ASSERT(!have_level2);
+                if (delay_it) {
+                        send_break_message(fsp, exclusive, mid, oplock_request);
+                        return true;
+                }
+        }
+
+        /*
+         * Match what was requested (fsp->oplock_type) with
+         * what was found in the existing share modes.
+         */
+
+        if (!valid_entry) {
+                /* All entries are placeholders or deferred.
+                 * Directly grant whatever the client wants. */
+                if (fsp->oplock_type == NO_OPLOCK) {
+                        /* Store a level2 oplock, but don't tell the client */
+                        fsp->oplock_type = FAKE_LEVEL_II_OPLOCK;
+                }
+        } else if (have_a_none_oplock) {
+                fsp->oplock_type = NO_OPLOCK;
+        } else if (have_level2) {
+                if (fsp->oplock_type == NO_OPLOCK ||
+                                fsp->oplock_type == FAKE_LEVEL_II_OPLOCK) {
+                        /* Store a level2 oplock, but don't tell the client */
+                        fsp->oplock_type = FAKE_LEVEL_II_OPLOCK;
+                } else {
+                        fsp->oplock_type = LEVEL_II_OPLOCK;
+                }
+        } else {
+                /* This case can never happen. */
+                SMB_ASSERT(1);
+        }
+
+        /*
+         * Don't grant level2 to clients that don't want them
+         * or if we've turned them off.
+         */
+        if (fsp->oplock_type == LEVEL_II_OPLOCK && !allow_level2) {
+                fsp->oplock_type = FAKE_LEVEL_II_OPLOCK;
+        }
+
+        DEBUG(10,("delay_for_oplocks: oplock type 0x%x on file %s\n",
+                fsp->oplock_type, fsp->fsp_name));
+
+        /* No delay. */
+        return false;
 }
 
@@ -973 +1007 @@
         uint32 share_mode;
         uint32 create_disposition;
-        uint32 create_options = 0;
+        uint32 create_options = FILE_NON_DIRECTORY_FILE;
 
         DEBUG(10,("map_open_params_to_ntcreate: fname = %s, deny_mode = 0x%x, "
@@ -1189 +1223 @@
                 DEBUG(10, ("open_file_ntcreate: printer open fname=%s\n", fname));
 
-                return print_fsp_open(conn, fname, fsp);
+                return print_fsp_open(conn, fname, fsp, psbuf);
         }
 
@@ -1826 +1860 @@
          */
 
-        if ((fsp->oplock_type != NO_OPLOCK) &&
-            (fsp->oplock_type != FAKE_LEVEL_II_OPLOCK)) {
-                if (!set_file_oplock(fsp, fsp->oplock_type)) {
-                        /* Could not get the kernel oplock */
-                        fsp->oplock_type = NO_OPLOCK;
-                }
+        if (!set_file_oplock(fsp, fsp->oplock_type)) {
+                /* Could not get the kernel oplock */
+                fsp->oplock_type = NO_OPLOCK;
         }
 
@@ -1838 +1869 @@
         }
 
-        set_share_mode(lck, fsp, current_user.ut.uid, 0, fsp->oplock_type, new_file_created);
+        set_share_mode(lck, fsp, current_user.ut.uid, 0,
+                       fsp->oplock_type);
 
         /* Handle strange delete on close create semantics. */
-        if ((create_options & FILE_DELETE_ON_CLOSE)
-            && (((conn->fs_capabilities & FILE_NAMED_STREAMS)
-                        && is_ntfs_stream_name(fname))
-                || can_set_initial_delete_on_close(lck))) {
+        if (create_options & FILE_DELETE_ON_CLOSE) {
+
                 status = can_set_delete_on_close(fsp, True, new_dos_attributes);
 
@@ -2286 +2316 @@
         }
 
-        set_share_mode(lck, fsp, current_user.ut.uid, 0, NO_OPLOCK, True);
+        set_share_mode(lck, fsp, current_user.ut.uid, 0, NO_OPLOCK);
 
         /* For directories the delete on close bit at open time seems

branches/samba-3.2.x/source/smbd/oplock.c

@@ -105 +105 @@
 bool set_file_oplock(files_struct *fsp, int oplock_type)
 {
-        if (koplocks && !koplocks->set_oplock(fsp, oplock_type)) {
+        if ((fsp->oplock_type != NO_OPLOCK) &&
+            (fsp->oplock_type != FAKE_LEVEL_II_OPLOCK) &&
+            koplocks &&
+            !koplocks->set_oplock(fsp, oplock_type)) {
                 return False;
         }
@@ -113 +116 @@
         if (oplock_type == LEVEL_II_OPLOCK) {
                 level_II_oplocks_open++;
-        } else {
+        } else if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
                 exclusive_oplocks_open++;
         }
@@ -146 +149 @@
         SMB_ASSERT(exclusive_oplocks_open>=0);
         SMB_ASSERT(level_II_oplocks_open>=0);
-        
-        fsp->oplock_type = NO_OPLOCK;
+
+        if (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
+                /* This doesn't matter for close. */
+                fsp->oplock_type = FAKE_LEVEL_II_OPLOCK;
+        } else {
+                fsp->oplock_type = NO_OPLOCK;
+        }
         fsp->sent_oplock_break = NO_BREAK_SENT;
-        
+
         flush_write_cache(fsp, OPLOCK_RELEASE_FLUSH);
 
@@ -436 +444 @@
         SMB_ASSERT(fsp->oplock_type == LEVEL_II_OPLOCK);
 
+        DEBUG(10,("process_oplock_async_level2_break_message: sending break to "
+                "none message for fid %d, file %s\n",
+                fsp->fnum,
+                fsp->fsp_name));
+
         /* Now send a break to none message to our client. */
 
@@ -809 +822 @@
                 share_mode_entry_to_message(msg, share_entry);
 
-                messaging_send_buf(smbd_messaging_context(), share_entry->pid,
-                                   MSG_SMB_ASYNC_LEVEL2_BREAK,
-                                   (uint8 *)msg,
-                                   MSG_SMB_SHARE_MODE_ENTRY_SIZE);
+                /*
+                 * Deal with a race condition when breaking level2
+                 * oplocks. Don't send all the messages and release
+                 * the lock, this allows someone else to come in and
+                 * get a level2 lock before any of the messages are
+                 * processed, and thus miss getting a break message.
+                 * Ensure at least one entry (the one we're breaking)
+                 * is processed immediately under the lock and becomes
+                 * set as NO_OPLOCK to stop any waiter getting a level2.
+                 * Bugid #5980.
+                 */
+
+                if (procid_is_me(&share_entry->pid)) {
+                        DATA_BLOB blob = data_blob_const(msg,
+                                        MSG_SMB_SHARE_MODE_ENTRY_SIZE);
+                        process_oplock_async_level2_break_message(smbd_messaging_context(),
+                                                NULL,
+                                                MSG_SMB_ASYNC_LEVEL2_BREAK,
+                                                share_entry->pid,
+                                                &blob);
+                } else {
+                        messaging_send_buf(smbd_messaging_context(),
+                                        share_entry->pid,
+                                        MSG_SMB_ASYNC_LEVEL2_BREAK,
+                                        (uint8 *)msg,
+                                        MSG_SMB_SHARE_MODE_ENTRY_SIZE);
+                }
         }
 

branches/samba-3.2.x/source/smbd/password.c

@@ -28 +28 @@
 /* this holds info on user ids that are already validated for this VC */
 static user_struct *validated_users;
-static int next_vuid = VUID_OFFSET;
+static uint16_t next_vuid = VUID_OFFSET;
 static int num_validated_vuids;
 
@@ -150 +150 @@
 }
 
+static void increment_next_vuid(uint16_t *vuid)
+{
+        *vuid += 1;
+
+        /* Check for vuid wrap. */
+        if (*vuid == UID_FIELD_INVALID) {
+                *vuid = VUID_OFFSET;
+        }
+}
+
 /****************************************************
  Create a new partial auth user struct.
@@ -178 +188 @@
         while( get_valid_user_struct_internal(next_vuid,
                         SERVER_ALLOCATED_REQUIRED_ANY) != NULL ) {
-                next_vuid++;
-                /* Check for vuid wrap. */
-                if (next_vuid == UID_FIELD_INVALID) {
-                        next_vuid = VUID_OFFSET;
-                }
+                increment_next_vuid(&next_vuid);
         }
 
@@ -195 +201 @@
          * to NTLMSSP.
          */
-        next_vuid++;
+        increment_next_vuid(&next_vuid);
         num_validated_vuids++;
 
@@ -325 +331 @@
                 "and will be vuid %u\n",
                 (int)vuser->uid,vuser->user.unix_name, vuser->vuid));
-
-        next_vuid++;
-        num_validated_vuids++;
 
         if (!session_claim(vuser)) {

branches/samba-3.2.x/source/smbd/posix_acls.c

@@ -3198 +3198 @@
         }
 
+        /* only allow chown to the current user. This is more secure,
+           and also copes with the case where the SID in a take ownership ACL is
+           a local SID on the users workstation
+        */
+        if (uid != current_user.ut.uid) {
+                errno = EPERM;
+                return -1;
+        }
+
         if (SMB_VFS_STAT(conn,fname,&st)) {
                 return -1;
@@ -3205 +3214 @@
                 return -1;
         }
-
-        /* only allow chown to the current user. This is more secure,
-           and also copes with the case where the SID in a take ownership ACL is
-           a local SID on the users workstation 
-        */
-        uid = current_user.ut.uid;
 
         become_root();
@@ -3438 +3441 @@
         mode_t orig_mode = (mode_t)0;
         NTSTATUS status;
-        uid_t orig_uid;
-        gid_t orig_gid;
-        bool need_chown = False;
+        bool set_acl_as_root = false;
+        bool acl_set_support = false;
+        bool ret = false;
 
         DEBUG(10,("set_nt_acl: called for file %s\n", fsp->fsp_name ));
@@ -3461 +3464 @@
         }
 
-        /* Save the original elements we check against. */
+        /* Save the original element we check against. */
         orig_mode = sbuf.st_mode;
-        orig_uid = sbuf.st_uid;
-        orig_gid = sbuf.st_gid;
 
         /*
@@ -3476 +3477 @@
 
         /*
-         * Do we need to chown ?
+         * Do we need to chown ? If so this must be done first as the incoming
+         * CREATOR_OWNER acl will be relative to the *new* owner, not the old.
+         * Noticed by Simo.
          */
 
-        if (((user != (uid_t)-1) && (orig_uid != user)) || (( grp != (gid_t)-1) && (orig_gid != grp))) {
-                need_chown = True;
-        }
-
-        if (need_chown && (user == (uid_t)-1 || user == current_user.ut.uid)) {
+        if (((user != (uid_t)-1) && (sbuf.st_uid != user)) || (( grp != (gid_t)-1) && (sbuf.st_gid != grp))) {
 
                 DEBUG(3,("set_nt_acl: chown %s. uid = %u, gid = %u.\n",
@@ -3508 +3507 @@
                 } else {
 
-                        int ret;
+                        int sret;
 
                         if(fsp->fh->fd == -1)
-                                ret = SMB_VFS_STAT(fsp->conn, fsp->fsp_name, &sbuf);
+                                sret = SMB_VFS_STAT(fsp->conn, fsp->fsp_name, &sbuf);
                         else
-                                ret = SMB_VFS_FSTAT(fsp, &sbuf);
-
-                        if(ret != 0)
+                                sret = SMB_VFS_FSTAT(fsp, &sbuf);
+
+                        if(sret != 0)
                                 return map_nt_error_from_unix(errno);
                 }
 
-                /* Save the original elements we check against. */
+                /* Save the original element we check against. */
                 orig_mode = sbuf.st_mode;
-                orig_uid = sbuf.st_uid;
-                orig_gid = sbuf.st_gid;
-
-                /* We did chown already, drop the flag */
-                need_chown = False;
+
+                /* If we successfully chowned, we know we must
+                 * be able to set the acl, so do it as root.
+                 */
+                set_acl_as_root = true;
         }
 
         create_file_sids(&sbuf, &file_owner_sid, &file_grp_sid);
-
-#if 0
-        /* Disable this - prevents ACL inheritance from the ACL editor. JRA. */
-
-        /* See here: http://www.codeproject.com/KB/winsdk/accessctrl2.aspx
-         * for details and also the log trace in bug #4308. JRA.
-         */
-
-        if ((security_info_sent & DACL_SECURITY_INFORMATION) &&
-                psd->dacl != NULL &&
-                (psd->type & (SE_DESC_DACL_AUTO_INHERITED|
-                              SE_DESC_DACL_AUTO_INHERIT_REQ))==
-                        (SE_DESC_DACL_AUTO_INHERITED|
-                         SE_DESC_DACL_AUTO_INHERIT_REQ) ) {
-                status = append_parent_acl(fsp, &sbuf, psd, &psd);
-                if (!NT_STATUS_IS_OK(status)) {
-                        return status;
-                }
-        }
-#endif
 
         acl_perms = unpack_canon_ace( fsp, &sbuf, &file_owner_sid, &file_grp_sid,
@@ -3554 +3533 @@
 
         /* Ignore W2K traverse DACL set. */
-        if (file_ace_list || dir_ace_list) {
-
-                if (!acl_perms) {
-                        DEBUG(3,("set_nt_acl: cannot set permissions\n"));
+        if (!file_ace_list && !dir_ace_list) {
+                return NT_STATUS_OK;
+        }
+
+        if (!acl_perms) {
+                DEBUG(3,("set_nt_acl: cannot set permissions\n"));
+                free_canon_ace_list(file_ace_list);
+                free_canon_ace_list(dir_ace_list);
+                return NT_STATUS_ACCESS_DENIED;
+        }
+
+        /*
+         * Only change security if we got a DACL.
+         */
+
+        if(!(security_info_sent & DACL_SECURITY_INFORMATION) || (psd->dacl == NULL)) {
+                free_canon_ace_list(file_ace_list);
+                free_canon_ace_list(dir_ace_list);
+                return NT_STATUS_OK;
+        }
+
+        /*
+         * Try using the POSIX ACL set first. Fall back to chmod if
+         * we have no ACL support on this filesystem.
+         */
+
+        if (acl_perms && file_ace_list) {
+                if (set_acl_as_root) {
+                        become_root();
+                }
+                ret = set_canon_ace_list(fsp, file_ace_list, False, sbuf.st_gid, &acl_set_support);
+                if (set_acl_as_root) {
+                        unbecome_root();
+                }
+                if (acl_set_support && ret == false) {
+                        DEBUG(3,("set_nt_acl: failed to set file acl on file %s (%s).\n", fsp->fsp_name, strerror(errno) ));
                         free_canon_ace_list(file_ace_list);
-                        free_canon_ace_list(dir_ace_list); 
-                        return NT_STATUS_ACCESS_DENIED;
-                }
-
-                /*
-                 * Only change security if we got a DACL.
-                 */
-
-                if((security_info_sent & DACL_SECURITY_INFORMATION) && (psd->dacl != NULL)) {
-
-                        bool acl_set_support = False;
-                        bool ret = False;
+                        free_canon_ace_list(dir_ace_list);
+                        return map_nt_error_from_unix(errno);
+                }
+        }
+
+        if (acl_perms && acl_set_support && fsp->is_directory) {
+                if (dir_ace_list) {
+                        if (set_acl_as_root) {
+                                become_root();
+                        }
+                        ret = set_canon_ace_list(fsp, dir_ace_list, True, sbuf.st_gid, &acl_set_support);
+                        if (set_acl_as_root) {
+                                unbecome_root();
+                        }
+                        if (ret == false) {
+                                DEBUG(3,("set_nt_acl: failed to set default acl on directory %s (%s).\n", fsp->fsp_name, strerror(errno) ));
+                                free_canon_ace_list(file_ace_list);
+                                free_canon_ace_list(dir_ace_list);
+                                return map_nt_error_from_unix(errno);
+                        }
+                } else {
+                        int sret = -1;
 
                         /*
-                         * Try using the POSIX ACL set first. Fall back to chmod if
-                         * we have no ACL support on this filesystem.
+                         * No default ACL - delete one if it exists.
                          */
 
-                        if (acl_perms && file_ace_list) {
-                                ret = set_canon_ace_list(fsp, file_ace_list, False, sbuf.st_gid, &acl_set_support);
-                                if (acl_set_support && ret == False) {
-                                        DEBUG(3,("set_nt_acl: failed to set file acl on file %s (%s).\n", fsp->fsp_name, strerror(errno) ));
+                        if (set_acl_as_root) {
+                                become_root();
+                        }
+                        sret = SMB_VFS_SYS_ACL_DELETE_DEF_FILE(conn, fsp->fsp_name);
+                        if (set_acl_as_root) {
+                                unbecome_root();
+                        }
+                        if (sret == -1) {
+                                if (acl_group_override(conn, sbuf.st_gid, fsp->fsp_name)) {
+                                        DEBUG(5,("set_nt_acl: acl group control on and "
+                                                "current user in file %s primary group. Override delete_def_acl\n",
+                                                fsp->fsp_name ));
+
+                                        become_root();
+                                        sret = SMB_VFS_SYS_ACL_DELETE_DEF_FILE(conn, fsp->fsp_name);
+                                        unbecome_root();
+                                }
+
+                                if (sret == -1) {
+                                        DEBUG(3,("set_nt_acl: sys_acl_delete_def_file failed (%s)\n", strerror(errno)));
                                         free_canon_ace_list(file_ace_list);
-                                        free_canon_ace_list(dir_ace_list); 
+                                        free_canon_ace_list(dir_ace_list);
                                         return map_nt_error_from_unix(errno);
                                 }
                         }
-
-                        if (acl_perms && acl_set_support && fsp->is_directory) {
-                                if (dir_ace_list) {
-                                        if (!set_canon_ace_list(fsp, dir_ace_list, True, sbuf.st_gid, &acl_set_support)) {
-                                                DEBUG(3,("set_nt_acl: failed to set default acl on directory %s (%s).\n", fsp->fsp_name, strerror(errno) ));
-                                                free_canon_ace_list(file_ace_list);
-                                                free_canon_ace_list(dir_ace_list); 
-                                                return map_nt_error_from_unix(errno);
-                                        }
-                                } else {
-
-                                        /*
-                                         * No default ACL - delete one if it exists.
-                                         */
-
-                                        if (SMB_VFS_SYS_ACL_DELETE_DEF_FILE(conn, fsp->fsp_name) == -1) {
-                                                int sret = -1;
-
-                                                if (acl_group_override(conn, sbuf.st_gid, fsp->fsp_name)) {
-                                                        DEBUG(5,("set_nt_acl: acl group control on and "
-                                                                "current user in file %s primary group. Override delete_def_acl\n",
-                                                                fsp->fsp_name ));
-
-                                                        become_root();
-                                                        sret = SMB_VFS_SYS_ACL_DELETE_DEF_FILE(conn, fsp->fsp_name);
-                                                        unbecome_root();
-                                                }
-
-                                                if (sret == -1) {
-                                                        DEBUG(3,("set_nt_acl: sys_acl_delete_def_file failed (%s)\n", strerror(errno)));
-                                                        free_canon_ace_list(file_ace_list);
-                                                        free_canon_ace_list(dir_ace_list);
-                                                        return map_nt_error_from_unix(errno);
-                                                }
-                                        }
+                }
+        }
+
+        if (acl_set_support) {
+                if (set_acl_as_root) {
+                        become_root();
+                }
+                store_inheritance_attributes(fsp, file_ace_list, dir_ace_list,
+                                (psd->type & SE_DESC_DACL_PROTECTED) ? True : False);
+                if (set_acl_as_root) {
+                        unbecome_root();
+                }
+        }
+
+        /*
+         * If we cannot set using POSIX ACLs we fall back to checking if we need to chmod.
+         */
+
+        if(!acl_set_support && acl_perms) {
+                mode_t posix_perms;
+
+                if (!convert_canon_ace_to_posix_perms( fsp, file_ace_list, &posix_perms)) {
+                        free_canon_ace_list(file_ace_list);
+                        free_canon_ace_list(dir_ace_list);
+                        DEBUG(3,("set_nt_acl: failed to convert file acl to posix permissions for file %s.\n",
+                                fsp->fsp_name ));
+                        return NT_STATUS_ACCESS_DENIED;
+                }
+
+                if (orig_mode != posix_perms) {
+                        int sret = -1;
+
+                        DEBUG(3,("set_nt_acl: chmod %s. perms = 0%o.\n",
+                                fsp->fsp_name, (unsigned int)posix_perms ));
+
+                        if (set_acl_as_root) {
+                                become_root();
+                        }
+                        sret = SMB_VFS_CHMOD(conn,fsp->fsp_name, posix_perms);
+                        if (set_acl_as_root) {
+                                unbecome_root();
+                        }
+                        if(sret == -1) {
+                                if (acl_group_override(conn, sbuf.st_gid, fsp->fsp_name)) {
+                                        DEBUG(5,("set_nt_acl: acl group control on and "
+                                                "current user in file %s primary group. Override chmod\n",
+                                                fsp->fsp_name ));
+
+                                        become_root();
+                                        sret = SMB_VFS_CHMOD(conn,fsp->fsp_name, posix_perms);
+                                        unbecome_root();
                                 }
-                        }
-
-                        if (acl_set_support) {
-                                store_inheritance_attributes(fsp, file_ace_list, dir_ace_list,
-                                                (psd->type & SE_DESC_DACL_PROTECTED) ? True : False);
-                        }
-
-                        /*
-                         * If we cannot set using POSIX ACLs we fall back to checking if we need to chmod.
-                         */
-
-                        if(!acl_set_support && acl_perms) {
-                                mode_t posix_perms;
-
-                                if (!convert_canon_ace_to_posix_perms( fsp, file_ace_list, &posix_perms)) {
+
+                                if (sret == -1) {
+                                        DEBUG(3,("set_nt_acl: chmod %s, 0%o failed. Error = %s.\n",
+                                                fsp->fsp_name, (unsigned int)posix_perms, strerror(errno) ));
                                         free_canon_ace_list(file_ace_list);
                                         free_canon_ace_list(dir_ace_list);
-                                        DEBUG(3,("set_nt_acl: failed to convert file acl to posix permissions for file %s.\n",
-                                                fsp->fsp_name ));
-                                        return NT_STATUS_ACCESS_DENIED;
+                                        return map_nt_error_from_unix(errno);
                                 }
-
-                                if (orig_mode != posix_perms) {
-
-                                        DEBUG(3,("set_nt_acl: chmod %s. perms = 0%o.\n",
-                                                fsp->fsp_name, (unsigned int)posix_perms ));
-
-                                        if(SMB_VFS_CHMOD(conn,fsp->fsp_name, posix_perms) == -1) {
-                                                int sret = -1;
-                                                if (acl_group_override(conn, sbuf.st_gid, fsp->fsp_name)) {
-                                                        DEBUG(5,("set_nt_acl: acl group control on and "
-                                                                "current user in file %s primary group. Override chmod\n",
-                                                                fsp->fsp_name ));
-
-                                                        become_root();
-                                                        sret = SMB_VFS_CHMOD(conn,fsp->fsp_name, posix_perms);
-                                                        unbecome_root();
-                                                }
-
-                                                if (sret == -1) {
-                                                        DEBUG(3,("set_nt_acl: chmod %s, 0%o failed. Error = %s.\n",
-                                                                fsp->fsp_name, (unsigned int)posix_perms, strerror(errno) ));
-                                                        free_canon_ace_list(file_ace_list);
-                                                        free_canon_ace_list(dir_ace_list);
-                                                        return map_nt_error_from_unix(errno);
-                                                }
-                                        }
-                                }
-                        }
-                }
-
-                free_canon_ace_list(file_ace_list);
-                free_canon_ace_list(dir_ace_list); 
-        }
-
-        /* Any chown pending? */
-        if (need_chown) {
-                DEBUG(3,("set_nt_acl: chown %s. uid = %u, gid = %u.\n",
-                         fsp->fsp_name, (unsigned int)user, (unsigned int)grp ));
-                
-                if(try_chown( fsp->conn, fsp->fsp_name, user, grp) == -1) {
-                        DEBUG(3,("set_nt_acl: chown %s, %u, %u failed. Error = %s.\n",
-                                 fsp->fsp_name, (unsigned int)user, (unsigned int)grp, strerror(errno) ));
-                        if (errno == EPERM) {
-                                return NT_STATUS_INVALID_OWNER;
-                        }
-                        return map_nt_error_from_unix(errno);
-                }
-        }
-        
+                        }
+                }
+        }
+
+        free_canon_ace_list(file_ace_list);
+        free_canon_ace_list(dir_ace_list);
         return NT_STATUS_OK;
 }

branches/samba-3.2.x/source/smbd/process.c

@@ -280 +280 @@
         if (CVAL(lenbuf,0) == 0 &&
                         min_recv_size &&
-                        smb_len_large(lenbuf) > min_recv_size && /* Could be a UNIX large writeX. */
+                        smb_len_large(lenbuf) > (min_recv_size + STANDARD_WRITE_AND_X_HEADER_SIZE) && /* Could be a UNIX large writeX. */
                         !srv_is_signing_active()) {
 

branches/samba-3.2.x/source/smbd/reply.c

@@ -2363 +2363 @@
 
         if (!NT_STATUS_IS_OK(status)) {
-                DEBUG(10, ("open_file_ntcreate failed: %s\n",
+                DEBUG(10, ("create_file_unixpath failed: %s\n",
                            nt_errstr(status)));
                 return status;
@@ -3203 +3203 @@
 
                 if ((nread = SMB_VFS_SENDFILE(smbd_server_fd(), fsp, &header, startpos, smb_maxcnt)) == -1) {
-                        /* Returning ENOSYS or EINVAL means no data at all was sent. 
+                        /* Returning ENOSYS means no data at all was sent.
                            Do this as a normal read. */
-                        if (errno == ENOSYS || errno == EINVAL) {
+                        if (errno == ENOSYS) {
                                 goto normal_read;
                         }
@@ -3894 +3894 @@
                 return false;
         }
+        if (IS_PRINT(conn)) {
+                DEBUG(10,("is_valid_writeX_buffer: printing tid\n"));
+                return false;
+        }
         doff = SVAL(inbuf,smb_vwv11);
 
@@ -4634 +4638 @@
         files_struct *fsp;
         NTSTATUS status;
+        SMB_STRUCT_STAT sbuf;
 
         START_PROFILE(SMBsplopen);
@@ -4657 +4662 @@
 
         /* Open for exclusive use, write only. */
-        status = print_fsp_open(conn, NULL, fsp);
+        status = print_fsp_open(conn, NULL, fsp, &sbuf);
 
         if (!NT_STATUS_IS_OK(status)) {
@@ -5476 +5481 @@
         NTSTATUS status = NT_STATUS_OK;
         struct share_mode_lock *lck = NULL;
-        bool dst_exists;
+        bool dst_exists, old_is_stream, new_is_stream;
 
         ZERO_STRUCT(sbuf);
@@ -5545 +5550 @@
         }
 
+        old_is_stream = is_ntfs_stream_name(fsp->fsp_name);
+        new_is_stream = is_ntfs_stream_name(newname);
+
+        /* Return the correct error code if both names aren't streams. */
+        if (!old_is_stream && new_is_stream) {
+                return NT_STATUS_OBJECT_NAME_INVALID;
+        }
+
+        if (old_is_stream && !new_is_stream) {
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+
         /*
          * Have vfs_object_exist also fill sbuf1
@@ -5556 +5573 @@
         }
 
-        if(replace_if_exists && dst_exists) {
-                if (is_ntfs_stream_name(newname)) {
-                        return NT_STATUS_INVALID_PARAMETER;
-                }
-        }
-
         if (dst_exists) {
                 struct file_id fileid = vfs_file_id_from_sbuf(conn, &sbuf1);
                 files_struct *dst_fsp = file_find_di_first(fileid);
-                if (dst_fsp) {
+                /* The file can be open when renaming a stream */
+                if (dst_fsp && !new_is_stream) {
                         DEBUG(3, ("rename_internals_fsp: Target file open\n"));
                         return NT_STATUS_ACCESS_DENIED;
@@ -5624 +5636 @@
                  * depends on these semantics. JRA.
                  */
-
-                set_allow_initial_delete_on_close(lck, fsp, True);
 
                 if (create_options & FILE_DELETE_ON_CLOSE) {

branches/samba-3.2.x/source/smbd/server.c

@@ -741 +741 @@
 
                                 if (!reinit_after_fork(
-                                            smbd_messaging_context(), true)) {
+                                            smbd_messaging_context(),
+                                            smbd_event_context(),
+                                            true)) {
                                         DEBUG(0,("reinit_after_fork() failed\n"));
                                         smb_panic("reinit_after_fork() failed");
@@ -1309 +1311 @@
                 pidfile_create("smbd");
 
-        if (!reinit_after_fork(smbd_messaging_context(), false)) {
+        if (!reinit_after_fork(smbd_messaging_context(),
+                               smbd_event_context(), false)) {
                 DEBUG(0,("reinit_after_fork() failed\n"));
                 exit(1);

branches/samba-3.2.x/source/smbd/service.c

@@ -698 +698 @@
 
                 guest = True;
-                pass = getpwnam_alloc(NULL, guestname);
+                pass = getpwnam_alloc(talloc_tos(), guestname);
                 if (!pass) {
                         DEBUG(0,("make_connection_snum: Invalid guest "

branches/samba-3.2.x/source/smbd/trans2.c

@@ -3675 +3675 @@
         unsigned int ofs = 0;
 
-        for (i=0; i<num_streams; i++) {
+        for (i = 0; i < num_streams && ofs <= max_data_bytes; i++) {
                 unsigned int next_offset;
                 size_t namelen;
@@ -3693 +3693 @@
 
                 namelen -= 2;
-
-                if (ofs + 24 + namelen > max_data_bytes) {
-                        TALLOC_FREE(namebuf);
-                        return NT_STATUS_BUFFER_TOO_SMALL;
-                }
 
                 SIVAL(data, ofs+4, namelen);
@@ -3712 +3707 @@
                 else {
                         unsigned int align = ndr_align_size(next_offset, 8);
-
-                        if (next_offset + align > max_data_bytes) {
-                                return NT_STATUS_BUFFER_TOO_SMALL;
-                        }
 
                         memset(data+next_offset, 0, align);
@@ -5353 +5344 @@
         char *base_name = NULL;
         bool dest_has_wcard = False;
+        SMB_STRUCT_STAT sbuf;
+        char *newname_last_component = NULL;
         NTSTATUS status = NT_STATUS_OK;
         char *p;
@@ -5360 +5353 @@
                 return NT_STATUS_INVALID_PARAMETER;
         }
+
+        ZERO_STRUCT(sbuf);
 
         overwrite = (CVAL(pdata,0) ? True : False);
@@ -5394 +5389 @@
 
         if (fsp && fsp->base_fsp) {
+                /* newname must be a stream name. */
                 if (newname[0] != ':') {
                         return NT_STATUS_NOT_SUPPORTED;
@@ -5404 +5400 @@
                 }
         } else {
+                /* newname must *not* be a stream name. */
                 if (is_ntfs_stream_name(newname)) {
                         return NT_STATUS_NOT_SUPPORTED;
@@ -5429 +5426 @@
                         return NT_STATUS_NO_MEMORY;
                 }
-        }
-
-        if (fsp) {
-                SMB_STRUCT_STAT sbuf;
-                char *newname_last_component = NULL;
-
-                ZERO_STRUCT(sbuf);
 
                 status = unix_convert(ctx, conn, newname, False,
-                                        &newname,
-                                        &newname_last_component,
-                                        &sbuf);
+                                &newname,
+                                &newname_last_component,
+                                &sbuf);
 
                 /* If an error we expect this to be
@@ -5450 +5440 @@
                         return status;
                 }
-
+        }
+
+        if (fsp) {
                 DEBUG(10,("smb_file_rename_information: SMB_FILE_RENAME_INFORMATION (fnum %d) %s -> %s\n",
                         fsp->fnum, fsp->fsp_name, base_name ));