Changeset 745 for trunk/server/source3/utils/smbcontrol.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/utils/smbcontrol.c (modified) (31 diffs)

trunk/server/source3/utils/smbcontrol.c

@@ -9 +9 @@
    Copyright (C) Simo Sorce 2002
    Copyright (C) James Peach 2006
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -25 +25 @@
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "popt_common.h"
+#include "librpc/gen_ndr/spoolss.h"
+#include "nt_printing.h"
+#include "printing/notify.h"
+#include "libsmb/nmblib.h"
+#include "messages.h"
+#include "util_tdb.h"
 
 #if HAVE_LIBUNWIND_H
@@ -62 +70 @@
         DEBUG(10,("smbcontrol/send_message: broadcast message to "
                   "%d processes\n", n_sent));
-        
+
         return ret;
 }
@@ -110 +118 @@
                                 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++;
 }
@@ -123 +135 @@
                             DATA_BLOB *data)
 {
-        printf("%.*s", (int)data->length, (const char *)data->data);
+        printf("%*s", (int)data->length, (const char *)data->data);
         num_replies++;
 }
@@ -158 +170 @@
                             strlen(argv[1]) + 1);
 }
+
+
+static bool do_idmap(struct messaging_context *msg_ctx,
+                     const struct server_id pid,
+                     const int argc, const char **argv)
+{
+        static const char* usage = "Usage: "
+                "smbcontrol <dest> idmap <cmd> [arg]\n"
+                "\tcmd:\tflush [gid|uid]\n"
+                "\t\tdelete \"UID <uid>\"|\"GID <gid>\"|<sid>\n"
+                "\t\tkill \"UID <uid>\"|\"GID <gid>\"|<sid>\n";
+        const char* arg = NULL;
+        int arglen = 0;
+        int msg_type;
+
+        switch (argc) {
+        case 2:
+                break;
+        case 3:
+                arg = argv[2];
+                arglen = strlen(arg) + 1;
+                break;
+        default:
+                fprintf(stderr, "%s", usage);
+                return false;
+        }
+
+        if (strcmp(argv[1], "flush") == 0) {
+                msg_type = MSG_IDMAP_FLUSH;
+        }
+        else if (strcmp(argv[1], "delete") == 0) {
+                msg_type = MSG_IDMAP_DELETE;
+        }
+        else if (strcmp(argv[1], "kill") == 0) {
+                msg_type = MSG_IDMAP_KILL;
+        }
+        else if (strcmp(argv[1], "help") == 0) {
+                fprintf(stdout, "%s", usage);
+                return true;
+        }
+        else {
+                fprintf(stderr, "%s", usage);
+                return false;
+        }
+
+        return send_message(msg_ctx, pid, msg_type, arg, arglen);
+}
+
 
 #if defined(HAVE_LIBUNWIND_PTRACE) && defined(HAVE_LINUX_PTRACE)
@@ -260 +320 @@
 }
 
-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)
@@ -292 +351 @@
                 print_stack_trace(dest, &count);
         } else {
-                connections_forall(stack_trace_connection, &count);
+                connections_forall_read(stack_trace_connection, &count);
         }
 
@@ -477 +536 @@
                 break;
         }
-        
+
         printf("Profiling %s on pid %u\n",s,(unsigned int)procid_to_pid(&pid));
 }
@@ -573 +632 @@
                 fprintf(stderr, "\tprinter <printername> <comment|port|"
                         "driver> <value>\n");
-                
+
                 return False;
         }
@@ -586 +645 @@
                         return False;
                 }
-                
-                notify_printer_status_byname(argv[2], PRINTER_STATUS_PAUSED);
+
+                notify_printer_status_byname(messaging_event_context(msg_ctx),
+                                             msg_ctx, argv[2],
+                                             PRINTER_STATUS_PAUSED);
 
                 goto send;
@@ -598 +659 @@
                         return False;
                 }
-                
-                notify_printer_status_byname(argv[2], PRINTER_STATUS_OK);
+
+                notify_printer_status_byname(messaging_event_context(msg_ctx),
+                                             msg_ctx, argv[2],
+                                             PRINTER_STATUS_OK);
 
                 goto send;
@@ -615 +678 @@
 
                 notify_job_status_byname(
-                        argv[2], jobid, JOB_STATUS_PAUSED, 
+                        messaging_event_context(msg_ctx), msg_ctx,
+                        argv[2], jobid, JOB_STATUS_PAUSED,
                         SPOOLSS_NOTIFY_MSG_UNIX_JOBID);
 
@@ -632 +696 @@
 
                 notify_job_status_byname(
+                        messaging_event_context(msg_ctx), msg_ctx,
                         argv[2], jobid, JOB_STATUS_QUEUED, 
                         SPOOLSS_NOTIFY_MSG_UNIX_JOBID);
@@ -649 +714 @@
 
                 notify_job_status_byname(
+                        messaging_event_context(msg_ctx), msg_ctx,
                         argv[2], jobid, JOB_STATUS_DELETING,
                         SPOOLSS_NOTIFY_MSG_UNIX_JOBID);
