Change some of the broken links pointing to www.citadel.org

[citadel.git] / citadel / control.c

diff --git a/citadel/control.c b/citadel/control.c
index 2e5bf43c876aa27896ad9da9b87d4b4f7240905c..1e469b489ef84178f4466574a9ad5d2b780e1d11 100644 (file)
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -1,21 +1,15 @@
 /*
  * This module handles states which are global to the entire server.
  *
- * Copyright (c) 1987-2010 by the citadel.org team
+ * Copyright (c) 1987-2012 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ *  This program is open source software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "sysdep.h"
@@ -176,17 +170,34 @@ void get_control(void)
                if (control_fp != NULL) {
                        lock_control();
                        rv = fchown(fileno(control_fp), config.c_ctdluid, -1);
+                       if (rv == -1)
+                               syslog(LOG_EMERG, "Failed to adjust ownership of: %s [%s]\n", 
+                                      file_citadel_control, strerror(errno));
                        rv = fchmod(fileno(control_fp), S_IRUSR|S_IWUSR);
+                       if (rv == -1)
+                               syslog(LOG_EMERG, "Failed to adjust accessrights of: %s [%s]\n", 
+                                      file_citadel_control, strerror(errno));
                }
        }
        if (control_fp == NULL) {
                control_fp = fopen(file_citadel_control, "wb+");
                if (control_fp != NULL) {
                        lock_control();
+                       memset(&CitControl, 0, sizeof(struct CitControl));
+
                        rv = fchown(fileno(control_fp), config.c_ctdluid, -1);
+                       if (rv == -1)
+                               syslog(LOG_EMERG, "Failed to adjust ownership of: %s [%s]\n", 
+                                      file_citadel_control, strerror(errno));
+
                        rv = fchmod(fileno(control_fp), S_IRUSR|S_IWUSR);
-                       memset(&CitControl, 0, sizeof(struct CitControl));
+                       if (rv == -1)
+                               syslog(LOG_EMERG, "Failed to adjust accessrights of: %s [%s]\n", 
+                                      file_citadel_control, strerror(errno));
                        rv = fwrite(&CitControl, sizeof(struct CitControl), 1, control_fp);
+                       if (rv == -1)
+                               syslog(LOG_EMERG, "Failed to write: %s [%s]\n", 
+                                      file_citadel_control, strerror(errno));
                        rewind(control_fp);
                }
        }
@@ -197,9 +208,14 @@ void get_control(void)
 
        rewind(control_fp);
        rv = fread(&CitControl, sizeof(struct CitControl), 1, control_fp);
+       if (rv == -1)
+               syslog(LOG_EMERG, "Failed to read Controlfile: %s [%s]\n", 
+                      file_citadel_control, strerror(errno));
        already_have_control = 1;
        rv = chown(file_citadel_control, config.c_ctdluid, (-1));
-       
+       if (rv == -1)
+               syslog(LOG_EMERG, "Failed to adjust ownership of: %s [%s]\n", 
+                      file_citadel_control, strerror(errno));  
 }
 
 /*
@@ -212,6 +228,9 @@ void put_control(void)
        if (control_fp != NULL) {
                rewind(control_fp);
                rv = fwrite(&CitControl, sizeof(struct CitControl), 1, control_fp);
+               if (rv == -1)
+                       syslog(LOG_EMERG, "Failed to write: %s [%s]\n", 
+                              file_citadel_control, strerror(errno));
                fflush(control_fp);
        }
 }
@@ -310,7 +329,7 @@ long get_new_room_number(void)
  * Get or set global configuration options
  *
  * IF YOU ADD OR CHANGE FIELDS HERE, YOU *MUST* DOCUMENT YOUR CHANGES AT:
- * http://www.citadel.org/doku.php/documentation:appproto:system_config
+ * http://www.citadel.org/doku.php?id=documentation:applicationprotocol
  *
  */
 void cmd_conf(char *argbuf)
@@ -402,6 +421,8 @@ void cmd_conf(char *argbuf)
                cprintf("%ld\n", config.c_pop3_fastest);
                cprintf("%d\n", config.c_spam_flag_only);
                cprintf("%d\n", config.c_guest_logins);
+               cprintf("%d\n", config.c_port_number);
+               cprintf("%d\n", config.c_ctdluid);
                cprintf("000\n");
        }
 
@@ -661,6 +682,12 @@ void cmd_conf(char *argbuf)
                        case 67:
                                config.c_guest_logins = atoi(buf);
                                break;
+                       case 68:
+                               config.c_port_number = atoi(buf);
+                               break;
+                       case 69:
+                               config.c_ctdluid = atoi(buf);
+                               break;
                        }
                        ++a;
                }