* Repaired the "remember username/password" functionality of the client

  (it was broken during the transition to the new client protocol library)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index d783cf473744d7fdf86b839efc1327d853981ae1..9a351ce4055e84de4e5eb85155e423ba5331be07 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 601.58  2002/11/07 04:40:07  ajc
+ * Repaired the "remember username/password" functionality of the client
+   (it was broken during the transition to the new client protocol library)
+
  Revision 601.57  2002/11/06 05:03:01  ajc
  * No changes; just testing CVS permissions
 
@@ -4180,4 +4184,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/citadel.c b/citadel/citadel.c
index a2c6fb5f88063c8d82864457f51b56ee9db38d2c..e5ce98dcb9e51f5e8f0bf3b47d405e49c8459675 100644 (file)
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -736,7 +736,7 @@ int set_password(CtdlIPC *ipc)
        if (!strcasecmp(pass1, pass2)) {
                CtdlIPCChangePassword(ipc, pass1, buf);
                scr_printf("%s\n", buf);
-               offer_to_remember_password(hostbuf, portbuf, fullname, pass1);
+               offer_to_remember_password(ipc, hostbuf, portbuf, fullname, pass1);
                return (0);
        } else {
                scr_printf("*** They don't match... try again.\n");
@@ -1158,7 +1158,7 @@ int main(int argc, char **argv)
        
        if (r / 100 == 2) {
                load_user_info(aaa);
-               offer_to_remember_password(hostbuf, portbuf,
+               offer_to_remember_password(ipc, hostbuf, portbuf,
                                           fullname, password);
                goto PWOK;
        }

diff --git a/citadel/client_passwords.c b/citadel/client_passwords.c
index 23d2e84c11000319cdf809d816064aba9d2b10c9..5e8dc10de1cf56c9700d5027009fcb13ed946e04 100644 (file)
--- a/citadel/client_passwords.c
+++ b/citadel/client_passwords.c
@@ -20,10 +20,11 @@
 #include "citadel_ipc.h"
 #include "tools.h"
 #include "commands.h"
+#include "client_passwords.h"
 
 #define PWFILENAME "%s/.citadel.passwords"
 
-static void determine_pwfilename(char *pwfile, size_t n) {
+void determine_pwfilename(char *pwfile, size_t n) {
        struct passwd *p;
 
        p = getpwuid(getuid());

diff --git a/citadel/client_passwords.h b/citadel/client_passwords.h
index 96a5fb4f865b055419230242faf7997cfee4c64c..4885791c69e38ab332279e59f14a38da7a498097 100644 (file)
--- a/citadel/client_passwords.h
+++ b/citadel/client_passwords.h
@@ -3,7 +3,8 @@
  *
  */
 
-void determine_pwfilename(char *);
+
+void determine_pwfilename(char *pwfile, size_t n);
 void get_stored_password(
                char *host,
                char *port,
@@ -14,7 +15,7 @@ void set_stored_password(
                char *port,
                char *username,
                char *password);
-void offer_to_remember_password(
+void offer_to_remember_password(CtdlIPC *ipc,
                char *host,
                char *port,
                char *username,