]> git.sur5r.net Git - bacula/bacula/log
bacula/bacula
11 years agoTweak second part of fix for #1893
Marco van Wieringen [Fri, 15 Jun 2012 13:07:07 +0000 (15:07 +0200)]
Tweak second part of fix for #1893

11 years agoFix bug #1893
Marco van Wieringen [Fri, 15 Jun 2012 12:16:58 +0000 (14:16 +0200)]
Fix bug #1893

Only try to close an database transaction when the database
is opened. Only destroy an rwl_lock when it is initialized.
As dbcheck only calls db_init_database and then db_close_database
the database is never opened and we try to end an transaction
on a non-opened database, the rwl_destroy will also give
an error (which is ignored) as the rwl_lock is only initialized
on opening of the database.

11 years agoRemove restriction of network buffer size being multiple of a tape block
Kern Sibbald [Wed, 13 Jun 2012 05:55:47 +0000 (07:55 +0200)]
Remove restriction of network buffer size being multiple of a tape block

11 years agoRecompile configure.in
Kern Sibbald [Mon, 11 Jun 2012 15:30:34 +0000 (17:30 +0200)]
Recompile configure.in

11 years agoAdd rudimentary support for saving AFS acls.
Marco van Wieringen [Mon, 11 Jun 2012 15:16:40 +0000 (17:16 +0200)]
Add rudimentary support for saving AFS acls.

    Add support for saving and restoring AFS acls using the
    pioctl interface of (Open)AFS. This is mostly a proof of
    concept its no where ready for production and may put
    a enormous load on your AFS cell so please use it only
    for testing. It also only solves part of the AFS backup
    problem as we only save and restore acls on directories
    on an AFS filesystem but not the actual cell configuration
    etc. For that we advice you to use the native tooling
    using some script or the bpipe plugin.

11 years agoAdd missing systemd file
Kern Sibbald [Mon, 11 Jun 2012 14:53:09 +0000 (16:53 +0200)]
Add missing systemd file

11 years agoUpdate developer
Kern Sibbald [Mon, 11 Jun 2012 14:51:01 +0000 (16:51 +0200)]
Update developer

11 years agoAdd clean
Kern Sibbald [Mon, 11 Jun 2012 14:50:49 +0000 (16:50 +0200)]
Add clean

11 years agoUpdate notes, version to 5.2.9
Kern Sibbald [Mon, 11 Jun 2012 14:37:27 +0000 (16:37 +0200)]
Update notes, version to 5.2.9

11 years agoUpdate ReleaseNotes, ChangeLog, and po files
Kern Sibbald [Mon, 11 Jun 2012 14:06:47 +0000 (16:06 +0200)]
Update ReleaseNotes, ChangeLog, and po files

11 years agoRecompile configure.in
Kern Sibbald [Mon, 11 Jun 2012 14:06:24 +0000 (16:06 +0200)]
Recompile configure.in

11 years agoUpdate comment in pushtags
Kern Sibbald [Mon, 11 Jun 2012 14:05:11 +0000 (16:05 +0200)]
Update comment in pushtags

11 years agoEnsure cancel status is set for canceled duplicate jobs -- partial fix for bug #1851
Kern Sibbald [Sun, 10 Jun 2012 07:42:41 +0000 (09:42 +0200)]
Ensure cancel status is set for canceled duplicate jobs -- partial fix for bug #1851

11 years agoEnhance Win32 error messages -- fixes bug #1879
Kern Sibbald [Sun, 10 Jun 2012 07:41:05 +0000 (09:41 +0200)]
Enhance Win32 error messages -- fixes bug #1879

11 years agoUpdate version and date
Kern Sibbald [Sat, 9 Jun 2012 10:38:49 +0000 (12:38 +0200)]
Update version and date

11 years agoApply patch from bug 1876 to permit dot commands in a runscript
Kern Sibbald [Sat, 9 Jun 2012 10:35:02 +0000 (12:35 +0200)]
Apply patch from bug 1876 to permit dot commands in a runscript

11 years agoRemove config variables from examples/devices fixes bug #1884
Kern Sibbald [Sat, 9 Jun 2012 10:08:53 +0000 (12:08 +0200)]
Remove config variables from examples/devices fixes bug #1884

