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>

diff --git a/source3/include/messages.h b/source3/include/messages.h
index 41d5bb19fdb29a376604ce6322a19ae8227e2921..86402dc07b90c2ffa2ec137ba233c60ffcaa37c0 100644 (file)
--- 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 d66af3975775a4f156eec816060a2218aec9e295..0cdef63fdc24ab44d20868d1daef9281d652f727 100644 (file)
--- 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 0c0672c7a6dc9bf70ba7e0cc69da9ba5ba476836..8e15bcecc152c7628688b39cde4477dc07afe6a1 100644 (file)
--- 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 38671ca6623a32a34d9105abbef14ac86fd59a02..3d176026174c1090b6cc11773630a011007d4681 100644 (file)
--- 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 ec6f49e718e961589da0608fb248f6424b50d3d1..a2f8d686659d0ec1c758ea26da21fcfedbe4797c 100644 (file)
--- 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);
        }
 
        /*