@@ -1,6 +1,8 @@

 1.3.5:

  - ログにゴミが出力されることがあった不具合を修正

  - 他のサーバがメンバから外れた際にセグフォが発生することがあった不具合を修正

+ - Cオプション(--core)を追加

+ - Cオプションを指定すると、ulimit -c unlimited しなくてもコアを吐くことが可能になる

 1.3.4:

  - makuosanにrオプションを指定していても、msyncのdeleteオプションで

@@ -172,6 +172,9 @@

    */

 #undef HAVE_SYS_NDIR_H

+/* Define to 1 if you have the <sys/prctl.h> header file. */

+#undef HAVE_SYS_PRCTL_H

+

 /* Define to 1 if you have the <sys/select.h> header file. */

 #undef HAVE_SYS_SELECT_H

@@ -4471,7 +4471,7 @@ fi

 done

-for ac_header in arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h utime.h

+for ac_header in arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h utime.h sys/prctl.h

 do :

   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"

@@ -17,7 +17,7 @@ AC_CHECK_LIB(socket, socket)

 AC_CHECK_LIB(nsl, inet_addr)

 # Checks for header files.

-AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h utime.h])

+AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h utime.h sys/prctl.h])

 AC_CHECK_HEADERS(openssl/md5.h openssl/blowfish.h,,[AC_MSG_ERROR([Can't found openssl header file])])

 # Checks for typedefs, structures, and compiler characteristics.

@@ -33,7 +33,6 @@

 #include <sys/un.h>

 #include <sys/time.h>

 #include <sys/utsname.h>

-#include <sys/prctl.h>

 #include <sys/resource.h>

 #include <arpa/inet.h>

 #include <netinet/in.h>

@@ -278,6 +277,8 @@ typedef struct

   int lisocket;

   int cryptena;

   int comm_ena;

+  int core_ena;

+  int coresize;

   int commpass;

   int ownmatch;

   int parallel;

@@ -285,7 +286,6 @@ typedef struct

   int sendsize;

   int sendready;

   int sendrate;

-  int coresize;

   struct utsname uts;  

   struct sockaddr_in maddr;

   struct sockaddr_in iaddr;

@@ -3,6 +3,9 @@

  * Copyright (C) 2008-2012 KLab Inc.

  */

 #include "makuosan.h"

+#ifdef HAVE_SYS_PRCTL_H

+#include <sys/prctl.h>

+#endif

 static void version_print()

 {

@@ -311,12 +314,13 @@ static void minit_getopt(int argc, char *argv[])

   int r;

   struct option opt[]={

     {"chroot",  0, NULL, 'c'},

+    {"core",    0, NULL, 'C'},

     {"help",    0, NULL, 'h'},

     {"version", 0, NULL, 'V'},

     {0, 0, 0, 0}

   };

-  while((r=getopt_long(argc, argv, "T:R:S:f:u:g:G:d:b:p:m:i:l:U:k:K:VhnsroOc", opt, NULL)) != -1){

+  while((r=getopt_long(argc, argv, "T:R:S:f:u:g:G:d:b:p:m:i:l:U:k:K:VhnsroOcC", opt, NULL)) != -1){

     switch(r){

       case 'V':

         version_print();

@@ -364,6 +368,10 @@ static void minit_getopt(int argc, char *argv[])

         moption.comm_ena = 0;

         break;

+      case 'C':

+        moption.core_ena = 1;

+        break;

+

       case 'c':

         moption.chroot = 1;

         break;

@@ -616,17 +624,21 @@ static void minit_setguid()

 static void minit_enable_core()

 {

-  struct rlimit r;

-  if(prctl(PR_SET_DUMPABLE, 1) == -1){

-    fprintf(stderr, "%s: prctl error: %s\n", __func__, strerror(errno));

-  }

-  r.rlim_cur = 0;

-  r.rlim_max = 0;

+  struct rlimit r = {0, 0};

   if(getrlimit(RLIMIT_CORE, &r) == -1){

     fprintf(stderr, "%s: getrlimit error: %s\n", __func__, strerror(errno));

     exit(1);

   }

-  r.rlim_cur = -1;

+  moption.coresize = (int)(r.rlim_cur);

+  if(!moption.core_ena){

+    return;

+  }

+#ifdef HAVE_SYS_PRCTL_H

+  if(prctl(PR_SET_DUMPABLE, 1) == -1){

+    fprintf(stderr, "%s: prctl error: %s\n", __func__, strerror(errno));

+  }

+#endif

+  r.rlim_cur = r.rlim_max;

   if(setrlimit(RLIMIT_CORE, &r) == -1){

     fprintf(stderr, "%s: setrlimit error: %s\n", __func__, strerror(errno));

     exit(1);

@@ -682,7 +694,7 @@ static void minit_bootlog()

   lprintf(0, "makuosan version %s\n", PACKAGE_VERSION);

   lprintf(0, "sysname   : %s\n", moption.uts.sysname);

   lprintf(0, "loglevel  : %d\n", moption.loglevel);

-  if(moption.coresize == -1){

+  if(moption.coresize == (int)RLIM_INFINITY){

     lprintf(0, "coresize  : unlimited\n");

   }else{

     lprintf(0, "coresize  : %d\n", moption.coresize);