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

Timestamp:

Jun 17, 2009, 2:19:52 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 branch to 3.3.5

Location:

branches/samba-3.3.x/source/smbd

Files:

• file_access.c (modified) (3 diffs)
• filename.c (modified) (6 diffs)
• msdfs.c (modified) (2 diffs)
• posix_acls.c (modified) (2 diffs)
• posix_acls.c# (modified) (1 diff)
• server.c (modified) (1 diff)
• service.c (modified) (2 diffs)
• uid.c (modified) (5 diffs)

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

@@ -93 +93 @@
 
 #ifdef S_ISVTX
-        /* sticky bit means delete only by owner or root. */
+        /* sticky bit means delete only by owner of file or by root or
+         * by owner of directory. */
         if (sbuf.st_mode & S_ISVTX) {
                 SMB_STRUCT_STAT sbuf_file;
@@ -102 +103 @@
                                 return True;
                         }
+                        DEBUG(10,("can_delete_file_in_directory: can't "
+                                "stat file %s (%s)",
+                                fname, strerror(errno) ));
                         return False;
                 }
@@ -108 +112 @@
                  * for bug #3348. Don't assume owning sticky bit
                  * directory means write access allowed.
+                 * Fail to delete if we're not the owner of the file,
+                 * or the owner of the directory as we have no possible
+                 * chance of deleting. Otherwise, go on and check the ACL.
                  */
-                if (conn->server_info->utok.uid != sbuf_file.st_uid) {
+                if ((conn->server_info->utok.uid != sbuf.st_uid) &&
+                                (conn->server_info->utok.uid != sbuf_file.st_uid)) {
+                        DEBUG(10,("can_delete_file_in_directory: not "
+                                "owner of file %s or directory %s",
+                                fname, dname));
                         return False;
                 }

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

@@ -37 +37 @@
                                      const char *name, TALLOC_CTX *mem_ctx,
                                      char **found_name);
+static int get_real_filename_internal(connection_struct *conn,
+                                      const char *path, const char *name,
+                                      bool mangled,
+                                      TALLOC_CTX *mem_ctx, char **found_name);
 
 /****************************************************************************
@@ -494 +498 @@
                                 }
 
-                                /* ENOENT is the only valid error here. */
-                                if ((errno != 0) && (errno != ENOENT)) {
+                                /*
+                                 * ENOENT/EACCESS are the only valid errors
+                                 * here. EACCESS needs handling here for
+                                 * "dropboxes", i.e. directories where users
+                                 * can only put stuff with permission -wx.
+                                 */
+                                if ((errno != 0) && (errno != ENOENT)
+                                    && (errno != EACCES)) {
                                         /*
                                          * ENOTDIR and ELOOP both map to
@@ -505 +515 @@
                                                 result =
                                                 NT_STATUS_OBJECT_PATH_NOT_FOUND;
-                                        }
-                                        else {
+                                        } else {
                                                 result =
                                                 map_nt_error_from_unix(errno);
@@ -838 +847 @@
                         /* Name is now unmangled. */
                         name = unmangled_name;
-                }
-                return get_real_filename(conn, path, name, mem_ctx,
-                                         found_name);
+                } else {
+                        /*
+                         * If we have mangled names, do not ask the VFS'es
+                         * GET_REAL_FILENAME. The Unix file system below does
+                         * not know about Samba's style of mangling.
+                         *
+                         * Boolean flags passed down are evil, the alternative
+                         * would be to pass a comparison function down into
+                         * the loop in get_real_filename_internal(). For now,
+                         * do the quick&dirty boolean flag approach.
+                         */
+                        return get_real_filename_internal(conn, path, name,
+                                                          true,
+                                                          mem_ctx, found_name);
+                }
         }
 
@@ -847 +868 @@
 }
 
