Start adding back removed code.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3487 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/filed/filed.c b/bacula/src/filed/filed.c
index 2a0de9878f1c1193cb14d83602864ffc389f8e9e..3c4c90a9ec3ccabef9c0fef9a3ac7f9ee14beb1f 100644 (file)
--- a/bacula/src/filed/filed.c
+++ b/bacula/src/filed/filed.c
@@ -40,7 +40,6 @@ bool no_signals = false;
 
 char *configfile = NULL;
 static bool foreground = false;
-static bool inetd_request = false;
 static workq_t dir_workq;             /* queue of work from Director */
 static pthread_t server_tid;
 
@@ -55,7 +54,6 @@ static void usage()
 "        -dnn        set debug level to nn\n"
 "        -f          run in foreground (for debugging)\n"
 "        -g          groupid\n"
-"        -i          inetd request\n"
 "        -s          no signals (for debugging)\n"
 "        -t          test configuration file and exit\n"
 "        -u          userid\n"
@@ -91,7 +89,7 @@ int main (int argc, char *argv[])
    init_msg(NULL, NULL);
    daemon_start_time = time(NULL);
 
-   while ((ch = getopt(argc, argv, "c:d:fg:istu:v?")) != -1) {
+   while ((ch = getopt(argc, argv, "c:d:fg:stu:v?")) != -1) {
       switch (ch) {
       case 'c':                    /* configuration file */
          if (configfile != NULL) {
@@ -115,9 +113,6 @@ int main (int argc, char *argv[])
          gid = optarg;
          break;
 
-      case 'i':
-         inetd_request = true;
-         break;
       case 's':
          no_signals = true;
          break;
@@ -184,7 +179,7 @@ int main (int argc, char *argv[])
       terminate_filed(0);
    }
 
-   if (!foreground &&!inetd_request) {
+   if (!foreground) {
       daemon_start();
       init_stack_dump();              /* set new pid */
    }
@@ -209,25 +204,12 @@ int main (int argc, char *argv[])
    }
    server_tid = pthread_self();
 
-   if (inetd_request) {
-      /* Socket is on fd 0 */
-      struct sockaddr client_addr;
-      int port = -1;
-      socklen_t client_addr_len = sizeof(client_addr);
-      if (getsockname(0, &client_addr, &client_addr_len) == 0) {
-                /* MA BUG 6 remove ifdefs */
-                port = sockaddr_get_port_net_order(&client_addr);
-      }
-      BSOCK *bs = init_bsock(NULL, 0, "client", "unknown client", port, &client_addr);
-      handle_client_request((void *)bs);
-   } else {
-      /* Become server, and handle requests */
-      IPADDR *p;
-      foreach_dlist(p, me->FDaddrs) {
-         Dmsg1(10, "filed: listening on port %d\n", p->get_port_host_order());
-      }
-      bnet_thread_server(me->FDaddrs, me->MaxConcurrentJobs, &dir_workq, handle_client_request);
+   /* Become server, and handle requests */
+   IPADDR *p;
+   foreach_dlist(p, me->FDaddrs) {
+      Dmsg1(10, "filed: listening on port %d\n", p->get_port_host_order());
    }
+   bnet_thread_server(me->FDaddrs, me->MaxConcurrentJobs, &dir_workq, handle_client_request);
 
    terminate_filed(0);
    exit(0);                           /* should never get here */

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 9e11c1eecd322e6ca9c5d2ebc76c970bebd1215b..376d714d102f79d407c087b52e0fe8adf7d70f3e 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "1.39.23"
-#define BDATE   "18 September 2006"
-#define LSMDATE "18Sep06"
+#define BDATE   "20 September 2006"
+#define LSMDATE "20Sep06"
 #define BYEAR "2006"       /* year for copyright messages in progs */
 
 /* Debug flags */

diff --git a/bacula/technotes-1.39 b/bacula/technotes-1.39
index 25364a31f81b7a286293d46b97fb5b587f733b8d..ffc8c40b727df2c2af5fb69528120e61a77b4f77 100644 (file)
--- a/bacula/technotes-1.39
+++ b/bacula/technotes-1.39
@@ -1,6 +1,11 @@
               Technical notes on version 1.39  
 
 General:
+20Sep06
+kes  Start adding back removed code.
+kes  Back out a number of changes because backups to tape crash my
+     system.
+kes  Remove the inetd code from the File daemon.
 18Sep06
 kes  Add -c option to pg_dump so that it initializes tables when   
      restored.