From 3ab946b1d2677cb3d8095e54767487d569457542 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 24 Apr 2003 07:30:25 +0000
Subject: [PATCH] Doc + fix automount on files

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@456 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/ReleaseNotes               | 4 ++--
 bacula/kernstodo                  | 3 +++
 bacula/src/console/authenticate.c | 3 ++-
 bacula/src/dird/ua_cmds.c         | 4 ++--
 bacula/src/lib/cram-md5.c         | 2 +-
 bacula/src/stored/mount.c         | 2 +-
 bacula/src/version.h              | 4 ++--
 7 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index b4bf68611a..160b3184c8 100644
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -1,6 +1,6 @@
-          Release Notes for Bacula 1.30
+          Release Notes for Bacula 1.30-22Apr03 BETA
 
-  Bacula code: Total files = 235 Total lines = 66,658 (*.h *.c *.in)
+  Bacula code: Total files = 235 Total lines = 67,254 (*.h *.c *.in)
 
 Major Changes this Release:
 - The Windows Client now uses Cygwin 1.3.20 and should be much 
diff --git a/bacula/kernstodo b/bacula/kernstodo
index 0f2169c5ec..ff138597ba 100644
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -17,6 +17,9 @@ Testing to do: (painful)
 - multiple simultaneous Volumes
 
 For 1.30 release:
+- Bug: up arrow prints garbage in command line on gnome-console!
+- Bug: fix access problems on files restored on WinXP (possibly do
+       this in a later update.
 - Fix Bare Metal restore problem.
 - Test multiple simultaneous Volumes
 
diff --git a/bacula/src/console/authenticate.c b/bacula/src/console/authenticate.c
index 72a065145d..819b93ab19 100644
--- a/bacula/src/console/authenticate.c
+++ b/bacula/src/console/authenticate.c
@@ -55,7 +55,8 @@ int authenticate_director(JCR *jcr, DIRRES *director)
 
    if (!cram_md5_get_auth(dir, director->password) || 
        !cram_md5_auth(dir, director->password)) {
-      Dmsg0(-1, "Director authorization problem.\n");
+      Dmsg0(-1, _("Director authorization problem.\n"
+            "Most likely the passwords do not agree.\n"));  
       return 0;
    }
 
diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c
index e7dfa8a644..ad2efde98e 100644
--- a/bacula/src/dird/ua_cmds.c
+++ b/bacula/src/dird/ua_cmds.c
@@ -424,9 +424,10 @@ static int cancelcmd(UAContext *ua, char *cmd)
       }
    }
      
+   set_jcr_job_status(jcr, JS_Canceled);
+
    switch (jcr->JobStatus) {
    case JS_Created:
-      set_jcr_job_status(jcr, JS_Canceled);
       bsendmsg(ua, _("JobId %d, Job %s marked to be canceled.\n"),
 	      jcr->JobId, jcr->Job);
 #ifndef USE_SEMAPHORE
@@ -436,7 +437,6 @@ static int cancelcmd(UAContext *ua, char *cmd)
       return 1;
 	 
    default:
-      set_jcr_job_status(jcr, JS_Canceled);
       /* Cancel File daemon */
       ua->jcr->client = jcr->client;
       if (!connect_to_file_daemon(ua->jcr, 10, FDConnectTimeout, 1)) {
diff --git a/bacula/src/lib/cram-md5.c b/bacula/src/lib/cram-md5.c
index ef64ff15e4..7d788381a6 100644
--- a/bacula/src/lib/cram-md5.c
+++ b/bacula/src/lib/cram-md5.c
@@ -69,7 +69,7 @@ int cram_md5_auth(BSOCK *bs, char *password)
    if (ok) {
       bnet_fsend(bs, "1000 OK auth\n");
    } else {
-      bnet_fsend(bs, "1999 No auth\n");
+      bnet_fsend(bs, "1999 Authorization failed.\n");
       bmicrosleep(5, 0);
    }
    return ok;
diff --git a/bacula/src/stored/mount.c b/bacula/src/stored/mount.c
index 420eb488e8..449cc28495 100644
--- a/bacula/src/stored/mount.c
+++ b/bacula/src/stored/mount.c
@@ -133,7 +133,7 @@ mount_next_vol:
        *   and read the label. If there is no tape in the drive,
        *   we will err, recurse and ask the operator the next time.
        */
-      if (autochanger || (!release && dev_cap(dev, CAP_AUTOMOUNT))) {
+      if (autochanger || (!release && dev_is_tape(dev) && dev_cap(dev, CAP_AUTOMOUNT))) {
          ask = 0;                     /* don't ask SYSOP this time */
       }
 
diff --git a/bacula/src/version.h b/bacula/src/version.h
index ea659e40a7..6d893e7386 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #define VERSION "1.30"
 #define VSTRING "1"
-#define BDATE   "22 April 2003"
-#define LSMDATE "22Apr03"
+#define BDATE   "24 April 2003"
+#define LSMDATE "24Apr03"
 
 /* Debug flags */
 #define DEBUG 1
-- 
2.39.5