r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need

[vlendec/samba-autobuild/.git] / source3 / printing / nt_printing.c

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index bcdf0e046257fa4e7b0d826fcc097180fafa7a11..4b71f6e0b6688f1173d814f18c7f6e5c8797effc 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -1281,6 +1281,8 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file, fstr
        SMB_STRUCT_STAT stat_buf;
        BOOL bad_path;
 
+       NTSTATUS status;
+
        SET_STAT_INVALID(st);
        SET_STAT_INVALID(stat_buf);
        new_create_time = (time_t)0;
@@ -1291,16 +1293,16 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file, fstr
 
        driver_unix_convert(filepath,conn,NULL,&bad_path,&stat_buf);
 
-       fsp = open_file_ntcreate(conn, filepath, &stat_buf,
+       status = open_file_ntcreate(conn, filepath, &stat_buf,
                                FILE_GENERIC_READ,
                                FILE_SHARE_READ|FILE_SHARE_WRITE,
                                FILE_OPEN,
                                0,
                                FILE_ATTRIBUTE_NORMAL,
                                INTERNAL_OPEN_ONLY,
-                               NULL);
+                               NULL, &fsp);
 
-       if (!fsp) {
+       if (!NT_STATUS_IS_OK(status)) {
                /* Old file not found, so by definition new file is in fact newer */
                DEBUG(10,("file_version_is_newer: Can't open old file [%s], errno = %d\n",
                                filepath, errno));
@@ -1327,16 +1329,16 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file, fstr
        pstrcpy(filepath, new_file);
        driver_unix_convert(filepath,conn,NULL,&bad_path,&stat_buf);
 
-       fsp = open_file_ntcreate(conn, filepath, &stat_buf,
+       status = open_file_ntcreate(conn, filepath, &stat_buf,
                                FILE_GENERIC_READ,
                                FILE_SHARE_READ|FILE_SHARE_WRITE,
                                FILE_OPEN,
                                0,
                                FILE_ATTRIBUTE_NORMAL,
                                INTERNAL_OPEN_ONLY,
-                               NULL);
+                               NULL, &fsp);
 
-       if (!fsp) {
+       if (!NT_STATUS_IS_OK(status)) {
                /* New file not found, this shouldn't occur if the caller did its job */
                DEBUG(3,("file_version_is_newer: Can't open new file [%s], errno = %d\n",
                                filepath, errno));
@@ -1405,6 +1407,7 @@ static uint32 get_correct_cversion(const char *architecture, fstring driverpath_
        BOOL              bad_path;
        SMB_STRUCT_STAT   st;
        connection_struct *conn;
+       NTSTATUS status;
 
        SET_STAT_INVALID(st);
 
@@ -1460,16 +1463,16 @@ static uint32 get_correct_cversion(const char *architecture, fstring driverpath_
                goto error_exit;
        }
 
-       fsp = open_file_ntcreate(conn, driverpath, &st,
+       status = open_file_ntcreate(conn, driverpath, &st,
                                FILE_GENERIC_READ,
                                FILE_SHARE_READ|FILE_SHARE_WRITE,
                                FILE_OPEN,
                                0,
                                FILE_ATTRIBUTE_NORMAL,
                                INTERNAL_OPEN_ONLY,
-                               NULL);
+                               NULL, &fsp);
 
-       if (!fsp) {
+       if (!NT_STATUS_IS_OK(status)) {
                DEBUG(3,("get_correct_cversion: Can't open file [%s], errno = %d\n",
                                driverpath, errno));
                *perr = WERR_ACCESS_DENIED;
@@ -4368,7 +4371,8 @@ WERROR get_a_printer( Printer_entry *print_hnd, NT_PRINTER_INFO_LEVEL **pp_print
                                fstrcpy( servername, print_hnd->servername );
                        else {
                                fstrcpy( servername, "%L" );
-                               standard_sub_basic( "", servername, sizeof(servername)-1 );
+                               standard_sub_basic( "", "", servername,
+                                                   sizeof(servername)-1 );
                        }
 
                        result = get_a_printer_2( (*pp_printer)->info_2, servername, sharename );
@@ -5441,7 +5445,7 @@ BOOL print_access_check(struct current_user *user, int snum, int access_type)
  Check the time parameters allow a print operation.
 *****************************************************************************/
 
-BOOL print_time_access_check(int snum)
+BOOL print_time_access_check(const char *servicename)
 {
        NT_PRINTER_INFO_LEVEL *printer = NULL;
        BOOL ok = False;
@@ -5449,7 +5453,7 @@ BOOL print_time_access_check(int snum)
        struct tm *t;
        uint32 mins;
 
-       if (!W_ERROR_IS_OK(get_a_printer(NULL, &printer, 2, lp_servicename(snum))))
+       if (!W_ERROR_IS_OK(get_a_printer(NULL, &printer, 2, servicename)))
                return False;
 
        if (printer->info_2->starttime == 0 && printer->info_2->untiltime == 0)