The branch, master has been updated
via 473c558937303226c1200ad01bad3920fc8a51f6 (commit)
via 46bb22fe5e9f88a705f4842b12ce4343879c339c (commit)
from 0f58db81585316103b9c9c26223121f451e1cfa9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 473c558937303226c1200ad01bad3920fc8a51f6
Author: Günther Deschner <[email protected]>
Date: Tue Feb 10 15:11:29 2009 +0100
s3-rpcclient: use one macro for all printername formats.
Guenther
commit 46bb22fe5e9f88a705f4842b12ce4343879c339c
Author: Günther Deschner <[email protected]>
Date: Tue Feb 10 13:55:03 2009 +0100
s3-spoolss: remove more whitespace.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/printing/printing.c | 270 +++++++++++++++++++-------------------
source3/rpcclient/cmd_spoolss.c | 168 ++++++++-----------------
2 files changed, 186 insertions(+), 252 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 0721713..17ddc55 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -1,20 +1,20 @@
-/*
+/*
Unix SMB/Netbios implementation.
Version 3.0
printing backend routines
Copyright (C) Andrew Tridgell 1992-2000
Copyright (C) Jeremy Allison 2002
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -28,10 +28,10 @@ extern userdom_struct current_user_info;
/* Current printer interface */
static bool remove_from_jobs_changed(const char* sharename, uint32 jobid);
-/*
+/*
the printing backend revolves around a tdb database that stores the
- SMB view of the print queue
-
+ SMB view of the print queue
+
The key for this database is a jobid - a internally generated number that
uniquely identifies a print job
@@ -39,7 +39,7 @@ static bool remove_from_jobs_changed(const char* sharename,
uint32 jobid);
- possibly running lpq and updating the internal database from that
- reading entries from the database
- jobids are assigned when a job starts spooling.
+ jobids are assigned when a job starts spooling.
*/
static TDB_CONTEXT *rap_tdb;
@@ -114,7 +114,7 @@ bool rap_to_pjobid(uint16 rap_jobid, fstring sharename,
uint32 *pjobid)
key.dptr = buf;
key.dsize = sizeof(rap_jobid);
data = tdb_fetch(rap_tdb, key);
- if ( data.dptr && data.dsize == sizeof(struct rap_jobid_key) )
+ if ( data.dptr && data.dsize == sizeof(struct rap_jobid_key) )
{
struct rap_jobid_key *jinfo = (struct rap_jobid_key*)data.dptr;
fstrcpy( sharename, jinfo->sharename );
@@ -223,10 +223,10 @@ void printing_end(void)
}
/****************************************************************************
- Retrieve the set of printing functions for a given service. This allows
+ Retrieve the set of printing functions for a given service. This allows
us to set the printer function table based on the value of the 'printing'
service parameter.
-
+
Use the generic interface as the default and only use cups interface only
when asked for (and only when supported)
****************************************************************************/
@@ -248,7 +248,7 @@ static struct printif *get_printer_fns_from_type( enum
printing_types type )
#endif /* HAVE_IPRINT */
printer_fns->type = type;
-
+
return printer_fns;
}
@@ -273,9 +273,9 @@ static TDB_DATA print_key(uint32 jobid, uint32 *tmp)
}
/***********************************************************************
- unpack a pjob from a tdb buffer
+ unpack a pjob from a tdb buffer
***********************************************************************/
-
+
int unpack_pjob( uint8 *buf, int buflen, struct printjob *pjob )
{
int len = 0;
@@ -285,7 +285,7 @@ int unpack_pjob( uint8 *buf, int buflen, struct printjob
*pjob )
if ( !buf || !pjob )
return -1;
-
+
len += tdb_unpack(buf+len, buflen-len, "dddddddddffff",
&pjpid,
&pjsysjob,
@@ -300,13 +300,13 @@ int unpack_pjob( uint8 *buf, int buflen, struct printjob
*pjob )
pjob->jobname,
pjob->user,
pjob->queuename);
-
+
if ( len == -1 )
return -1;
-
+
if ( (used = unpack_devicemode(&pjob->nt_devmode, buf+len, buflen-len))
== -1 )
return -1;
-
+
len += used;
pjob->pid = pjpid;
@@ -318,7 +318,7 @@ int unpack_pjob( uint8 *buf, int buflen, struct printjob
*pjob )
pjob->page_count = pjpage_count;
pjob->spooled = pjspooled;
pjob->smbjob = pjsmbjob;
-
+
return len;
}
@@ -479,13 +479,13 @@ static void pjob_store_notify(const char* sharename,
uint32 jobid, struct printj
/* Job attributes that can't be changed. We only send
notification for these on a new job. */
- /* ACHTUNG! Due to a bug in Samba's spoolss parsing of the
- NOTIFY_INFO_DATA buffer, we *have* to send the job submission
- time first or else we'll end up with potential alignment
- errors. I don't think the systemtime should be spooled as
- a string, but this gets us around that error.
- --jerry (i'll feel dirty for this) */
-
+ /* ACHTUNG! Due to a bug in Samba's spoolss parsing of the
+ NOTIFY_INFO_DATA buffer, we *have* to send the job submission
+ time first or else we'll end up with potential alignment
+ errors. I don't think the systemtime should be spooled as
+ a string, but this gets us around that error.
+ --jerry (i'll feel dirty for this) */
+
if (new_job) {
notify_job_submitted(sharename, jobid, new_data->starttime);
notify_job_username(sharename, jobid, new_data->user);
@@ -522,7 +522,7 @@ static bool pjob_store(const char* sharename, uint32 jobid,
struct printjob *pjo
struct tdb_print_db *pdb = get_print_db_byname(sharename);
uint8 *buf = NULL;
int len, newlen, buflen;
-
+
if (!pdb)
return False;
@@ -534,7 +534,7 @@ static bool pjob_store(const char* sharename, uint32 jobid,
struct printjob *pjo
/* Doh! Now we have to pack/unpack data since the NT_DEVICEMODE was
added */
newlen = 0;
-
+
do {
len = 0;
buflen = newlen;
@@ -554,7 +554,7 @@ static bool pjob_store(const char* sharename, uint32 jobid,
struct printjob *pjo
pjob->queuename);
len += pack_devicemode(pjob->nt_devmode, buf+len, buflen-len);
-
+
if (buflen != len) {
buf = (uint8 *)SMB_REALLOC(buf, len);
if (!buf) {
@@ -564,8 +564,8 @@ static bool pjob_store(const char* sharename, uint32 jobid,
struct printjob *pjo
newlen = len;
}
} while ( buflen != len );
-
-
+
+
/* Store new data */
new_data.dptr = buf;
@@ -629,10 +629,10 @@ void pjob_delete(const char* sharename, uint32 jobid)
/* We must cycle through JOB_STATUS_DELETING and
JOB_STATUS_DELETED for the port monitor to delete the job
properly. */
-
+
job_status = JOB_STATUS_DELETING|JOB_STATUS_DELETED;
notify_job_status(sharename, jobid, job_status);
-
+
/* Remove from printing.tdb */
tdb_delete(pdb->tdb, print_key(jobid, &tmp));
@@ -668,7 +668,7 @@ static void print_unix_job(const char *sharename,
print_queue_struct *q, uint32
{
struct printjob pj, *old_pj;
- if (jobid == (uint32)-1)
+ if (jobid == (uint32)-1)
jobid = q->job + UNIX_JOB_START;
/* Preserve the timestamp on an existing unix print job */
@@ -721,7 +721,7 @@ static int traverse_fn_delete(TDB_CONTEXT *t, TDB_DATA key,
TDB_DATA data, void
if ( key.dsize != sizeof(jobid) )
return 0;
-
+
jobid = IVAL(key.dptr, 0);
if ( unpack_pjob( data.dptr, data.dsize, &pjob ) == -1 )
return 0;
@@ -741,7 +741,7 @@ static int traverse_fn_delete(TDB_CONTEXT *t, TDB_DATA key,
TDB_DATA data, void
(unsigned int)jobid ));
pjob_delete(ts->sharename, jobid);
return 0;
- }
+ }
/* need to continue the the bottom of the function to
save the correct attributes */
@@ -762,7 +762,7 @@ static int traverse_fn_delete(TDB_CONTEXT *t, TDB_DATA key,
TDB_DATA data, void
}
/* this check only makes sense for jobs submitted from Windows clients
*/
-
+
if ( pjob.smbjob ) {
for (i=0;i<ts->qcount;i++) {
uint32 curr_jobid;
@@ -779,7 +779,7 @@ static int traverse_fn_delete(TDB_CONTEXT *t, TDB_DATA key,
TDB_DATA data, void
if ( pjob.status == LPQ_DELETING ) {
int result;
- result = (*(ts->print_if->job_delete))(
+ result = (*(ts->print_if->job_delete))(
ts->sharename,
ts->lprm_command, &pjob );
if ( result != 0 ) {
@@ -792,14 +792,14 @@ static int traverse_fn_delete(TDB_CONTEXT *t, TDB_DATA
key, TDB_DATA data, void
pjob_delete(ts->sharename,
jobid);
pjob.status = LPQ_DELETED;
}
-
+
}
break;
}
}
}
-
+
/* The job isn't in the system queue - we have to assume it has
completed, so delete the database entry. */
@@ -823,11 +823,11 @@ static int traverse_fn_delete(TDB_CONTEXT *t, TDB_DATA
key, TDB_DATA data, void
return 0;
}
- /* Save the pjob attributes we will store.
- FIXME!!! This is the only place where queue->job
+ /* Save the pjob attributes we will store.
+ FIXME!!! This is the only place where queue->job
represents the SMB jobid --jerry */
- ts->queue[i].job = jobid;
+ ts->queue[i].job = jobid;
ts->queue[i].size = pjob.size;
ts->queue[i].page_count = pjob.page_count;
ts->queue[i].status = pjob.status;
@@ -901,7 +901,7 @@ static void set_updating_pid(const fstring sharename, bool
updating)
TDB_DATA data;
pid_t updating_pid = sys_getpid();
uint8 buffer[4];
-
+
struct tdb_print_db *pdb = get_print_db_byname(sharename);
if (!pdb)
@@ -909,8 +909,8 @@ static void set_updating_pid(const fstring sharename, bool
updating)
slprintf(keystr, sizeof(keystr)-1, "UPDATING/%s", sharename);
key = string_tdb_data(keystr);
-
- DEBUG(5, ("set_updating_pid: %s updating lpq cache for print share
%s\n",
+
+ DEBUG(5, ("set_updating_pid: %s updating lpq cache for print share
%s\n",
updating ? "" : "not ",
sharename ));
@@ -919,12 +919,12 @@ static void set_updating_pid(const fstring sharename,
bool updating)
release_print_db(pdb);
return;
}
-
+
SIVAL( buffer, 0, updating_pid);
data.dptr = buffer;
data.dsize = 4; /* we always assume this is a 4 byte value */
- tdb_store(pdb->tdb, key, data, TDB_REPLACE);
+ tdb_store(pdb->tdb, key, data, TDB_REPLACE);
release_print_db(pdb);
}
@@ -1070,36 +1070,36 @@ static bool print_cache_expired(const char *sharename,
bool check_pending)
* that last lpq scan would stay around for a loooong loooong time...
:-). JRA.
*/
- if (last_qscan_time == ((time_t)-1)
- || (time_now - last_qscan_time) >= lp_lpqcachetime()
- || last_qscan_time > (time_now + MAX_CACHE_VALID_TIME))
+ if (last_qscan_time == ((time_t)-1)
+ || (time_now - last_qscan_time) >= lp_lpqcachetime()
+ || last_qscan_time > (time_now + MAX_CACHE_VALID_TIME))
{
uint32 u;
time_t msg_pending_time;
- DEBUG(4, ("print_cache_expired: cache expired for queue %s "
- "(last_qscan_time = %d, time now = %d, qcachetime =
%d)\n",
- sharename, (int)last_qscan_time, (int)time_now,
+ DEBUG(4, ("print_cache_expired: cache expired for queue %s "
+ "(last_qscan_time = %d, time now = %d, qcachetime =
%d)\n",
+ sharename, (int)last_qscan_time, (int)time_now,
(int)lp_lpqcachetime() ));
- /* check if another smbd has already sent a message to update
the
- queue. Give the pending message one minute to clear and
- then send another message anyways. Make sure to check for
+ /* check if another smbd has already sent a message to update
the
+ queue. Give the pending message one minute to clear and
+ then send another message anyways. Make sure to check for
clocks that have been run forward and then back again. */
snprintf(key, sizeof(key), "MSG_PENDING/%s", sharename);
- if ( check_pending
- && tdb_fetch_uint32( pdb->tdb, key, &u )
+ if ( check_pending
+ && tdb_fetch_uint32( pdb->tdb, key, &u )
&& (msg_pending_time=u) > 0
- && msg_pending_time <= time_now
- && (time_now - msg_pending_time) < 60 )
+ && msg_pending_time <= time_now
+ && (time_now - msg_pending_time) < 60 )
{
DEBUG(4,("print_cache_expired: message already pending
for %s. Accepting cache\n",
sharename));
goto done;
}
-
+
result = True;
}
@@ -1112,7 +1112,7 @@ done:
main work for updating the lpq cahe for a printer queue
****************************************************************************/
-static void print_queue_update_internal( const char *sharename,
+static void print_queue_update_internal( const char *sharename,
struct printif *current_printif,
char *lpq_command, char *lprm_command
)
{
@@ -1130,7 +1130,7 @@ static void print_queue_update_internal( const char
*sharename,
if (!pdb) {
return;
}
-
+
DEBUG(5,("print_queue_update_internal: printer = %s, type = %d, lpq
command = [%s]\n",
sharename, current_printif->type, lpq_command));
@@ -1139,18 +1139,18 @@ static void print_queue_update_internal( const char
*sharename,
* attempting to get the lock and doing this
* if the lpq takes a long time.
*/
-
+
slprintf(cachestr, sizeof(cachestr)-1, "CACHE/%s", sharename);
tdb_store_int32(pdb->tdb, cachestr, (int)time(NULL));
/* get the current queue using the appropriate interface */
ZERO_STRUCT(status);
- qcount = (*(current_printif->queue_get))(sharename,
- current_printif->type,
+ qcount = (*(current_printif->queue_get))(sharename,
+ current_printif->type,
lpq_command, &queue, &status);
- DEBUG(3, ("print_queue_update_internal: %d job%s in queue for %s\n",
+ DEBUG(3, ("print_queue_update_internal: %d job%s in queue for %s\n",
qcount, (qcount != 1) ? "s" : "", sharename));
/* Sort the queue by submission time otherwise they are displayed
@@ -1164,7 +1164,7 @@ static void print_queue_update_internal( const char
*sharename,
and doesn't exist in the system queue is considered finished
and removed from the database
- any job in the system database but not in the internal database
+ any job in the system database but not in the internal database
is added as a unix job
fill in any system job numbers as we go
@@ -1240,7 +1240,7 @@ static void print_queue_update_internal( const char
*sharename,
status.qcount = qcount;
data.dptr = (uint8 *)&status;
data.dsize = sizeof(status);
- tdb_store(pdb->tdb, key, data, TDB_REPLACE);
+ tdb_store(pdb->tdb, key, data, TDB_REPLACE);
/*
* Update the cache time again. We want to do this call
@@ -1272,7 +1272,7 @@ static void print_queue_update_internal( const char
*sharename,
smbd processes maytry to update the lpq cache concurrently).
****************************************************************************/
-static void print_queue_update_with_lock( const char *sharename,
+static void print_queue_update_with_lock( const char *sharename,
struct printif *current_printif,
char *lpq_command, char
*lprm_command )
{
@@ -1289,7 +1289,7 @@ static void print_queue_update_with_lock( const char
*sharename,
release_print_db(pdb);
return;
}
-
+
/*
* Check to see if someone else is doing this update.
* This is essentially a mutex on the update.
@@ -1340,10 +1340,10 @@ static void print_queue_update_with_lock( const char
*sharename,
tdb_unlock_bystring(pdb->tdb, keystr);
/* do the main work now */
-
- print_queue_update_internal( sharename, current_printif,
+
+ print_queue_update_internal( sharename, current_printif,
lpq_command, lprm_command );
-
+
/* Delete our pid from the db. */
set_updating_pid(sharename, False);
release_print_db(pdb);
@@ -1376,7 +1376,7 @@ static void print_queue_receive(struct messaging_context
*msg,
return;
}
- print_queue_update_with_lock(sharename,
+ print_queue_update_with_lock(sharename,
get_printer_fns_from_type((enum printing_types)printing_type),
lpqcommand, lprmcommand );
@@ -1590,10 +1590,10 @@ static void print_queue_update(int snum, bool force)
SMB_ASSERT( newlen == len );
DEBUG(10,("print_queue_update: Sending message -> printer = %s, "
- "type = %d, lpq command = [%s] lprm command = [%s]\n",
+ "type = %d, lpq command = [%s] lprm command = [%s]\n",
sharename, type, lpqcommand, lprmcommand ));
- /* here we set a msg pending record for other smbd processes
+ /* here we set a msg pending record for other smbd processes
to throttle the number of duplicate print_queue_update msgs
sent. */
@@ -1615,7 +1615,7 @@ static void print_queue_update(int snum, bool force)
release_print_db( pdb );
/* finally send the message */
-
+
messaging_send_buf(smbd_messaging_context(),
pid_to_procid(background_lpq_updater_pid),
MSG_PRINTER_UPDATE, (uint8 *)buffer, len);
@@ -1627,7 +1627,7 @@ static void print_queue_update(int snum, bool force)
/****************************************************************************
Create/Update an entry in the print tdb that will allow us to send notify
- updates only to interested smbd's.
+ updates only to interested smbd's.
****************************************************************************/
bool print_notify_register_pid(int snum)
@@ -1643,17 +1643,17 @@ bool print_notify_register_pid(int snum)
/* if (snum == -1), then the change notify request was
on a print server handle and we need to register on
all print queus */
--
Samba Shared Repository
