* Fixed a problem where the client protocol would spit out two responses

  and therefore get out of sync if ASUP command set the access level to
  0 and therefore deleted the user (thanks to Eric McDonald)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 7069b2c48edee89691a20448d97fa276380c4c5b..e4cb2988c6ee7620eb1549e493c035a675aff428 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,9 @@
 $Log$
+Revision 1.401  1999/10/28 19:50:55  ajc
+* Fixed a problem where the client protocol would spit out two responses
+  and therefore get out of sync if ASUP command set the access level to
+  0 and therefore deleted the user (thanks to Eric McDonald)
+
 Revision 1.400  1999/10/28 05:08:49  ajc
 * Removed all of the thread cancellation cruft that is no longer necessary
 * Moved the now non-system-dependent RemoveContext() out of sysdep.c (now
@@ -1380,4 +1385,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Initial CVS import 
-

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 5cf386354cdb7c410d70e23e92b7f7c4b1da78b9..dc83df311239ee8b9410004ed876aeaee94ae09c 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -1144,6 +1144,7 @@ void cmd_asup(char *cmdbuf) {
        char requested_user[256];
        int np;
        int newax;
+       int deleted = 0;
        
        if ( (CC->internal_pgm==0)
           && ( (CC->logged_in == 0) || (is_aide()==0) ) ) {
@@ -1179,10 +1180,12 @@ void cmd_asup(char *cmdbuf) {
        lputuser(&usbuf);
        if (usbuf.axlevel == 0) {
                if (purge_user(requested_user)==0) {
-                       cprintf("%d %s deleted.\n", OK, requested_user);
+                       deleted = 1;
                        }
                }
-       cprintf("%d Ok\n", OK);
+       cprintf("%d Ok", OK);
+       if (deleted) cprintf(" (%s deleted)", requested_user);
+       cprintf("\n");
        }