From 78e5f0a504d04be46d1999722aa441b76752a4b1 Mon Sep 17 00:00:00 2001
From: iratqq <iratqq@ec19f817-7043-0410-8555-aba96bfc7626>
Date: Fri, 8 Feb 2008 03:35:56 +0000
Subject: [PATCH] change dictdit and chrootdir "$sj3var_dir/dict".

---
 trunk/configure.in                       | 8 ++++----
 trunk/src/sj3serv/setup.c                | 2 +-
 trunk/src/sj3serv/sj3serv.lua.example.in | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/trunk/configure.in b/trunk/configure.in
index 46e3388..b41e7ec 100644
--- a/trunk/configure.in
+++ b/trunk/configure.in
@@ -810,9 +810,9 @@ sj3var_dir=`echo $localstatedir | grep prefix`
 if test -n "$sj3var_dir"; then
     if test "$prefix" = "NONE"
     then
-	sj3var_dir="$ac_default_prefix/var"
+	sj3var_dir="$ac_default_prefix/var/sj3"
     else
-	sj3var_dir="$prefix/var"
+	sj3var_dir="$prefix/var/sj3"
     fi
 else
 	sj3var_dir="$localstatedir"
@@ -820,12 +820,12 @@ fi
 
 SJ3VARDIR="$sj3var_dir"
 AC_SUBST(SJ3VARDIR)
-AC_DEFINE_UNQUOTED(CHROOTDIR, "$sj3var_dir/spool/sj3", [chrooted dir])
+AC_DEFINE_UNQUOTED(CHROOTDIR, "$sj3var_dir/dict", [chrooted dir])
 AC_DEFINE_UNQUOTED(SOCKDIR, "$sj3var_dir/run", [socket dir])
 AC_DEFINE_UNQUOTED(SOCKETFILE, "/sj3serv.socket", [socket file])
 AC_DEFINE_UNQUOTED(SOCKETNAME, "$sj3var_dir/run/sj3serv.socket", [socket file])
 
-SJ3DICTDIR="$sj3var_dir/spool/sj3"
+SJ3DICTDIR="$sj3var_dir/dict"
 AC_SUBST(SJ3DICTDIR)
 AC_DEFINE_UNQUOTED(DICTROOTDIR, "$SJ3DICTDIR", [dict root dir])
 
diff --git a/trunk/src/sj3serv/setup.c b/trunk/src/sj3serv/setup.c
index 08b2148..5e5cbfb 100644
--- a/trunk/src/sj3serv/setup.c
+++ b/trunk/src/sj3serv/setup.c
@@ -99,7 +99,7 @@ struct dict_entry {
 	TAILQ_ENTRY(dict_entry) entries;
 } *read_dict, *open_dict;
 
-int dir_mode = -1;
+int dir_mode = S_IRWXU;
 int file_mode = S_IRUSR | S_IWUSR;
 
 TAILQ_HEAD(, allow_user_entry) allow_user_head;
diff --git a/trunk/src/sj3serv/sj3serv.lua.example.in b/trunk/src/sj3serv/sj3serv.lua.example.in
index 68e0644..2450ccb 100644
--- a/trunk/src/sj3serv/sj3serv.lua.example.in
+++ b/trunk/src/sj3serv/sj3serv.lua.example.in
@@ -31,12 +31,12 @@ sj3.set_server {
 
    -- chroot_dir: String
    --  chrooted path
-   chroot_dir = prefix .. "/spool",
+   chroot_dir = prefix .. "/dict",
 
    -- dict_dir: String
    --  dictionary name
    --  Note: this directory is opened after chroot
-   dict_dir = "/sj3",
+   dict_dir = "/",
 
    -- strict_auth: Boolean
    --  check always peer userid for security.