*** empty log message ***

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

diff --git a/bacula/src/wx-console/TODO b/bacula/src/wx-console/TODO
index 2d3eebce8b848cbc21eeb3c91556247d4efac9d4..a1c5b3157be06064ed99abd4075f469c5adfa290 100644 (file)
--- a/bacula/src/wx-console/TODO
+++ b/bacula/src/wx-console/TODO
@@ -1,3 +1,4 @@
+wxbRestorePanel : Add buttons to mark/unmark directories/files.
 
 wxbRestorePanel : Allow the user to choose where he wants to restore his files
 
@@ -7,6 +8,12 @@ wxbRestorePanel : Check more carefully which job we just have run.
 
 console_thread : Allow the user to choose his config file.
 
+general : use dot commands
+
+general : create a class like wxbtableparser, which fetches commands results
+
+win32 : do a static build
+
 (old build params : )
 -lgcc -lodbc32 -lwsock32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lopengl32 -lglu32 -lole32 -loleaut32 -luuid 
 -lkernel32 -lcomdlg32 -lgdi32 -lrpcrt4 -luser32 -lz

diff --git a/bacula/src/wx-console/authenticate.c b/bacula/src/wx-console/authenticate.c
index 94babca87fe348916c777042438c943c8e6f54d7..94dc6a9031058d23c1e62856d3eca5b64b89a0ab 100644 (file)
--- a/bacula/src/wx-console/authenticate.c
+++ b/bacula/src/wx-console/authenticate.c
@@ -25,8 +25,7 @@
 
    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., 59 Temple Place - Suite 330, Boston, 
-   MA  02111-1307, USA.
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
 #include "bacula.h"
@@ -36,7 +35,7 @@
 #include "csprint.h"
 
 void senditf(char *fmt, ...);
-void sendit(char *buf); 
+void sendit(char *buf);
 
 /* Commands sent to Director */
 static char hello[]    = "Hello %s calling\n";
@@ -56,7 +55,7 @@ int authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons)
    char bashed_name[MAX_NAME_LENGTH];
    char *password;
 
-   /* 
+   /*
     * Send my name to the Director then do authentication
     */
    if (cons) {
@@ -71,19 +70,19 @@ int authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons)
    btimer_t *tid = start_bsock_timer(dir, 60 * 5);
    bnet_fsend(dir, hello, bashed_name);
 
-   if (!cram_md5_get_auth(dir, password, ssl_need) || 
+   if (!cram_md5_get_auth(dir, password, ssl_need) ||
        !cram_md5_auth(dir, password, ssl_need)) {
       stop_bsock_timer(tid);
-      csprint("Director authorization problem.\nMost likely the passwords do not agree.\n", CS_DATA);  
+      csprint("Director authorization problem.\nMost likely the passwords do not agree.\n", CS_DATA);
       return 0;
    }
 
    Dmsg1(6, ">dird: %s", dir->msg);
    if (bnet_recv(dir) <= 0) {
       stop_bsock_timer(tid);
-      csprint("Bad response to Hello command: ERR=", CS_DATA);  
+      csprint("Bad response to Hello command: ERR=", CS_DATA);
       csprint(bnet_strerror(dir), CS_DATA);
-      csprint("\n", CS_DATA);  
+      csprint("\n", CS_DATA);
       return 0;
    }
    Dmsg1(10, "<dird: %s", dir->msg);

diff --git a/bacula/src/wx-console/console_conf.h b/bacula/src/wx-console/console_conf.h
index f5bf3693bca2b6db0fea16de2cf23f40bb495ee6..3faf82fe0035213d64b8b05b6614d919534c844c 100644 (file)
--- a/bacula/src/wx-console/console_conf.h
+++ b/bacula/src/wx-console/console_conf.h
@@ -23,7 +23,7 @@
 #include "jcr.h"
 
 /*
- * Resource codes -- they must be sequential for indexing   
+ * Resource codes -- they must be sequential for indexing
  */
 #define R_FIRST                       1001
 

diff --git a/bacula/src/wx-console/console_thread.h b/bacula/src/wx-console/console_thread.h
index f3a9cbc44a49366a09ded44e2bef236f834af888..50f5703a2a171d52b418c92a2a708fef991fd36c 100644 (file)
--- a/bacula/src/wx-console/console_thread.h
+++ b/bacula/src/wx-console/console_thread.h
@@ -6,7 +6,7 @@
  *
  */
 /*
-   Copyright (C) 2000, 2001 Kern Sibbald and John Walker
+   Copyright (C) 2004 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License