Changeset 165 for branches/samba-3.0/source/smbd

Timestamp:

Mar 11, 2009, 9:14:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

Location:

branches/samba-3.0/source/smbd

Files:

• aio.c (modified) (2 diffs)
• build_options.c (modified) (3 diffs)
• conn.c (modified) (1 diff)
• dosmode.c (modified) (2 diffs)
• files.c (modified) (1 diff)
• msdfs.c (modified) (5 diffs)
• notify.c (modified) (1 diff)
• password.c (modified) (2 diffs)
• posix_acls.c (modified) (6 diffs)
• process.c (modified) (1 diff)
• reply.c (modified) (3 diffs)
• server.c (modified) (4 diffs)
• sesssetup.c (modified) (6 diffs)
• share_access.c (modified) (2 diffs)
• trans2.c (modified) (6 diffs)
• uid.c (modified) (5 diffs)

branches/samba-3.0/source/smbd/aio.c

@@ -254 +254 @@
         a->aio_sigevent.sigev_value.sival_int = aio_ex->mid;
 
+        become_root();
         if (SMB_VFS_AIO_READ(fsp,a) == -1) {
                 DEBUG(0,("schedule_aio_read_and_X: aio_read failed. "
                          "Error %s\n", strerror(errno) ));
                 delete_aio_ex(aio_ex);
-                return False;
-        }
+                unbecome_root();
+                return False;
+        }
+        unbecome_root();
 
         DEBUG(10,("schedule_aio_read_and_X: scheduled aio_read for file %s, "
@@ -344 +347 @@
         a->aio_sigevent.sigev_value.sival_int = aio_ex->mid;
 
+        become_root();
         if (SMB_VFS_AIO_WRITE(fsp,a) == -1) {
                 DEBUG(3,("schedule_aio_wrote_and_X: aio_write failed. "
                          "Error %s\n", strerror(errno) ));
                 delete_aio_ex(aio_ex);
-                return False;
-        }
+                unbecome_root();
+                return False;
+        }
+        unbecome_root();
 
         if (!write_through && !lp_syncalways(SNUM(fsp->conn))

branches/samba-3.0/source/smbd/build_options.c

@@ -345 +345 @@
         output(screen, "   HAVE_INTTYPES_H\n");
 #endif
+#ifdef HAVE_KEYUTILS_H
+        output(screen, "   HAVE_KEYUTILS_H\n");
+#endif
 #ifdef HAVE_KRB5_H
         output(screen, "   HAVE_KRB5_H\n");
@@ -2265 +2268 @@
         output(screen, "   WITH_CIFSMOUNT\n");
 #endif
+#ifdef WITH_CIFSUPCALL
+        output(screen, "   WITH_CIFSUPCALL\n");
+#endif
 #ifdef WITH_DFS
         output(screen, "   WITH_DFS\n");
@@ -2613 +2619 @@
 #ifdef WITH_CIFSMOUNT
         output(screen, "   WITH_CIFSMOUNT\n");
+#endif
+#ifdef WITH_CIFSUPCALL
+        output(screen, "   WITH_CIFSUPCALL\n");
 #endif
 #ifdef WITH_DFS

branches/samba-3.0/source/smbd/conn.c

@@ -262 +262 @@
         handle = conn->vfs_handles;
         while(handle) {
+                thandle = handle->next;
                 DLIST_REMOVE(conn->vfs_handles, handle);
-                thandle = handle->next;
                 if (handle->free_data)
                         handle->free_data(&handle->data);

branches/samba-3.0/source/smbd/dosmode.c

@@ -78 +78 @@
         mode_t dir_mode = 0; /* Mode of the inherit_from directory if
                               * inheriting. */
+
         if (!lp_store_dos_attributes(SNUM(conn)) && IS_DOS_READONLY(dosmode)) {
                 result &= ~(S_IWUSR | S_IWGRP | S_IWOTH);
@@ -167 +168 @@
                 }
         } /* Else never set the readonly bit. */
+
 #ifndef __OS2__
         if (MAP_ARCHIVE(conn) && ((sbuf->st_mode & S_IXUSR) != 0))

branches/samba-3.0/source/smbd/files.c

@@ -125 +125 @@
         chain_fsp = fsp;
 
-        /* A new fsp invalidates a negative fsp_fi_cache. */
-        if (fsp_fi_cache.fsp == NULL) {
-                ZERO_STRUCT(fsp_fi_cache);
-        }
+        /* A new fsp invalidates the positive and
+           negative fsp_fi_cache as the new fsp is pushed
+           at the start of the list and we search from
+           a cache hit to the *end* of the list. */
+
+        ZERO_STRUCT(fsp_fi_cache);
 
         *result = fsp;

branches/samba-3.0/source/smbd/msdfs.c

@@ -714 +714 @@
                                 char **ppdata, 
                                 struct junction_map *junction,
-                                int consumedcnt,
                                 BOOL self_referral)
 {
@@ -771 +770 @@
 
         /* create the header */
-        SSVAL(pdata,0,consumedcnt * 2); /* path consumed */
+        SSVAL(pdata,0,requestedpathlen - 2); /* UCS2 of path consumed minus
+
         SSVAL(pdata,2,junction->referral_count); /* number of referral in this pkt */
         if(self_referral) {
@@ -815 +815 @@
                                 char **ppdata, 
                                 struct junction_map *junction,
-                                int consumedcnt,
                                 BOOL self_referral)
 {
@@ -853 +852 @@
 
         /* create the header */
-        SSVAL(pdata,0,consumedcnt * 2); /* path consumed */
+        SSVAL(pdata,0,reqpathlen - 2); /* UCS2 of path consumed minus
+                                          2 byte null */
+
         SSVAL(pdata,2,junction->referral_count); /* number of referral */
         if(self_referral) {
@@ -975 +976 @@
         case 2:
                 reply_size = setup_ver2_dfs_referral(pathnamep, ppdata, &junction, 
-                                                     consumedcnt, self_referral);
+                                                     self_referral);
                 break;
         case 3:
                 reply_size = setup_ver3_dfs_referral(pathnamep, ppdata, &junction, 
-                                                     consumedcnt, self_referral);
+                                                     self_referral);
                 break;
         default:

branches/samba-3.0/source/smbd/notify.c

@@ -349 +349 @@
 {
         char *fullpath;
+
+        if (path[0] == '.' && path[1] == '/') {
+                path += 2;
+        }
 
         if (asprintf(&fullpath, "%s/%s", conn->connectpath, path) == -1) {

branches/samba-3.0/source/smbd/password.c

@@ -271 +271 @@
                         const char *unix_homedir =
                                 pdb_get_unix_homedir(server_info->sam_account);
-
                         if (unix_homedir) {
                                 vuser->unix_homedir =
@@ -356 +355 @@
                                         vuser->unix_homedir[1] = ':';
 #endif
-
 
         if ( (!vuser->guest) && vuser->unix_homedir && *(vuser->unix_homedir)) 

branches/samba-3.0/source/smbd/posix_acls.c

@@ -3120 +3120 @@
 }
 
+#if 0
+/* Disable this - prevents ACL inheritance from the ACL editor. JRA. */
+
 /****************************************************************************
  Take care of parent ACL inheritance.
@@ -3301 +3304 @@
         }
 
-        parent_sd->dacl->aces = new_ace;
-        parent_sd->dacl->num_aces = i;
-
-        *pp_new_sd = parent_sd;
+        /* This sucks. psd should be const and we should
+         * be doing a deep-copy here. We're getting away
+         * with is as we know parent_sd is talloced off
+         * talloc_tos() as well as psd. JRA. */
+
+        psd->dacl->aces = new_ace;
+        psd->dacl->num_aces = i;
+        psd->type &= ~(SE_DESC_DACL_AUTO_INHERITED|
+                         SE_DESC_DACL_AUTO_INHERIT_REQ);
+
+        *pp_new_sd = psd;
         return status;
 }
+#endif
 
 /****************************************************************************
@@ -3420 +3431 @@
         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 &&
@@ -3431 +3449 @@
                 }
         }
+#endif
 
         acl_perms = unpack_canon_ace( fsp, &sbuf, &file_owner_sid, &file_grp_sid,
@@ -4271 +4290 @@
                 return False;
         }
+#ifndef __OS2__
+        /* Samba always runs as root on OS/2 */
         if (current_user.ut.uid == 0 || conn->admin_user) {
                 /* I'm sorry sir, I didn't know you were root... */
                 return True;
         }
+#endif
 
         /* Check primary owner write access. */
@@ -4327 +4349 @@
                 (unsigned int)access_mask, fname ));
 
-#ifndef __OS2__
-        /* Samba always runs as root on OS/2 */
         if (current_user.ut.uid == 0 || conn->admin_user) {
                 /* I'm sorry sir, I didn't know you were root... */
                 return True;
         }
-#endif
+
         if (!VALID_STAT(*psbuf)) {
                 /* Get the file permission mask and owners. */

branches/samba-3.0/source/smbd/process.c

@@ -968 +968 @@
 
                         if (!change_to_user(conn,session_tag)) {
+                                remove_deferred_open_smb_message(
+                                        SVAL(inbuf, smb_mid));
                                 return(ERROR_NT(NT_STATUS_DOS(ERRSRV,ERRbaduid)));
                         }

branches/samba-3.0/source/smbd/reply.c

@@ -169 +169 @@
 
         *d = '\0';
-
         return ret;
 }
@@ -2215 +2214 @@
 
                 if ( SMB_VFS_SENDFILE( smbd_server_fd(), fsp, fsp->fh->fd, &header, startpos, nread) == -1) {
-                        /* Returning ENOSYS means no data at all was sent. Do this as a normal read. */
+                        /* Returning ENOSYS means no data at all was sent.
+                           Do this as a normal read. */
                         if (errno == ENOSYS) {
                                 goto normal_readbraw;
@@ -4645 +4645 @@
                         DEBUG(3,("rename_internals: succeeded doing rename "
                                  "on %s -> %s\n", directory, newname));
+                        notify_rename(conn, S_ISDIR(sbuf1.st_mode),
+                                      directory, newname);
                         rename_open_files(conn, lck, sbuf1.st_dev,
                                           sbuf1.st_ino, newname);
                         TALLOC_FREE(lck);
-                        notify_rename(conn, S_ISDIR(sbuf1.st_mode),
-                                      directory, newname);
                         return NT_STATUS_OK;    
                 }

branches/samba-3.0/source/smbd/server.c

@@ -300 +300 @@
  Open the socket communication.
 ****************************************************************************/
+
+bool reinit_after_fork(struct messaging_context *msg_ctx,
+                        struct event_context *ev_ctx,
+                        bool parent_longlived);
 
 static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_ports)
@@ -561 +565 @@
                                                         False);
                                 
