/*
* This file is part of DisOrder.
- * Copyright (C) 2004-2009 Richard Kettlewell
+ * Copyright (C) 2004-2012 Richard Kettlewell
*
* 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
#include "vector.h"
#include "version.h"
#include "dateparse.h"
-#include "trackdb.h"
#include "inputline.h"
static disorder_client *client;
{ "help-commands", no_argument, 0, 'H' },
{ "user", required_argument, 0, 'u' },
{ "password", required_argument, 0, 'p' },
- { "wait-for-root", no_argument, 0, 'W' },
{ 0, 0, 0, 0 }
};
exit(0);
}
-static void wait_for_root(void) {
- const char *password;
-
- while(!trackdb_readable()) {
- disorder_info("waiting for trackdb...");
- sleep(1);
- }
- trackdb_init(TRACKDB_NO_RECOVER|TRACKDB_NO_UPGRADE);
- for(;;) {
- trackdb_open(TRACKDB_READ_ONLY);
- password = trackdb_get_password("root");
- trackdb_close();
- if(password)
- break;
- disorder_info("waiting for root user to be created...");
- sleep(1);
- }
- trackdb_deinit(NULL);
-}
-
int main(int argc, char **argv) {
- int n, i, j, local = 0, wfr = 0;
+ int n, i, j, local = 0;
int status = 0;
struct vector args;
const char *user = 0, *password = 0;
pcre_free = xfree;
if(!setlocale(LC_CTYPE, "")) disorder_fatal(errno, "error calling setlocale");
if(!setlocale(LC_TIME, "")) disorder_fatal(errno, "error calling setlocale");
- while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:W", options, 0)) >= 0) {
+ while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:", options, 0)) >= 0) {
switch(n) {
case 'h': help();
case 'H': help_commands();
case 'N': config_per_user = 0; break;
case 'u': user = optarg; break;
case 'p': password = optarg; break;
- case 'W': wfr = 1; break;
default: disorder_fatal(0, "invalid option");
}
}
}
if(local)
config->connect.af = -1;
- if(wfr)
- wait_for_root();
n = optind;
optind = 1; /* for subsequent getopt calls */
/* gcrypt initialization */
/*
* This file is part of DisOrder.
- * Copyright (C) 2004-2009 Richard Kettlewell
+ * Copyright (C) 2004-2012 Richard Kettlewell
*
* 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
{ "log", required_argument, 0, 'l' },
{ "pidfile", required_argument, 0, 'P' },
{ "wide-open", no_argument, 0, 'w' },
+ { "wait-for-root", no_argument, 0, 'W' },
{ "syslog", no_argument, 0, 's' },
{ 0, 0, 0, 0 }
};
disorder_info("%s", newpath);
}
+/* Used by test scripts to wait for things to get ready */
+static void wait_for_root(void) {
+ const char *password;
+
+ while(!trackdb_readable()) {
+ disorder_info("waiting for trackdb...");
+ sleep(1);
+ }
+ trackdb_init(TRACKDB_NO_RECOVER|TRACKDB_NO_UPGRADE);
+ for(;;) {
+ trackdb_open(TRACKDB_READ_ONLY);
+ password = trackdb_get_password("root");
+ trackdb_close();
+ if(password)
+ break;
+ disorder_info("waiting for root user to be created...");
+ sleep(1);
+ }
+ trackdb_deinit(NULL);
+}
+
int main(int argc, char **argv) {
- int n, background = 1, logsyslog = 0;
+ int n, background = 1, logsyslog = 0, wfr = 0;
const char *pidfile = 0;
struct rlimit rl[1];
/* garbage-collect PCRE's memory */
pcre_malloc = xmalloc;
pcre_free = xfree;
- while((n = getopt_long(argc, argv, "hVc:dfP:Ns", options, 0)) >= 0) {
+ while((n = getopt_long(argc, argv, "hVc:dfP:NsW", options, 0)) >= 0) {
switch(n) {
case 'h': help();
case 'V': version("disorderd");
case 'P': pidfile = optarg; break;
case 's': logsyslog = 1; break;
case 'w': wideopen = 1; break;
+ case 'W': wfr = 1; break;
default: disorder_fatal(0, "invalid option");
}
}
+ if(wfr) {
+ if(config_read(1, NULL))
+ disorder_fatal(0, "cannot read configuration");
+ wait_for_root();
+ return 0;
+ }
/* go into background if necessary */
if(background)
daemonize(progname, LOG_DAEMON, pidfile);
if waited > 0:
print " took about %ss for socket to appear" % waited
# Wait for root user to be created
- command(["disorder",
- "--config", disorder._configfile, "--no-per-user-config",
+ command(["disorderd",
+ "--config", disorder._configfile,
"--wait-for-root"])
def create_user(username="fred", password="fredpass"):