diff options
| author | Jeremy Allison <jra@samba.org> | 2005-05-06 08:07:39 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:56:47 -0500 |
| commit | 02e3717ee9e045d197d845489e84ac40083ca868 (patch) | |
| tree | dddd1100fcec3249f31741b8564d635396873775 /source3/smbd/reply.c | |
| parent | 61ffe158f2d3f149b230cc31c4b58d7d025ab28d (diff) | |
| download | samba-02e3717ee9e045d197d845489e84ac40083ca868.tar.gz samba-02e3717ee9e045d197d845489e84ac40083ca868.tar.bz2 samba-02e3717ee9e045d197d845489e84ac40083ca868.zip | |
r6625: Remove another global variable left over from a long time ago (magic char).
Jeremy.
(This used to be commit b1bfa9cb37deb22d1d08bc60ba44d61334f6446e)
Diffstat (limited to 'source3/smbd/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index aa33e59b7e..d39b9a20d3 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -30,7 +30,6 @@ extern enum protocol_types Protocol; extern int max_send; extern int max_recv; -extern char magic_char; extern int global_oplock_break; unsigned int smb_echo_count = 0; extern uint32 global_client_caps; @@ -1753,7 +1752,7 @@ NTSTATUS unlink_internals(connection_struct *conn, int dirtype, char *name) * Tine Smukavec <valentin.smukavec@hermes.si>. */ - if (!rc && mangle_is_mangled(mask)) + if (!rc && mangle_is_mangled(mask,SNUM(conn))) mangle_check_cache( mask, sizeof(pstring)-1 ); if (!has_wild) { @@ -4055,7 +4054,7 @@ NTSTATUS rename_internals(connection_struct *conn, char *name, char *newname, ui * Tine Smukavec <valentin.smukavec@hermes.si>. */ - if (!rc && mangle_is_mangled(mask)) + if (!rc && mangle_is_mangled(mask,SNUM(conn))) mangle_check_cache( mask, sizeof(pstring)-1 ); has_wild = ms_has_wild(mask); @@ -4064,7 +4063,7 @@ NTSTATUS rename_internals(connection_struct *conn, char *name, char *newname, ui /* * No wildcards - just process the one file. */ - BOOL is_short_name = mangle_is_8_3(name, True); + BOOL is_short_name = mangle_is_8_3(name, True, SNUM(conn)); /* Add a terminating '/' to the directory name. */ pstrcat(directory,"/"); @@ -4536,7 +4535,7 @@ int reply_copy(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, * Tine Smukavec <valentin.smukavec@hermes.si>. */ - if (!rc && mangle_is_mangled(mask)) + if (!rc && mangle_is_mangled(mask, SNUM(conn))) mangle_check_cache( mask, sizeof(pstring)-1 ); has_wild = ms_has_wild(mask); |