* Ignore comments in public_clients file

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 023fb7466a25afe37a286d858389d14d995e94df..41cdfc957a06d6e9b5cebdfd6078d4b640ca071c 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 607.19  2003/07/11 22:33:02  ajc
+ * Ignore comments in public_clients file
+
  Revision 607.18  2003/07/11 22:30:19  ajc
  * Automatically add 127.0.0.1 and config.c_fqdn to public_clients
 
@@ -4845,3 +4848,4 @@ 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/citserver.c b/citadel/citserver.c
index 9960d66dc62e8e39c109819ba1852917851fffb7..876c2d5c8fc58205b9639b5e514f9fd656130590 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -417,6 +417,9 @@ int is_public_client(void)
 
                fp = fopen("public_clients", "r");
                if (fp != NULL) while (fgets(buf, sizeof buf, fp)!=NULL) {
+                       for (i=0; i<strlen(buf); ++i) {
+                               if (buf[i] == '#') buf[i] = 0;
+                       }
                        while (isspace((buf[strlen(buf)-1]))) {
                                buf[strlen(buf)-1] = 0;
                        }