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

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.4

Location:

branches/samba-3.3.x/source/smbd

Files:

• filename.c (modified) (4 diffs)
• ipc.c (modified) (2 diffs)
• notify.c (modified) (1 diff)
• open.c (modified) (2 diffs)
• oplock.c (modified) (7 diffs)
• posix_acls.c (modified) (7 diffs)
• uid.c (modified) (2 diffs)

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

@@ -34 +34 @@
                                   SMB_STRUCT_STAT *pst,
                                   char **path);
+static int get_real_filename_mangled(connection_struct *conn, const char *path,
+                                     const char *name, TALLOC_CTX *mem_ctx,
+                                     char **found_name);
 
 /****************************************************************************
@@ -448 +451 @@
 
                         if (name_has_wildcard ||
-                            (SMB_VFS_GET_REAL_FILENAME(
+                            (get_real_filename_mangled(
                                      conn, dirpath, start,
                                      talloc_tos(), &found_name) == -1)) {
@@ -790 +793 @@
 ****************************************************************************/
 
-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_mangled(connection_struct *conn, const char *path,
+                                     const char *name, TALLOC_CTX *mem_ctx,
+                                     char **found_name)
 {
-        struct smb_Dir *cur_dir;
-        const char *dname;
         bool mangled;
         char *unmangled_name = NULL;
-        long curpos;
 
         mangled = mangle_is_mangled(name, conn->params);
@@ -839 +839 @@
                         name = unmangled_name;
                 }
-        }
+                return get_real_filename(conn, path, name, mem_ctx,
+                                         found_name);
+        }
+
+        return SMB_VFS_GET_REAL_FILENAME(conn, path, name, mem_ctx,
+                                         found_name);
+}
+
+int get_real_filename(connection_struct *conn, const char *path,
+                      const char *name, TALLOC_CTX *mem_ctx,
+                      char **found_name)
+{
+        struct smb_Dir *cur_dir;
+        const char *dname;
+        bool mangled;
+        char *unmangled_name = NULL;
+        long curpos;
 
         /* open the directory */

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

@@ -662 +662 @@
         }
 
+        talloc_steal(talloc_tos(), state);
+
         handle_trans(conn, req, state);
 
@@ -790 +792 @@
          */
         SCVAL(req->inbuf,smb_com,SMBtrans);
+
+        talloc_steal(talloc_tos(), state);
 
         handle_trans(conn, req, state);

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

@@ -235 +235 @@
                      fsp->fsp_name) == -1) {
                 DEBUG(0, ("asprintf failed\n"));
+                TALLOC_FREE(fsp->notify);
                 return NT_STATUS_NO_MEMORY;
         }

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

@@ -3283 +3283 @@
                   ea_list, sd, fname));
 
+        /* MSDFS pathname processing must be done FIRST.
+           MSDFS pathnames containing IPv6 addresses can
+           be confused with NTFS stream names (they contain
+           ":" characters. JRA. */
+
+        if ((req != NULL) && (req->flags2 & FLAGS2_DFS_PATHNAMES)) {
+                char *resolved_fname;
+
+                status = resolve_dfspath(talloc_tos(), conn, true, fname,
+                                         &resolved_fname);
+
+                if (!NT_STATUS_IS_OK(status)) {
+                        /*
+                         * For PATH_NOT_COVERED we had
+                         * reply_botherror(req, NT_STATUS_PATH_NOT_COVERED,
+                         *                 ERRSRV, ERRbadpath);
+                         * Need to fix in callers
+                         */
+                        goto fail;
+                }
+                fname = resolved_fname;
+        }
+
         /*
          * Get the file name.
@@ -3410 +3433 @@
         }
 
-        if ((req != NULL) && (req->flags2 & FLAGS2_DFS_PATHNAMES)) {
-                char *resolved_fname;
-
-                status = resolve_dfspath(talloc_tos(), conn, true, fname,
-                                         &resolved_fname);
-
-                if (!NT_STATUS_IS_OK(status)) {
-                        /*
-                         * For PATH_NOT_COVERED we had
-                         * reply_botherror(req, NT_STATUS_PATH_NOT_COVERED,
-                         *                 ERRSRV, ERRbadpath);
-                         * Need to fix in callers
-                         */
-                        goto fail;
-                }
-                fname = resolved_fname;
-        }
-
         /*
          * Check if POSIX semantics are wanted.

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

@@ -413 +413 @@
         message_to_share_mode_entry(&msg, (char *)data->data);
 
-        DEBUG(10, ("Got oplock async level 2 break message from pid %d: %s/%lu\n",
-                   (int)procid_to_pid(&src), file_id_string_tos(&msg.id), msg.share_file_id));
+        DEBUG(10, ("Got oplock async level 2 break message from pid %s: "
+                   "%s/%lu\n", procid_str(debug_ctx(), &src),
+                   file_id_string_tos(&msg.id), msg.share_file_id));
 
         fsp = initial_break_processing(msg.id, msg.share_file_id);
@@ -456 +457 @@
 
         /* Need to wait before sending a break message if we sent ourselves this message. */
