Renamed validpw() in auth.c to validate_password()

in order to distinguish it from the validpw() function in user_ops.c

diff --git a/citadel/auth.c b/citadel/auth.c
index d23ca24dcf99757fce27ceddff11519eb52874bf..a689c9006634c56711bf6717096cc193c9bc7d8a 100644 (file)
--- a/citadel/auth.c
+++ b/citadel/auth.c
@@ -78,11 +78,11 @@ static int conv(int num_msg, const struct pam_message **msg,
 
 
 /*
- * validpw(): check that `pass' is the correct password for `uid'
- *            returns zero if no, nonzero if yes
+ * check that `pass' is the correct password for `uid'
+ * returns zero if no, nonzero if yes
  */
 
-int validpw(uid_t uid, const char *pass)
+int validate_password(uid_t uid, const char *pass)
 {
 #ifdef HAVE_PAM_START
        struct pam_conv pc;

diff --git a/citadel/auth.h b/citadel/auth.h
index ea5fc59056929625f369cbdc0dcca8729235cf75..d80afb9309a5e7756069cf832fe811d6ba846ee1 100644 (file)
--- a/citadel/auth.h
+++ b/citadel/auth.h
@@ -1,2 +1,2 @@
 /* $Id$ */
-int validpw(uid_t uid, const char *pass);
+int validate_password(uid_t uid, const char *pass);

diff --git a/citadel/chkpwd.c b/citadel/chkpwd.c
index 3779cd0e7b5a693d036e796223d341f782b69379..bb15e7a1ecc8d3f38ba622e1044bb78fea82c66f 100644 (file)
--- a/citadel/chkpwd.c
+++ b/citadel/chkpwd.c
@@ -55,7 +55,7 @@ int main(void)
 
   strtok(buf, "\n");
 
-  if (validpw(uid, buf))
+  if (validate_password(uid, buf))
     return 0;
 
   return 1;

diff --git a/citadel/serv_imap.c b/citadel/serv_imap.c
index 8a7b713ebc3cd3482fac3b3617928cc8f98490a8..d6b0fd89636c382b99265a9a098b62543aeb7969 100644 (file)
--- a/citadel/serv_imap.c
+++ b/citadel/serv_imap.c
@@ -443,8 +443,13 @@ void imap_output_capability_string(void) {
        if (!CC->redirect_ssl) cprintf(" STARTTLS");
 #endif
 
-       /* Comment this out if its unfinished state is choking your client */
-       cprintf(" METADATA LIST-EXTENDED");
+       /* We are building a partial implementation of METADATA for the sole purpose
+        * of interoperating with the ical/vcard version of the Bynari Insight Connector.
+        * If you were expecting something else, comment out one or both of these
+        * extension advertisements.
+        */
+       cprintf(" METADATA");
+       /* cprintf(" LIST-EXTENDED"); */
 }
 
 /*