summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-09-04 23:40:49 +0000
committerJeremy Allison <jra@samba.org>2002-09-04 23:40:49 +0000
commit2658e4ee23600e49a4231bc2b40c20a571c3f826 (patch)
treebc9bbec7ce10de6e2cd7a366ccc55f2769a1e2ac /source3
parentcc5088b5f4174a7f44004746d3c7d395d51441ff (diff)
downloadsamba-2658e4ee23600e49a4231bc2b40c20a571c3f826.tar.gz
samba-2658e4ee23600e49a4231bc2b40c20a571c3f826.tar.bz2
samba-2658e4ee23600e49a4231bc2b40c20a571c3f826.zip
Added better error code on out of space. Removed total jobs check - not
applicable any more. Jeremy. (This used to be commit 8828e2ea3c668aab6cda1b4be9a7e4ce1c23ca81)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/doserr.h13
-rw-r--r--source3/printing/printing.c49
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c7
3 files changed, 16 insertions, 53 deletions
diff --git a/source3/include/doserr.h b/source3/include/doserr.h
index 135d799596..93936463e6 100644
--- a/source3/include/doserr.h
+++ b/source3/include/doserr.h
@@ -148,17 +148,20 @@
/* these are win32 error codes. There are only a few places where
these matter for Samba, primarily in the NT printing code */
#define WERR_OK W_ERROR(0)
+#define WERR_BADFUNC W_ERROR(1)
#define WERR_BADFILE W_ERROR(2)
#define WERR_ACCESS_DENIED W_ERROR(5)
#define WERR_BADFID W_ERROR(6)
-#define WERR_BADFUNC W_ERROR(1)
-#define WERR_INSUFFICIENT_BUFFER W_ERROR(122)
+#define WERR_NOMEM W_ERROR(8)
+#define WERR_GENERAL_FAILURE W_ERROR(31)
+#define WERR_NOT_SUPPORTED W_ERROR(50)
+#define WERR_PRINTQ_FULL W_ERROR(61)
+#define WERR_NO_SPOOL_SPACE W_ERROR(62)
#define WERR_NO_SUCH_SHARE W_ERROR(67)
#define WERR_ALREADY_EXISTS W_ERROR(80)
-#define WERR_INVALID_PARAM W_ERROR(87)
-#define WERR_NOT_SUPPORTED W_ERROR(50)
#define WERR_BAD_PASSWORD W_ERROR(86)
-#define WERR_NOMEM W_ERROR(8)
+#define WERR_INVALID_PARAM W_ERROR(87)
+#define WERR_INSUFFICIENT_BUFFER W_ERROR(122)
#define WERR_INVALID_NAME W_ERROR(123)
#define WERR_UNKNOWN_LEVEL W_ERROR(124)
#define WERR_OBJECT_PATH_INVALID W_ERROR(161)
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 0dacfe820c..c6a210d018 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -1265,42 +1265,6 @@ int print_queue_length(int snum, print_status_struct *pstatus)
return len;
}
-#if 0 /* JRATEST */
-/****************************************************************************
- Determine the number of jobs in all queues. This is very expensive. Don't
- call ! JRA.
-****************************************************************************/
-
-static int get_total_jobs(void)
-{
- int total_jobs = 0;
- int snum;
- int services = lp_numservices();
-
- for (snum = 0; snum < services; snum++) {
- struct tdb_print_db *pdb;
- int jobs;
-
- if (!lp_print_ok(snum))
- continue;
-
- pdb = get_print_db_byname(lp_const_servicename(snum));
- if (!pdb)
- continue;
-
- /* make sure the database is up to date */
- if (print_cache_expired(snum))
- print_queue_update(snum);
-
- jobs = tdb_fetch_int32(pdb->tdb, "INFO/total_jobs");
- if (jobs > 0)
- total_jobs += jobs;
- release_print_db(pdb);
- }
- return total_jobs;
-}
-#endif /* JRATEST */
-
/***************************************************************************
Start spooling a job - return the jobid.
***************************************************************************/
@@ -1364,17 +1328,6 @@ uint32 print_job_start(struct current_user *user, int snum, char *jobname)
return (uint32)-1;
}
-#if 0 /* JRATEST */
- /* Insure the maximum print jobs in the system is not violated */
- if (lp_totalprintjobs() && get_total_jobs() > lp_totalprintjobs()) {
- DEBUG(3, ("print_job_start: number of jobs (%d) larger than max printjobs per system (%d).\n",
- njobs, lp_totalprintjobs() ));
- release_print_db(pdb);
- errno = ENOSPC;
- return (uint32)-1;
- }
-#endif /* JRATEST */
-
/* create the database entry */
ZERO_STRUCT(pjob);
pjob.pid = local_pid;
@@ -1445,7 +1398,7 @@ to open spool file %s.\n", pjob.filename));
goto fail;
}
- pjob_store(snum, jobid, &pjob, False);
+ pjob_store(snum, jobid, &pjob, True);
release_print_db(pdb);
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index a20fa615fd..0236057475 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5159,6 +5159,13 @@ WERROR _spoolss_writeprinter(pipes_struct *p, SPOOL_Q_WRITEPRINTER *q_u, SPOOL_R
return WERR_BADFID;
(*buffer_written) = print_job_write(snum, Printer->jobid, (char *)buffer, buffer_size);
+ if (*buffer_written == -1) {
+ r_u->buffer_written = 0;
+ if (errno == ENOSPC)
+ return WERR_NO_SPOOL_SPACE;
+ else
+ return WERR_ACCESS_DENIED;
+ }
r_u->buffer_written = q_u->buffer_size2;