From 532de231b64fdf83df07cfe3f49161d2eb60903e Mon Sep 17 00:00:00 2001

From: "Konstantin A. Lepikhov" <lakostis@altlinux.ru>

Date: Mon, 6 Sep 2021 17:34:29 +0200

Subject: [PATCH] - Apply dat2db patch

---

 courier-authlib/README.authdebug.html.in  |  4 +--

 courier-authlib/README_authlib.html.in    |  8 +++---

 courier-authlib/authuserdb.c              |  4 +--

 courier-authlib/authuserdbpwd.c           |  4 +--

 courier-authlib/preauthuserdbcommon.c     |  6 ++---

 courier-authlib/userdb/makeuserdb.8.in    | 32 +++++++++++------------

 courier-authlib/userdb/makeuserdb.html.in | 32 +++++++++++------------

 courier-authlib/userdb/makeuserdb.in      |  4 +--

 courier-authlib/userdb/userdb.8.in        |  6 ++---

 courier-authlib/userdb/userdb.c           |  6 ++---

 courier-authlib/userdb/userdb.h           |  2 +-

 courier-authlib/userdb/userdb.html.in     |  6 ++---

 courier-authlib/userdb/userdbpw.8.in      |  6 ++---

 courier-authlib/userdb/userdbpw.html.in   |  6 ++---

 14 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/courier-authlib/README.authdebug.html.in b/courier-authlib/README.authdebug.html.in

index b549a6b..3982c94 100644

--- a/courier-authlib/README.authdebug.html.in

+++ b/courier-authlib/README.authdebug.html.in

@@ -179,7 +179,7 @@ Apr 14 14:07:15 billdog authdaemond: authcram: trying this module

 Apr 14 14:07:15 billdog authdaemond: cram: only supports authtype=cram-*

 Apr 14 14:07:15 billdog authdaemond: authcram: REJECT - try next module

 Apr 14 14:07:15 billdog authdaemond: authuserdb: trying this module

-Apr 14 14:07:15 billdog authdaemond: userdb: opened /etc/userdb.dat

+Apr 14 14:07:15 billdog authdaemond: userdb: opened /etc/courier-imap/userdb.db

 Apr 14 14:07:15 billdog authdaemond: userdb: looking up 'brian'

 Apr 14 14:07:15 billdog authdaemond: userdb: entry not found

 Apr 14 14:07:15 billdog authdaemond: authuserdb: REJECT - try next module

@@ -203,7 +203,7 @@ Apr 14 14:07:15 billdog authdaemond: authpam: ACCEPT, username brian

     module cannot handle it so it REJECTs</li>

     <li>'authuserdb' has a go. In this case there is an

-    /etc/userdb.dat file for it to look in, but the requested

+    /etc/courier-imap/userdb.db file for it to look in, but the requested

     username 'brian' does not exist in there, so it REJECTs</li>

     <li>'authpam' has a go. It finds the username and home

diff --git a/courier-authlib/README_authlib.html.in b/courier-authlib/README_authlib.html.in

index ac4448e..6684057 100644

--- a/courier-authlib/README_authlib.html.in

+++ b/courier-authlib/README_authlib.html.in

@@ -354,13 +354,13 @@ is checked only by Courier's POP3 server. If it is

 not defined the POP3 server will check <code class="literal">systempw</code> too.</p><p>Finally, compile the database:</p><div class="informalexample"><pre class="programlisting" xml:space="preserve">

 # makeuserdb

 </pre></div><p>

-This command creates the actual database, <code class="filename">@userdb@.dat</code> and

-<code class="filename">@userdb@shadow.dat</code> from the plain text file

+This command creates the actual database, <code class="filename">@userdb@.db</code> and

+<code class="filename">@userdb@shadow.db</code> from the plain text file

 <code class="filename">@userdb@</code>. Courier will now start accepting logins to this

 mailbox. Adding and removing mailboxes can be done while Courier is

 running.</p><p>

-Courier reads <code class="filename">@userdb@.dat</code> and

-<code class="filename">@userdb@shadow.dat</code> only. The plain text source,