11 years agoAdd more debug code for bug 1885
Kern Sibbald [Sat, 9 Jun 2012 09:48:33 +0000 (11:48 +0200)]
Add more debug code for bug 1885

11 years agoAdd more debug to block.c when read rejected
Kern Sibbald [Sat, 9 Jun 2012 09:40:45 +0000 (11:40 +0200)]
Add more debug to block.c when read rejected

11 years agoFail job that attempts to read from closed device -- reported in bug 1885 but not...
Kern Sibbald [Sat, 9 Jun 2012 09:33:23 +0000 (11:33 +0200)]
Fail job that attempts to read from closed device -- reported in bug 1885 but not fixed

11 years agoRecompile configure
Kern Sibbald [Sat, 9 Jun 2012 09:07:11 +0000 (11:07 +0200)]
Recompile configure

11 years agoDetect Python 2.7 fixes bug #1888
Kern Sibbald [Sat, 9 Jun 2012 09:00:14 +0000 (11:00 +0200)]
Detect Python 2.7 fixes bug #1888

11 years agoRecompile configure
Kern Sibbald [Sat, 9 Jun 2012 08:41:42 +0000 (10:41 +0200)]
Recompile configure

11 years agoApply systemd patch from bug #1886
Kern Sibbald [Sat, 9 Jun 2012 08:41:07 +0000 (10:41 +0200)]
Apply systemd patch from bug #1886

11 years agoRewrite some SD subroutines as class members
Kern Sibbald [Fri, 8 Jun 2012 15:51:54 +0000 (17:51 +0200)]
Rewrite some SD subroutines as class members

11 years agoNew overhaul of xattr code.
Marco van Wieringen [Tue, 5 Jun 2012 16:43:25 +0000 (18:43 +0200)]
New overhaul of xattr code.

Delay allocation to last minute when we are mostly sure we can
save a real xattr and we only need to get the actual value of it.
This way we don't have to free data on strange code paths. Also
made most functions have one exit point so things are more clean.

11 years agoUse IPPROTO_TCP for SOL_TCP if SOL_TCP isn't defined.
Marco van Wieringen [Sun, 3 Jun 2012 21:06:58 +0000 (23:06 +0200)]
Use IPPROTO_TCP for SOL_TCP if SOL_TCP isn't defined.

On a lot of platforms (*BSD, Solaris etc.) SOL_TCP isn't defined
but IPPROTO_TCP is so use that.

11 years agoFix compiler warning.
Marco van Wieringen [Sun, 3 Jun 2012 17:40:29 +0000 (19:40 +0200)]
Fix compiler warning.

11 years agoUpdate version date
Kern Sibbald [Sat, 2 Jun 2012 11:29:33 +0000 (13:29 +0200)]
Update version date

11 years agoTweak update date
Kern Sibbald [Sat, 2 Jun 2012 10:06:28 +0000 (12:06 +0200)]
Tweak update date

11 years agoUpdate po files
Kern Sibbald [Sat, 2 Jun 2012 10:05:50 +0000 (12:05 +0200)]
Update po files

11 years agoUpdate ChangeLog and ReleaseNotes
Kern Sibbald [Sat, 2 Jun 2012 10:05:40 +0000 (12:05 +0200)]
Update ChangeLog and ReleaseNotes

11 years agoCorrect Qt version needed for bat
Kern Sibbald [Sat, 2 Jun 2012 08:20:59 +0000 (10:20 +0200)]
Correct Qt version needed for bat

11 years agoTweak rebuild config.h.in
Marco van Wieringen [Fri, 1 Jun 2012 18:22:59 +0000 (20:22 +0200)]
Tweak rebuild config.h.in

11 years agoTweak define so autoheader doesn't complain.
Marco van Wieringen [Fri, 1 Jun 2012 18:22:00 +0000 (20:22 +0200)]
Tweak define so autoheader doesn't complain.

11 years agoUpdate version date
Kern Sibbald [Fri, 1 Jun 2012 16:30:12 +0000 (18:30 +0200)]
Update version date

11 years agoTurn on SD deadlock detection by default
Kern Sibbald [Fri, 1 Jun 2012 16:29:07 +0000 (18:29 +0200)]
Turn on SD deadlock detection by default

11 years agoTweak name of the database
Bruno Friedmann [Thu, 16 Feb 2012 15:51:38 +0000 (16:51 +0100)]
Tweak name of the database

