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

Timestamp:

Mar 1, 2010, 3:05:48 PM (15 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3.x to 3.3.11

Location:

branches/samba-3.3.x/source/smbd

Files:

• ipc.c (modified) (1 diff)
• lanman.c (modified) (3 diffs)
• mangle_hash.c (modified) (3 diffs)
• server.c (modified) (1 diff)
• service.c (modified) (9 diffs)
• trans2.c (modified) (2 diffs)
• vfs.c (modified) (1 diff)

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

@@ -163 +163 @@
                                            rparam, tot_param_sent, this_lparam,
                                            rdata, tot_data_sent, this_ldata);
+
+                SSVAL(outbuf,smb_vwv0,lparam);
+                SSVAL(outbuf,smb_vwv1,ldata);
 
                 SSVAL(outbuf,smb_vwv3,this_lparam);

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

@@ -1353 +1353 @@
 
 
-static bool srv_comp(struct srv_info_struct *s1,struct srv_info_struct *s2)
+static int srv_comp(struct srv_info_struct *s1,struct srv_info_struct *s2)
 {
         return(strcmp(s1->name,s2->name));
@@ -1457 +1457 @@
                                 s->name, s->type, s->comment, s->domain));
       
-                        if (data_len <= buf_len) {
+                        if (data_len < buf_len) {
                                 counted++;
                                 fixed_len += f_len;
@@ -1821 +1821 @@
                         total++;
                         data_len += fill_share_info(conn,i,uLevel,0,&f_len,0,&s_len,0);
-                        if (data_len <= buf_len) {
+                        if (data_len < buf_len) {
                                 counted++;
                                 fixed_len += f_len;

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

@@ -336 +336 @@
 
         SMB_ASSERT(chartest != NULL);
+        memset(chartest, '\0', 256);
 
         for( s = (const unsigned char *)basechars; *s; s++ ) {
@@ -412 +413 @@
         TDB_DATA data_val;
         char mangled_name_key[13];
-        char *s1;
-        char *s2;
+        char *s1 = NULL;
+        char *s2 = NULL;
 
         /* If the cache isn't initialized, give up. */
@@ -452 +453 @@
         }
         /* Restore the change we made to the const string. */
-        *s2 = '.';
+        if (s2) {
+                *s2 = '.';
+        }
 }
 

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

@@ -1248 +1248 @@
         gain_root_group_privilege();
 
+        /*
+         * Ensure we have CAP_KILL capability set on Linux,
+         * where we need this to communicate with threads.
+         * This is inherited by new threads, but not by new
+         * processes across exec().
+         */
+        set_effective_capability(KILL_CAPABILITY);
+
         fault_setup((void (*)(void *))exit_server_fault);
         dump_core_setup("smbd");

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

@@ -725 +725 @@
         int ret;
         char addr[INET6_ADDRSTRLEN];
-        bool on_err_call_dis_hook = false;
         NTSTATUS status;
 
@@ -926 +925 @@
         }
 
-        /*
-         * If widelinks are disallowed we need to canonicalise the connect
-         * path here to ensure we don't have any symlinks in the
-         * connectpath. We will be checking all paths on this connection are
-         * below this directory. We must do this after the VFS init as we
-         * depend on the realpath() pointer in the vfs table. JRA.
-         */
-        if (!lp_widelinks(snum)) {
-                if (!canonicalize_connect_path(conn)) {
-                        DEBUG(0, ("canonicalize_connect_path failed "
-                        "for service %s, path %s\n",
-                                lp_servicename(snum),
-                                conn->connectpath));
-                        conn_free(conn);
-                        *pstatus = NT_STATUS_BAD_NETWORK_NAME;
-                        return NULL;
-                }
-        }
-
         if ((!conn->printer) && (!conn->ipc)) {
                 conn->notify_ctx = notify_init(conn, server_id_self(),
@@ -952 +932 @@
         }
 
-/* ROOT Activities: */  
+/* ROOT Activities: */
+        /* explicitly check widelinks here so that we can correctly warn
+         * in the logs. */
+        widelinks_warning(snum);
+
         /*
          * Enforce the max connections parameter.
@@ -977 +961 @@
                 return NULL;
         }  
+
+        /* Invoke VFS make connection hook - must be the first
+           VFS operation we do. */
+
+        if (SMB_VFS_CONNECT(conn, lp_servicename(snum),
+                            conn->server_info->unix_name) < 0) {
+                DEBUG(0,("make_connection: VFS make connection failed!\n"));
+                yield_connection(conn, lp_servicename(snum));
+                conn_free(conn);
+                *pstatus = NT_STATUS_UNSUCCESSFUL;
+                return NULL;
+        }
+
+        /*
+         * Fix compatibility issue pointed out by Volker.
+         * We pass the conn->connectpath to the preexec
+         * scripts as a parameter, so attempt to canonicalize
+         * it here before calling the preexec scripts.
+         * We ignore errors here, as it is possible that
+         * the conn->connectpath doesn't exist yet and
+         * the preexec scripts will create them.
+         */
+
+        (void)canonicalize_connect_path(conn);
 
         /* Preexecs are done here as they might make the dir we are to ChDir
@@ -996 +1004 @@
                         DEBUG(1,("root preexec gave %d - failing "
                                  "connection\n", ret));
+                        SMB_VFS_DISCONNECT(conn);
                         yield_connection(conn, lp_servicename(snum));
                         conn_free(conn);
@@ -1007 +1016 @@
                 /* No point continuing if they fail the basic checks */
                 DEBUG(0,("Can't become connected user!\n"));
+                SMB_VFS_DISCONNECT(conn);
                 yield_connection(conn, lp_servicename(snum));
                 conn_free(conn);
@@ -1039 +1049 @@
         }
 
+        /*
+         * If widelinks are disallowed we need to canonicalise the connect
+         * path here to ensure we don't have any symlinks in the
+         * connectpath. We will be checking all paths on this connection are
+         * below this directory. We must do this after the VFS init as we
+         * depend on the realpath() pointer in the vfs table. JRA.
+         */
+        if (!lp_widelinks(snum)) {
+                if (!canonicalize_connect_path(conn)) {
+                        DEBUG(0, ("canonicalize_connect_path failed "
+                        "for service %s, path %s\n",
+                                lp_servicename(snum),
+                                conn->connectpath));
+                        *pstatus = NT_STATUS_BAD_NETWORK_NAME;
+                        goto err_root_exit;
+                }
+        }
+
 #ifdef WITH_FAKE_KASERVER
         if (lp_afs_share(snum)) {
@@ -1054 +1082 @@
         }
         
-        /* Invoke VFS make connection hook - do this before the VFS_STAT call
-           to allow any filesystems needing user credentials to initialize
-           themselves. */
-
-        if (SMB_VFS_CONNECT(conn, lp_servicename(snum),
-                            conn->server_info->unix_name) < 0) {
-                DEBUG(0,("make_connection: VFS make connection failed!\n"));
-                *pstatus = NT_STATUS_UNSUCCESSFUL;
-                goto err_root_exit;
-        }
-
-        /* Any error exit after here needs to call the disconnect hook. */
-        on_err_call_dis_hook = true;
 
         /* win2000 does not check the permissions on the directory
@@ -1139 +1154 @@
 
         change_to_root_user();
-        if (on_err_call_dis_hook) {
-                /* Call VFS disconnect hook */
-                SMB_VFS_DISCONNECT(conn);
-        }
+        /* Call VFS disconnect hook */
+        SMB_VFS_DISCONNECT(conn);
         yield_connection(conn, lp_servicename(snum));
         conn_free(conn);

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

@@ -5249 +5249 @@
         char *link_target = NULL;
         const char *newname = fname;
-        NTSTATUS status = NT_STATUS_OK;
         TALLOC_CTX *ctx = talloc_tos();
 
@@ -5268 +5267 @@
         if (!link_target) {
                 return NT_STATUS_INVALID_PARAMETER;
-        }
-
-        /* !widelinks forces the target path to be within the share. */
-        /* This means we can interpret the target as a pathname. */
-        if (!lp_widelinks(SNUM(conn))) {
-                char *rel_name = NULL;
-                char *last_dirp = NULL;
-
-                if (*link_target == '/') {
-                        /* No absolute paths allowed. */
-                        return NT_STATUS_ACCESS_DENIED;
-                }
-                rel_name = talloc_strdup(ctx,newname);
-                if (!rel_name) {
-                        return NT_STATUS_NO_MEMORY;
-                }
-                last_dirp = strrchr_m(rel_name, '/');
-                if (last_dirp) {
-                        last_dirp[1] = '\0';
-                } else {
-                        rel_name = talloc_strdup(ctx,"./");
-                        if (!rel_name) {
-                                return NT_STATUS_NO_MEMORY;
-                        }
-                }
-                rel_name = talloc_asprintf_append(rel_name,
-                                "%s",
-                                link_target);
-                if (!rel_name) {
-                        return NT_STATUS_NO_MEMORY;
-                }
-
-                status = check_name(conn, rel_name);
-                if (!NT_STATUS_IS_OK(status)) {
-                        return status;
-                }
         }
 

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

@@ -940 +940 @@
         /* Check for widelinks allowed. */
         if (!lp_widelinks(SNUM(conn)) && (strncmp(conn->connectpath, resolved_name, con_path_len) != 0)) {
-                DEBUG(2, ("reduce_name: Bad access attempt: %s is a symlink outside the share path", fname));
+                DEBUG(2, ("reduce_name: Bad access attempt: %s is a symlink outside the share path\n", fname));
                 if (free_resolved_name) {
                         SAFE_FREE(resolved_name);