Precisely report whats going wrong with the handling of the control file.

[citadel.git] / citadel / control.c

diff --git a/citadel/control.c b/citadel/control.c
index 242cac8163cf97c247c5ebeff6e3b2d14bbd4967..e71055c880492596fd8e5f404e1dc4169e8681f5 100644 (file)
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -176,17 +176,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 +214,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 +234,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);
        }
 }
@@ -686,9 +711,12 @@ void cmd_conf(char *argbuf)
                extract_token(confname, argbuf, 1, '|', sizeof confname);
                confptr = CtdlGetSysConfig(confname);
                if (confptr != NULL) {
+                       long len; 
+
+                       len = strlen(confptr);
                        cprintf("%d %s\n", LISTING_FOLLOWS, confname);
-                       client_write(confptr, strlen(confptr));
-                       if (confptr[strlen(confptr) - 1] != 10)
+                       client_write(confptr, len);
+                       if ((len > 0) && (confptr[len - 1] != 10))
                                client_write("\n", 1);
                        cprintf("000\n");
                        free(confptr);