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

Timestamp:

Jan 15, 2010, 8:23:30 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.10 (source)

Location:

branches/samba-3.3.x/source/smbd

Files:

• aio.c (modified) (11 diffs)
• blocking.c (modified) (8 diffs)
• dnsregister.c (modified) (1 diff)
• dosmode.c (modified) (3 diffs)
• mangle_hash.c (modified) (3 diffs)
• nttrans.c (modified) (1 diff)
• posix_acls.c (modified) (1 diff)
• reply.c (modified) (4 diffs)
• server.c (modified) (1 diff)
• trans2.c (modified) (11 diffs)

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

@@ -427 +427 @@
 *****************************************************************************/
 
-static int handle_aio_read_complete(struct aio_extra *aio_ex)
-{
-        int ret = 0;
+static int handle_aio_read_complete(struct aio_extra *aio_ex, int errcode)
+{
         int outsize;
         char *outbuf = aio_ex->outbuf;
@@ -441 +440 @@
                    true.... JRA. */
 
-                /* If errno is ECANCELED then don't return anything to the
-                 * client. */
-                if (errno == ECANCELED) {
-                        srv_cancel_sign_response(aio_ex->mid, false);
-                        return 0;
-                }
-
-                DEBUG( 3,( "handle_aio_read_complete: file %s nread == -1. "
+                DEBUG( 3,( "handle_aio_read_complete: file %s nread == %d. "
                            "Error = %s\n",
-                           aio_ex->fsp->fsp_name, strerror(errno) ));
-
-                ret = errno;
-                ERROR_NT(map_nt_error_from_unix(ret));
+                           aio_ex->fsp->fsp_name, (int)nread, strerror(errcode) ));
+
+                ERROR_NT(map_nt_error_from_unix(errcode));
                 outsize = srv_set_message(outbuf,0,0,true);
         } else {
@@ -485 +476 @@
                   (unsigned int)nread ));
 
-        return ret;
+        return errcode;
 }
 
@@ -493 +484 @@
 *****************************************************************************/
 
-static int handle_aio_write_complete(struct aio_extra *aio_ex)
-{
-        int ret = 0;
+static int handle_aio_write_complete(struct aio_extra *aio_ex, int errcode)
+{
         files_struct *fsp = aio_ex->fsp;
         char *outbuf = aio_ex->outbuf;
@@ -507 +497 @@
                                          "aio_write_behind failed ! File %s "
                                          "is corrupt ! Error %s\n",
-                                         fsp->fsp_name, strerror(errno) ));
-                                ret = errno;
+                                         fsp->fsp_name, strerror(errcode) ));
                         } else {
                                 DEBUG(0,("handle_aio_write_complete: "
@@ -516 +505 @@
                                          (unsigned int)numtowrite,
                                          (int)nwritten ));
-                                ret = EIO;
+                                errcode = EIO;
                         }
                 } else {
@@ -523 +512 @@
                                   fsp->fsp_name ));
                 }
+                /* TODO: should no return 0 in case of an error !!! */
                 return 0;
         }
@@ -535 +525 @@
                            (int)nwritten, strerror(errno) ));
 
-                /* If errno is ECANCELED then don't return anything to the
-                 * client. */
-                if (errno == ECANCELED) {
-                        srv_cancel_sign_response(aio_ex->mid, false);
-                        return 0;
-                }
-
-                ret = errno;
-                ERROR_BOTH(map_nt_error_from_unix(ret), ERRHRD, ERRdiskfull);
+                ERROR_NT(map_nt_error_from_unix(errcode));
                 srv_set_message(outbuf,0,0,true);
         } else {
@@ -560 +542 @@
                 status = sync_file(fsp->conn,fsp, write_through);
                 if (!NT_STATUS_IS_OK(status)) {
-                        ret = errno;
-                        ERROR_BOTH(map_nt_error_from_unix(ret),
+                        errcode = errno;
+                        ERROR_BOTH(map_nt_error_from_unix(errcode),
                                    ERRHRD, ERRdiskfull);
                         srv_set_message(outbuf,0,0,true);
@@ -581 +563 @@
                   (unsigned int)numtowrite, (unsigned int)nwritten ));
 
-        return ret;
+        return errcode;
 }
 
@@ -599 +581 @@
 
         /* Ensure the operation has really completed. */
