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/dosmode.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/dosmode.c')
| -rw-r--r-- | source3/smbd/dosmode.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c index baf235d3fe..928d48c351 100644 --- a/source3/smbd/dosmode.c +++ b/source3/smbd/dosmode.c @@ -455,13 +455,12 @@ uint32 dos_mode_msdfs(connection_struct *conn, /* Optimization : Only call is_hidden_path if it's not already hidden. */ if (!(result & aHIDDEN) && - is_in_path(smb_fname->base_name, conn->hide_list, - get_Protocol(conn->sconn), + is_in_path(smb_fname->base_name, conn->hide_list, get_Protocol(), conn->case_sensitive)) { result |= aHIDDEN; } - if (get_Protocol(conn->sconn) <= PROTOCOL_LANMAN2) { + if (get_Protocol() <= PROTOCOL_LANMAN2) { DEBUG(10,("dos_mode_msdfs : filtering result 0x%x\n", (unsigned int)result )); result &= 0xff; @@ -643,13 +642,12 @@ uint32 dos_mode(connection_struct *conn, struct smb_filename *smb_fname) /* Optimization : Only call is_hidden_path if it's not already hidden. */ if (!(result & aHIDDEN) && - is_in_path(smb_fname->base_name, conn->hide_list, - get_Protocol(conn->sconn), + is_in_path(smb_fname->base_name, conn->hide_list, get_Protocol(), conn->case_sensitive)) { result |= aHIDDEN; } - if (get_Protocol(conn->sconn) <= PROTOCOL_LANMAN2) { + if (get_Protocol() <= PROTOCOL_LANMAN2) { DEBUG(10,("dos_mode : filtering result 0x%x\n", (unsigned int)result )); result &= 0xff; |