-                                /* Reset the state of the random
-                                 * number generation system, so
-                                 * children do not get the same random
-                                 * numbers as each other */
-
-                                set_need_random_reseed();
-                                /* tdb needs special fork handling - remove
-                                 * CLEAR_IF_FIRST flags */
-                                if (tdb_reopen_all(1) == -1) {
-                                        DEBUG(0,("tdb_reopen_all failed.\n"));
-                                        smb_panic("tdb_reopen_all failed.");
+                                if (!reinit_after_fork(smbd_messaging_context(),
+                                                       smbd_event_context(),
+                                                       true)) {
+                                        DEBUG(0, ("reinit_after_fork failed.\n"));
+                                        smb_panic("reinit_after_fork failed.\n");
                                 }
 
                                 return True; 
                         }
+                        /* The parent doesn't need this socket */
+                        close(smbd_server_fd()); 
 
                         /* Sun May 6 18:56:14 2001 ackley@cs.unm.edu:
@@ -946 +946 @@
 
         reopen_logs();
+
 #ifdef __OS2__
         unsigned long  _System DosSetPriority (unsigned long  ulScope, unsigned long  ulClass, long lDelta, unsigned long ulID);
@@ -956 +957 @@
         DEBUG(0,( "Server priority set to PRTYC_FOREGROUNDSERVER\n"));
 #endif
+
         DEBUG(0,( "smbd version %s started.\n", SAMBA_VERSION_STRING));
         DEBUGADD( 0, ( "%s\n", COPYRIGHT_STARTUP_MESSAGE ) );

branches/samba-3.0/source/smbd/sesssetup.c

@@ -99 +99 @@
 /****************************************************************************
  Send a security blob via a session setup reply.
+ We must already have called set_message(outbuf,4,0,True)
+ before calling this function.
 ****************************************************************************/
 