-        if (procid_to_pid(&src) == sys_getpid()) {
+        if (procid_is_me(&src)) {
                 wait_before_sending_break();
         }
@@ -508 +509 @@
         message_to_share_mode_entry(&msg, (char *)data->data);
 
-        DEBUG(10, ("Got oplock break message from pid %d: %s/%lu\n",
-                   (int)procid_to_pid(&src), file_id_string_tos(&msg.id), msg.share_file_id));
+        DEBUG(10, ("Got oplock break message from pid %s: %s/%lu\n",
+                   procid_str(debug_ctx(), &src), file_id_string_tos(&msg.id),
+                   msg.share_file_id));
 
         fsp = initial_break_processing(msg.id, msg.share_file_id);
@@ -563 +565 @@
 
         /* Need to wait before sending a break message if we sent ourselves this message. */
-        if (procid_to_pid(&src) == sys_getpid()) {
+        if (procid_is_me(&src)) {
                 wait_before_sending_break();
         }
@@ -622 +624 @@
         file_id = (unsigned long)IVAL(data->data, 16);
 
-        DEBUG(10, ("Got kernel oplock break message from pid %d: %s/%u\n",
-                   (int)procid_to_pid(&src), file_id_string_tos(&id),
+        DEBUG(10, ("Got kernel oplock break message from pid %s: %s/%u\n",
+                   procid_str(debug_ctx(), &src), file_id_string_tos(&id),
                    (unsigned int)file_id));
 
@@ -714 +716 @@
         message_to_share_mode_entry(&msg, (char *)data->data);
 
-        DEBUG(10, ("Got oplock break response from pid %d: %s/%lu mid %u\n",
-                   (int)procid_to_pid(&src), file_id_string_tos(&msg.id), msg.share_file_id,
-                   (unsigned int)msg.op_mid));
+        DEBUG(10, ("Got oplock break response from pid %s: %s/%lu mid %u\n",
+                   procid_str(debug_ctx(), &src), file_id_string_tos(&msg.id),
+                   msg.share_file_id, (unsigned int)msg.op_mid));
 
         /* Here's the hack from open.c, store the mid in the 'port' field */
@@ -743 +745 @@
         message_to_share_mode_entry(&msg, (char *)data->data);
 
-        DEBUG(10, ("Got open retry msg from pid %d: %s mid %u\n",
-                   (int)procid_to_pid(&src), file_id_string_tos(&msg.id),
+        DEBUG(10, ("Got open retry msg from pid %s: %s mid %u\n",
+                   procid_str(debug_ctx(), &src), file_id_string_tos(&msg.id),
                    (unsigned int)msg.op_mid));
 

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

@@ -4 +4 @@
    Copyright (C) Jeremy Allison 1994-2000.
    Copyright (C) Andreas Gruenbacher 2002.
+   Copyright (C) Simo Sorce <idra@samba.org> 2009.
 
    This program is free software; you can redistribute it and/or modify
@@ -2815 +2816 @@
 }
 
+/*
+ * Add or Replace ACE entry.
+ * In some cases we need to add a specific ACE for compatibility reasons.
+ * When doing that we must make sure we are not actually creating a duplicate
+ * entry. So we need to search whether an ACE entry already exist and eventually
+ * replacce the access mask, or add a completely new entry if none was found.
+ *
+ * This function assumes the array has enough space to add a new entry without
+ * any reallocation of memory.
+ */
+
+static void add_or_replace_ace(SEC_ACE *nt_ace_list, size_t *num_aces,
+                                const DOM_SID *sid, enum security_ace_type type,
+                                uint32_t mask, uint8_t flags)
+{
+        int i;
+
+        /* first search for a duplicate */
+        for (i = 0; i < *num_aces; i++) {
+                if (sid_equal(&nt_ace_list[i].trustee, sid) &&
+                    (nt_ace_list[i].flags == flags)) break;
+        }
+
+        if (i < *num_aces) { /* found */
+                nt_ace_list[i].type = type;
+                nt_ace_list[i].access_mask = mask;
+                DEBUG(10, ("Replacing ACE %d with SID %s and flags %02x\n",
+                           i, sid_string_dbg(sid), flags));
+                return;
+        }
+
+        /* not found, append it */
+        init_sec_ace(&nt_ace_list[(*num_aces)++], sid, type, mask, flags);
+}
+
+
 /****************************************************************************
  Reply to query a security descriptor from an fsp. If it succeeds it allocates
@@ -2842 +2879 @@
         SEC_ACE *nt_ace_list = NULL;
         size_t num_profile_acls = 0;
+        DOM_SID orig_owner_sid;
         SEC_DESC *psd = NULL;
+        int i;
 
         /*
@@ -2848 +2887 @@
          */
 
+        create_file_sids(sbuf, &owner_sid, &group_sid);
+
         if (lp_profile_acls(SNUM(conn))) {
                 /* For WXP SP1 the owner must be administrators. */
+                sid_copy(&orig_owner_sid, &owner_sid);
                 sid_copy(&owner_sid, &global_sid_Builtin_Administrators);
                 sid_copy(&group_sid, &global_sid_Builtin_Users);
-                num_profile_acls = 2;
-        } else {
-                create_file_sids(sbuf, &owner_sid, &group_sid);
+                num_profile_acls = 3;
         }
 
@@ -2976 +3016 @@
                          * if we can't map the SID. */
                         if (lp_profile_acls(SNUM(conn))) {
-                                init_sec_ace(&nt_ace_list[num_aces++],
-                                                &global_sid_Builtin_Users,
-                                                SEC_ACE_TYPE_ACCESS_ALLOWED,
-                                                FILE_GENERIC_ALL, 0);
+                                add_or_replace_ace(nt_ace_list, &num_aces,
+                                                   &global_sid_Builtin_Users,
+                                                   SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                                   FILE_GENERIC_ALL, 0);
                         }
 
@@ -3001 +3041 @@
                          * if we can't map the SID. */
                         if (lp_profile_acls(SNUM(conn))) {
-                                init_sec_ace(&nt_ace_list[num_aces++], &global_sid_Builtin_Users, SEC_ACE_TYPE_ACCESS_ALLOWED, FILE_GENERIC_ALL,
-                                                SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT|
-                                                SEC_ACE_FLAG_INHERIT_ONLY|0);
+                                add_or_replace_ace(nt_ace_list, &num_aces,
+                                                &global_sid_Builtin_Users,
+                                                SEC_ACE_TYPE_ACCESS_ALLOWED,
+                                                FILE_GENERIC_ALL,
+                                                SEC_ACE_FLAG_OBJECT_INHERIT |
+                                                SEC_ACE_FLAG_CONTAINER_INHERIT |
+                                                SEC_ACE_FLAG_INHERIT_ONLY);
                         }
 
@@ -3014 +3058 @@
                         num_aces = merge_default_aces(nt_ace_list, num_aces);
 
+                        if (lp_profile_acls(SNUM(conn))) {
+                                for (i = 0; i < num_aces; i++) {
+                                        if (sid_equal(&nt_ace_list[i].trustee, &owner_sid)) {
+                                                add_or_replace_ace(nt_ace_list, &num_aces,
+                                                                   &orig_owner_sid,
+                                                                   nt_ace_list[i].type,
+                                                                   nt_ace_list[i].access_mask,
+                                                                   nt_ace_list[i].flags);
+                                                break;
+                                        }
+                                }
+                        }
                 }
 

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

@@ -167 +167 @@
                 if (ent->vuid == vuid) {
                         ent->vuid = UID_FIELD_INVALID;
+                        /* Ensure we're not freeing an active pointer. */
+                        if (conn->server_info == ent->server_info) {
+                                conn->server_info = NULL;
+                        }
                         TALLOC_FREE(ent->server_info);
                         ent->read_only = False;
@@ -218 +222 @@
 
         server_info = vuser ? vuser->server_info : conn->server_info;
+
+        if (!server_info) {
+                /* Invalid vuid sent - even with security = share. */
+                DEBUG(2,("change_to_user: Invalid vuid %d used on "
+                         "share %s.\n",vuid, lp_servicename(snum) ));
+                return false;
+        }
 
         if (!check_user_ok(conn, vuid, server_info, snum)) {