Changeset 751 for trunk/server/source3/smbd/service.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/smbd/service.c (modified) (11 diffs)

trunk/server/source3/smbd/service.c

@@ -702 +702 @@
                 }
 
+                /* We don't want to replace the original sanitized_username
+                   as it is the original user given in the connect attempt.
+                   This is used in '%U' substitutions. */
+                TALLOC_FREE(forced_serverinfo->sanitized_username);
+                forced_serverinfo->sanitized_username =
+                        talloc_move(forced_serverinfo,
+                                &conn->session_info->sanitized_username);
+
                 TALLOC_FREE(conn->session_info);
                 conn->session_info = forced_serverinfo;
@@ -738 +746 @@
 
 /****************************************************************************
+  Setup the share access mask for a connection.
+****************************************************************************/
+
+static void create_share_access_mask(connection_struct *conn, int snum)
+{
+        const struct security_token *token = conn->session_info->security_token;
+
+        share_access_check(token,
+                        lp_servicename(snum),
+                        MAXIMUM_ALLOWED_ACCESS,
+                        &conn->share_access);
+
+        if (security_token_has_privilege(token, SEC_PRIV_SECURITY)) {
+                conn->share_access |= SEC_FLAG_SYSTEM_SECURITY;
+        }
+        if (security_token_has_privilege(token, SEC_PRIV_RESTORE)) {
+                conn->share_access |= (SEC_RIGHTS_PRIV_RESTORE);
+        }
+        if (security_token_has_privilege(token, SEC_PRIV_BACKUP)) {
+                conn->share_access |= (SEC_RIGHTS_PRIV_BACKUP);
+        }
+        if (security_token_has_privilege(token, SEC_PRIV_TAKE_OWNERSHIP)) {
+                conn->share_access |= (SEC_STD_WRITE_OWNER);
+        }
+}
+
+/****************************************************************************
   Make a connection, given the snum to connect to, and the vuser of the
   connecting user if appropriate.
 ****************************************************************************/
 
-connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
+static connection_struct *make_connection_snum(struct smbd_server_connection *sconn,
+                                        connection_struct *conn,
                                         int snum, user_struct *vuser,
                                         DATA_BLOB password,
@@ -748 +784 @@
                                         NTSTATUS *pstatus)
 {
-        connection_struct *conn = NULL;
         struct smb_filename *smb_fname_cpath = NULL;
         fstring dev;
@@ -765 +800 @@
         }
 
-        conn = conn_new(sconn);
-        if (!conn) {
-                DEBUG(0,("Couldn't find free connection.\n"));
-                *pstatus = NT_STATUS_INSUFFICIENT_RESOURCES;
-                goto err_root_exit;
-        }
-
         conn->params->service = snum;
 
@@ -821 +849 @@
         status = set_conn_force_user_group(conn, snum);
         if (!NT_STATUS_IS_OK(status)) {
-                conn_free(conn);
                 *pstatus = status;
                 return NULL;
@@ -859 +886 @@
          */
 
-        share_access_check(conn->session_info->security_token,
-                           lp_servicename(snum), MAXIMUM_ALLOWED_ACCESS,
-                           &conn->share_access);
+        create_share_access_mask(conn, snum);
 
         if ((conn->share_access & FILE_WRITE_DATA) == 0) {
@@ -1118 +1143 @@
                 yield_connection(conn, lp_servicename(snum));
         }
-        if (conn) {
+        return NULL;
+}
+
+/****************************************************************************
+ Make a connection to a service from SMB1. Internal interface.
+****************************************************************************/
+
+static connection_struct *make_connection_smb1(struct smbd_server_connection *sconn,
+                                        int snum, user_struct *vuser,
+                                        DATA_BLOB password,
+                                        const char *pdev,
+                                        NTSTATUS *pstatus)
+{
+        connection_struct *ret_conn = NULL;
+        connection_struct *conn = conn_new(sconn);
+        if (!conn) {
+                DEBUG(0,("make_connection_smb1: Couldn't find free connection.\n"));
+                *pstatus = NT_STATUS_INSUFFICIENT_RESOURCES;
+                return NULL;
+        }
+        ret_conn = make_connection_snum(sconn,
+                                        conn,
+                                        snum,
+                                        vuser,
+                                        password,
+                                        pdev,
+                                        pstatus);
+        if (ret_conn != conn) {
                 conn_free(conn);
-        }
-        return NULL;
+                return NULL;
+        }
+        return conn;
 }
 
 /****************************************************************************
- Make a connection to a service.
+ Make a connection to a service from SMB2. External SMB2 interface.
+ We must set cnum before claiming connection.
+****************************************************************************/
+
+connection_struct *make_connection_smb2(struct smbd_server_connection *sconn,
+                                        struct smbd_smb2_tcon *tcon,
+                                        user_struct *vuser,
+                                        DATA_BLOB password,
+                                        const char *pdev,
+                                        NTSTATUS *pstatus)
+{
+        connection_struct *ret_conn = NULL;
+        connection_struct *conn = conn_new(sconn);
+        if (!conn) {
+                DEBUG(0,("make_connection_smb2: Couldn't find free connection.\n"));
+                *pstatus = NT_STATUS_INSUFFICIENT_RESOURCES;
+                return NULL;
+        }
+        conn->cnum = tcon->tid;
+        ret_conn = make_connection_snum(sconn,
+                                        conn,
+                                        tcon->snum,
+                                        vuser,
+                                        password,
+                                        pdev,
+                                        pstatus);
+        if (ret_conn != conn) {
+                conn_free(conn);
+                return NULL;
+        }
+        return conn;
+}
+
+/****************************************************************************
+ Make a connection to a service. External SMB1 interface.
  *
  * @param service 
@@ -1188 +1275 @@
                         DEBUG(5, ("making a connection to [homes] service "
                                   "created at session setup time\n"));
-                        return make_connection_snum(sconn,
+                        return make_connection_smb1(sconn,
                                                     vuser->homes_snum,
                                                     vuser, no_pw, 
@@ -1212 +1299 @@
                                           "service %s based on "
                                           "security=share\n", service_in));
-                                return make_connection_snum(sconn,
+                                return make_connection_smb1(sconn,
                                                             snum, NULL,
                                                             password,
@@ -1224 +1311 @@
                 DEBUG(5, ("making a connection to 'homes' service [%s] "
                           "created at session setup time\n", service_in));
-                return make_connection_snum(sconn,
+                return make_connection_smb1(sconn,
                                             vuser->homes_snum,
                                             vuser, no_pw, 
@@ -1272 +1359 @@
         DEBUG(5, ("making a connection to 'normal' service %s\n", service));
 
-        return make_connection_snum(sconn, snum, vuser,
+        return make_connection_smb1(sconn, snum, vuser,
                                     password,
                                     dev, status);