-        if (SMB_VFS_AIO_ERROR(aio_ex->fsp, &aio_ex->acb) == EINPROGRESS) {
+        err = SMB_VFS_AIO_ERROR(aio_ex->fsp, &aio_ex->acb);
+        if (err == EINPROGRESS) {
                 DEBUG(10,( "handle_aio_completed: operation mid %u still in "
                            "process for file %s\n",
                            aio_ex->mid, aio_ex->fsp->fsp_name ));
                 return False;
-        }
+        } else if (err == ECANCELED) {
+                /* If error is ECANCELED then don't return anything to the
+                 * client. */
+                DEBUG(10,( "handle_aio_completed: operation mid %u"
+                        " canceled\n", aio_ex->mid));
+                srv_cancel_sign_response(aio_ex->mid, false);
+                return True;
+        }
+
 
         if (aio_ex->read_req) {
-                err = handle_aio_read_complete(aio_ex);
+                err = handle_aio_read_complete(aio_ex, err);
         } else {
-                err = handle_aio_write_complete(aio_ex);
+                err = handle_aio_write_complete(aio_ex, err);
         }
 

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

@@ -95 +95 @@
 
 /****************************************************************************
+ We need a version of timeval_min that treats zero timval as infinite.
+****************************************************************************/
+
+static struct timeval timeval_brl_min(const struct timeval *tv1,
+                                        const struct timeval *tv2)
+{
+        if (timeval_is_zero(tv1)) {
+                return *tv2;
+        }
+        if (timeval_is_zero(tv2)) {
+                return *tv1;
+        }
+        return timeval_min(tv1, tv2);
+}
+
+/****************************************************************************
  After a change to blocking_lock_queue, recalculate the timed_event for the
  next processing.
@@ -117 +133 @@
                         if (brl->blocking_pid == 0xFFFFFFFF) {
                                 struct timeval psx_to = timeval_current_ofs(10, 0);
-                                next_timeout = timeval_min(&next_timeout, &psx_to);
+                                next_timeout = timeval_brl_min(&next_timeout, &psx_to);
                         }
 
@@ -123 +139 @@
                 }
 
-                if (timeval_is_zero(&next_timeout)) {
-                        next_timeout = brl->expire_time;
-                }
-                else {
-                        next_timeout = timeval_min(&next_timeout,
-                                                   &brl->expire_time);
-                }
+                next_timeout = timeval_brl_min(&next_timeout, &brl->expire_time);
         }
 
@@ -687 +697 @@
         struct timeval tv_curr = timeval_current();
         blocking_lock_record *blr, *next = NULL;
-        bool recalc_timeout = False;
 
         /*
@@ -737 +746 @@
                         DLIST_REMOVE(blocking_lock_queue, blr);
                         free_blocking_lock_record(blr);
-                        recalc_timeout = True;
                         continue;
                 }
@@ -762 +770 @@
                         DLIST_REMOVE(blocking_lock_queue, blr);
                         free_blocking_lock_record(blr);
-                        recalc_timeout = True;
                         change_to_root_user();
                         continue;
@@ -788 +795 @@
                         DLIST_REMOVE(blocking_lock_queue, blr);
                         free_blocking_lock_record(blr);
-                        recalc_timeout = True;
                         change_to_root_user();
                         continue;
@@ -824 +830 @@
                         DLIST_REMOVE(blocking_lock_queue, blr);
                         free_blocking_lock_record(blr);
-                        recalc_timeout = True;
-                }
-        }
-
-        if (recalc_timeout) {
-                recalc_brl_timeout();
-        }
+                }
+        }
+
+        recalc_brl_timeout();
 }
 

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

@@ -169 +169 @@
         int mdnsd_conn_fd = -1;
 
-        if (dns_state->srv_ref == NULL) {
+        if ((dns_state == NULL) || (dns_state->srv_ref == NULL)) {
                 return false;
         }

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

@@ -20 +20 @@
 
 #include "includes.h"
+
+extern enum protocol_types Protocol;
+
+static uint32_t filter_mode_by_protocol(uint32_t mode)
+{
+        if (Protocol <= PROTOCOL_LANMAN2) {
+                DEBUG(10,("filter_mode_by_protocol: "
+                        "filtering result 0x%x to 0x%x\n",
+                        (unsigned int)mode,
+                        (unsigned int)(mode & 0x3f) ));
+                mode &= 0x3f;
+        }
+        return mode;
+}
 
 static int set_sparse_flag(const SMB_STRUCT_STAT * const sbuf)
@@ -361 +375 @@
         }
 
+        if (result == 0) {
+                result = FILE_ATTRIBUTE_NORMAL;
+        }
+
+        result = filter_mode_by_protocol(result);
+
         DEBUG(8,("dos_mode_msdfs returning "));
 
@@ -425 +445 @@
                 result |= aHIDDEN;
         }
+
+        if (result == 0) {
+                result = FILE_ATTRIBUTE_NORMAL;
+        }
+
+        result = filter_mode_by_protocol(result);
 
         DEBUG(8,("dos_mode returning "));

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

@@ -433 +433 @@
                         /* Truncate at the '.' */
                         *s1 = '\0';
