From: Art Cancro <ajc@citadel.org>
Date: Mon, 18 Jun 2007 04:02:17 +0000 (+0000)
Subject: Renamed validpw() in auth.c to validate_password()
X-Git-Tag: v7.86~3303
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=d004ce21a37a89a9c2e175dbc028df7afcf0646c

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 d23ca24dc..a689c9006 100644
--- 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 ea5fc5905..d80afb930 100644
--- 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 3779cd0e7..bb15e7a1e 100644
--- 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 8a7b713eb..d6b0fd896 100644
--- 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"); */
 }
 
 /*