-int get_real_filename(connection_struct *conn, const char *path,
-                      const char *name, TALLOC_CTX *mem_ctx,
-                      char **found_name)
+static int get_real_filename_internal(connection_struct *conn,
+                                      const char *path, const char *name,
+                                      bool mangled,
+                                      TALLOC_CTX *mem_ctx, char **found_name)
 {
         struct smb_Dir *cur_dir;
         const char *dname;
-        bool mangled;
         char *unmangled_name = NULL;
         long curpos;
@@ -902 +923 @@
         errno = ENOENT;
         return -1;
+}
+
+
+
+int get_real_filename(connection_struct *conn,
+                      const char *path, const char *name,
+                      TALLOC_CTX *mem_ctx, char **found_name)
+{
+        /*
+         * This is the default VFS function. If we end up here, we know we
+         * don't have mangled names around.
+         */
+        return get_real_filename_internal(conn, path, name, false,
+                                          mem_ctx, found_name);
 }
 

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

@@ -264 +264 @@
         }
 
+        conn->fs_capabilities = SMB_VFS_FS_CAPABILITIES(conn);
+
         /*
          * Windows seems to insist on doing trans2getdfsreferral() calls on
@@ -403 +405 @@
         SMB_STRUCT_STAT st;
         int referral_len = 0;
+#if defined(HAVE_BROKEN_READLINK)
+        char link_target_buf[PATH_MAX];
+#else
         char link_target_buf[7];
+#endif
         size_t bufsize = 0;
         char *link_target = NULL;

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

@@ -1118 +1118 @@
                 return True;
 
-        /* Assume that the current user is in the current group (force group) */
-
-        if (uid_ace->unix_ug.uid == current_user.ut.uid && group_ace->unix_ug.gid == current_user.ut.gid)
-                return True;
+        /*
+         * if it's the current user, we already have the unix token
+         * and don't need to do the complex user_in_group_sid() call
+         */
+        if (uid_ace->unix_ug.uid == current_user.ut.uid) {
+                size_t i;
+
+                if (group_ace->unix_ug.gid == current_user.ut.gid) {
+                        return True;
+                }
+
+                for (i=0; i < current_user.ut.ngroups; i++) {
+                        if (group_ace->unix_ug.gid == current_user.ut.groups[i]) {
+                                return True;
+                        }
+                }
+        }
 
         /* u_name talloc'ed off tos. */
@@ -1128 +1141 @@
                 return False;
         }
+
+        /* notice that this is not reliable for users exported by winbindd! */
         return user_in_group_sid(u_name, &group_ace->trustee);
 }

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

@@ -1 +1 @@
 ***************
-*** 4289,4298 ****
-        if (!S_ISDIR(sbuf.st_mode)) {
+*** 1117,1132 ****
+        if (sid_equal(&group_ace->trustee, &global_sid_World))
+                return True;
+  
+-       /* Assume that the current user is in the current group (force group) */
+  
+-       if (uid_ace->unix_ug.uid == current_user.ut.uid && group_ace->unix_ug.gid == current_user.ut.gid)
+-               return True;
+  
+        /* u_name talloc'ed off tos. */
+        u_name = uidtoname(uid_ace->unix_ug.uid);
+        if (!u_name) {
                 return False;
         }
-        if (current_user.ut.uid == 0 || conn->admin_user) {
-                /* I'm sorry sir, I didn't know you were root... */
+        return user_in_group_sid(u_name, &group_ace->trustee);
+  }
+  
+--- 1117,1147 ----
+        if (sid_equal(&group_ace->trustee, &global_sid_World))
                 return True;
-        }
   
