Back-port from trunk of the logger fix for non-GNU-C compilers.

diff --git a/NEWS b/NEWS
index fabb82b3386fb2934a2445b1f20922ecc6748401..402bea3d4c65d24464c1677c158032b43ca2b64d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Changes in 1.6pre2
 
 * UPD: Removed --with-catsearch option from configure and enable FPCatSearch
        by default.
+* FIX: Build fix for non-GNU-C compilers in libatalk/util/logger.c.
 
 Changes in 1.6pre1
 ====================

diff --git a/libatalk/util/logger.c b/libatalk/util/logger.c
index a645229c71e343141cc867ec3692117f14a3f2d9..5076f0d450b0004a2049d49ad5533842c05854ca 100644 (file)
--- a/libatalk/util/logger.c
+++ b/libatalk/util/logger.c
@@ -50,14 +50,13 @@
 
 #define COUNT_ARRAY(array) (sizeof((array))/sizeof((array)[0]))
 #define NUMOF COUNT_ARRAY
-#define KEEP_LOGFILES_OPEN
+#undef  KEEP_LOGFILES_OPEN
 #define DO_SYSLOG
 #define DO_FILELOG
 
 #undef  DEBUG_OUTPUT_TO_SCREEN
 #undef  CHECK_STAT_ON_NEW_FILES 
 #undef  CHECK_ACCESS_ON_NEW_FILES 
-#define OPEN_LOGS_AS_UID 0
 
 /* =========================================================================
     External function declarations
@@ -144,30 +143,30 @@ static char *get_command_name(char *commandpath);
 
 static log_file_data_pair default_log_file_data_pair = {
 {
-  log_filename:    "\0\0\0\0\0\0\0\0",
-  log_file:        NULL,
-  log_level:       log_debug,
-  display_options: logoption_pid
+  /*log_filename:*/    "\0\0\0\0\0\0\0\0",
+  /*log_file:*/        NULL,
+  /*log_level:*/       log_debug,
+  /*display_options:*/ logoption_pid
 },
 {
-  log_filename:     LOGFILEPATH,
-  log_file:         NULL,
-  log_level:        log_debug,
-  display_options:  logoption_pid
+  /*log_filename:*/     LOGFILEPATH,
+  /*log_file:*/         NULL,
+  /*log_level:*/        log_debug,
+  /*display_options:*/  logoption_pid
 }};
 
 static log_file_data_pair logger_log_file_data_pair = {
 {
-  log_filename:    "\0\0\0\0\0\0\0\0",
-  log_file:        NULL,
-  log_level:       log_warning,
-  display_options: logoption_pid
+  /*log_filename:*/    "\0\0\0\0\0\0\0\0",
+  /*log_file:*/        NULL,
+  /*log_level:*/       log_warning,
+  /*display_options:*/ logoption_pid
 },
 {
-  log_filename:     LOGFILEPATH,
-  log_file:         NULL,
-  log_level:        log_maxdebug,
-  display_options:  logoption_pid
+  /*log_filename:*/     LOGFILEPATH,
+  /*log_file:*/         NULL,
+  /*log_level:*/        log_maxdebug,
+  /*display_options:*/  logoption_pid
 }};
 
 static log_file_data_pair *log_file_data_array[logtype_end_of_list_marker] = 
@@ -175,13 +174,13 @@ static log_file_data_pair *log_file_data_array[logtype_end_of_list_marker] =
 
 /* The class (populated) */
 static struct tag_global_log_data global_log_data = {
-  struct_size:         sizeof(struct tag_global_log_data),
-  temp_src_filename:   NULL,
-  temp_src_linenumber: 0,
-  processname:         "",
-  facility:            logfacility_daemon,
-  log_file_directory:  "",
-  logs:                NULL,
+  /*struct_size:*/         sizeof(struct tag_global_log_data),
+  /*temp_src_filename:*/   NULL,
+  /*temp_src_linenumber:*/ 0,
+  /*processname:*/         "",
+  /*facility:*/            logfacility_daemon,
+  /*log_file_directory:*/  "",
+  /*logs:*/                NULL,
 };
 
 /* macro to get access to the array */
@@ -373,7 +372,6 @@ bool log_setup(char *filename, enum loglevels loglevel, enum logtypes logtype,
   }
 #endif /* CHECK_ACCESS_ON_NEW_FILES */
 #endif /* CHECK_STAT_ON_NEW_FILES */
-/*
 #ifdef KEEP_LOGFILES_OPEN
   if ((*logs)[1].log_file!=NULL)
     fclose((*logs)[1].log_file);
@@ -387,7 +385,6 @@ bool log_setup(char *filename, enum loglevels loglevel, enum logtypes logtype,
     return false;
   }
 #endif
-*/
 
   LOG(log_debug7, logtype_logger, "log_file_arr[%d] now contains: "
                                  "{log_filename:%s, log_file:%p, log_level: %d}", logtype,
@@ -523,9 +520,7 @@ void make_log_entry(enum loglevels loglevel, enum logtypes logtype,
   char log_buffer[MAXLOGSIZE];
 #ifndef DISABLE_LOGGER
   char log_details_buffer[MAXLOGSIZE];
-#ifdef OPEN_LOGS_AS_UID
-  uid_t process_uid;
-#endif
+
   log_file_data_pair *logs;
 
   log_init();
@@ -590,15 +585,8 @@ void make_log_entry(enum loglevels loglevel, enum logtypes logtype,
     if ((*logs)[1].log_file==NULL) {
 #ifdef DEBUG_OUTPUT_TO_SCREEN
       printf("Opening the Log, filename is %s\n", (*logs)[1].log_filename);
-#endif
-#ifdef OPEN_LOGS_AS_UID
-   process_uid = getuid();
-   setuid(OPEN_LOGS_AS_UID);
 #endif
       (*logs)[1].log_file     = fopen((*logs)[1].log_filename, "at");
-#ifdef OPEN_LOGS_AS_UID
-   setuid(process_uid);
-#endif
       if ((*logs)[1].log_file == NULL)
       {
         (*logs)[1].log_file = stdout;
@@ -631,9 +619,7 @@ void make_log_entry(enum loglevels loglevel, enum logtypes logtype,
       printf("Closed\n");
 #endif
     }
-#else // KEEP_LOGFILES_OPEN
-    fflush((*logs)[1].log_file);
-#endif // KEEP_LOGFILES_OPEN
+#endif 
   }
 #endif