summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/util.c2
-rw-r--r--source3/smbd/server.c9
2 files changed, 9 insertions, 2 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 750ca0f3ab..2bd7636fb0 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -234,7 +234,7 @@ static void check_log_size(void)
pstring name;
fclose(dbf); dbf = NULL;
slprintf(name,sizeof(name)-1,"%s.old",debugf);
- sys_rename(debugf,name);
+ rename(debugf,name);
reopen_logs();
}
}
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 300e8d28e8..e167941ccb 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1512,7 +1512,14 @@ static void open_file(int fnum,int cnum,char *fname1,int flags,int mode, struct
fsp->granted_oplock = False;
fsp->sent_oplock_break = False;
fsp->cnum = cnum;
- string_set(&fsp->name,dos_to_unix(fname,False));
+ /*
+ * Note that the file name here is the *untranslated* name
+ * ie. it is still in the DOS codepage sent from the client.
+ * All use of this filename will pass though the sys_xxxx
+ * functions which will do the dos_to_unix translation before
+ * mapping into a UNIX filename. JRA.
+ */
+ string_set(&fsp->name,fname);
fsp->wbmpx_ptr = NULL;
/*