+                        /*
+                         * DANGER WILL ROBINSON - this
+                         * is changing a const string via
+                         * an aliased pointer ! Remember to
+                         * put it back once we've used it.
+                         * JRA
+                         */
                         *s2 = '\0';
                 }
@@ -444 +451 @@
                 DEBUG(5,("cache_mangled_name: Stored entry %s -> %s\n", mangled_name_key, raw_name));
         }
+        /* Restore the change we made to the const string. */
+        *s2 = '.';
 }
 
@@ -614 +623 @@
         status = is_valid_name(name_ucs2, False, False);
         SAFE_FREE(name_ucs2);
-        return NT_STATUS_IS_OK(status);
+        /* We return true if we *must* mangle, so if it's
+         * a valid name (status == OK) then we must return
+         * false. Bug #6939. */
+        return !NT_STATUS_IS_OK(status);
 }
 

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

@@ -1905 +1905 @@
 
                 /* needed_data_count 4 bytes */
-                SIVAL(pdata,8,labels_data_count);
+                SIVAL(pdata, 8, labels_data_count+4);
 
                 cur_pdata+=12;

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

@@ -930 +930 @@
                         nt_mask |= ((perms & S_IWUSR) ? UNIX_ACCESS_W : 0 );
                         nt_mask |= ((perms & S_IXUSR) ? UNIX_ACCESS_X : 0 );
+                }
+                if ((perms & S_IWUSR) && lp_dos_filemode(snum)) {
+                        nt_mask |= (WRITE_DAC_ACCESS|WRITE_OWNER_ACCESS);
                 }
         }

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

@@ -51 +51 @@
         char *d = path;
         const char *s = path;
-        NTSTATUS ret = NT_STATUS_OK;
         bool start_of_name_component = True;
         bool stream_started = false;
+        bool check_quota = false;
 
         *p_last_component_contains_wcard = False;
@@ -71 +71 @@
                                 }
                                 if (StrCaseCmp(s, ":$DATA") != 0) {
-                                        return NT_STATUS_INVALID_PARAMETER;
+                                        check_quota = true;
                                 }
                                 break;
@@ -132 +132 @@
                                 /* Are we at the start ? Can't go back further if so. */
                                 if (d <= path) {
-                                        ret = NT_STATUS_OBJECT_PATH_SYNTAX_BAD;
-                                        break;
+                                        return NT_STATUS_OBJECT_PATH_SYNTAX_BAD;
                                 }
                                 /* Go back one level... */
@@ -206 +205 @@
         *d = '\0';
 
-        return ret;
+        if (check_quota) {
+                if (StrCaseCmp(path, FAKE_FILE_NAME_QUOTA_UNIX) != 0) {
+                        return NT_STATUS_INVALID_PARAMETER;
+                }
+        }
+
+        return NT_STATUS_OK;
 }
 

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

@@ -652 +652 @@
                 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,

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

@@ -1280 +1280 @@
         char *last_entry_ptr;
         bool was_8_3;
-        uint32 nt_extmode; /* Used for NT connections instead of mode */
         bool needslash = ( conn->dirpath[strlen(conn->dirpath) -1] != '/');
         bool check_mangled_names = lp_manglednames(conn->params);
@@ -1466 +1465 @@
         p = pdata;
         last_entry_ptr = p;
