Changeset 732 for branches/samba-3.5.x/source3/libsmb

Timestamp:

Nov 12, 2012, 4:35:55 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.12

Location:

branches/samba-3.5.x/source3/libsmb

Files:

• cliconnect.c (modified) (4 diffs)
• clifile.c (modified) (6 diffs)

branches/samba-3.5.x/source3/libsmb/cliconnect.c

@@ -1075 +1075 @@
                         if (dest_realm) {
                                 realm = SMB_STRDUP(dest_realm);
+                                if (!realm) {
+                                        return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
+                                }
                                 strupper_m(realm);
                         } else {
@@ -1086 +1089 @@
                         }
 
-                        if (realm && *realm) {
-                                principal = talloc_asprintf(talloc_tos(),
-                                                            "cifs/%s@%s",
-                                                            cli->desthost,
-                                                            realm);
-                                if (!principal) {
-                                        SAFE_FREE(realm);
+                        if (realm == NULL || *realm == '\0') {
+                                realm = SMB_STRDUP(lp_realm());
+                                if (!realm) {
                                         return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
                                 }
-                                DEBUG(3,("cli_session_setup_spnego: guessed "
-                                        "server principal=%s\n",
-                                        principal ? principal : "<null>"));
+                                strupper_m(realm);
+                                DEBUG(3,("cli_session_setup_spnego: cannot "
+                                        "get realm from dest_realm %s, "
+                                        "desthost %s. Using default "
+                                        "smb.conf realm %s\n",
+                                        dest_realm ? dest_realm : "<null>",
+                                        cli->desthost,
+                                        realm));
                         }
+
+                        principal = talloc_asprintf(talloc_tos(),
+                                                    "cifs/%s@%s",
+                                                    cli->desthost,
+                                                    realm);
+                        if (!principal) {
+                                SAFE_FREE(realm);
+                                return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
+                        }
+                        DEBUG(3,("cli_session_setup_spnego: guessed "
+                                "server principal=%s\n",
+                                principal ? principal : "<null>"));
+
                         SAFE_FREE(realm);
                 }
@@ -1700 +1717 @@
                 struct timespec ts;
                 bool negotiated_smb_signing = false;
+
+                if (wct != 0x11) {
+                        tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                        return;
+                }
 
                 /* NT protocol */
@@ -1766 +1788 @@
 
         } else if (cli->protocol >= PROTOCOL_LANMAN1) {
+                if (wct != 0x0D) {
+                        tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+                        return;
+                }
+
                 cli->use_spnego = False;
                 cli->sec_mode = SVAL(vwv + 1, 0);

branches/samba-3.5.x/source3/libsmb/clifile.c

@@ -2150 +2150 @@
 
 struct cli_open_state {
+        struct tevent_context *ev;
+        struct cli_state *cli;
+        const char *fname;
         uint16_t vwv[15];
         uint16_t fnum;
+        unsigned openfn;
+        unsigned dos_deny;
+        uint8_t additional_flags;
         struct iovec bytes;
 };
 
 static void cli_open_done(struct tevent_req *subreq);
+static void cli_open_ntcreate_done(struct tevent_req *subreq);
 
 struct tevent_req *cli_open_create(TALLOC_CTX *mem_ctx,
@@ -2165 +2172 @@
         struct tevent_req *req, *subreq;
         struct cli_open_state *state;
-        unsigned openfn;
-        unsigned accessmode;
-        uint8_t additional_flags;
         uint8_t *bytes;
 
@@ -2174 +2178 @@
                 return NULL;
         }
-
-        openfn = 0;
+        state->ev = ev;
+        state->cli = cli;
+        state->fname = fname;
+
         if (flags & O_CREAT) {
-                openfn |= (1<<4);
+                state->openfn |= (1<<4);
         }
         if (!(flags & O_EXCL)) {
                 if (flags & O_TRUNC)
-                        openfn |= (1<<1);
+                        state->openfn |= (1<<1);
                 else
-                        openfn |= (1<<0);
-        }
-
-        accessmode = (share_mode<<4);
+                        state->openfn |= (1<<0);
+        }
+
+        state->dos_deny = (share_mode<<4);
 
         if ((flags & O_ACCMODE) == O_RDWR) {
-                accessmode |= 2;
+                state->dos_deny |= 2;
         } else if ((flags & O_ACCMODE) == O_WRONLY) {
-                accessmode |= 1;
+                state->dos_deny |= 1;
         }
 
 #if defined(O_SYNC)
         if ((flags & O_SYNC) == O_SYNC) {
-                accessmode |= (1<<14);
+                state->dos_deny |= (1<<14);
         }
 #endif /* O_SYNC */
 
         if (share_mode == DENY_FCB) {
-                accessmode = 0xFF;
+                state->dos_deny = 0xFF;
         }
 