@@ -109 +111 @@
                 ERROR_NT(nt_status_squash(nt_status));
         } else {
-                set_message(outbuf,4,0,True);
-
                 nt_status = nt_status_squash(nt_status);
                 SIVAL(outbuf, smb_rcls, NT_STATUS_V(nt_status));
@@ -519 +519 @@
         SAFE_FREE(client);
 
+        set_message(outbuf,4,0,True);
+
         if (sess_vuid == UID_FIELD_INVALID ) {
                 ret = NT_STATUS_LOGON_FAILURE;
@@ -525 +527 @@
                 reload_services( True );
 
-                set_message(outbuf,4,0,True);
                 SSVAL(outbuf, smb_vwv3, 0);
                         
@@ -582 +583 @@
         }
 
+        set_message(outbuf,4,0,True);
+
         if (NT_STATUS_IS_OK(nt_status)) {
                 int sess_vuid;
@@ -598 +601 @@
                         reload_services( True );
 
-                        set_message(outbuf,4,0,True);
                         SSVAL(outbuf, smb_vwv3, 0);
                         

branches/samba-3.0/source/smbd/share_access.c

@@ -193 +193 @@
  */
 
-BOOL user_ok_token(const char *username, struct nt_user_token *token, int snum)
+BOOL user_ok_token(const char *username, const struct nt_user_token *token, int snum)
 {
         if (lp_invalid_users(snum) != NULL) {
@@ -250 +250 @@
 
 BOOL is_share_read_only_for_token(const char *username,
-                                  struct nt_user_token *token, int snum)
+                                  const struct nt_user_token *token, int snum)
 {
         BOOL result = lp_readonly(snum);

branches/samba-3.0/source/smbd/trans2.c

@@ -205 +205 @@
         }
 
-        if (sizeret == -1){
-                return NULL;}
+        if (sizeret == -1)
+                return NULL;
 
         DEBUG(10,("get_ea_list_from_file: ea_namelist size = %u\n", (unsigned int)sizeret ));
@@ -303 +303 @@
         size_t total_ea_len = 0;
         TALLOC_CTX *mem_ctx = NULL;
+
         if (!lp_ea_support(SNUM(conn))) {
                 return 0;
@@ -865 +866 @@
                         return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
                 }
-        } else if (IVAL(pdata,0) != 4) {
-                return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
         }
 
@@ -977 +976 @@
         if (mask[0] == '.' && mask[1] == 0)
                 return False;
+        if (dptr_has_wild(conn->dirptr)) {
+                return False;
+        }
         if (conn->case_sensitive)
                 return strcmp(str,mask)==0;
-        if (StrCaseCmp(str,mask) != 0) {
-                return False;
-        }
-        if (dptr_has_wild(conn->dirptr)) {
-                return False;
-        }
-        return True;
+        else
+                return StrCaseCmp(str,mask) == 0;
 }
 
@@ -4162 +4159 @@
                         fsp_set_pending_modtime(fsp, ts[1]);
                 }
