sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-10 13:57:47 +03:00
Code

Merge of print notify fixes from APPLIANCE_HEAD.

Browse Source 
(This used to be commit 7bf9ca6ca36fa319a57eab05567d49a003237bb5)
This commit is contained in:
Tim Potter 2002-08-02 03:57:40 +00:00
parent dcb4aec627
commit 0efda5cc21
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source3/printing/notify.c
View File

@ -65,18 +65,17 @@ again:
/* Send message */
tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
tdb = conn_tdb_ctx();
if (!tdb) {
DEBUG(3, ("Failed to open connections database in send_spoolss_notify2_msg\n"));
return;
goto done;
}
message_send_all(tdb, MSG_PRINTER_NOTIFY2, buf, buflen, False, NULL);
message_send_all(tdb, MSG_PRINTER_NOTIFY2, buf,
buflen, False, NULL);
done:
SAFE_FREE(buf);
tdb_close(tdb);
}
static void send_notify_field_values(const char *printer_name, uint32 type,

5
source3/smbd/connection.c
View File

@ -29,6 +29,11 @@ static TDB_CONTEXT *tdb;
TDB_CONTEXT *conn_tdb_ctx(void)
{
if (!tdb) {
tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT,
O_RDWR | O_CREAT, 0644);
}
return tdb;
}

17
source3/utils/smbcontrol.c
View File

@ -223,6 +223,23 @@ static void register_all(void)
message_register(MSG_POOL_USAGE, pool_usage_cb);
}
/* This guy is here so we can link printing/notify.c to the smbcontrol
binary without having to pull in tons of other crap. */
TDB_CONTEXT *conn_tdb_ctx(void)
{
static TDB_CONTEXT *tdb;
if (tdb)
return tdb;
tdb = tdb_open_log(lock_path("connections.tdb"), 0, TDB_DEFAULT, O_RDONLY, 0);
if (!tdb)
DEBUG(3, ("Failed to open connections database in send_spoolss_notify2_msg\n"));
return tdb;
}
/****************************************************************************
do command