From d005b0e2d8e848b390942b5e427bf6e614bf0ccb Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Fri, 20 Jun 2008 15:42:40 +0000 Subject: [PATCH] More word alignment cleanup. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7194 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/qt-console/bat_conf.cpp | 2 +- bacula/src/qt-console/bat_conf.h | 2 +- bacula/src/stored/dircmd.c | 2 +- bacula/src/version.h | 4 ++-- bacula/technotes-2.5 | 2 ++ 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bacula/src/qt-console/bat_conf.cpp b/bacula/src/qt-console/bat_conf.cpp index 35974d42dd..8dca8462a3 100644 --- a/bacula/src/qt-console/bat_conf.cpp +++ b/bacula/src/qt-console/bat_conf.cpp @@ -79,7 +79,7 @@ int res_all_size = sizeof(res_all); static RES_ITEM dir_items[] = { {"name", store_name, ITEM(dir_res.hdr.name), 0, ITEM_REQUIRED, 0}, {"description", store_str, ITEM(dir_res.hdr.desc), 0, 0, 0}, - {"dirport", store_int, ITEM(dir_res.DIRport), 0, ITEM_DEFAULT, 9101}, + {"dirport", store_pint32, ITEM(dir_res.DIRport), 0, ITEM_DEFAULT, 9101}, {"address", store_str, ITEM(dir_res.address), 0, ITEM_REQUIRED, 0}, {"password", store_password, ITEM(dir_res.password), 0, 0, 0}, {"tlsauthenticate",store_bool, ITEM(dir_res.tls_authenticate), 0, 0, 0}, diff --git a/bacula/src/qt-console/bat_conf.h b/bacula/src/qt-console/bat_conf.h index e09678c4a1..69b86f77d8 100644 --- a/bacula/src/qt-console/bat_conf.h +++ b/bacula/src/qt-console/bat_conf.h @@ -64,7 +64,7 @@ enum { class DIRRES { public: RES hdr; - int DIRport; /* UA server port */ + uint32_t DIRport; /* UA server port */ char *address; /* UA server address */ char *password; /* UA server password */ bool tls_authenticate; /* Authenticate with tls */ diff --git a/bacula/src/stored/dircmd.c b/bacula/src/stored/dircmd.c index 5891d6d0ec..b2eb57dcfd 100644 --- a/bacula/src/stored/dircmd.c +++ b/bacula/src/stored/dircmd.c @@ -97,7 +97,7 @@ static void send_dir_busy_message(BSOCK *dir, DEVICE *dev); struct s_cmds { const char *cmd; bool (*func)(JCR *jcr); - int monitoraccess; /* specify if monitors have access to this function */ + bool monitoraccess; /* set if monitors can access this cmd */ }; /* diff --git a/bacula/src/version.h b/bacula/src/version.h index dfc0f21edc..d9fd1b75b1 100644 --- a/bacula/src/version.h +++ b/bacula/src/version.h @@ -4,8 +4,8 @@ #undef VERSION #define VERSION "2.5.1" -#define BDATE "18 June 2008" -#define LSMDATE "18Jun08" +#define BDATE "20 June 2008" +#define LSMDATE "20Jun08" #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n" #define BYEAR "2008" /* year for copyright messages in progs */ diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5 index 7369058460..37c7447d06 100644 --- a/bacula/technotes-2.5 +++ b/bacula/technotes-2.5 @@ -30,6 +30,8 @@ vtape driver General: +20Jun08 +kes More word alignment cleanup. 19Jun08 kes Add dbuser to DIR conf file (replaces user). kes Add --with-db-password to ./configure -- 2.39.5