/*
* This file is part of DisOrder.
- * Copyright (C) 2004-2009 Richard Kettlewell
+ * Copyright (C) 2004-2013 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 <getopt.h>
#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+#if HAVE_SYS_UN_H
+# include <sys/un.h>
+#endif
#include <errno.h>
#include <locale.h>
#include <time.h>
#include <stddef.h>
-#include <unistd.h>
-#include <pcre.h>
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#if HAVE_PCRE_H
+# include <pcre.h>
+#endif
#include <ctype.h>
-#include <gcrypt.h>
-#include <langinfo.h>
+#if HAVE_GCRYPT_H
+# include <gcrypt.h>
+#endif
+#if HAVE_LANGINFO_H
+# include <langinfo.h>
+#endif
#include "configuration.h"
#include "syscalls.h"
#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;
mem_init();
+#if HAVE_PCRE_H
/* garbage-collect PCRE's memory */
pcre_malloc = xmalloc;
pcre_free = xfree;
+#endif
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 */
+#if HAVE_GCRYPT_H
/* gcrypt initialization */
if(!gcry_check_version(NULL))
disorder_fatal(0, "gcry_check_version failed");
gcry_control(GCRYCTL_INIT_SECMEM, 0);
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
+#endif
/* accumulate command args */
while(n < argc) {
if((i = TABLE_FIND(commands, name, argv[n])) < 0)