-
-        nt_extmode = mode ? mode : FILE_ATTRIBUTE_NORMAL;
 
         switch (info_level) {
@@ -1615 +1612 @@
                         SOFF_T(p,0,file_size); p += 8;
                         SOFF_T(p,0,allocation_size); p += 8;
-                        SIVAL(p,0,nt_extmode); p += 4;
+                        SIVAL(p,0,mode); p += 4;
                         q = p; p += 4; /* q is placeholder for name length. */
                         {
@@ -1666 +1663 @@
                         SOFF_T(p,0,file_size); p += 8;
                         SOFF_T(p,0,allocation_size); p += 8;
-                        SIVAL(p,0,nt_extmode); p += 4;
+                        SIVAL(p,0,mode); p += 4;
                         len = srvstr_push(base_data, flags2,
                                           p + 4, fname, PTR_DIFF(end_data, p+4),
@@ -1689 +1686 @@
                         SOFF_T(p,0,file_size); p += 8;
                         SOFF_T(p,0,allocation_size); p += 8;
-                        SIVAL(p,0,nt_extmode); p += 4;
+                        SIVAL(p,0,mode); p += 4;
                         q = p; p += 4; /* q is placeholder for name length. */
                         {
@@ -1738 +1735 @@
                         SOFF_T(p,0,file_size); p += 8;
                         SOFF_T(p,0,allocation_size); p += 8;
-                        SIVAL(p,0,nt_extmode); p += 4;
+                        SIVAL(p,0,mode); p += 4;
                         q = p; p += 4; /* q is placeholder for name length. */
                         {
@@ -1771 +1768 @@
                         SOFF_T(p,0,file_size); p += 8;
                         SOFF_T(p,0,allocation_size); p += 8;
-                        SIVAL(p,0,nt_extmode); p += 4;
+                        SIVAL(p,0,mode); p += 4;
                         q = p; p += 4; /* q is placeholder for name length */
                         {
@@ -2270 +2267 @@
         continue_bit = (findnext_flags & FLAG_TRANS2_FIND_CONTINUE);
 
-        srvstr_get_path_wcard(ctx, params, req->flags2, &resume_name,
+        if (!continue_bit) {
+                /* We only need resume_name if continue_bit is zero. */
+                srvstr_get_path_wcard(ctx, params, req->flags2, &resume_name,
                               params+12,
                               total_params - 12, STR_TERMINATE, &ntstatus,
                               &mask_contains_wcard);
-        if (!NT_STATUS_IS_OK(ntstatus)) {
-                /* Win9x or OS/2 can send a resume name of ".." or ".". This will cause the parser to
-                   complain (it thinks we're asking for the directory above the shared
-                   path or an invalid name). Catch this as the resume name is only compared, never used in
-                   a file access. JRA. */
-                srvstr_pull_talloc(ctx, params, req->flags2,
+                if (!NT_STATUS_IS_OK(ntstatus)) {
+                        /* Win9x or OS/2 can send a resume name of ".." or ".". This will cause the parser to
+                           complain (it thinks we're asking for the directory above the shared
+                           path or an invalid name). Catch this as the resume name is only compared, never used in
+                           a file access. JRA. */
+                        srvstr_pull_talloc(ctx, params, req->flags2,
                                 &resume_name, params+12,
                                 total_params - 12,
                                 STR_TERMINATE);
 
-                if (!resume_name || !(ISDOT(resume_name) || ISDOTDOT(resume_name))) {
-                        reply_nterror(req, ntstatus);
-                        return;
+                        if (!resume_name || !(ISDOT(resume_name) || ISDOTDOT(resume_name))) {
+                                reply_nterror(req, ntstatus);
+                                return;
+                        }
                 }
         }
@@ -2294 +2294 @@
 resume_key = %d resume name = %s continue=%d level = %d\n",
                 dptr_num, max_data_bytes, maxentries, close_after_request, close_if_end, 
-                requires_resume_key, resume_key, resume_name, continue_bit, info_level));
+                requires_resume_key, resume_key,
+                resume_name ? resume_name : "(NULL)", continue_bit, info_level));
 
         if (!maxentries) {
@@ -2416 +2417 @@
          */
 
-        if(*resume_name && !continue_bit) {
+        if(!continue_bit && resume_name && *resume_name) {
                 SMB_STRUCT_STAT st;
 
@@ -4078 +4079 @@
                 mode = dos_mode(conn,fname,&sbuf);
         }
-        if (!mode)
-                mode = FILE_ATTRIBUTE_NORMAL;
 
         nlink = sbuf.st_nlink;