Remove the vCard module's attempt to create a netconfig file in the obsolete format...

diff --git a/citadel/citadel.h b/citadel/citadel.h
index cb2bafd9dd9b6ad2aea1fd8b00d756dee0292c69..70e084002a50a1703fc7003a06ec5821486b404b 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -1,7 +1,7 @@
 /*
  * Main Citadel header file
  *
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-2017 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -45,7 +45,7 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL      905             /* This version */
+#define REV_LEVEL      906             /* This version */
 #define REV_MIN                591             /* Oldest compatible database */
 #define EXPORT_REV_MIN 760             /* Oldest compatible export files */
 #define LIBCITADEL_MIN 903             /* Minimum required version of libcitadel */

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 0caefacec8f0b4f605b8583f009d5aa825fbfa3c..82482fc56bd0d93b16c8908438c37d34130d5896 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
-AC_INIT([Citadel], [905], [http://www.citadel.org/])
+AC_INIT([Citadel], [906], [http://www.citadel.org/])
 AC_REVISION([$Revision: 5108 $])
 AC_CONFIG_SRCDIR([citserver.c])
 AC_CONFIG_HEADER(sysdep.h)

diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c
index 439a714a8d5b4d682f24c72b05b5d9077dd8c5f8..db2f6114fc4698b42fa0b1b1535b8f1516d4dbd5 100644 (file)
--- a/citadel/modules/vcard/serv_vcard.c
+++ b/citadel/modules/vcard/serv_vcard.c
@@ -2,7 +2,7 @@
  * A server-side module for Citadel which supports address book information
  * using the standard vCard format.
  * 
- * Copyright (c) 1999-2016 by the citadel.org team
+ * Copyright (c) 1999-2017 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -1534,7 +1534,7 @@ CTDL_MODULE_INIT(vcard)
                CtdlRegisterFixedOutputHook("text/x-vcard", vcard_fixed_output);
                CtdlRegisterFixedOutputHook("text/vcard", vcard_fixed_output);
 
-               /* Create the Global ADdress Book room if necessary */
+               /* Create the Global Address Book room if necessary */
                CtdlCreateRoom(ADDRESS_BOOK_ROOM, 3, "", 0, 1, 0, VIEW_ADDRESSBOOK);
 
                /* Set expiration policy to manual; otherwise objects will be lost! */
@@ -1550,7 +1550,7 @@ CTDL_MODULE_INIT(vcard)
                         * purged.
                         *
                         * FIXME this no longer works
-                        */
+                        *
                        assoc_file_name(filename, sizeof filename, &qr, ctdl_netcfg_dir);
                        fp = fopen(filename, "a");
                        if (fp != NULL) {
@@ -1568,6 +1568,7 @@ CTDL_MODULE_INIT(vcard)
                                syslog(LOG_ERR, "Cannot create %s: %s", filename, strerror(errno));
                        }
                }
+                        */
 
                /* for postfix tcpdict */
                CtdlRegisterServiceHook(CtdlGetConfigInt("c_pftcpdict_port"),   /* Postfix */