diff options
| author | Volker Lendecke <vl@samba.org> | 2009-11-23 16:33:26 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-11-23 16:34:59 +0100 |
| commit | 0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6 (patch) | |
| tree | 5ac6a5d6276f2645e0d4f2ae89c92420bd66985f /source3/smbd/trans2.c | |
| parent | 81c46686db36eaffd25c013f19094b01a8406c6a (diff) | |
| download | samba-0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6.tar.gz samba-0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6.tar.bz2 samba-0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6.zip | |
Revert "s3: Move the global variable Protocol to struct smbd_server_connection"
This reverts commit c85a4c9ba4a7de65a7850f6f9708df66bd24deea.
Diffstat (limited to 'source3/smbd/trans2.c')
| -rw-r--r-- | source3/smbd/trans2.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 5618f0282d..8226b6c428 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -1368,8 +1368,7 @@ static bool smbd_dirptr_lanman2_match_fn(TALLOC_CTX *ctx, fname, mask); state->got_exact_match = got_match; if (!got_match) { - got_match = mask_match(fname, mask, - get_Protocol(state->conn->sconn), + got_match = mask_match(fname, mask, get_Protocol(), state->conn->case_sensitive); } @@ -1393,10 +1392,9 @@ static bool smbd_dirptr_lanman2_match_fn(TALLOC_CTX *ctx, mangled_name, mask); state->got_exact_match = got_match; if (!got_match) { - got_match = mask_match( - mangled_name, mask, - get_Protocol(state->conn->sconn), - state->conn->case_sensitive); + got_match = mask_match(mangled_name, mask, + get_Protocol(), + state->conn->case_sensitive); } } @@ -2467,7 +2465,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd if(numentries == 0) { dptr_close(sconn, &dptr_num); - if (get_Protocol(sconn) < PROTOCOL_NT1) { + if (get_Protocol() < PROTOCOL_NT1) { reply_doserror(req, ERRDOS, ERRnofiles); goto out; } else { @@ -8149,7 +8147,7 @@ void reply_findnclose(struct smb_request *req) static void handle_trans2(connection_struct *conn, struct smb_request *req, struct trans_state *state) { - if (get_Protocol(req->sconn) >= PROTOCOL_NT1) { + if (get_Protocol() >= PROTOCOL_NT1) { req->flags2 |= 0x40; /* IS_LONG_NAME */ SSVAL(req->inbuf,smb_flg2,req->flags2); } |