-                
+
                 notify_job_status_byname(
+                        messaging_event_context(msg_ctx), msg_ctx,
                         argv[2], jobid, JOB_STATUS_DELETING|
                         JOB_STATUS_DELETED,
@@ -661 +728 @@
         } else if (strcmp(cmd, "printer") == 0) {
                 uint32 attribute;
-                
+
                 if (argc != 5) {
                         fprintf(stderr, "Usage: smbcontrol <dest> printnotify "
@@ -681 +748 @@
                 }
 
-                notify_printer_byname(argv[2], attribute,
+                notify_printer_byname(messaging_event_context(msg_ctx),
+                                      msg_ctx, argv[2], attribute,
                                       CONST_DISCARD(char *, argv[4]));
 
@@ -708 +776 @@
 
         return send_message(msg_ctx, pid, MSG_SMB_FORCE_TDIS, argv[1],
+                            strlen(argv[1]) + 1);
+}
+
+/* Tell winbindd an IP got dropped */
+
+static bool do_ip_dropped(struct messaging_context *msg_ctx,
+                          const struct server_id pid,
+                          const int argc, const char **argv)
+{
+        if (argc != 2) {
+                fprintf(stderr, "Usage: smbcontrol <dest> ip-dropped "
+                        "<ip-address>\n");
+                return False;
+        }
+
+        return send_message(msg_ctx, pid, MSG_WINBIND_IP_DROPPED, argv[1],
                             strlen(argv[1]) + 1);
 }
@@ -903 +987 @@
         tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
                                 WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
-                                TDB_DEFAULT /* TDB_CLEAR_IF_FIRST */, O_RDWR|O_CREAT, 0600);
+                                TDB_DEFAULT|TDB_INCOMPATIBLE_HASH /* TDB_CLEAR_IF_FIRST */,
+                                O_RDWR|O_CREAT, 0600);
 
         if (!tdb) {
@@ -935 +1020 @@
                 /* Check that the entry "WINBINDD_OFFLINE" still exists. */
                 d = tdb_fetch_bystring( tdb, "WINBINDD_OFFLINE" );
-        
+
                 if (!d.dptr || d.dsize != 4) {
                         SAFE_FREE(d.dptr);
@@ -955 +1040 @@
         struct server_id myid;
 
-        myid = pid_to_procid(sys_getpid());
+        myid = messaging_server_id(msg_ctx);
 
         if (argc != 1) {
@@ -987 +1072 @@
         struct server_id myid;
 
-        myid = pid_to_procid(sys_getpid());
+        myid = messaging_server_id(msg_ctx);
 
         if (argc != 1) {
@@ -1007 +1092 @@
         int buf_len = 0;
 
-        myid = pid_to_procid(sys_getpid());
+        myid = messaging_server_id(msg_ctx);
 
         if (argc < 1 || argc > 2) {
-                fprintf(stderr, "Usage: smbcontrol <dest> dump_domain_list "
+                fprintf(stderr, "Usage: smbcontrol <dest> dump-domain-list "
                         "<domain>\n");
                 return false;
@@ -1070 +1155 @@
                                       const int argc, const char **argv)
 {
-        struct server_id myid = pid_to_procid(sys_getpid());
+        struct server_id myid;
+
+        myid = messaging_server_id(msg_ctx);
 
         if (argc != 1) {
@@ -1166 +1253 @@
 } msg_types[] = {
         { "debug", do_debug, "Set debuglevel"  },
+        { "idmap", do_idmap, "Manipulate idmap cache" },
         { "force-election", do_election,
           "Force a browse election" },
@@ -1178 +1266 @@
         { "printnotify", do_printnotify, "Send a print notify message" },
         { "close-share", do_closeshare, "Forcibly disconnect a share" },
+        { "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" },
@@ -1226 +1315 @@
 /* Return the pid number for a string destination */
 
-static struct server_id parse_dest(const char *dest)
+static struct server_id parse_dest(struct messaging_context *msg,
+                                   const char *dest)
 {
         struct server_id result = {-1};
@@ -1240 +1330 @@
 
         if (strequal(dest, "self")) {
-                return pid_to_procid(sys_getpid());
+                return messaging_server_id(msg);
         }
 
@@ -1278 +1368 @@
         /* Check destination */
 
-        pid = parse_dest(dest);
+        pid = parse_dest(msg_ctx, dest);
         if (!procid_valid(&pid)) {
                 return False;
@@ -1343 +1433 @@
         load_case_tables();
 
-        setup_logging(argv[0],True);
-        
+        setup_logging(argv[0], DEBUG_STDOUT);
+
         /* Parse command line arguments using popt */
 
@@ -1387 +1477 @@
          * routines mostly return True==1 for success, but
          * 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);
         }
-        
+
         ret = !do_command(msg_ctx, argc, argv);
         TALLOC_FREE(frame);