summaryrefslogtreecommitdiff
path: root/source3/printing/nt_printing.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-11-27 23:59:42 +0000
committerJeremy Allison <jra@samba.org>2000-11-27 23:59:42 +0000
commit0f1c800f8542297b9c1a6a4dff20263e3b6d9d40 (patch)
tree426b829c4680972d57e606f81f2af0f84a1d86ca /source3/printing/nt_printing.c
parent120f3afa899eac9a03643ce3e81264d245e09d3d (diff)
downloadsamba-0f1c800f8542297b9c1a6a4dff20263e3b6d9d40.tar.gz
samba-0f1c800f8542297b9c1a6a4dff20263e3b6d9d40.tar.bz2
samba-0f1c800f8542297b9c1a6a4dff20263e3b6d9d40.zip
passdb/secrets.c passdb/smbpassfile.c smbd/server.c : Actually *use* the code
written to transition from an old DOMAIN.MACHINE.MAC file to secrets.tdb. printing/nt_printing.c: Fix case insensitive name lookups for driver files. John - this should fix the Win9x/WinME problem correctly. Jeremy. (This used to be commit 8f3332a9acf413ac5d12053ca5c52733a4e946cc)
Diffstat (limited to 'source3/printing/nt_printing.c')
-rw-r--r--source3/printing/nt_printing.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index bbe01b87f6..af2be89e23 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -353,6 +353,7 @@ static uint32 get_correct_cversion(fstring architecture, fstring driverpath_in,
fstring user_name;
fstring null_pw;
files_struct *fsp = NULL;
+ BOOL bad_path;
SMB_STRUCT_STAT st;
struct passwd *pass;
connection_struct *conn;
@@ -404,6 +405,9 @@ static uint32 get_correct_cversion(fstring architecture, fstring driverpath_in,
/* Open the driver file (Portable Executable format) and determine the
* deriver the cversion. */
slprintf(driverpath, sizeof(driverpath), "%s/%s", architecture, driverpath_in);
+
+ unix_convert(driverpath,conn,NULL,&bad_path,&st);
+
fsp = open_file_shared(conn, driverpath, &st,
SET_OPEN_MODE(DOS_OPEN_RDONLY),
(FILE_FAIL_IF_NOT_EXIST|FILE_EXISTS_OPEN),
@@ -956,7 +960,8 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file,
files_struct *fsp = NULL;
SMB_STRUCT_STAT st;
SMB_STRUCT_STAT stat_buf;
-
+ BOOL bad_path;
+
ZERO_STRUCT(st);
ZERO_STRUCT(stat_buf);
new_create_time = (time_t)0;
@@ -965,6 +970,8 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file,
/* Get file version info (if available) for previous file (if it exists) */
pstrcpy(filepath, old_file);
+ unix_convert(filepath,conn,NULL,&bad_path,&stat_buf);
+
fsp = open_file_shared(conn, filepath, &stat_buf,
SET_OPEN_MODE(DOS_OPEN_RDONLY),
(FILE_FAIL_IF_NOT_EXIST|FILE_EXISTS_OPEN),
@@ -994,6 +1001,8 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file,
/* Get file version info (if available) for new file */
pstrcpy(filepath, new_file);
+ unix_convert(filepath,conn,NULL,&bad_path,&stat_buf);
+
fsp = open_file_shared(conn, filepath, &stat_buf,
SET_OPEN_MODE(DOS_OPEN_RDONLY),
(FILE_FAIL_IF_NOT_EXIST|FILE_EXISTS_OPEN),