pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Add vmailmgr (not tried yet).

Module Name:	pkgsrc-wip
Committed By:	Amitai Schleier <schmonz-web-git%schmonz.com@localhost>
Pushed By:	schmonz
Date:		Mon Feb 19 22:53:20 2024 -0500
Changeset:	88c3b57d71a0f267aa88a56e479876bb0e0dd8e3

Added Files:
	vmailmgr/DESCR
	vmailmgr/Makefile
	vmailmgr/PLIST
	vmailmgr/TODO.md
	vmailmgr/distinfo
	vmailmgr/patches/patch-Makefile.am
	vmailmgr/patches/patch-Makefile.in
	vmailmgr/patches/patch-authenticate_Makefile.am
	vmailmgr/patches/patch-cgi_Makefile.am
	vmailmgr/patches/patch-commands_vdeliver.cc
	vmailmgr/patches/patch-lib_fdbuf_fdbuf.h
	vmailmgr/patches/patch-lib_misc_response.h
	vmailmgr/patches/patch-lib_misc_server.cc
	vmailmgr/patches/patch-lib_vpwtable_cdb__write.cc
	vmailmgr/patches/patch-lib_vpwtable_gdbm__del.cc
	vmailmgr/patches/patch-lib_vpwtable_gdbm__exists.cc
	vmailmgr/patches/patch-lib_vpwtable_gdbm__getbyname.cc
	vmailmgr/patches/patch-lib_vpwtable_gdbm__put.cc
	vmailmgr/patches/patch-lib_vpwtable_gdbm__write.cc

Log Message:
Add vmailmgr (not tried yet).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=88c3b57d71a0f267aa88a56e479876bb0e0dd8e3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 vmailmgr/DESCR                                     | 22 +++++++++++
 vmailmgr/Makefile                                  | 25 +++++++++++++
 vmailmgr/PLIST                                     | 43 ++++++++++++++++++++++
 vmailmgr/TODO.md                                   | 10 +++++
 vmailmgr/distinfo                                  | 19 ++++++++++
 vmailmgr/patches/patch-Makefile.am                 | 14 +++++++
 vmailmgr/patches/patch-Makefile.in                 | 13 +++++++
 vmailmgr/patches/patch-authenticate_Makefile.am    | 22 +++++++++++
 vmailmgr/patches/patch-cgi_Makefile.am             | 11 ++++++
 vmailmgr/patches/patch-commands_vdeliver.cc        | 13 +++++++
 vmailmgr/patches/patch-lib_fdbuf_fdbuf.h           | 12 ++++++
 vmailmgr/patches/patch-lib_misc_response.h         | 13 +++++++
 vmailmgr/patches/patch-lib_misc_server.cc          | 12 ++++++
 vmailmgr/patches/patch-lib_vpwtable_cdb__write.cc  | 15 ++++++++
 vmailmgr/patches/patch-lib_vpwtable_gdbm__del.cc   | 13 +++++++
 .../patches/patch-lib_vpwtable_gdbm__exists.cc     | 13 +++++++
 .../patches/patch-lib_vpwtable_gdbm__getbyname.cc  | 13 +++++++
 vmailmgr/patches/patch-lib_vpwtable_gdbm__put.cc   | 16 ++++++++
 vmailmgr/patches/patch-lib_vpwtable_gdbm__write.cc | 27 ++++++++++++++
 19 files changed, 326 insertions(+)