+Courier reads <code class="filename">@userdb@.db</code> and

+<code class="filename">@userdb@shadow.db</code> only. The plain text source,

 <code class="filename">@userdb@</code> is not read by Courier itself. Changes take

 effect

 only when <span class="command"><strong>makeuserdb</strong></span> runs.</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="userdbcomplex" shape="rect"> </a>Large virtual domain farm</h3></div></div></div><p>

diff --git a/courier-authlib/authuserdb.c b/courier-authlib/authuserdb.c

index 36006ca..4ab93f8 100644

--- a/courier-authlib/authuserdb.c

+++ b/courier-authlib/authuserdb.c

@@ -81,14 +81,14 @@ int	rc;

 		return (-1);

 	userdb_set_debug(courier_authdebug_login_level);

-	userdb_init(USERDB ".dat");

+	userdb_init(USERDB ".db");

         if ( (u=userdb(cci.user)) == 0)

 	{

 		userdb_close();

 		return (-1);

 	}

-	if ( (udbs=userdbshadow(USERDB "shadow.dat", cci.user)) == 0)

+	if ( (udbs=userdbshadow(USERDB "shadow.db", cci.user)) == 0)

 	{

 		free(u);

 		userdb_close();

diff --git a/courier-authlib/authuserdbpwd.c b/courier-authlib/authuserdbpwd.c

index 3a5be7b..ea553cc 100644

--- a/courier-authlib/authuserdbpwd.c

+++ b/courier-authlib/authuserdbpwd.c

@@ -242,7 +242,7 @@ static int dochangepwd1(const char *service, const char *uid,

 	struct  userdbs *udb;

-	udbs=userdbshadow(USERDB "shadow.dat", uid);

+	udbs=userdbshadow(USERDB "shadow.db", uid);

 	if (!udbs)

 	{

@@ -293,7 +293,7 @@ static int dochangepwd1(const char *service, const char *uid,

 	free(passwords);

 	free(udbs);

-        userdb_init(USERDB ".dat");

+        userdb_init(USERDB ".db");

         if ( (u=userdb(uid)) == 0 ||

 	     (udb=userdb_creates(u)) == 0)

         {

diff --git a/courier-authlib/preauthuserdbcommon.c b/courier-authlib/preauthuserdbcommon.c

index e39decb..3dc0fd3 100644

--- a/courier-authlib/preauthuserdbcommon.c

+++ b/courier-authlib/preauthuserdbcommon.c

@@ -34,7 +34,7 @@ char	*passwords=0;

 int	rc;

 	userdb_set_debug(courier_authdebug_login_level);

-	userdb_init(USERDB ".dat");

+	userdb_init(USERDB ".db");

 	/* We rely on DPRINTF doing 'safe' printing */

 	DPRINTF("userdb: looking up '%s'", userid);

         if ( (u=userdb(userid)) == 0)

@@ -62,7 +62,7 @@ int	rc;

 	if (needpass)

 	{

-		udbs=userdbshadow(USERDB "shadow.dat", userid);

+		udbs=userdbshadow(USERDB "shadow.db", userid);

 		if (udbs)

 		{

@@ -128,7 +128,7 @@ void auth_userdb_enumerate( void(*cb_func)(const char *name,

 {

 	struct userdbs *u;

-	userdb_init(USERDB ".dat");

+	userdb_init(USERDB ".db");

 	for (u=userdb_enum_first(); u; u=userdb_enum_next())

 	{

diff --git a/courier-authlib/userdb/makeuserdb.8.in b/courier-authlib/userdb/makeuserdb.8.in

index 28f5094..37e5c06 100644

--- a/courier-authlib/userdb/makeuserdb.8.in

+++ b/courier-authlib/userdb/makeuserdb.8.in

@@ -42,19 +42,19 @@ makeuserdb \- create @userdb@

 .PP

 \fBmakeuserdb\fR

 creates

-@userdb@\&.dat

+@userdb@\&.db

 from the contents of

 @userdb@\&.

 @userdb@\*(Aqs contents are described later in this document\&.

 Maildrop,

 Courier, and other applications use

-@userdb@\&.dat

+@userdb@\&.db

 as a substitute/complement for your system password file\&. The usual purpose for

-@userdb@\&.dat

+@userdb@\&.db

 is to specify "virtual" accounts \- accounts that do not have an associated system login\&. Usually (but not necessarily) all virtual accounts share the same system userid\&.

-@userdb@\&.dat

+@userdb@\&.db

 may also replace your system password file\&. Because the system password file is a text file, when there\*(Aqs a large number of accounts it will be significantly faster to search

-@userdb\&.dat@, which is a binary database, instead of a flat text file that the system password file usually is\&.

+@userdb\&.db@, which is a binary database, instead of a flat text file that the system password file usually is\&.

 .PP

 The

 \fBmakeuserdb\fR

@@ -63,10 +63,10 @@ command can be safely executed during normal system activity\&.

 The

 \fB\-f\fR

 option creates

-\fIfilename\fR\&.dat

+\fIfilename\fR\&.db

 from

 \fIfilename\fR, instead of the default

-@userdb@\&.dat

+@userdb@\&.db

 from

 @userdb@\&.

 .SS "Format of @userdb@"

@@ -100,7 +100,7 @@ is followed by exactly one tab character, then a list of field/value pairs separ

 is the name of the field,

 \fIvalue\fR

 is the field value\&. Fields and values themself cannot contain slashes or control characters\&. Fields may be specified in any order\&. Here are all the currently defined fields\&. Note that not every field is used by every application that reads

-@userdb@\&.dat\&.

+@userdb@\&.db\&.

 .PP

 \fIuid\fR

 \-

@@ -159,14 +159,14 @@ Courier

 has a software\-based Maildir quota enforcement mechanism which requires additional setup and configuration\&. See

 \m[blue]\fB\fBmaildirquota\fR(7)\fR\m[]\&\s-2\u[2]\d\s+2

 for additional information\&.

-.SS "@userdb@shadow\&.dat"

+.SS "@userdb@shadow\&.db"

 .PP

 All fields whose name ends with \*(Aqpw\*(Aq will NOT copied to

-@userdb@\&.dat\&. These fields will be copied to

-@userdb@shadow\&.dat\&.

+@userdb@\&.db\&. These fields will be copied to

+@userdb@shadow\&.db\&.

 \fBmakeuserdb\fR

 creates

-@userdb@shadow\&.dat

+@userdb@shadow\&.db

 without any group and world permissions\&. Note that

 \fBmakeuserdb\fR

 reports an error if

@@ -199,7 +199,7 @@ After saving the output of

 \fBpw2userdb\fR, you must still run

 \fBmakeuserdb\fR

 to create

-@userdb@\&.dat\&.

+@userdb@\&.db\&.

 .PP

 \fBvchkpw2userdb\fR

 converts a vpopmail\-style directory hierarchy to the

@@ -252,7 +252,7 @@ makeuserdb

 .PP

 It is still necessary to run

 \fBmakeuserdb\fR, of course, to create the binary database file

-@userdb@\&.dat

+@userdb@\&.db

 .PP

 NOTE: You are still required to create the

 \fB@userdb@\fR

@@ -288,8 +288,8 @@ without having to go in and cleaning up again, afterwards\&.

 .\}

 .nf

 @userdb@

-@userdb@\&.dat

-@userdb@shadow\&.dat

+@userdb@\&.db

+@userdb@shadow\&.db

 @tmpdir@/userdb\&.tmp \- temporary file

 @tmpdir@/userdbshadow\&.tmp \- temporary file

 .fi

diff --git a/courier-authlib/userdb/makeuserdb.html.in b/courier-authlib/userdb/makeuserdb.html.in

index c3797a4..c2f6705 100644

--- a/courier-authlib/userdb/makeuserdb.html.in

+++ b/courier-authlib/userdb/makeuserdb.html.in

@@ -5,31 +5,31 @@ Copyright 1998 - 2009 Double Precision, Inc.  See COPYING for distribution

 information.

 --></head><body><div class="refentry"><a id="makeuserdb" shape="rect"> </a><div class="titlepage"/><div class="refnamediv"><h2>Name</h2><p>makeuserdb — create @userdb@</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">makeuserdb</code>  [-f <em class="replaceable"><code>filename</code></em>]</p></div><div class="cmdsynopsis"><p><code class="command">pw2userdb</code> </p></div><div class="cmdsynopsis"><p><code class="command">vchkpw2userdb</code>  [--vpopmailhome=<em class="replaceable"><code>dir</code></em>] [--todir=<em class="replaceable"><code>dir</code></em>]</p></div></div><div class="refsect1"><a id="makeuserdb_description" shape="rect"> </a><h2>DESCRIPTION</h2><p>

-<span class="command"><strong>makeuserdb</strong></span> creates <code class="filename">@userdb@.dat</code> from

+<span class="command"><strong>makeuserdb</strong></span> creates <code class="filename">@userdb@.db</code> from

 the contents of <code class="filename">@userdb@</code>.

 <code class="filename">@userdb@</code>'s contents are described later in this document.

 <span class="application">Maildrop</span>,

 <span class="application">Courier</span>, and other applications use

-<code class="filename">@userdb@.dat</code> as a

+<code class="filename">@userdb@.db</code> as a

 substitute/complement for your system password file.

 The usual purpose for

-<code class="filename">@userdb@.dat</code> is to specify "virtual" accounts - accounts

+<code class="filename">@userdb@.db</code> is to specify "virtual" accounts - accounts

 that do

 not have an associated system login.

 Usually (but not necessarily) all virtual accounts share the same

 system userid.

-<code class="filename">@userdb@.dat</code> may also replace

+<code class="filename">@userdb@.db</code> may also replace

 your system password file. Because the system password file is a text file,

 when there's a large number of accounts it will be significantly faster to

 search

-<code class="filename">@userdb.dat@</code>, which is a binary database,

+<code class="filename">@userdb.db@</code>, which is a binary database,

 instead of a flat text file that the system password file usually is.</p><p>

 The <span class="command"><strong>makeuserdb</strong></span> command can be safely executed during

 normal system activity.</p><p>

 The <code class="option">-f</code> option creates

-<code class="filename"><em class="replaceable"><code>filename</code></em>.dat</code> from

+<code class="filename"><em class="replaceable"><code>filename</code></em>.db</code> from

 <code class="filename"><em class="replaceable"><code>filename</code></em></code>, instead of the

-default <code class="filename">@userdb@.dat</code> from

+default <code class="filename">@userdb@.db</code> from

 <code class="filename">@userdb@</code>.</p><div class="refsect2"><a id="makeuserdb_format_of__userdb_" shape="rect"> </a><h3>Format of <code class="filename">@userdb@</code></h3><p>

 <code class="filename">@userdb@</code> is a plain text file that can be created using

 any text editor. Blank lines are ignored. Lines that start with the #

@@ -51,7 +51,7 @@ Fields and values themself cannot contain slashes or control characters.

 Fields may be

 specified in any order. Here are all the currently defined fields.  Note that

 not every field is used by every application that reads

-<code class="filename">@userdb@.dat</code>.</p><div class="blockquote"><blockquote class="blockquote"><p>

+<code class="filename">@userdb@.db</code>.</p><div class="blockquote"><blockquote class="blockquote"><p>

 <em class="parameter"><code>uid</code></em> - <em class="replaceable"><code>value</code></em> is a (possibly)

 unique numerical user ID for this account.</p><p>

 <em class="parameter"><code>gid</code></em> - <em class="replaceable"><code>value</code></em> is a (possibly)

@@ -92,11 +92,11 @@ software-based Maildir quota enforcement

 mechanism which requires additional setup and configuration.

 See

 <a class="ulink" href="maildirquota.html" target="_top" shape="rect"><span class="citerefentry"><span class="refentrytitle">maildirquota</span>(7)</span></a>

-for additional information.</p></blockquote></div></div><div class="refsect2"><a id="makeuserdb__userdb_shadow_dat" shape="rect"> </a><h3><code class="filename">@userdb@shadow.dat</code></h3><p>

+for additional information.</p></blockquote></div></div><div class="refsect2"><a id="makeuserdb__userdb_shadow_dat" shape="rect"> </a><h3><code class="filename">@userdb@shadow.db</code></h3><p>

 All fields whose name ends with 'pw' will NOT copied to

-<code class="filename">@userdb@.dat</code>. These fields will be copied to

-<code class="filename">@userdb@shadow.dat</code>.

-<span class="command"><strong>makeuserdb</strong></span> creates <code class="filename">@userdb@shadow.dat</code>

+<code class="filename">@userdb@.db</code>. These fields will be copied to

+<code class="filename">@userdb@shadow.db</code>.

+<span class="command"><strong>makeuserdb</strong></span> creates <code class="filename">@userdb@shadow.db</code>

 without any group and world permissions.

 Note that <span class="command"><strong>makeuserdb</strong></span> reports an error

 if <span class="command"><strong>@userdb@</strong></span> has any group

@@ -119,7 +119,7 @@ amount of

 time it takes to look up this information.</p><p>

 After saving the output of <span class="command"><strong>pw2userdb</strong></span>, you must still run

 <span class="command"><strong>makeuserdb</strong></span> to create

-<code class="filename">@userdb@.dat</code>.</p><p>

+<code class="filename">@userdb@.db</code>.</p><p>

 <span class="command"><strong>vchkpw2userdb</strong></span> converts a vpopmail-style

 directory hierarchy to the <code class="filename">@userdb@</code> format.

 This is an external virtual domain management package that's often used

@@ -152,7 +152,7 @@ vchkpw2userdb --todir=@userdb@/vpopmail<br clear="none"/>

 makeuserdb<br clear="none"/>

 </p></div></div></blockquote></div><p>

 It is still necessary to run <span class="command"><strong>makeuserdb</strong></span>, of course, to

-create the binary database file <code class="filename">@userdb@.dat</code></p><p>

+create the binary database file <code class="filename">@userdb@.db</code></p><p>

 NOTE:  You are still required to create the <span class="command"><strong>@userdb@</strong></span> entry

 which maps

 system userids back to accounts,

@@ -179,8 +179,8 @@ This allows you to run

 <span class="command"><strong>vchkpw2userdb</strong></span> without having to go in and

 cleaning up again, afterwards.</p></div></div><div class="refsect1"><a id="makeuserdb_files" shape="rect"> </a><h2>FILES</h2><div class="literallayout"><p><br clear="none"/>

 <code class="filename">@userdb@</code><br clear="none"/>

-<code class="filename">@userdb@.dat</code><br clear="none"/>

-<code class="filename">@userdb@shadow.dat</code><br clear="none"/>

+<code class="filename">@userdb@.db</code><br clear="none"/>

+<code class="filename">@userdb@shadow.db</code><br clear="none"/>

 <code class="filename">@tmpdir@/userdb.tmp</code> - temporary file<br clear="none"/>

 <code class="filename">@tmpdir@/userdbshadow.tmp</code> - temporary file<br clear="none"/>

 </p></div></div><div class="refsect1"><a id="makeuserdb_bugs" shape="rect"> </a><h2>BUGS</h2><p><span class="command"><strong>makeuserdb</strong></span> is a Perl script, and uses Perl's portable

diff --git a/courier-authlib/userdb/makeuserdb.in b/courier-authlib/userdb/makeuserdb.in

index 4765309..20c1bb4 100644

--- a/courier-authlib/userdb/makeuserdb.in

+++ b/courier-authlib/userdb/makeuserdb.in

@@ -26,10 +26,10 @@ if ($name eq "-f") {

 	$dbfile=~s/\/$//;

 }

-$datfile=$dbfile.".dat";

+$datfile=$dbfile.".db";

 # XXX the lock file here is etc/userdb.lock but the userdb command uses etc/.lock.userdb

 $lockfile=$dbfile.".lock";

-$shadowfile=$dbfile."shadow.dat";

+$shadowfile=$dbfile."shadow.db";

 $tmpdatfile=$dbfile.".tmp";

 $tmpshadowfile=$dbfile."shadow.tmp";

diff --git a/courier-authlib/userdb/userdb.8.in b/courier-authlib/userdb/userdb.8.in

index 890f832..16e4919 100644

--- a/courier-authlib/userdb/userdb.8.in

+++ b/courier-authlib/userdb/userdb.8.in

@@ -179,16 +179,16 @@ userdb postmaster@test\&.испытание set \e

 .if n \{\

 .RE

 .\}

-.SS "REBUILDING @userdb@\&.dat"

+.SS "REBUILDING @userdb@\&.db"

 .PP

 The actual virtual account/address database is

-@userdb@\&.dat\&. This is a binary database file\&.

+@userdb@\&.db\&. This is a binary database file\&.

 \fB@userdb@\fR

 is the plain text version\&. After running

 \fBuserdb\fR, execute the

 \m[blue]\fB\fBmakeuserdb\fR(8)\fR\m[]\&\s-2\u[1]\d\s+2

 command to rebuild

-@userdb@\&.dat

+@userdb@\&.db

 for the changes to take effect\&.

 .SH "BUGS"

 .PP

diff --git a/courier-authlib/userdb/userdb.c b/courier-authlib/userdb/userdb.c

index e5a6066..1e0bd07 100644

--- a/courier-authlib/userdb/userdb.c

+++ b/courier-authlib/userdb/userdb.c

@@ -26,7 +26,7 @@ static ino_t di;

 static int initialized=0;

 int userdb_debug_level=0;

-/* Open userdb.dat, if already opened, see if it changed, if so reopen */

+/* Open userdb.db, if already opened, see if it changed, if so reopen */

 void userdb_init(const char *n)

 {

@@ -89,7 +89,7 @@ void userdb_set_debug(int lvl)

 	userdb_debug_level = lvl;

 }

-/* Fetch a record from userdb.dat */

+/* Fetch a record from userdb.db */

 char	*userdb(const char *u)

 {

@@ -305,7 +305,7 @@ struct userdbs *userdb_enum_next()

 	return NULL;

 }

-/* Extracted a userdb.dat record, convert it to a userdbs structure */

+/* Extracted a userdb.db record, convert it to a userdbs structure */

 struct userdbs *userdb_creates(const char *u)

 {

diff --git a/courier-authlib/userdb/userdb.h b/courier-authlib/userdb/userdb.h

index 3b2690a..db450fe 100644

--- a/courier-authlib/userdb/userdb.h

+++ b/courier-authlib/userdb/userdb.h

@@ -14,7 +14,7 @@ extern "C" {

 #endif

 /*

-	Functions to access local/config/userdb.dat

+	Functions to access local/config/userdb.db

 */

 void userdb_set_debug(int);

diff --git a/courier-authlib/userdb/userdb.html.in b/courier-authlib/userdb/userdb.html.in

index a2af5e5..1cf338c 100644

--- a/courier-authlib/userdb/userdb.html.in

+++ b/courier-authlib/userdb/userdb.html.in

@@ -86,13 +86,13 @@ all the fields in <code class="filename">@userdb@</code> for this

 	international domain name:

       </p><div class="blockquote"><blockquote class="blockquote"><div class="informalexample"><div class="literallayout"><p><span class="command"><strong><br clear="none"/>

 userdb postmaster@test.испытание set \<br clear="none"/>

-        home=/home/postmaster.test.com uid=999 gid=999</strong></span></p></div></div></blockquote></div></div><div class="refsect2"><a id="userdb_rebuilding__userdb__dat" shape="rect"> </a><h3>REBUILDING <code class="filename">@userdb@.dat</code></h3><p>

+        home=/home/postmaster.test.com uid=999 gid=999</strong></span></p></div></div></blockquote></div></div><div class="refsect2"><a id="userdb_rebuilding__userdb__dat" shape="rect"> </a><h3>REBUILDING <code class="filename">@userdb@.db</code></h3><p>

 The actual virtual account/address database is

-<code class="filename">@userdb@.dat</code>.

+<code class="filename">@userdb@.db</code>.

 This is a binary database file. <span class="command"><strong>@userdb@</strong></span> is the plain text

 version. After running <span class="command"><strong>userdb</strong></span>, execute the

 <a class="ulink" href="makeuserdb.html" target="_top" shape="rect"><span class="citerefentry"><span class="refentrytitle">makeuserdb</span>(8)</span></a> command to rebuild

-<code class="filename">@userdb@.dat</code> for the changes to take effect.</p></div></div><div class="refsect1"><a id="userdb_bugs" shape="rect"> </a><h2>BUGS</h2><p>

+<code class="filename">@userdb@.db</code> for the changes to take effect.</p></div></div><div class="refsect1"><a id="userdb_bugs" shape="rect"> </a><h2>BUGS</h2><p>

 <em class="parameter"><code><em class="replaceable"><code>addr</code></em></code></em> must be unique.

 If <code class="filename">@userdb@</code> is a subdirectory,

 it's possible to create the same

diff --git a/courier-authlib/userdb/userdbpw.8.in b/courier-authlib/userdb/userdbpw.8.in

index bfd8ab4..f3074d8 100644

--- a/courier-authlib/userdb/userdbpw.8.in

+++ b/courier-authlib/userdb/userdbpw.8.in

@@ -65,11 +65,11 @@ uses the SHA1 hash function instead\&. Whether either HMAC function is actually

 library\&.

 .PP

 Note that even though the result of HMAC hashing looks like an encrypted password, it\*(Aqs really not\&. HMAC\-based challenge/response authentication mechanisms require the cleartext password to be available as cleartext\&. Computing an intermediate HMAC context does scramble the cleartext password, however if its compromised, it WILL be possible for an attacker to succesfully authenticate\&. Therefore, applications that use challenge/response authentication will store intermediate HMAC contexts in the "pw" fields in the userdb database, which will be compiled into the

-userdbshadow\&.dat

+userdbshadow\&.db

 database, which has group and world permissions turned off\&. The userdb library also requires that the cleartext userdb source for the

-userdb\&.dat

+userdb\&.db

 and

-userdbshadow\&.dat

+userdbshadow\&.db

 databases is also stored with the group and world permissions turned off\&.

 .PP

 \fBuserdbpw\fR

diff --git a/courier-authlib/userdb/userdbpw.html.in b/courier-authlib/userdb/userdbpw.html.in

index d2424c5..b385bb8 100644

--- a/courier-authlib/userdb/userdbpw.html.in

+++ b/courier-authlib/userdb/userdbpw.html.in

@@ -27,11 +27,11 @@ however if its compromised, it WILL be possible for an attacker to succesfully

 authenticate.  Therefore, applications that use challenge/response

 authentication will store intermediate HMAC contexts in the "pw" fields in the

 userdb database, which will be compiled into the

-<code class="filename">userdbshadow.dat</code>

+<code class="filename">userdbshadow.db</code>

 database, which has group and world permissions turned off. The

 userdb library also requires that the cleartext userdb source for the

-<code class="filename">userdb.dat</code> and

-<code class="filename">userdbshadow.dat</code> databases is also stored with the

+<code class="filename">userdb.db</code> and

+<code class="filename">userdbshadow.db</code> databases is also stored with the

 group and world permissions turned off.</p><p><span class="command"><strong>userdbpw</strong></span> is usually used together in a pipe with

 <span class="command"><strong>userdb</strong></span>, which reads from standard input. For example:</p><div class="blockquote"><blockquote class="blockquote"><div class="informalexample"><pre class="programlisting" xml:space="preserve"><span class="command"><strong>userdbpw -md5 | userdb users/john set systempw</strong></span></pre></div></blockquote></div><p>or:</p><div class="blockquote"><blockquote class="blockquote"><div class="informalexample"><pre class="programlisting" xml:space="preserve"><span class="command"><strong>userdbpw -hmac-md5 | userdb users/john set hmac-md5pw</strong></span></pre></div></blockquote></div><p>These commands set the <code class="option">systempw</code> field in the record for

 the user <code class="option">john</code> in <code class="filename">@userdb@/users</code> file, and the

-- 

2.33.0