Add instructions for creating the database
Add dir_user and dir_group as owner in case of non-root

Signed-off-by: Bruno Friedmann <bruno@ioda-net.ch>
Signed-off-by: Marco van Wieringen <mvw@planets.elm.net>
11 years agoTry to use multi-row insert statements for mysql.
Marco van Wieringen [Thu, 19 Apr 2012 12:04:41 +0000 (14:04 +0200)]
Try to use multi-row insert statements for mysql.

As it seems we could speedup the insert of the batch mode
somewhat by using multi-row insert statements. This implements
a very simple routine which batch up 32 inserts into one
query before pushing it to the database. The 32 is arbitrary
and just a test value for now we can always bump or lower it.

11 years agoFix bug #1880 ltdl.m4 missing for new feature.
Marco van Wieringen [Fri, 1 Jun 2012 13:24:49 +0000 (15:24 +0200)]
Fix bug #1880 ltdl.m4 missing for new feature.

11 years agoTweak recompile configure.in
Marco van Wieringen [Fri, 1 Jun 2012 09:27:48 +0000 (11:27 +0200)]
Tweak recompile configure.in

11 years agoFix bug #1870 GNU binutils-gold build failure.
Marco van Wieringen [Fri, 1 Jun 2012 09:24:53 +0000 (11:24 +0200)]
Fix bug #1870 GNU binutils-gold build failure.

Use some extra libtool magic to determine what lib to use
to get dlopen and friends for loading plugins from libbac.

11 years agoFix bug #1874 crash with xattr support on a BTRFS filesystem
Marco van Wieringen [Fri, 1 Jun 2012 09:21:32 +0000 (11:21 +0200)]
Fix bug #1874 crash with xattr support on a BTRFS filesystem

Add some extra safeguards that structure are always initialized
the way we think they should be and a special code path doesn't
give freeing failures on non allocated memory.

11 years agoAdd new empty netinet/tcp.h so Windows compile works
Kern Sibbald [Thu, 31 May 2012 13:31:10 +0000 (15:31 +0200)]
Add new empty netinet/tcp.h so Windows compile works

11 years agoEliminate compiler warning in stored/dircmd.c
Kern Sibbald [Thu, 31 May 2012 07:24:29 +0000 (09:24 +0200)]
Eliminate compiler warning in stored/dircmd.c

11 years agoFix TCP Heartbeat code
Kern Sibbald [Wed, 30 May 2012 17:02:33 +0000 (19:02 +0200)]
Fix TCP Heartbeat code

11 years agoTweak connect error.
Marco van Wieringen [Wed, 30 May 2012 14:15:36 +0000 (16:15 +0200)]
Tweak connect error.

On lookup of a hostname we could get back both IPv4 and IPV6 addresses
for a given host. But we may only support IPV4 on the local host
and as such trying to create an IPV6 socket will fail. If we check
the return code of the socket call for EAFNOSUPPORT we catch such
an error and can continue trying to create a socket type that is
supported.

11 years agoTweak debug levels and messages
Kern Sibbald [Tue, 29 May 2012 19:56:25 +0000 (21:56 +0200)]
Tweak debug levels and messages

11 years agoTweak conio comment
Kern Sibbald [Mon, 28 May 2012 16:31:59 +0000 (18:31 +0200)]
Tweak conio comment

11 years agoAlign conio.c struct at 8 bytes to fix Sparc bus error.
Kern Sibbald [Mon, 28 May 2012 13:44:38 +0000 (15:44 +0200)]
Align conio.c struct at 8 bytes to fix Sparc bus error.

11 years agoTweak recompile configure.in
Kern Sibbald [Mon, 28 May 2012 09:26:19 +0000 (11:26 +0200)]
Tweak recompile configure.in

11 years agoOn some platforms intptr_t is in an other include file.
Marco van Wieringen [Thu, 19 Apr 2012 12:08:40 +0000 (14:08 +0200)]
On some platforms intptr_t is in an other include file.

11 years agoAdd support for fcntl(fd, F_CLOSEM) to close filedescriptors.
Marco van Wieringen [Thu, 19 Apr 2012 12:05:42 +0000 (14:05 +0200)]
Add support for fcntl(fd, F_CLOSEM) to close filedescriptors.

