Changeset 309 for branches/samba-3.3.x/source/smbd

Timestamp:

Aug 4, 2009, 8:51:22 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 to 3.3.7

Location:

branches/samba-3.3.x/source/smbd

Files:

• lanman.c (modified) (1 diff)
• open.c (modified) (2 diffs)
• server.c (modified) (3 diffs)
• trans2.c (modified) (5 diffs)

branches/samba-3.3.x/source/smbd/lanman.c

@@ -1215 +1215 @@
                 }
                 fstrcpy(s->comment, p);
+                string_truncate(s->comment, MAX_SERVER_STRING_LENGTH);
 
                 s->domain[0] = '\0';

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

@@ -318 +318 @@
         if (!CAN_WRITE(conn)) {
                 /* It's a read-only share - fail if we wanted to write. */
-                if(accmode != O_RDONLY) {
+                if(accmode != O_RDONLY || (flags & O_TRUNC) || (flags & O_APPEND)) {
                         DEBUG(3,("Permission denied opening %s\n", path));
                         return NT_STATUS_ACCESS_DENIED;
@@ -326 +326 @@
                            access into the directory.
                         */
-                        flags &= ~O_CREAT;
-                        local_flags &= ~O_CREAT;
+                        flags &= ~(O_CREAT|O_EXCL);
+                        local_flags &= ~(O_CREAT|O_EXCL);
                 }
         }

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

@@ -356 +356 @@
         unsigned dns_port = 0;
 
-        if (!is_daemon) {
-                return open_sockets_inetd();
-        }
-
 #ifdef HAVE_ATEXIT
         {
@@ -369 +365 @@
         }
 #endif
+
+        if (!is_daemon) {
+                /*
+                 * Stop zombies the old way.
+                 * We aren't forking any new
+                 * 'normal' connections when
+                 * run from [x]inetd.
+                 */
+                CatchChild();
+                return open_sockets_inetd();
+        }
 
         /* Stop zombies */
@@ -1260 +1267 @@
         BlockSignals(False, SIGTERM);
 
+        /* Ensure we leave no zombies until we
+         * correctly set up child handling below. */
+        CatchChild();
+
         /* we want total control over the permissions on created files,
            so set our umask to 0 */

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

@@ -4938 +4938 @@
         if (setting_write_time) {
                 /*
-                 * This was a setfileinfo on an open file.
+                 * This was a Windows setfileinfo on an open file.
                  * NT does this a lot. We also need to 
                  * set the time here, as it can be read by 
@@ -6016 +6016 @@
         bool delete_on_fail = False;
         enum perm_type ptype;
+        files_struct *all_fsps = NULL;
+        bool modify_mtime = true;
+        struct file_id id;
 
         if (total_data < 100) {
@@ -6162 +6165 @@
 
         /* Deal with any time changes. */
-
-        return smb_set_file_time(conn,
+        id = vfs_file_id_from_sbuf(conn, psbuf);
+        for(all_fsps = file_find_di_first(id); all_fsps;
+                        all_fsps = file_find_di_next(all_fsps)) {
+                /*
+                 * We're setting the time explicitly for UNIX.
+                 * Cancel any pending changes over all handles.
+                 */
+                all_fsps->update_write_time_on_close = false;
+                TALLOC_FREE(all_fsps->update_write_time_event);
+        }
+
+        /*
+         * Override the "setting_write_time"
+         * parameter here as it almost does what
+         * we need. Just remember if we modified
+         * mtime and send the notify ourselves.
+         */
+        if (null_timespec(ts[1])) {
+                modify_mtime = false;
+        }
+
+        status = smb_set_file_time(conn,
                                 fsp,
                                 fname,
                                 psbuf,
                                 ts,
-                                true);
+                                false);
+
+        if (modify_mtime) {
+                notify_fname(conn, NOTIFY_ACTION_MODIFIED,
+                        FILE_NOTIFY_CHANGE_LAST_WRITE, fname);
+        }
+        return status;
 }
 
@@ -6795 +6824 @@
         }
 
-        if (!CAN_WRITE(conn)) {
-                reply_doserror(req, ERRSRV, ERRaccess);
-                return;
-        }
-
         if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
                 reply_nterror(req, NT_STATUS_INVALID_LEVEL);
                 return;
+        }
+
+        if (!CAN_WRITE(conn)) {
+                /* Allow POSIX opens. The open path will deny
+                 * any non-readonly opens. */
+                if (info_level != SMB_POSIX_PATH_OPEN) {
+                        reply_doserror(req, ERRSRV, ERRaccess);
+                        return;
+                }
         }
 
@@ -7109 +7142 @@
 
         DEBUG(3,("call_trans2mkdir : name = %s\n", directory));
+
+        status = resolve_dfspath(ctx,
+                                conn,
+                                req->flags2 & FLAGS2_DFS_PATHNAMES,
+                                directory,
+                                &directory);
+        if (!NT_STATUS_IS_OK(status)) {
+                if (NT_STATUS_EQUAL(status,NT_STATUS_PATH_NOT_COVERED)) {
+                        reply_botherror(req,
+                                        NT_STATUS_PATH_NOT_COVERED,
+                                        ERRSRV, ERRbadpath);
+                }
+                reply_nterror(req, status);
+                return;
+        }
 
         status = unix_convert(ctx, conn, directory, False, &directory, NULL, &sbuf);