[BACK]Return to fmadm.c CVS log [TXT] [DIR] Up to [Coherent Logic Development] / freem / src

Diff for /freem/src/fmadm.c between versions 1.38 and 1.42

version 1.38, 2025/04/15 02:24:43 version 1.42, 2025/05/13 20:03:53
Line 24 Line 24
  *   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.   *   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.
  *   *
  *   $Log$   *   $Log$
    *   Revision 1.42  2025/05/13 20:03:53  snw
    *   Error-check fopen in fm_daemonctl
    *
    *   Revision 1.41  2025/04/25 20:08:19  snw
    *   Work on improving routine importer
    *
    *   Revision 1.40  2025/04/15 18:19:40  snw
    *   Further attempts to fix FreeBSD
    *
    *   Revision 1.39  2025/04/15 16:49:36  snw
    *   Make use of logprintf throughout codebase
    *
  *   Revision 1.38  2025/04/15 02:24:43  snw   *   Revision 1.38  2025/04/15 02:24:43  snw
  *   Improve FreeM logging capabilities   *   Improve FreeM logging capabilities
  *   *
Line 144 Line 156
 #include "transact.h"  #include "transact.h"
 #include "namespace.h"  #include "namespace.h"
 #include "fs.h"  #include "fs.h"
   #include "log.h"
   
 #ifdef HAVE_LIBREADLINE  #ifdef HAVE_LIBREADLINE
 #  if defined(HAVE_READLINE_READLINE_H)  #  if defined(HAVE_READLINE_READLINE_H)
Line 204  extern char env_config_file[4096]; Line 217  extern char env_config_file[4096];
 extern char env_user[255];  extern char env_user[255];
 extern char env_group[255];  extern char env_group[255];
 extern char env_enabled[10];  extern char env_enabled[10];
   extern char shm_env[255];
   
 int fm_shell(void);  int fm_shell(void);
 void fm_checkperms(void);  void fm_checkperms(void);
Line 387  int main (int argc, char **argv) Line 401  int main (int argc, char **argv)
           
     snprintf (env_config_file, sizeof (env_config_file) - 1, "%s/freem/env.conf", SYSCONFDIR);      snprintf (env_config_file, sizeof (env_config_file) - 1, "%s/freem/env.conf", SYSCONFDIR);
           
 /*  
     printf ("action = '%s' object = '%s' environment = '%s' namespace = '%s' config_file = '%s' base_arg = '%d' next argument = '%s'\n", action, obj_str, fma_environment, fma_namespace, config_file, base_arg, argv[base_arg]);      //printf ("action = '%s' object = '%s' environment = '%s' namespace = '%s' config_file = '%s' base_arg = '%d' next argument = '%s'\n", action, obj_str, fma_environment, fma_namespace, config_file, base_arg, argv[base_arg]);
     exit(1);      //exit(1);
 */  
       strncpy (shm_env, fma_environment, sizeof (shm_env) - 1);
       init_log ();
           
     /* override for fmadm configure and daemon stuff */      /* override for fmadm configure and daemon stuff */
     if (got_action) {      if (got_action) {
Line 570  act_switch: Line 586  act_switch:
   
   
         case ACT_IMPORT:          case ACT_IMPORT:
               //printf ("opts[0] = %s\n", opts[0]);
             fmadm_exit (fm_import (obj, optc, opts));              fmadm_exit (fm_import (obj, optc, opts));
   
   
Line 1356  int fm_daemonctl (short action, short ob Line 1373  int fm_daemonctl (short action, short ob
         envlist = (char *) malloc (sizeof (char) * BIGSTR);          envlist = (char *) malloc (sizeof (char) * BIGSTR);
         NULLPTRCHK(envlist,"fm_daemonctl");          NULLPTRCHK(envlist,"fm_daemonctl");
   
         ef = fopen (env_config_file, "r");          if ((ef = fopen (env_config_file, "r")) == NULL) {
               logprintf (FM_LOG_FATAL, "fm_daemonctl:  failed to open %s (error code %d [%s])", env_config_file, errno, strerror (errno));
           }        
           
         while (fgets (line, 254, ef)) {          while (fgets (line, 254, ef)) {
             if (line[0] == '[') {              if (line[0] == '[') {
                 strncpy (env, &(line[1]), 255);                  strncpy (env, &(line[1]), 255);
Line 1533  void fm_configure (void) Line 1552  void fm_configure (void)
     char sysgbl[4096];      char sysgbl[4096];
     char usrrtn[4096];      char usrrtn[4096];
     char usrgbl[4096];      char usrgbl[4096];
       
     char jnldir[4096];      char jnldir[4096];
     char jnlfile[4096];      char jnlfile[4096];
     char jnlmode[4];      char jnlmode[4];
Line 1796  void fm_configure (void) Line 1815  void fm_configure (void)
                   
         snprintf (buf, sizeof (buf) - 1, "env_path=%s/freem/%s", LOCALSTATEDIR, fma_environment);          snprintf (buf, sizeof (buf) - 1, "env_path=%s/freem/%s", LOCALSTATEDIR, fma_environment);
         fm_write (fp, buf);          fm_write (fp, buf);
   
           snprintf (buf, sizeof (buf) - 1, "log_threshold_file=info");
           fm_write (fp, buf);
           
           snprintf (buf, sizeof (buf) - 1, "log_threshold_syslog=info");
           fm_write (fp, buf);
   
           snprintf (buf, sizeof (buf) - 1, "log_threshold_stderr=warning");
           fm_write (fp, buf);
                   
         fclose (fp);          fclose (fp);
         fprintf (stderr, "[OK]\n");          fprintf (stderr, "[OK]\n");
Line 1806  void fm_configure (void) Line 1834  void fm_configure (void)
         update_conf (env_config_file, fma_environment, "user", env_user);          update_conf (env_config_file, fma_environment, "user", env_user);
         update_conf (env_config_file, fma_environment, "group", env_group);          update_conf (env_config_file, fma_environment, "group", env_group);
         update_conf (env_config_file, fma_environment, "enabled", env_enabled);          update_conf (env_config_file, fma_environment, "enabled", env_enabled);
           update_conf (env_config_file, fma_environment, "log_threshold_file", "info");
           update_conf (env_config_file, fma_environment, "log_threshold_syslog", "info");
           update_conf (env_config_file, fma_environment, "log_threshold_stderr", "warning");        
     }      }
   
     if (reconfigure == FALSE) {      if (reconfigure == FALSE) {
Removed from v.1.38  
changed lines
  Added in v.1.42

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>