11 years agoUse closefrom if available instead of trying to close fds ourself.
Marco van Wieringen [Thu, 19 Apr 2012 12:05:34 +0000 (14:05 +0200)]
Use closefrom if available instead of trying to close fds ourself.

11 years agoFix class member shadowing.
Marco van Wieringen [Thu, 19 Apr 2012 12:05:23 +0000 (14:05 +0200)]
Fix class member shadowing.

"devlock.c", line 60: Warning: priority hides devlock::priority.

11 years agoMove storages tls initialization to proper place.
Marco van Wieringen [Thu, 19 Apr 2012 12:05:13 +0000 (14:05 +0200)]
Move storages tls initialization to proper place.

We initialize all tls stuff in the check_resources function except
for the tls stuff for storages which we initialize in the
check_catalog function because we walk the storages there already.
This might be an optimization but it doesn't make sense its better
to check the whole resources stuff in the check_resources function
as the name seems to imply that is what is done there.

11 years agoFix Copyright on init scripts suse, add specific daemon user & group
Bruno Friedmann [Thu, 19 Apr 2012 12:05:01 +0000 (14:05 +0200)]
Fix Copyright on init scripts suse, add specific daemon user & group

Signed-off-by: Marco van Wieringen <mvw@planets.elm.net>
11 years agoAdd support for new POSIX getaddrinfo interface.
Marco van Wieringen [Thu, 19 Apr 2012 12:04:52 +0000 (14:04 +0200)]
Add support for new POSIX getaddrinfo interface.

Support the new POSIX getaddrinfo interface which replaces
the dated gethostbyname interface which is obsoleted in
the POSIX 1003.1 standard. When getaddrinfo is supported
by the OS its the prefered interface as gethostbyname is
not thread-safe and we don't support the gethostbyname_r
thread-safe version of gethostbyname.

The bnet code is changed to support the absolute mimimum set
of the getaddrinfo interface replacing only the core functions
normally performed by gethostbyname. We could add more generic
support for the getaddrinfo function but have not for now.

bstmp is changed to use the full getaddrinfo functionality
so it now can also connect to ipv6 mailhost when getaddrinfo
is used.

Also all sprintf calls in bsmtp are replaced with snprintf calls.

11 years agoFix get_basename() -- rewrite
Kern Sibbald [Fri, 18 May 2012 09:21:57 +0000 (11:21 +0200)]
Fix get_basename() -- rewrite

11 years agoTweak increase debug level to reduce unnecessary debug output
Kern Sibbald [Fri, 18 May 2012 08:12:16 +0000 (10:12 +0200)]
Tweak increase debug level to reduce unnecessary debug output

11 years agoApply James' exchange-fd.c regression fix
Kern Sibbald [Tue, 15 May 2012 18:34:32 +0000 (20:34 +0200)]
Apply James' exchange-fd.c regression fix

11 years agoRemove broke MySQL library detection + cleanup
Kern Sibbald [Sun, 6 May 2012 09:12:45 +0000 (11:12 +0200)]
Remove broke MySQL library detection + cleanup

11 years agoAdd first Dutch translation
Kern Sibbald [Sat, 5 May 2012 11:54:27 +0000 (13:54 +0200)]
Add first Dutch translation

11 years agoEnsure that StorageId is updated after write
Kern Sibbald [Mon, 30 Apr 2012 19:12:32 +0000 (21:12 +0200)]
Ensure that StorageId is updated after write

11 years agoFix updating of cached slots + error message numbering
Kern Sibbald [Mon, 30 Apr 2012 19:12:03 +0000 (21:12 +0200)]
Fix updating of cached slots + error message numbering

11 years agoTweak debug levels
Kern Sibbald [Mon, 30 Apr 2012 19:07:28 +0000 (21:07 +0200)]
Tweak debug levels

11 years agoUpdate version date
Kern Sibbald [Sun, 29 Apr 2012 08:49:15 +0000 (10:49 +0200)]
Update version date

11 years agoTweak ReleaseNotes. More to do
Kern Sibbald [Sun, 29 Apr 2012 08:48:17 +0000 (10:48 +0200)]
Tweak ReleaseNotes. More to do

11 years agoRemove old shared objects before install
Kern Sibbald [Sun, 29 Apr 2012 08:39:29 +0000 (10:39 +0200)]
Remove old shared objects before install

