s3-build: avoid to globally include printing and spoolss headers.

[vlendec/samba-autobuild/.git] / source3 / utils / smbcontrol.c

diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 6ea200bfec5dcfb3d2771f101c5e851bc9a8d196..ee96a02a6f89b502eb28a6baadb5f02b8d855881 100644 (file)
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -24,6 +24,9 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/messaging.h"
+#include "librpc/gen_ndr/spoolss.h"
+#include "nt_printing.h"
 
 #if HAVE_LIBUNWIND_H
 #include <libunwind.h>
@@ -109,8 +112,12 @@ static void print_pid_string_cb(struct messaging_context *msg,
                                struct server_id pid,
                                DATA_BLOB *data)
 {
-       printf("PID %u: %.*s", (unsigned int)procid_to_pid(&pid),
-              (int)data->length, (const char *)data->data);
+       char *pidstr;
+
+       pidstr = procid_str(talloc_tos(), &pid);
+       printf("PID %s: %.*s", pidstr, (int)data->length,
+              (const char *)data->data);
+       TALLOC_FREE(pidstr);
        num_replies++;
 }
 
@@ -122,7 +129,7 @@ static void print_string_cb(struct messaging_context *msg,
                            struct server_id pid,
                            DATA_BLOB *data)
 {
-       printf("%.*s", (int)data->length, (const char *)data->data);
+       printf("%*s", (int)data->length, (const char *)data->data);
        num_replies++;
 }
 
@@ -259,8 +266,7 @@ cleanup:
        ptrace(PTRACE_DETACH, pid, NULL, NULL);
 }
 
-static int stack_trace_connection(struct db_record *rec,
-                                 const struct connections_key *key,
+static int stack_trace_connection(const struct connections_key *key,
                                  const struct connections_data *crec,
                                  void *priv)
 {
@@ -291,7 +297,7 @@ static bool do_daemon_stack_trace(struct messaging_context *msg_ctx,
                 */
                print_stack_trace(dest, &count);
        } else {
-               connections_forall(stack_trace_connection, &count);
+               connections_forall_read(stack_trace_connection, &count);
        }
 
        return True;
@@ -669,11 +675,11 @@ static bool do_printnotify(struct messaging_context *msg_ctx,
                }
 
                if (strcmp(argv[3], "comment") == 0) {
-                       attribute = PRINTER_NOTIFY_COMMENT;
+                       attribute = PRINTER_NOTIFY_FIELD_COMMENT;
                } else if (strcmp(argv[3], "port") == 0) {
-                       attribute = PRINTER_NOTIFY_PORT_NAME;
+                       attribute = PRINTER_NOTIFY_FIELD_PORT_NAME;
                } else if (strcmp(argv[3], "driver") == 0) {
-                       attribute = PRINTER_NOTIFY_DRIVER_NAME;
+                       attribute = PRINTER_NOTIFY_FIELD_DRIVER_NAME;
                } else {
                        fprintf(stderr, "Invalid printer command '%s'\n",
                                argv[3]);
@@ -954,7 +960,7 @@ static bool do_winbind_onlinestatus(struct messaging_context *msg_ctx,
 {
        struct server_id myid;
 
-       myid = pid_to_procid(sys_getpid());
+       myid = procid_self();
 
        if (argc != 1) {
                fprintf(stderr, "Usage: smbcontrol winbindd onlinestatus\n");
@@ -986,7 +992,7 @@ static bool do_dump_event_list(struct messaging_context *msg_ctx,
 {
        struct server_id myid;
 
-       myid = pid_to_procid(sys_getpid());
+       myid = procid_self();
 
        if (argc != 1) {
                fprintf(stderr, "Usage: smbcontrol <dest> dump-event-list\n");
@@ -1006,7 +1012,7 @@ static bool do_winbind_dump_domain_list(struct messaging_context *msg_ctx,
        uint8_t *buf = NULL;
        int buf_len = 0;
 
-       myid = pid_to_procid(sys_getpid());
+       myid = procid_self();
 
        if (argc < 1 || argc > 2) {
                fprintf(stderr, "Usage: smbcontrol <dest> dump_domain_list "
@@ -1069,7 +1075,7 @@ static bool do_winbind_validate_cache(struct messaging_context *msg_ctx,
                                      const struct server_id pid,
                                      const int argc, const char **argv)
 {
-       struct server_id myid = pid_to_procid(sys_getpid());
+       struct server_id myid = procid_self();
 
        if (argc != 1) {
                fprintf(stderr, "Usage: smbcontrol winbindd validate-cache\n");
@@ -1239,7 +1245,7 @@ static struct server_id parse_dest(const char *dest)
        /* Try self - useful for testing */
 
        if (strequal(dest, "self")) {
-               return pid_to_procid(sys_getpid());
+               return procid_self();
        }
 
        /* Fix winbind typo. */
@@ -1247,15 +1253,12 @@ static struct server_id parse_dest(const char *dest)
                dest = "winbindd";
        }
 
-       if (!(strequal(dest, "winbindd") || strequal(dest, "nmbd"))) {
-               /* Check for numeric pid number */
-
-               result = interpret_pid(dest);
+       /* Check for numeric pid number */
+       result = interpret_pid(dest);
 
-               /* Zero isn't valid if not smbd. */
-               if (result.pid && procid_valid(&result)) {
-                       return result;
-               }
+       /* Zero isn't valid if not "all". */
+       if (result.pid && procid_valid(&result)) {
+               return result;
        }
 
        /* Look up other destinations in pidfile directory */
@@ -1391,7 +1394,7 @@ int main(int argc, const char **argv)
          * shell needs 0. */ 
        
        if (!(evt_ctx = tevent_context_init(NULL)) ||
-           !(msg_ctx = messaging_init(NULL, server_id_self(), evt_ctx))) {
+           !(msg_ctx = messaging_init(NULL, procid_self(), evt_ctx))) {
                fprintf(stderr, "could not init messaging context\n");
                TALLOC_FREE(frame);
                exit(1);