@@ -2208 +2214 @@
         SSVAL(state->vwv + 1, 0, 0);
         SSVAL(state->vwv + 2, 0, 0);  /* no additional info */
-        SSVAL(state->vwv + 3, 0, accessmode);
+        SSVAL(state->vwv + 3, 0, state->dos_deny);
         SSVAL(state->vwv + 4, 0, aSYSTEM | aHIDDEN);
         SSVAL(state->vwv + 5, 0, 0);
         SIVAL(state->vwv + 6, 0, 0);
-        SSVAL(state->vwv + 8, 0, openfn);
+        SSVAL(state->vwv + 8, 0, state->openfn);
         SIVAL(state->vwv + 9, 0, 0);
         SIVAL(state->vwv + 11, 0, 0);
         SIVAL(state->vwv + 13, 0, 0);
 
-        additional_flags = 0;
-
         if (cli->use_oplocks) {
                 /* if using oplocks then ask for a batch oplock via
                    core and extended methods */
-                additional_flags =
+                state->additional_flags =
                         FLAG_REQUEST_OPLOCK|FLAG_REQUEST_BATCH_OPLOCK;
                 SSVAL(state->vwv+2, 0, SVAL(state->vwv+2, 0) | 6);
@@ -2238 +2242 @@
         state->bytes.iov_len = talloc_get_size(bytes);
 
-        subreq = cli_smb_req_create(state, ev, cli, SMBopenX, additional_flags,
+        subreq = cli_smb_req_create(state, ev, cli, SMBopenX,
+                                    state->additional_flags,
                                     15, state->vwv, 1, &state->bytes);
         if (subreq == NULL) {
@@ -2279 +2284 @@
         uint16_t *vwv;
         NTSTATUS status;
+        uint32_t access_mask, share_mode, create_disposition, create_options;
 
         status = cli_smb_recv(subreq, 3, &wct, &vwv, NULL, NULL);
-        if (!NT_STATUS_IS_OK(status)) {
-                TALLOC_FREE(subreq);
+        TALLOC_FREE(subreq);
+
+        if (NT_STATUS_IS_OK(status)) {
+                state->fnum = SVAL(vwv+2, 0);
+                tevent_req_done(req);
+                return;
+        }
+
+        if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
                 tevent_req_nterror(req, status);
                 return;
         }
-        state->fnum = SVAL(vwv+2, 0);
+
+        /*
+         * For the new shiny OS/X Lion SMB server, try a ntcreate
+         * fallback.
+         */
+
+        if (!map_open_params_to_ntcreate(state->fname, state->dos_deny,
+                                        state->openfn, &access_mask,
+                                        &share_mode, &create_disposition,
+                                        &create_options)) {
+                tevent_req_nterror(req, NT_STATUS_NOT_SUPPORTED);
+                return;
+        }
+
+        subreq = cli_ntcreate_send(state, state->ev, state->cli,
+                                state->fname, 0, access_mask,
+                                0, share_mode, create_disposition,
+                                create_options, 0);
+        if (tevent_req_nomem(subreq, req)) {
+                return;
+        }
+        tevent_req_set_callback(subreq, cli_open_ntcreate_done, req);
+}
+
+static void cli_open_ntcreate_done(struct tevent_req *subreq)
+{
+        struct tevent_req *req = tevent_req_callback_data(
+                subreq, struct tevent_req);
+        struct cli_open_state *state = tevent_req_data(
+                req, struct cli_open_state);
+        NTSTATUS status;
+
+        status = cli_ntcreate_recv(subreq, &state->fnum);
+        TALLOC_FREE(subreq);
+
+        if (!NT_STATUS_IS_OK(status)) {
+                tevent_req_nterror(req, status);
+                return;
+        }
         tevent_req_done(req);
 }