+
         }
 #ifdef __OS2__
@@ -6190 +6188 @@
                 return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
         }
+        /* If total_data == 4 Windows doesn't care what values
+         * are placed in that field, it just ignores them.
+         * The System i QNTC IBM SMB client puts bad values here,
+         * so ignore them. */
 
         status = create_directory(conn, directory);

branches/samba-3.0/source/smbd/uid.c

@@ -143 +143 @@
 }
 
+/*******************************************************************
+ Check if a username is OK in share level security.
+********************************************************************/
+
+static bool check_user_ok_sharelevel_security(connection_struct *conn,
+                                        const char *unix_name,
+                                        int snum)
+{
+        NT_USER_TOKEN *token = conn->nt_user_token;
+
+        if (!user_ok_token(unix_name, token, snum)) {
+                return false;
+        }
+
+        conn->read_only = is_share_read_only_for_token(unix_name,
+                                                      token,
+                                                      snum);
+
+        if (!conn->read_only &&
+            !share_access_check(token, lp_servicename(snum),
+                                FILE_WRITE_DATA)) {
+                /* smb.conf allows r/w, but the security descriptor denies
+                 * write. Fall back to looking at readonly. */
+                conn->read_only = true;
+                DEBUG(5,("falling back to read-only access-evaluation due to "
+                         "security descriptor\n"));
+        }
+
+        if (!share_access_check(token, lp_servicename(snum),
+                                conn->read_only ?
+                                FILE_READ_DATA : FILE_WRITE_DATA)) {
+                return false;
+        }
+
+        conn->admin_user = token_contains_name_in_list(
+                                unix_name, NULL, token,
+                                lp_admin_users(SNUM(conn)));
+
+        return true;
+}
+
+
 /****************************************************************************
  Become the user of a connection number without changing the security context
@@ -150 +192 @@
 BOOL change_to_user(connection_struct *conn, uint16 vuid)
 {
+        enum security_types sec = (enum security_types)lp_security();
         user_struct *vuser = get_valid_user_struct(vuid);
-
         int snum;
         gid_t gid;
@@ -173 +215 @@
          */
 
-        if((lp_security() == SEC_SHARE) && (current_user.conn == conn) &&
+        if((sec == SEC_SHARE) && (current_user.conn == conn) &&
            (current_user.ut.uid == conn->uid)) {
                 DEBUG(4,("change_to_user: Skipping user change - already "
@@ -194 +236 @@
                          lp_servicename(snum)));
                 return False;
+        } else if ((sec == SEC_SHARE) && !check_user_ok_sharelevel_security(conn,
+                        conn->user, snum)) {
+                DEBUG(2,("change_to_user: unix user %s "
+                         "not permitted access to share %s.\n",
+                         conn->user,
+                         lp_servicename(snum)));
+                return false;
         }
 
@@ -273 +322 @@
         DEBUG(5,("change_to_user uid=(%d,%d) gid=(%d,%d)\n",
                  (int)getuid(),(int)geteuid(),(int)getgid(),(int)getegid()));
-
+  
         return(True);
 }