Update

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

diff --git a/bacula/src/gnome2-console/test-gnome-console.conf b/bacula/src/gnome2-console/test-gnome-console.conf
index fa5f9bcd4e4d6e1ad02dee60391cf08d0feb94c9..b2725a1f9f6e727978cddccb2aa54f1f76c0d9aa 100644 (file)
--- a/bacula/src/gnome2-console/test-gnome-console.conf
+++ b/bacula/src/gnome2-console/test-gnome-console.conf
@@ -5,6 +5,6 @@
 Director {
   Name = rufus-dir
   DIRport = 8101
-  address = localhost
+  address = rufus
   Password = UA_password
 }

diff --git a/bacula/src/qt-console/authenticate.cpp b/bacula/src/qt-console/authenticate.cpp
deleted file mode 100644 (file)
index 7f0be62..0000000
--- a/bacula/src/qt-console/authenticate.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- *
- *   Bacula UA authentication. Provides authentication with
- *     the Director.
- *
- *     Kern Sibbald, June MMI
- *
- *     Version $Id$
- *
- *    This routine runs as a thread and must be thread reentrant.
- *
- *  Basic tasks done here:
- *
- */
-/*
-   Bacula® - The Network Backup Solution
-
-   Copyright (C) 2001-2007 Free Software Foundation Europe e.V.
-
-   The main author of Bacula is Kern Sibbald, with contributions from
-   many others, a complete list can be found in the file AUTHORS.
-   This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation plus additions
-   that are listed in the file LICENSE.
-
-   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, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-   Bacula® is a registered trademark of John Walker.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
-*/
-
-#include "bat.h"
-
-
-/* Commands sent to Director */
-static char hello[]    = "Hello %s calling\n";
-
-/* Response from Director */
-static char OKhello[]   = "1000 OK:";
-
-/* Forward referenced functions */
-
-/*
- * Authenticate Director
- */
-int authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons)
-{
-   BSOCK *dir = jcr->dir_bsock;
-   int tls_local_need = BNET_TLS_NONE;
-   int tls_remote_need = BNET_TLS_NONE;
-   int compatible = true;
-   char bashed_name[MAX_NAME_LENGTH];
-   char *password;
-
-   /*
-    * Send my name to the Director then do authentication
-    */
-   if (cons) {
-      bstrncpy(bashed_name, cons->hdr.name, sizeof(bashed_name));
-      bash_spaces(bashed_name);
-      password = cons->password;
-   } else {
-      bstrncpy(bashed_name, "*UserAgent*", sizeof(bashed_name));
-      password = director->password;
-   }
-   /* Timeout Hello after 5 mins */
-   btimer_t *tid = start_bsock_timer(dir, 60 * 5);
-   bnet_fsend(dir, hello, bashed_name);
-
-   /* respond to Dir challenge */
-   if (!cram_md5_respond(dir, password, &tls_remote_need, &compatible) ||
-       /* Now challenge dir */
-       !cram_md5_challenge(dir, password, tls_local_need, compatible)) {
-      stop_bsock_timer(tid);
-      printf(_("%s: Director authorization problem.\n"), my_name);
-      set_text(_("Director authorization problem.\n"));    
-      set_text(_(
-       "Please see http://www.bacula.org/rel-manual/faq.html#AuthorizationErrors for help.\n"));
-      return 0;
-   }
-
-   Dmsg1(6, ">dird: %s", dir->msg);
-   if (bnet_recv(dir) <= 0) {
-      stop_bsock_timer(tid);
-      set_textf(_("Bad response to Hello command: ERR=%s\n"),
-         bnet_strerror(dir));
-      printf(_("%s: Bad response to Hello command: ERR=%s\n"),
-         my_name, bnet_strerror(dir));
-      set_text(_("The Director is probably not running.\n"));
-      return 0;
-   }
-  stop_bsock_timer(tid);
-   Dmsg1(10, "<dird: %s", dir->msg);
-   if (strncmp(dir->msg, OKhello, sizeof(OKhello)-1) != 0) {
-      set_text(_("Director rejected Hello command\n"));    
-      return 0;
-   } else {
-      set_text(dir->msg);
-   }
-   return 1;
-}