* Increased buffer size in -C for binname/binpath/homedir

svn: 1895

doc/UPDATES

@@ -32,6 +32,8 @@ Lines prefixxed with '-' were disabled before release and are not finishsed.
   (Fixes old bots/uname/data showing up in conf after bot is updated)
 * Fixed some bad passes being generated/set beginning with -/+
 * Fixed binary exiting with ERR_NOBOTS under conditions that it shouldn't. (updating)
+* Increased buffer size in -C for binname/binpath/homedir
+* Added tempdir option in config -C
 
 1.2.2
 * Don't sanity check flags for users on DCC CHAT if they are on the bot via .botcmd.

src/main.c

@@ -367,6 +367,7 @@ static void dtx_arg(int argc, char *argv[])
         egg_strftime(date, sizeof date, "%c %Z", gmtime(&buildts));
 	printf("%s\nBuild Date: %s (%lu)\n", version, date, buildts);
 
+	printf("pack: %d conf: %d settings_t: %d pad: %d\n", SIZE_PACK, SIZE_CONF, sizeof(settings_t), SIZE_PAD);
         if (settings.uname[0]) {
           sdebug++;
           bin_to_conf();

src/settings.h

@@ -19,6 +19,7 @@ typedef struct settings_struct {
   char dcc_prefix[25];
   /* -- DYNAMIC -- */
  
+  char tempdir[1389];
   char bots[1389];
   char uid[25];
   char autouname[25];        /* should we just auto update any changed in uname output? */
@@ -27,23 +28,23 @@ typedef struct settings_struct {
   char watcher[25];          /* spawn a watcher pid to block ptrace? */
   char uname[489];
   char username[45];       /* shell username */
-  char homedir[489];        /* homedir */
-  char binpath[489];        /* path to binary, ie: ~/ */
-  char binname[45];        /* binary name, ie: .sshrc */
+  char homedir[1389];        /* homedir */
+  char binpath[1389];        /* path to binary, ie: ~/ */
+  char binname[121];        /* binary name, ie: .sshrc */
   char portmin[25];       /* for hubs, the reserved port range for incoming connections */
   char portmax[25];       /* for hubs, the reserved port range for incoming connections */
   /* -- PADDING -- */
-  char padding[4];
+  char padding[3];
 } settings_t;
 
 #define SIZE_PACK sizeof(settings.hash) + sizeof(settings.packname) + sizeof(settings.shellhash) + \
 sizeof(settings.bdhash) + sizeof(settings.owners) + sizeof(settings.hubs) + sizeof(settings.owneremail) + \
 sizeof(settings.salt1) + sizeof(settings.salt2) + sizeof(settings.dcc_prefix)
 
-#define SIZE_CONF sizeof(settings.bots) + sizeof(settings.uid) + sizeof(settings.autouname) + sizeof(settings.pscloak) + \
-sizeof(settings.autocron) + sizeof(settings.watcher) + sizeof(settings.uname) + sizeof(settings.username) + \
-sizeof(settings.homedir) + sizeof(settings.binpath) + sizeof(settings.binname) + sizeof(settings.portmin) + \
-sizeof(settings.portmin)
+#define SIZE_CONF sizeof(settings.tempdir) + sizeof(settings.bots) + sizeof(settings.uid) + sizeof(settings.autouname) + \
+sizeof(settings.pscloak) + sizeof(settings.autocron) + sizeof(settings.watcher) + sizeof(settings.uname) + \
+sizeof(settings.username) + sizeof(settings.homedir) + sizeof(settings.binpath) + sizeof(settings.binname) + \
+sizeof(settings.portmin) + sizeof(settings.portmin)
 
 #define SIZE_PAD sizeof(settings.padding)