diff options
| author | Simo Sorce <idra@samba.org> | 2011-08-10 23:36:06 -0400 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2011-08-11 14:57:55 +0200 |
| commit | cb1af61cb1988931654ad14c787d2493ef629a58 (patch) | |
| tree | 22cecff8c2167935e2f15062ada5a5bd59d5af09 | |
| parent | 91a45490a57e160acd3cbecd58cf2c614cda70be (diff) | |
| download | samba-cb1af61cb1988931654ad14c787d2493ef629a58.tar.gz samba-cb1af61cb1988931654ad14c787d2493ef629a58.tar.bz2 samba-cb1af61cb1988931654ad14c787d2493ef629a58.zip | |
s3-messaging: Remove obsolete class.
The FLAG_MSG_PRINT_NOTIFY class is actually obsolete and never used, as the
only message belonging to it is not used either.
Signed-off-by: Andreas Schneider <asn@samba.org>
| -rw-r--r-- | source3/include/messages.h | 2 | ||||
| -rw-r--r-- | source3/lib/messages.c | 2 | ||||
| -rw-r--r-- | source3/librpc/idl/messaging.idl | 2 | ||||
| -rw-r--r-- | source3/printing/spoolssd.c | 2 | ||||
| -rw-r--r-- | source3/rpc_server/spoolss/srv_spoolss_nt.c | 13 |
5 files changed, 2 insertions, 19 deletions
diff --git a/source3/include/messages.h b/source3/include/messages.h index 41d5bb19fd..86402dc07b 100644 --- a/source3/include/messages.h +++ b/source3/include/messages.h @@ -42,7 +42,7 @@ #define FLAG_MSG_GENERAL 0x0001 #define FLAG_MSG_SMBD 0x0002 #define FLAG_MSG_NMBD 0x0004 -#define FLAG_MSG_PRINT_NOTIFY 0x0008 +/* #define FLAG_MSG_PRINT_NOTIFY 0x0008 Obsolete */ #define FLAG_MSG_PRINT_GENERAL 0x0010 /* dbwrap messages 4001-4999 */ #define FLAG_MSG_DBWRAP 0x0020 diff --git a/source3/lib/messages.c b/source3/lib/messages.c index d66af39757..0cdef63fdc 100644 --- a/source3/lib/messages.c +++ b/source3/lib/messages.c @@ -150,8 +150,6 @@ bool message_send_all(struct messaging_context *msg_ctx, msg_all.msg_flag = FLAG_MSG_GENERAL; else if (msg_type > 1000 && msg_type < 2000) msg_all.msg_flag = FLAG_MSG_NMBD; - else if (msg_type > 2000 && msg_type < 2100) - msg_all.msg_flag = FLAG_MSG_PRINT_NOTIFY; else if (msg_type > 2100 && msg_type < 3000) msg_all.msg_flag = FLAG_MSG_PRINT_GENERAL; else if (msg_type > 3000 && msg_type < 4000) diff --git a/source3/librpc/idl/messaging.idl b/source3/librpc/idl/messaging.idl index 0c0672c7a6..8e15bcecc1 100644 --- a/source3/librpc/idl/messaging.idl +++ b/source3/librpc/idl/messaging.idl @@ -45,7 +45,7 @@ interface messaging MSG_SEND_PACKET = 0x0103, /* printing messages */ - MSG_PRINTER_NOTIFY = 0x2001, /* Obsolete */ + /* MSG_PRINTER_NOTIFY = 0x2001, Obsoleted */ MSG_PRINTER_NOTIFY2 = 0x0202, MSG_PRINTER_DRVUPGRADE = 0x0203, MSG_PRINTERDATA_INIT_RESET = 0x0204, diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c index 38671ca662..3d17602617 100644 --- a/source3/printing/spoolssd.c +++ b/source3/printing/spoolssd.c @@ -349,7 +349,6 @@ static bool spoolss_child_init(struct tevent_context *ev_ctx, if (!serverid_register(procid_self(), FLAG_MSG_GENERAL | - FLAG_MSG_PRINT_NOTIFY | FLAG_MSG_PRINT_GENERAL)) { return false; } @@ -825,7 +824,6 @@ pid_t start_spoolssd(struct tevent_context *ev_ctx, if (!serverid_register(procid_self(), FLAG_MSG_GENERAL | FLAG_MSG_SMBD | - FLAG_MSG_PRINT_NOTIFY | FLAG_MSG_PRINT_GENERAL)) { exit(1); } diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c index ec6f49e718..a2f8d68665 100644 --- a/source3/rpc_server/spoolss/srv_spoolss_nt.c +++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c @@ -283,15 +283,6 @@ static void srv_spoolss_replycloseprinter(int snum, if (prn_hnd->notify.msg_ctx != NULL) { messaging_deregister(prn_hnd->notify.msg_ctx, MSG_PRINTER_NOTIFY2, NULL); - - /* - * Tell the serverid.tdb we're no longer - * interested in printer notify messages. - */ - - serverid_register_msg_flags( - messaging_server_id(prn_hnd->notify.msg_ctx), - false, FLAG_MSG_PRINT_NOTIFY); } } @@ -2636,10 +2627,6 @@ static bool srv_spoolss_replyopenprinter(int snum, const char *printer, messaging_register(msg_ctx, NULL, MSG_PRINTER_NOTIFY2, receive_notify2_message_list); - /* Tell the connections db we're now interested in printer - * notify messages. */ - serverid_register_msg_flags(messaging_server_id(msg_ctx), - true, FLAG_MSG_PRINT_NOTIFY); } /* |