Patches from Matt with slight mod from me to do without strlen. Also modified lprintf...

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 87f4f6f827d4c65be909a214d6e092a56f77152d..43c0567bf94e1341275adc37dd43e355acf6e159 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -175,9 +175,6 @@ void master_cleanup(int exitcode) {
        lprintf(CTDL_INFO, "Closing databases\n");
        close_databases();
 
-       /* flush the networker stuff */
-/*     destroy_network_queue_room();*/
-
        /* Do system-dependent stuff */
        sysdep_master_cleanup();
        
@@ -369,8 +366,9 @@ int is_public_client(void)
                                }
                                else ptr++;
                        }
-                       while (isspace((buf[strlen(buf)-1]))) {
-                               buf[strlen(buf)-1] = 0;
+                       ptr--;
+                       while (ptr>buf && isspace(*ptr)) {
+                               *(ptr--) = 0;
                        }
                        if (hostname_to_dotted_quad(addrbuf, buf) == 0) {
                                if ((strlen(public_clients) +