11 years agoAdd missing dummy bVarPrefixLinks variable retrieval.
Marco van Wieringen [Sun, 22 Apr 2012 17:23:40 +0000 (19:23 +0200)]
Add missing dummy bVarPrefixLinks variable retrieval.

11 years agoRebuild configure.
Marco van Wieringen [Sun, 22 Apr 2012 17:21:49 +0000 (19:21 +0200)]
Rebuild configure.

11 years agoFix mysql config for older versions of mysql+config.
Marco van Wieringen [Sun, 22 Apr 2012 17:16:51 +0000 (19:16 +0200)]
Fix mysql config for older versions of mysql+config.

On older versions of mysql_config the newly used
flags are not supported. So we test if the new flag
is supported and otherwise fallback to a kludge with
some sed strings to get the info we want from the
older mysql_config options.

This fixes problems on :

Centos 6
RHEL 6
SLES 11sp1
SLES 11sp2
OpenSuse 11.4

11 years agoFix problem in BVFS with concurrent queries
Eric Bollengier [Fri, 20 Apr 2012 08:48:59 +0000 (10:48 +0200)]
Fix problem in BVFS with concurrent queries

11 years agoAdd more checks to bvfs
Eric Bollengier [Fri, 20 Apr 2012 07:07:04 +0000 (09:07 +0200)]
Add more checks to bvfs

11 years agoRecompile configure.in
Kern Sibbald [Thu, 19 Apr 2012 09:46:16 +0000 (11:46 +0200)]
Recompile configure.in

11 years agoApply MSQL detection fixes from bug #1829
Kern Sibbald [Thu, 19 Apr 2012 09:46:01 +0000 (11:46 +0200)]
Apply MSQL detection fixes from bug #1829

11 years agoRecompile configure.in
Kern Sibbald [Thu, 19 Apr 2012 09:17:32 +0000 (11:17 +0200)]
Recompile configure.in

11 years agoFix bug #1805 cannot specify hostname in ./configure
Kern Sibbald [Thu, 19 Apr 2012 09:17:13 +0000 (11:17 +0200)]
Fix bug #1805 cannot specify hostname in ./configure

11 years agoUpdate version + date
Kern Sibbald [Thu, 19 Apr 2012 09:08:51 +0000 (11:08 +0200)]
Update version + date

11 years agoRequire latest Qtlibs
Kern Sibbald [Thu, 19 Apr 2012 09:07:18 +0000 (11:07 +0200)]
Require latest Qtlibs

11 years agoFix restore_job restore keyword
Eric Bollengier [Thu, 19 Apr 2012 07:04:21 +0000 (09:04 +0200)]
Fix restore_job restore keyword

11 years agoAllow plugin to backup a directory
Eric Bollengier [Wed, 18 Apr 2012 14:32:43 +0000 (16:32 +0200)]
Allow plugin to backup a directory

11 years agoPrint seconds in schedule time as noted in bug #1854
Kern Sibbald [Wed, 18 Apr 2012 20:37:58 +0000 (22:37 +0200)]
Print seconds in schedule time as noted in bug #1854

11 years agoChange dev->open() to return bool
Kern Sibbald [Wed, 18 Apr 2012 07:57:06 +0000 (09:57 +0200)]
Change dev->open() to return bool

11 years agoMore definitive fix for update slots bug
Kern Sibbald [Sat, 14 Apr 2012 09:24:30 +0000 (11:24 +0200)]
More definitive fix for update slots bug

11 years agoFix old update slots bug
Kern Sibbald [Fri, 13 Apr 2012 21:15:43 +0000 (23:15 +0200)]
Fix old update slots bug

11 years agoBackport new StorageId code
Kern Sibbald [Sun, 15 Apr 2012 12:05:31 +0000 (14:05 +0200)]
Backport new StorageId code

11 years agoFix #1857 about restore cd command that blocks on empty directory
Eric Bollengier [Tue, 17 Apr 2012 13:00:39 +0000 (15:00 +0200)]
Fix #1857 about restore cd command that blocks on empty directory

11 years agoFix #4062 on make_catalog_backup.pl script when user/password are empty
Eric Bollengier [Thu, 12 Apr 2012 12:01:14 +0000 (14:01 +0200)]
Fix #4062 on make_catalog_backup.pl script when user/password are empty

