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

Timestamp:

May 24, 2009, 7:51:24 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.3

Location:

branches/samba-3.3.x/source/smbd

Files:

• dosmode.c (modified) (2 diffs)
• open.c (modified) (2 diffs)
• process.c (modified) (1 diff)
• reply.c (modified) (1 diff)
• server.c (modified) (2 diffs)

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

@@ -336 +336 @@
                         p = path;
                 }
-                
-                if (p[0] == '.' && p[1] != '.' && p[1] != 0) {
+
+                /* Only . and .. are not hidden. */
+                if (p[0] == '.' && !((p[1] == '\0') ||
+                                (p[1] == '.' && p[2] == '\0'))) {
                         result |= aHIDDEN;
                 }
@@ -388 +390 @@
                         p = path;
                 }
-                
-                if (p[0] == '.' && p[1] != '.' && p[1] != 0) {
+
+                /* Only . and .. are not hidden. */
+                if (p[0] == '.' && !((p[1] == '\0') ||
+                                (p[1] == '.' && p[2] == '\0'))) {
                         result |= aHIDDEN;
                 }

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

@@ -426 +426 @@
                         if (!NT_STATUS_IS_OK(status)) {
                                 if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+                                        /*
+                                         * On NT_STATUS_ACCESS_DENIED, access_granted
+                                         * contains the denied bits.
+                                         */
+
+                                        if ((access_mask & FILE_WRITE_ATTRIBUTES) &&
+                                                        (access_granted & FILE_WRITE_ATTRIBUTES) &&
+                                                        (lp_map_readonly(SNUM(conn)) ||
+                                                         lp_map_archive(SNUM(conn)) ||
+                                                         lp_map_hidden(SNUM(conn)) ||
+                                                         lp_map_system(SNUM(conn)))) {
+                                                access_granted &= ~FILE_WRITE_ATTRIBUTES;
+
+                                                DEBUG(10,("open_file: overrode FILE_WRITE_ATTRIBUTES "
+                                                        "on file %s\n",
+                                                        path ));
+                                        }
+
                                         if ((access_mask & DELETE_ACCESS) &&
-                                                        (access_granted == DELETE_ACCESS) &&
+                                                        (access_granted & DELETE_ACCESS) &&
                                                         can_delete_file_in_directory(conn, path)) {
                                                 /* Were we trying to do a stat open
@@ -437 +455 @@
                                                  * for details. */
 
-                                                DEBUG(10,("open_file: overrode ACCESS_DENIED "
+                                                access_granted &= ~DELETE_ACCESS;
+
+                                                DEBUG(10,("open_file: overrode DELETE_ACCESS "
                                                         "on file %s\n",
                                                         path ));
-                                        } else {
+                                        }
+
+                                        if (access_granted != 0) {
                                                 DEBUG(10, ("open_file: Access denied on "
                                                         "file %s\n",

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

@@ -1040 +1040 @@
 /* 0x31 */ { NULL, NULL, 0 },
 /* 0x32 */ { "SMBtrans2",reply_trans2, AS_USER | CAN_IPC },
-/* 0x33 */ { "SMBtranss2",reply_transs2, AS_USER},
+/* 0x33 */ { "SMBtranss2",reply_transs2, AS_USER | CAN_IPC},
 /* 0x34 */ { "SMBfindclose",reply_findclose,AS_USER},
 /* 0x35 */ { "SMBfindnclose",reply_findnclose,AS_USER},

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

@@ -77 +77 @@
                 }
 
-                if (!stream_started && *s == ':') {
+                if (!posix_path && !stream_started && *s == ':') {
                         if (*p_last_component_contains_wcard) {
                                 return NT_STATUS_OBJECT_NAME_INVALID;
                         }
-                        /* stream names allow more characters than file names */
+                        /* Stream names allow more characters than file names.
+                           We're overloading posix_path here to allow a wider
+                           range of characters. If stream_started is true this
+                           is still a Windows path even if posix_path is true.
+                           JRA.
+                        */
                         stream_started = true;
                         start_of_name_component = false;

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

@@ -588 +588 @@
                            MSG_SMB_INJECT_FAULT, msg_inject_fault);
 #endif
+
+        /* Kick off our mDNS registration. */
+        if (dns_port != 0) {
+#ifdef WITH_DNSSD_SUPPORT
+                dns_register_smbd(&dns_reg, dns_port, &maxfd,
+                                  &r_fds, &idle_timeout);
+#endif
+#ifdef WITH_AVAHI_SUPPORT
+                void *avahi_conn;
+                avahi_conn = avahi_start_register(
+                        smbd_event_context(), smbd_event_context(),
+                        dns_port);
+                if (avahi_conn == NULL) {
+                        DEBUG(10, ("avahi_start_register failed\n"));
+                }
+#endif
+        }
 
         /* now accept incoming connections - forking a new process
@@ -632 +649 @@
                 FD_ZERO(&w_fds);
                 GetTimeOfDay(&now);
-
-                /* Kick off our mDNS registration. */
-                if (dns_port != 0) {
-                        dns_register_smbd(&dns_reg, dns_port, &maxfd,
-                                        &r_fds, &idle_timeout);
-                }
 
                 event_add_to_select_args(smbd_event_context(), &now,