*/
#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>
return ret;
}
-static void timeout_handler(struct event_context *event_ctx,
- struct timed_event *te,
- const struct timeval *now,
- void *private_data)
+static void smbcontrol_timeout(struct tevent_context *event_ctx,
+ struct tevent_timer *te,
+ struct timeval now,
+ void *private_data)
{
bool *timed_out = (bool *)private_data;
TALLOC_FREE(te);
static void wait_replies(struct messaging_context *msg_ctx,
bool multiple_replies)
{
- struct timed_event *te;
+ struct tevent_timer *te;
bool timed_out = False;
- if (!(te = event_add_timed(messaging_event_context(msg_ctx), NULL,
- timeval_current_ofs(timeout, 0),
- "smbcontrol_timeout",
- timeout_handler, (void *)&timed_out))) {
- DEBUG(0, ("event_add_timed failed\n"));
+ if (!(te = tevent_add_timer(messaging_event_context(msg_ctx), NULL,
+ timeval_current_ofs(timeout, 0),
+ smbcontrol_timeout, (void *)&timed_out))) {
+ DEBUG(0, ("tevent_add_timer failed\n"));
return;
}
while (!timed_out) {
- message_dispatch(msg_ctx);
+ int ret;
if (num_replies > 0 && !multiple_replies)
break;
- event_loop_once(messaging_event_context(msg_ctx));
+ ret = tevent_loop_once(messaging_event_context(msg_ctx));
+ if (ret != 0) {
+ break;
+ }
}
}
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++;
}
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++;
}
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)
{
*/
print_stack_trace(dest, &count);
} else {
- connections_forall(stack_trace_connection, &count);
+ connections_forall_read(stack_trace_connection, &count);
}
return True;
}
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]);
/* Remove the entry in the winbindd_cache tdb to tell a later
starting winbindd that we're online. */
- tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
+ tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
if (!tdb) {
fprintf(stderr, "Cannot open the tdb %s for writing.\n",
- lock_path("winbindd_cache.tdb"));
+ cache_path("winbindd_cache.tdb"));
return False;
}
starting winbindd that we're offline. We may actually create
it here... */
- tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
+ 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);
if (!tdb) {
fprintf(stderr, "Cannot open the tdb %s for writing.\n",
- lock_path("winbindd_cache.tdb"));
+ cache_path("winbindd_cache.tdb"));
return False;
}
{
struct server_id myid;
- myid = pid_to_procid(sys_getpid());
+ myid = procid_self();
if (argc != 1) {
fprintf(stderr, "Usage: smbcontrol winbindd onlinestatus\n");
{
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");
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 "
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");
ZERO_STRUCT(p);
- (void)interpret_addr2(&p.ip, argv[1]);
+ p.ip = interpret_addr2(argv[1]);
p.port = 137;
p.packet_type = NMB_PACKET;
/* Try self - useful for testing */
if (strequal(dest, "self")) {
- return pid_to_procid(sys_getpid());
+ return procid_self();
}
/* Fix winbind typo. */
dest = "winbindd";
}
- if (!(strequal(dest, "winbindd") || strequal(dest, "nmbd"))) {
- /* Check for numeric pid number */
+ /* Check for numeric pid number */
+ result = interpret_pid(dest);
- 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 */
{
poptContext pc;
int opt;
- struct event_context *evt_ctx;
+ struct tevent_context *evt_ctx;
struct messaging_context *msg_ctx;
static struct poptOption long_options[] = {
* routines mostly return True==1 for success, but
* shell needs 0. */
- if (!(evt_ctx = event_context_init(NULL)) ||
- !(msg_ctx = messaging_init(NULL, server_id_self(), evt_ctx))) {
+ if (!(evt_ctx = tevent_context_init(NULL)) ||
+ !(msg_ctx = messaging_init(NULL, procid_self(), evt_ctx))) {
fprintf(stderr, "could not init messaging context\n");
TALLOC_FREE(frame);
exit(1);
git.samba.org / vlendec / samba-autobuild / .git / blobdiff