The make_catalog_backup.pl sets PGUSER and PGPASSWORD env vars even if they
are not set in the bacula config. This leads to an error if postgresql is used
with IDENT authentification.

The following error message is printed:
---
pg_dump: [archiver (db)] connection to database "bacula" failed: FATAL: no
PostgreSQL user name specified in startup packet

11 years agoFix bug #1853: bacula-sd dead but pid file exists.
Marco van Wieringen [Wed, 28 Mar 2012 16:33:14 +0000 (18:33 +0200)]
Fix bug #1853: bacula-sd dead but pid file exists.

We scanned using a %d pattern into a bool value. On some
platforms (SPARC) this gives a severe SIGBUS e.g. bus error
as the sizeof(bool) on 64 bits is 1 byte and the %d uses an
integer value which is 4 bytes. Its obvious now we know this
problem that its an problem on other platforms too but it
seems only on SPARC it triggers a hardware error by the CPU.

The workaround is to use a temporary variable and set the
bool to either true or false based on the integer value.

11 years agoFix bug #1841 estimate command level=differential goes wrong in accurate mode.
Marco van Wieringen [Fri, 23 Mar 2012 19:24:04 +0000 (20:24 +0100)]
Fix bug #1841 estimate command level=differential goes wrong in accurate mode.

11 years agoFix bug #1842 Incorrect port number reported
Martin Simmons [Thu, 22 Mar 2012 16:20:49 +0000 (17:20 +0100)]
Fix bug #1842 Incorrect port number reported

An incorrect port number reported when console fails to authenticate.

Signed-off-by: Marco van Wieringen <mvw@planets.elm.net>
11 years agoFix bug #1848 bsock.c:335 Socket has errors=1 on call to client
Marco van Wieringen [Thu, 22 Mar 2012 12:08:14 +0000 (13:08 +0100)]
Fix bug #1848 bsock.c:335 Socket has errors=1 on call to client

Removed the unneeded bnet_sig(dir, BNET_EOD) as the calling
function changer_cmd in dircmd.c already sets the BNET_EOD on
returning. So the autochanger_cmd function doesn't need to do
it.

11 years agoForce the re-initialization of BaseJobOpts, AccurateOpts and VerifyOpts between two...
Eric Bollengier [Sat, 10 Mar 2012 09:25:15 +0000 (10:25 +0100)]
Force the re-initialization of BaseJobOpts, AccurateOpts and VerifyOpts between two Include{}

When using this configuration

FileSet {
 Name = X
 Include {
   Options { Accurate = A }
   File = /tmp
 }

 Include {
   Options { Compression = GZIP1 }
   File = /elsewhere
 }
}

The second Include {} block is using the Accurate=A option from the first Include{}. With this
fix, the Accurate/BaseJob/Verify options are set to default between two Include{}.

We still have the same kind of problem for the "flags" that contains most options.
Something like the following configuration won't work as expected:

FileSet {
 Name = X
 Include {
   Options { Portable = no }
   File = /tmp
 }

 Include {
   Options { Portable = yes }
   File = /elsewhere
 }
}

11 years agoAdd test-deltaseq source
Kern Sibbald [Thu, 8 Mar 2012 08:07:19 +0000 (09:07 +0100)]
Add test-deltaseq source

11 years agoRename delta-test plugin to test-deltaseq
Kern Sibbald [Thu, 8 Mar 2012 08:04:39 +0000 (09:04 +0100)]
Rename delta-test plugin to test-deltaseq

11 years agoUpdate version date
Kern Sibbald [Tue, 21 Feb 2012 15:59:33 +0000 (16:59 +0100)]
Update version date

11 years agoUpdate ChangeLog + ReleaseNotes
Kern Sibbald [Tue, 21 Feb 2012 15:58:50 +0000 (16:58 +0100)]
Update ChangeLog + ReleaseNotes

11 years agoFix old exchange-fd plugin Accurate checkFile code.
Eric Bollengier [Fri, 17 Feb 2012 14:21:15 +0000 (15:21 +0100)]
Fix old exchange-fd plugin Accurate checkFile code.

It now marks files as seen only when the plugin is used. Not perfect, but
probably sufficient.

11 years agoTweak some comments and formatting.
Marco van Wieringen [Thu, 16 Feb 2012 22:52:39 +0000 (23:52 +0100)]
Tweak some comments and formatting.