diffs:
diff --git a/vmailmgr/DESCR b/vmailmgr/DESCR
new file mode 100644
index 0000000000..e7a5835996
--- /dev/null
+++ b/vmailmgr/DESCR
@@ -0,0 +1,22 @@
+VMailMgr (short for Virtual MAIL ManaGeR) is a package of programs
+designed to manage multiple domains of mail addresses and mailboxes on a
+single host. It co-operates with qmail for mail delivery and program
+control. It features:
+
+- A password checking interface between qmail-popup and qmail-pop3d
+  which replaces the usual checkpassword, as well as an authentication
+  module for Courier IMAP, that provide access to the virtual mailboxes
+  by one of three methods:
+  - IP-based virtual server access (invisible to the POP3 user)
+  - username-based access (username-virtualuser)
+  - hostname-based access (virtualuser%virtual.host@localhost or
+    virtualuser:virtual.host)
+- CDB-based password tables to speed up access for domains of any size.
+- Tools to setup a virtual domain, add and delete individual virtual
+  users and aliases, and to change passwords. CGI programs to accomplish
+  the above tasks from a set of web pages.
+- A native PHP library to complement or replace the CGIs.
+- A daemon process that securely directs the operation of the CGIs
+  and PHP code.
+- A separate delivery agent that automatically deals with any address
+  inside a virtual domain from a single .qmail-default file.
diff --git a/vmailmgr/Makefile b/vmailmgr/Makefile
new file mode 100644
index 0000000000..08e50905a3
--- /dev/null
+++ b/vmailmgr/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD$
+
+DISTNAME=		vmailmgr-0.97-1.src.rpm
+PKGNAME=		${DISTNAME:S/-1.src.rpm$//}
+CATEGORIES=		mail
+MASTER_SITES=		${HOMEPAGE}current/
+EXTRACT_SUFX=		# none
+EXTRACT_CMD=		${TAR} xzf $${extract_file} && ${TAR} xzf ${PKGNAME_NOREV}.tar.gz
+
+MAINTAINER=		schmonz%NetBSD.org@localhost
+HOMEPAGE=		https://untroubled.org/vmailmgr/
+COMMENT=		Manage multiple mail domains on a single qmail host
+LICENSE=		gnu-gpl-v2
+
+WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
+
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		autoconf213 automake14 gmake perl tar
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+
+pre-configure:
+	cd ${WRKSRC} && autoreconf -i
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/vmailmgr/PLIST b/vmailmgr/PLIST
new file mode 100644
index 0000000000..14593f3ee4
--- /dev/null
+++ b/vmailmgr/PLIST
@@ -0,0 +1,43 @@
+@comment $NetBSD$
+bin/checkvpw
+bin/dumpvuser
+bin/listvdomain
+bin/showvconfig
+bin/vaddalias
+bin/vadduser
+bin/vaddusers
+bin/vauthenticate
+bin/vchattr
+bin/vchforwards
+bin/vconf2dir
+bin/vdeliver
+bin/vdeluser
+bin/vpasswd
+bin/vpasswds
+bin/vrehash
+bin/vsetup
+bin/vupgrade
+libexec/cgi-bin/listvdomain
+libexec/cgi-bin/vaddalias
+libexec/cgi-bin/vadduser
+libexec/cgi-bin/vchattr
+libexec/cgi-bin/vchforwards
+libexec/cgi-bin/vdeluser
+libexec/cgi-bin/vpasswd
+man/man1/checkvpw.1
+man/man1/dumpvuser.1
+man/man1/listvdomain.1
+man/man1/vadduser.1
+man/man1/vauthenticate.1
+man/man1/vchattr.1
+man/man1/vchforwards.1
+man/man1/vdeliver.1
+man/man1/vdeluser.1
+man/man1/vpasswd.1
+man/man1/vpasswds.1
+man/man1/vrehash.1
+man/man1/vsetup.1
+man/man1/vupgrade.1
+man/man7/vmailmgr.7
+man/man8/vmailmgrd.8
+sbin/vmailmgrd
diff --git a/vmailmgr/TODO.md b/vmailmgr/TODO.md
new file mode 100644
index 0000000000..2a812af67e
--- /dev/null
+++ b/vmailmgr/TODO.md
@@ -0,0 +1,10 @@
+# TODO
+
+- PKGMANDIR
+- Fix macOS build
+- Bruce shipped separate RPMs for:
+    - cgi
+    - courier-imap
+    - daemon
+    - php
+    - python
diff --git a/vmailmgr/distinfo b/vmailmgr/distinfo
new file mode 100644
index 0000000000..54f2ee461e
--- /dev/null
+++ b/vmailmgr/distinfo
@@ -0,0 +1,19 @@
+$NetBSD$
+
+BLAKE2s (vmailmgr-0.97-1.src.rpm) = 7d123e15f2e42edcafc780f157fe636706770be32142d43ee7b981e4b0cd42b8
+SHA512 (vmailmgr-0.97-1.src.rpm) = b8a4518a1b182a56f5db9f9a982dd35b574bb08a3fc00f58e36a85ecad2f77f22a3f392d8739be0fb67bbafe250ec6c01b8d8c44e6dee8c8d1f1b95c12d450e5
+Size (vmailmgr-0.97-1.src.rpm) = 637291 bytes
+SHA1 (patch-Makefile.am) = 2170216e56600228e70f237a15f482421741e2d0
+SHA1 (patch-Makefile.in) = 77d418acd00895d7747fccd8e298c88cc66190fc
+SHA1 (patch-authenticate_Makefile.am) = 70882f5912b7ea2e5e4ca32b8132f16bb541c454
+SHA1 (patch-cgi_Makefile.am) = 5cab84302883fbaf7477def403ec0025cd9e7eb4
+SHA1 (patch-commands_vdeliver.cc) = cbbd24e3a82ea18efc69097913279f4e1d1f715b
+SHA1 (patch-lib_fdbuf_fdbuf.h) = 49df77596e79033a1667316636a7cc7c9e7c4086
+SHA1 (patch-lib_misc_response.h) = dd36666436fc11ea6dc6efde625f3b5ba9809922
+SHA1 (patch-lib_misc_server.cc) = 368077d018036afb68e23390ebfc382dcea1394a
+SHA1 (patch-lib_vpwtable_cdb__write.cc) = 37ec16e5c3ba97a50cfad26adbe78f433526a68a
+SHA1 (patch-lib_vpwtable_gdbm__del.cc) = 26b9325bc921ae24e5833dbe04c5b9753c52c18d
+SHA1 (patch-lib_vpwtable_gdbm__exists.cc) = 08d7bc89f01c804befd42d52e6df3bc0e42e6f41
+SHA1 (patch-lib_vpwtable_gdbm__getbyname.cc) = f2d1abb4c6664fb606601585a2a0c9b627363825
+SHA1 (patch-lib_vpwtable_gdbm__put.cc) = 6e4ab7191d25920b35772a398c42ba8b8d7ec377
+SHA1 (patch-lib_vpwtable_gdbm__write.cc) = fab34888ee0af4d18d4c50dd407e9fcd54c8fa92
diff --git a/vmailmgr/patches/patch-Makefile.am b/vmailmgr/patches/patch-Makefile.am
new file mode 100644
index 0000000000..4c04800492
--- /dev/null
+++ b/vmailmgr/patches/patch-Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- Makefile.am.orig	2004-03-15 17:58:59.000000000 +0000
++++ Makefile.am
+@@ -1,7 +1,7 @@
+ if WANTPYTHON
+-SUBDIRS = python php lib authenticate commands daemon cgi doc scripts
++SUBDIRS = lib authenticate commands daemon cgi doc scripts
+ else
+-SUBDIRS = php lib authenticate commands daemon cgi doc scripts
++SUBDIRS = lib authenticate commands daemon cgi doc scripts
+ endif
+ 
+ dist-hook:
diff --git a/vmailmgr/patches/patch-Makefile.in b/vmailmgr/patches/patch-Makefile.in
new file mode 100644
index 0000000000..3a28ffc0a6
--- /dev/null
+++ b/vmailmgr/patches/patch-Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- Makefile.in.orig	2024-02-20 03:29:16.187148576 +0000
++++ Makefile.in
+@@ -82,7 +82,7 @@ W3M = @W3M@
+ cgidir = @cgidir@
+ phpdir = @phpdir@
+ pythonlibdir = @pythonlibdir@
+-@WANTPYTHON_TRUE@SUBDIRS = python php lib authenticate commands daemon cgi doc scripts
++@WANTPYTHON_TRUE@SUBDIRS = php lib authenticate commands daemon cgi doc scripts
+ @WANTPYTHON_FALSE@SUBDIRS = php lib authenticate commands daemon cgi doc scripts
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/vmailmgr/patches/patch-authenticate_Makefile.am b/vmailmgr/patches/patch-authenticate_Makefile.am
new file mode 100644
index 0000000000..880149f420
--- /dev/null
+++ b/vmailmgr/patches/patch-authenticate_Makefile.am
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- authenticate/Makefile.am.orig	2024-02-20 03:24:52.209991167 +0000
++++ authenticate/Makefile.am
+@@ -1,5 +1,5 @@
+ bin_PROGRAMS = checkvpw vauthenticate
+-authlib_PROGRAMS = authvmailmgr
++#authlib_PROGRAMS = authvmailmgr
+ authlibdir = ${prefix}/lib/courier-imap/libexec/authlib/
+ 
+ noinst_PODS = checkvpw.pod vauthenticate.pod
+@@ -25,8 +25,8 @@ INCLUDES = $(CIINCLUDES) -I../lib
+ checkvpw_SOURCES = checkvpw.cc authvlib.cc authvlib.h
+ checkvpw_LDADD = ../lib/libvmailmgr.a
+ 
+-authvmailmgr_SOURCES = authvmailmgr.cc authvlib.cc authvlib.h
+-authvmailmgr_LDADD = ../lib/libvmailmgr.a -L../lib/courier-authlib -lauthmod
++#authvmailmgr_SOURCES = authvmailmgr.cc authvlib.cc authvlib.h
++#authvmailmgr_LDADD = ../lib/libvmailmgr.a -L../lib/courier-authlib -lauthmod
+ 
+ vauthenticate_SOURCES = vauthenticate.cc authvlib.cc authvlib.h
+ vauthenticate_LDADD = ../lib/libvmailmgr.a
diff --git a/vmailmgr/patches/patch-cgi_Makefile.am b/vmailmgr/patches/patch-cgi_Makefile.am
new file mode 100644
index 0000000000..fbcbf95498
--- /dev/null
+++ b/vmailmgr/patches/patch-cgi_Makefile.am
@@ -0,0 +1,11 @@
+$NetBSD$
+
+--- cgi/Makefile.am.orig	2024-02-20 03:25:23.776012371 +0000
++++ cgi/Makefile.am
+@@ -1,5 +1,6 @@
+ EXTRA_DIST = listvdomain.html vaddalias.html vadduser.html vchalias.html \
+ 	vchattr.html vchforwards.html vdeluser.html vpasswd.html
++cgidir=$(PREFIX)/libexec/cgi-bin
+ cgi_PROGRAMS = vpasswd vadduser vdeluser vaddalias vchattr vchforwards \
+ 	listvdomain
+ 
diff --git a/vmailmgr/patches/patch-commands_vdeliver.cc b/vmailmgr/patches/patch-commands_vdeliver.cc
new file mode 100644
index 0000000000..8be40278aa
--- /dev/null
+++ b/vmailmgr/patches/patch-commands_vdeliver.cc
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- commands/vdeliver.cc.orig	2024-02-20 03:26:27.764197339 +0000
++++ commands/vdeliver.cc
+@@ -262,7 +262,7 @@ void inject(mystring sender, mystring re
+     close(pipe2[1]);
+     if((dup2(pipe1[0], 0) != 0) || (dup2(pipe2[0], 1) != 1))
+       exit(111);
+-    execl(qq.c_str(), qq.c_str(), 0);
++    execl(qq.c_str(), qq.c_str(), (char *)0);
+     die_temp("Exec of qmail-queue failed.");
+   default:
+     close(pipe1[0]);
diff --git a/vmailmgr/patches/patch-lib_fdbuf_fdbuf.h b/vmailmgr/patches/patch-lib_fdbuf_fdbuf.h
new file mode 100644
index 0000000000..40e6991797
--- /dev/null
+++ b/vmailmgr/patches/patch-lib_fdbuf_fdbuf.h
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- lib/fdbuf/fdbuf.h.orig	2024-02-20 03:19:48.448432259 +0000
++++ lib/fdbuf/fdbuf.h
+@@ -21,6 +21,7 @@
+ #include "config.h"
+ #include <string.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #ifdef _REENTRANT
+ #include <pthread.h>
diff --git a/vmailmgr/patches/patch-lib_misc_response.h b/vmailmgr/patches/patch-lib_misc_response.h
new file mode 100644
index 0000000000..841b2b035f
--- /dev/null
+++ b/vmailmgr/patches/patch-lib_misc_response.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- lib/misc/response.h.orig	2024-02-20 01:35:31.754629170 +0000
++++ lib/misc/response.h
+@@ -19,7 +19,7 @@ struct response
+   mystring message() const;
+   mystring codestr() const;
+ 
+-  static const unsigned long maxsize = 1<<16-1;
++  static const unsigned long maxsize = 1<<(16-1);
+ };
+ 
+ #define RETURN(CODE,STR) return response(response::CODE, STR)
diff --git a/vmailmgr/patches/patch-lib_misc_server.cc b/vmailmgr/patches/patch-lib_misc_server.cc
new file mode 100644
index 0000000000..804b60b64d
--- /dev/null
+++ b/vmailmgr/patches/patch-lib_misc_server.cc
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- lib/misc/server.cc.orig	2024-02-20 01:36:50.043359706 +0000
++++ lib/misc/server.cc
+@@ -17,6 +17,7 @@
+ #include <config.h>
+ #include "server.h"
+ #include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ #include "un.h"
+ #include "debug.h"
diff --git a/vmailmgr/patches/patch-lib_vpwtable_cdb__write.cc b/vmailmgr/patches/patch-lib_vpwtable_cdb__write.cc
new file mode 100644
index 0000000000..ae64dfdb76
--- /dev/null
+++ b/vmailmgr/patches/patch-lib_vpwtable_cdb__write.cc
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- lib/vpwtable/cdb_write.cc.orig	2024-02-20 03:14:13.278367363 +0000
++++ lib/vpwtable/cdb_write.cc
+@@ -23,8 +23,8 @@
+ class cdb_vpwtable_writer : public vpwtable_writer
+ {
+ private:
+-  const mystring& tmpname;
+-  const mystring& cdbname;
++  const mystring tmpname;
++  const mystring cdbname;
+   cdb_writer out;
+   bool opened;
+ public:
diff --git a/vmailmgr/patches/patch-lib_vpwtable_gdbm__del.cc b/vmailmgr/patches/patch-lib_vpwtable_gdbm__del.cc
new file mode 100644
index 0000000000..164d9d9b84
--- /dev/null
+++ b/vmailmgr/patches/patch-lib_vpwtable_gdbm__del.cc
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- lib/vpwtable/gdbm_del.cc.orig	2024-02-20 03:20:54.978827529 +0000
++++ lib/vpwtable/gdbm_del.cc
+@@ -23,7 +23,7 @@ bool vpwtable::del(const mystring& name)
+   GDBM_FILE db = gdbm_open((char*)filename.c_str(), 0, GDBM_WRITER, 0, 0);
+   if(!db)
+     return false;
+-  datum key = { (char*)name.c_str(), name.length() };
++  datum key = { (char*)name.c_str(), static_cast<int>(name.length()) };
+   bool result = gdbm_delete(db, key) == 0;
+   gdbm_close(db);
+   return result;
diff --git a/vmailmgr/patches/patch-lib_vpwtable_gdbm__exists.cc b/vmailmgr/patches/patch-lib_vpwtable_gdbm__exists.cc
new file mode 100644
index 0000000000..c1c2ef825a
--- /dev/null
+++ b/vmailmgr/patches/patch-lib_vpwtable_gdbm__exists.cc
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- lib/vpwtable/gdbm_exists.cc.orig	2024-02-20 03:21:16.821104286 +0000
++++ lib/vpwtable/gdbm_exists.cc
+@@ -23,7 +23,7 @@ bool vpwtable::exists(const mystring& na
+   GDBM_FILE db = gdbm_open((char*)filename.c_str(), 0, GDBM_READER, 0, 0);
+   if(!db)
+     return false;
+-  datum key = { (char*)name.c_str(), name.length() };
++  datum key = { (char*)name.c_str(), static_cast<int>(name.length()) };
+   bool result = gdbm_exists(db, key);
+   gdbm_close(db);
+   return result;
diff --git a/vmailmgr/patches/patch-lib_vpwtable_gdbm__getbyname.cc b/vmailmgr/patches/patch-lib_vpwtable_gdbm__getbyname.cc
new file mode 100644
index 0000000000..3f0bb61901
--- /dev/null
+++ b/vmailmgr/patches/patch-lib_vpwtable_gdbm__getbyname.cc
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- lib/vpwtable/gdbm_getbyname.cc.orig	2024-02-20 03:21:36.626537464 +0000
++++ lib/vpwtable/gdbm_getbyname.cc
+@@ -24,7 +24,7 @@ vpwentry* vpwtable::getbyname(const myst
+   if(!db)
+     return 0;
+   mystring lower = name.lower();
+-  datum key = { (char*)lower.c_str(), lower.length() };
++  datum key = { (char*)lower.c_str(), static_cast<int>(lower.length()) };
+   datum result = gdbm_fetch(db, key);
+   gdbm_close(db);
+   return vpwentry::new_from_record(name, mystring(result.dptr, result.dsize));
diff --git a/vmailmgr/patches/patch-lib_vpwtable_gdbm__put.cc b/vmailmgr/patches/patch-lib_vpwtable_gdbm__put.cc
new file mode 100644
index 0000000000..11d879e29d
--- /dev/null
+++ b/vmailmgr/patches/patch-lib_vpwtable_gdbm__put.cc
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- lib/vpwtable/gdbm_put.cc.orig	2024-02-20 03:21:52.065572565 +0000
++++ lib/vpwtable/gdbm_put.cc
+@@ -25,9 +25,9 @@ bool vpwtable::put(const vpwentry* vpw,
+   if(!db)
+     return false;
+   mystring name = vpw->name.lower();
+-  datum key = { (char*)name.c_str(), name.length() };
++  datum key = { (char*)name.c_str(), static_cast<int>(name.length()) };
+   mystring binary = vpw->to_record();
+-  datum data = { (char*)binary.c_str(), binary.length() };
++  datum data = { (char*)binary.c_str(), static_cast<int>(binary.length()) };
+   bool result = gdbm_store(db, key, data,
+ 			   onlyadd ? GDBM_INSERT : GDBM_REPLACE) == 0;
+   gdbm_close(db);
diff --git a/vmailmgr/patches/patch-lib_vpwtable_gdbm__write.cc b/vmailmgr/patches/patch-lib_vpwtable_gdbm__write.cc
new file mode 100644
index 0000000000..ed90eb203c
--- /dev/null
+++ b/vmailmgr/patches/patch-lib_vpwtable_gdbm__write.cc
@@ -0,0 +1,27 @@
+$NetBSD$
+
+--- lib/vpwtable/gdbm_write.cc.orig	2024-02-20 03:22:19.220947617 +0000
++++ lib/vpwtable/gdbm_write.cc
+@@ -22,8 +22,8 @@
+ class gdbm_vpwtable_writer : public vpwtable_writer
+ {
+ private:
+-  const mystring& tmpname;
+-  const mystring& destname;
++  const mystring tmpname;
++  const mystring destname;
+   GDBM_FILE out;
+   bool opened;
+ public:
+@@ -60,9 +60,9 @@ bool gdbm_vpwtable_writer::operator!() c
+ bool gdbm_vpwtable_writer::put(const vpwentry& vpw)
+ {
+   mystring name = vpw->name.lower();
+-  datum key = { (char*)name.c_str(), name.length() };
++  datum key = { (char*)name.c_str(), static_cast<int>(name.length()) };
+   mystring binary = vpw->to_record();
+-  datum data = { (char*)binary.c_str(), binary.length() };
++  datum data = { (char*)binary.c_str(), static_cast<int>(binary.length()) };
+   return gdbm_store(out, key, data, GDBM_INSERT) == 0;
+ }
+
Home | Main Index | Thread Index | Old Index