Hi
After satisfying the ssl dependency the .irc.entropy file also popped up.
The new diff file:
diff -rupN bahamut-1.8.6.orig/include/config.h bahamut-1.8.6/include/config.h
--- bahamut-1.8.6.orig/include/config.h 2008-10-10 19:52:21.000000000 +0200
+++ bahamut-1.8.6/include/config.h 2010-02-16 09:38:36.000000000 +0200
@@ -134,11 +134,13 @@
/* File names
* the server will look for these files
*/
-#define MPATH "ircd.motd"
-#define SMPATH "ircd.smotd"
-#define LPATH "ircd.log"
-#define PPATH "ircd.pid"
-#define HPATH "opers.txt"
+#define ETCDIR "/etc/ircd"
+#define RUNDIR "/var/run/ircd"
+#define MPATH ETCDIR "/ircd.motd"
+#define SMPATH ETCDIR "ircd.smotd"
+#define LPATH "/var/log/ircd/ircd.log"
+#define PPATH RUNDIR "/ircd.pid"
+#define HPATH ETCDIR "/opers.txt"
/* Services Definitions */
diff -rupN bahamut-1.8.6.orig/src/dh.c bahamut-1.8.6/src/dh.c
--- bahamut-1.8.6.orig/src/dh.c 2009-03-01 21:23:59.000000000 +0200
+++ bahamut-1.8.6/src/dh.c 2010-02-16 09:43:49.000000000 +0200
@@ -117,7 +117,7 @@ static inline void entropy_error(void)
RAND_SRC, strerror(errno));
printf("ircd needs a %d byte random seed.\n", RAND_BYTES);
printf("You can place a file containing random data called"
- " .ircd.entropy\nin the directory with your ircd.conf."
+ " .ircd.entropy\nin the directory /var/lib/ircd."
" This file must be at least %d bytes\n", RAND_BYTES);
printf("long and should be suitably random.\n");
}
@@ -171,10 +171,10 @@ static int make_entropy()
printf("Done.\n");
fclose(fp);
- fp = fopen(".ircd.entropy", "w");
+ fp = fopen("/var/lib/ircd/.ircd.entropy", "w");
if(!fp)
{
- printf("Could not open .ircd.entropy for writing: %s\n",
+ printf("Could not open /var/lib/ircd/.ircd.entropy for writing: %s\n",
strerror(errno));
return 0;
}
@@ -182,7 +182,7 @@ static int make_entropy()
fwrite(randbuf, RAND_BYTES * 4, 1, fp);
fclose(fp);
- RAND_load_file(".ircd.entropy", -1);
+ RAND_load_file("/var/lib/ircd/.ircd.entropy", -1);
return 1;
}
@@ -192,7 +192,7 @@ static int init_random()
int ret;
time_t now;
- ret = RAND_load_file(".ircd.entropy", -1);
+ ret = RAND_load_file("/var/lib/ircd/.ircd.entropy", -1);
if(ret <= 0)
{
if(!make_entropy())
@@ -206,7 +206,7 @@ static int init_random()
/* this is probably not too good, but it saves just writing
the whole state back to disk with no changes. */
RAND_seed(&now, 4);
- RAND_write_file(".ircd.entropy");
+ RAND_write_file("/var/lib/ircd/.ircd.entropy");
return 0;
}
diff -rupN bahamut-1.8.6.orig/src/ircd.c bahamut-1.8.6/src/ircd.c
--- bahamut-1.8.6.orig/src/ircd.c 2009-03-04 04:11:01.000000000 +0200
+++ bahamut-1.8.6/src/ircd.c 2010-02-16 09:38:36.000000000 +0200
@@ -172,7 +172,7 @@ void s_die()
#ifdef USE_SYSLOG
(void) syslog(LOG_CRIT, "Server killed By SIGTERM");
#endif
- ircsprintf(tmp, "%s/.maxclients", dpath);
+ ircsprintf(tmp, "/var/lib/ircd/.maxclients", dpath);
fp=fopen(tmp, "w");
if(fp!=NULL)
{
@@ -769,7 +769,7 @@ main(int argc, char *argv[])
exit(0);
}
- ircsprintf(tmp, "%s/.maxclients", dpath);
+ ircsprintf(tmp, "/var/lib/ircd/.maxclients", dpath);
mcsfp = fopen(tmp, "r");
if(mcsfp != NULL)
{
diff -rupN bahamut-1.8.6.orig/src/klines.c bahamut-1.8.6/src/klines.c
--- bahamut-1.8.6.orig/src/klines.c 2008-10-10 19:52:21.000000000 +0200
+++ bahamut-1.8.6/src/klines.c 2010-02-16 09:38:36.000000000 +0200
@@ -471,7 +471,7 @@ klinestore_compact(void)
journalcount = 0;
/* open a compaction file to dump all active klines to */
- ircsnprintf(buf1, sizeof(buf1), "%s/.klines_c", dpath);
+ ircsnprintf(buf1, sizeof(buf1), "/var/lib/ircd/.klines_c", dpath);
newfile = open(buf1, O_WRONLY|O_CREAT|O_TRUNC, 0700);
if (newfile < 0)
{
@@ -548,7 +548,7 @@ klinestore_init(int noreload)
char buf1[1024];
FILE *jf;
- ircsnprintf(journalfilename, sizeof(journalfilename), "%s/.klines", dpath);
+ ircsnprintf(journalfilename, sizeof(journalfilename), "/var/lib/ircd/.klines", dpath);
if (journal >= 0)
{
diff -rupN bahamut-1.8.6.orig/src/s_serv.c bahamut-1.8.6/src/s_serv.c
--- bahamut-1.8.6.orig/src/s_serv.c 2008-10-10 20:27:25.000000000 +0200
+++ bahamut-1.8.6/src/s_serv.c 2010-02-16 09:38:36.000000000 +0200
@@ -809,7 +809,7 @@ int send_lusers(aClient *cptr, aClient *
char tmp[PATH_MAX];
last_stat_save = timeofday;
- ircsprintf(tmp, "%s/.maxclients", dpath);
+ ircsprintf(tmp, "/var/lib/ircd/.maxclients", dpath);
fp = fopen(tmp, "w");
if (fp != NULL)
{
Kind Regards,
Bennie
