smbcontrol: Clean up the msg_ctx

[obnox/samba/samba-obnox.git] / source3 / utils / smbcontrol.c

diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 47884ff86163ee129a237e67ac13b42440408928..d0e923a7b84a29edf2d011c9eec60ed39fde13c4 100644 (file)
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -790,6 +790,27 @@ static bool do_closeshare(struct tevent_context *ev_ctx,
                            strlen(argv[1]) + 1);
 }
 
+/* Kill a client by IP address */
+static bool do_kill_client_by_ip(struct tevent_context *ev_ctx,
+                                struct messaging_context *msg_ctx,
+                                const struct server_id pid,
+                                const int argc, const char **argv)
+{
+       if (argc != 2) {
+               fprintf(stderr, "Usage: smbcontrol <dest> kill-client-ip "
+                       "<IP address>\n");
+               return false;
+       }
+
+       if (!is_ipaddress_v4(argv[1]) && !is_ipaddress_v6(argv[1])) {
+               fprintf(stderr, "%s is not a valid IP address!\n", argv[1]);
+               return false;
+       }
+
+       return send_message(msg_ctx, pid, MSG_SMB_KILL_CLIENT_IP,
+                           argv[1], strlen(argv[1]) + 1);
+}
+
 /* Tell winbindd an IP got dropped */
 
 static bool do_ip_dropped(struct tevent_context *ev_ctx,
@@ -900,6 +921,53 @@ static bool do_dmalloc_changed(struct tevent_context *ev_ctx,
                            NULL, 0);
 }
 
+static void print_uint32_cb(struct messaging_context *msg, void *private_data,
+                           uint32_t msg_type, struct server_id pid,
+                           DATA_BLOB *data)
+{
+       uint32_t num_children;
+
+       if (data->length != sizeof(uint32_t)) {
+               printf("Invalid response: %d bytes long\n",
+                      (int)data->length);
+               goto done;
+       }
+       num_children = IVAL(data->data, 0);
+       printf("%u children\n", (unsigned)num_children);
+done:
+       num_replies++;
+}
+
+static bool do_num_children(struct tevent_context *ev_ctx,
+                           struct messaging_context *msg_ctx,
+                           const struct server_id pid,
+                           const int argc, const char **argv)
+{
+       if (argc != 1) {
+               fprintf(stderr, "Usage: smbcontrol <dest> num-children\n");
+               return False;
+       }
+
+       messaging_register(msg_ctx, NULL, MSG_SMB_NUM_CHILDREN,
+                          print_uint32_cb);
+
+       /* Send a message and register our interest in a reply */
+
+       if (!send_message(msg_ctx, pid, MSG_SMB_TELL_NUM_CHILDREN, NULL, 0))
+               return false;
+
+       wait_replies(ev_ctx, msg_ctx, procid_to_pid(&pid) == 0);
+
+       /* No replies were received within the timeout period */
+
+       if (num_replies == 0)
+               printf("No replies received\n");
+
+       messaging_deregister(msg_ctx, MSG_SMB_NUM_CHILDREN, NULL);
+
+       return num_replies;
+}
+
 /* Shutdown a server process */
 
 static bool do_shutdown(struct tevent_context *ev_ctx,
@@ -928,7 +996,7 @@ static bool do_drvupgrade(struct tevent_context *ev_ctx,
                return False;
        }
 
-       return send_message(msg_ctx, pid, MSG_DEBUG, argv[1],
+       return send_message(msg_ctx, pid, MSG_PRINTER_DRVUPGRADE, argv[1],
                            strlen(argv[1]) + 1);
 }
 
@@ -1287,6 +1355,8 @@ static const struct {
        { "debuglevel", do_debuglevel, "Display current debuglevels" },
        { "printnotify", do_printnotify, "Send a print notify message" },
        { "close-share", do_closeshare, "Forcibly disconnect a share" },
+       { "kill-client-ip", do_kill_client_by_ip,
+         "Forcibly disconnect a client with a specific IP address" },
        { "ip-dropped", do_ip_dropped, "Tell winbind that an IP got dropped" },
        { "lockretry", do_lockretry, "Force a blocking lock retry" },
        { "brl-revalidate", do_brl_revalidate, "Revalidate all brl entries" },
@@ -1306,6 +1376,8 @@ static const struct {
          "Validate winbind's credential cache" },
        { "dump-domain-list", do_winbind_dump_domain_list, "Dump winbind domain list"},
        { "notify-cleanup", do_notify_cleanup },
+       { "num-children", do_num_children,
+         "Print number of smbd child processes" },
        { "noop", do_noop, "Do nothing" },
        { NULL }
 };
@@ -1369,7 +1441,7 @@ static struct server_id parse_dest(struct messaging_context *msg,
 
        /* Look up other destinations in pidfile directory */
 
-       if ((pid = pidfile_pid(lp_piddir(), dest)) != 0) {
+       if ((pid = pidfile_pid(lp_pid_directory(), dest)) != 0) {
                return pid_to_procid(pid);
        }
 
@@ -1508,6 +1580,7 @@ int main(int argc, const char **argv)
        }
 
        ret = !do_command(evt_ctx, msg_ctx, argc, argv);
+       TALLOC_FREE(msg_ctx);
        TALLOC_FREE(frame);
        return ret;
 }