-        /* Check primary owner write access. */
-        if (current_user.ut.uid == sbuf.st_uid) {
---- 4289,4301 ----
-        if (!S_ISDIR(sbuf.st_mode)) {
++       /*
++        * if it's the current user, we already have the unix token
++        * and don't need to do the complex user_in_group_sid() call
++        */
++       if (uid_ace->unix_ug.uid == current_user.ut.uid) {
++               size_t i;
+  
++               if (group_ace->unix_ug.gid == current_user.ut.gid) {
++                       return True;
++               }
++ 
++               for (i=0; i < current_user.ut.ngroups; i++) {
++                       if (group_ace->unix_ug.gid == current_user.ut.groups[i]) {
++                               return True;
++                       }
++               }
++       }
+  
+        /* u_name talloc'ed off tos. */
+        u_name = uidtoname(uid_ace->unix_ug.uid);
+        if (!u_name) {
                 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
++ 
++       /* notice that this is not reliable for users exported by winbindd! */
+        return user_in_group_sid(u_name, &group_ace->trustee);
+  }
   
-        /* Check primary owner write access. */
-        if (current_user.ut.uid == sbuf.st_uid) {

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

@@ -591 +591 @@
         /* 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;

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

@@ -291 +291 @@
         }
 
+        if (!service_ok(res)) {
+                res = -1;
+        }
+
  error:
 
@@ -741 +745 @@
 
         if (!NT_STATUS_IS_OK(status)) {
-                DEBUG(0, ("create_connection_server_info failed: %s\n",
+                DEBUG(1, ("create_connection_server_info failed: %s\n",
                           nt_errstr(status)));
                 *pstatus = status;

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

@@ -55 +55 @@
 }
 
+/****************************************************************************
+ talloc free the conn->server_info if not used in the vuid cache.
+****************************************************************************/
+
+static void free_conn_server_info_if_unused(connection_struct *conn)
+{
+        unsigned int i;
+
+        for (i = 0; i < VUID_CACHE_SIZE; i++) {
+                struct vuid_cache_entry *ent;
+                ent = &conn->vuid_cache.array[i];
+                if (ent->vuid != UID_FIELD_INVALID &&
+                                conn->server_info == ent->server_info) {
+                        return;
+                }
+        }
+        /* Not used, safe to free. */
+        TALLOC_FREE(conn->server_info);
+}
+
 /*******************************************************************
  Check if a username is OK.
@@ -78 +98 @@
                         ent = &conn->vuid_cache.array[i];
                         if (ent->vuid == vuid) {
+                                free_conn_server_info_if_unused(conn);
                                 conn->server_info = ent->server_info;
                                 conn->read_only = ent->read_only;
@@ -143 +164 @@
                 ent->read_only = readonly_share;
                 ent->admin_user = admin_user;
+                free_conn_server_info_if_unused(conn);
                 conn->server_info = ent->server_info;
         }
@@ -154 +176 @@
 /****************************************************************************
  Clear a vuid out of the connection's vuid cache
+ This is only called on SMBulogoff.
 ****************************************************************************/
 
@@ -167 +190 @@
                 if (ent->vuid == vuid) {
                         ent->vuid = UID_FIELD_INVALID;
-                        /* Ensure we're not freeing an active pointer. */
+                        /*
+                         * We need to keep conn->server_info around
+                         * if it's equal to ent->server_info as a SMBulogoff
+                         * is often followed by a SMBtdis (with an invalid
+                         * vuid). The debug code (or regular code in
+                         * vfs_full_audit) wants to refer to the
+                         * conn->server_info pointer to print debug
+                         * statements. Theoretically this is a bug,
+                         * as once the vuid is gone the server_info
+                         * on the conn struct isn't valid any more,
+                         * but there's enough code that assumes
+                         * conn->server_info is never null that
+                         * it's easier to hold onto the old pointer
+                         * until we get a new sessionsetupX.
+                         * As everything is hung off the
+                         * conn pointer as a talloc context we're not
+                         * leaking memory here. See bug #6315. JRA.
+                         */
                         if (conn->server_info == ent->server_info) {
-                                conn->server_info = NULL;
+                                ent->server_info = NULL;
+                        } else {
+                                TALLOC_FREE(ent->server_info);
                         }
-                        TALLOC_FREE(ent->server_info);
                         ent->read_only = False;
                         ent->admin_user = False;