From ab9aaf47a151d53bc215ae331be46d222aeff4b7 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 9 Feb 2009 19:00:56 +0000
Subject: [PATCH] kes  Free name item in guid_to_name.c when already in list.
 kes  Add more info to error message in ua_tree.c

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8433 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/src/dird/ua_tree.c       | 7 ++++---
 bacula/src/filed/authenticate.c | 4 ++--
 bacula/src/lib/guid_to_name.c   | 2 ++
 bacula/src/version.h            | 6 +++---
 bacula/technotes-2.5            | 3 +++
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/bacula/src/dird/ua_tree.c b/bacula/src/dird/ua_tree.c
index 18f8605c40..f1b056553b 100644
--- a/bacula/src/dird/ua_tree.c
+++ b/bacula/src/dird/ua_tree.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2002-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2002-2009 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.
@@ -129,7 +129,7 @@ bool user_select_files_from_tree(TREE_CTX *tree)
       if (ua->api) user->signal(BNET_CMD_BEGIN);
       parse_args_only(ua->cmd, &ua->args, &ua->argc, ua->argk, ua->argv, MAX_CMD_ARGS);
       if (ua->argc == 0) {
-         ua->warning_msg(_("Invalid command. Enter \"done\" to exit.\n"));
+         ua->warning_msg(_("Invalid command \"%s\". Enter \"done\" to exit.\n")
          if (ua->api) user->signal(BNET_CMD_FAILED);
          continue;
       }
@@ -139,12 +139,13 @@ bool user_select_files_from_tree(TREE_CTX *tree)
       stat = false;
       for (i=0; i<comsize; i++)       /* search for command */
          if (strncasecmp(ua->argk[0],  _(commands[i].key), len) == 0) {
+            ua->cmd);
             stat = (*commands[i].func)(ua, tree);   /* go execute command */
             found = 1;
             break;
          }
       if (!found) {
-         ua->warning_msg(_("Invalid command. Enter \"done\" to exit.\n"));
+         ua->warning_msg(_("Invalid command \"%s\". Enter \"done\" to exit.\n")
          if (ua->api) user->signal(BNET_CMD_FAILED);
          continue;
       }
diff --git a/bacula/src/filed/authenticate.c b/bacula/src/filed/authenticate.c
index a33c3d6bc9..5c62eb408a 100644
--- a/bacula/src/filed/authenticate.c
+++ b/bacula/src/filed/authenticate.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2009 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.
@@ -44,7 +44,7 @@ const int dbglvl = 50;
  *   1 10Mar08
  */
 static char OK_hello[]  = "2000 OK Hello 1\n";
-static char Dir_sorry[] = "2999 No go\n";
+static char Dir_sorry[] = "2999 Authentication failed.\n";
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 
 /*********************************************************************
diff --git a/bacula/src/lib/guid_to_name.c b/bacula/src/lib/guid_to_name.c
index 90747896a8..e407c2247d 100644
--- a/bacula/src/lib/guid_to_name.c
+++ b/bacula/src/lib/guid_to_name.c
@@ -147,6 +147,7 @@ char *guid_list::uid_to_name(uid_t uid, char *name, int maxlen)
       }
       fitem = (guitem *)uid_list->binary_insert(item, uid_compare);
       if (fitem != item) {               /* item already there this shouldn't happen */
+         free(item->name);
          free(item);
          item = fitem;   
       }
@@ -172,6 +173,7 @@ char *guid_list::gid_to_name(gid_t gid, char *name, int maxlen)
       }
       fitem = (guitem *)gid_list->binary_insert(item, gid_compare);
       if (fitem != item) {               /* item already there this shouldn't happen */
+         free(item->name);
          free(item);
          item = fitem;   
       }
diff --git a/bacula/src/version.h b/bacula/src/version.h
index a2433b5cee..82bf5ea814 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -3,9 +3,9 @@
  */
 
 #undef  VERSION
-#define VERSION "2.5.31"
-#define BDATE   "25 January 2009"
-#define LSMDATE "25Jan09"
+#define VERSION "2.5.32"
+#define BDATE   "08 February 2009"
+#define LSMDATE "09Feb09"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2009"       /* year for copyright messages in progs */
diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index e0b78956ff..05252544fc 100644
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -25,6 +25,9 @@ filepattern (restore with regex in bsr)
 mixed priorities
 
 General:
+08Feb09
+kes  Free name item in guid_to_name.c when already in list.
+kes  Add more info to error message in ua_tree.c
 05Feb09
 kes  Make re-read last block fatal if block numbers differ by
      more than one.
-- 
2.39.5