diff --git a/trunk/src/sj3serv/setup.c b/trunk/src/sj3serv/setup.c
index 5e5cbfb..acbb256 100644
--- a/trunk/src/sj3serv/setup.c
+++ b/trunk/src/sj3serv/setup.c
@@ -75,7 +75,7 @@ char domain_socket_name[MAXPATHLEN];
 char dict_dir[MAXPATHLEN];
 char dict_file[FILENAME_MAX];
 
-char chuser_name[BUFSIZ];
+char chuser_name[MAXLOGNAME];
 
 int chroot_enable = -1;
 char chroot_dir[MAXPATHLEN];
@@ -104,7 +104,7 @@ int file_mode = S_IRUSR | S_IWUSR;
 
 TAILQ_HEAD(, allow_user_entry) allow_user_head;
 struct allow_user_entry {
-	char username[BUFSIZ];
+	char username[MAXLOGNAME];
 	char hostname[MAXHOSTNAMELEN];
 	TAILQ_ENTRY(allow_user_entry) entries;
 } *allow_user;
@@ -243,7 +243,7 @@ set_error(lua_State *lstate)
 static int
 append_allowuser(lua_State *lstate)
 {
-	char username[BUFSIZ];
+	char username[MAXLOGNAME];
 	char hostname[MAXHOSTNAMELEN];
 
 	if (!sj3lua_check_table(lstate))
diff --git a/trunk/src/sj3serv/sj3serv.h b/trunk/src/sj3serv/sj3serv.h
index b928554..76f6a19 100644
--- a/trunk/src/sj3serv/sj3serv.h
+++ b/trunk/src/sj3serv/sj3serv.h
@@ -111,11 +111,11 @@ void debug_out(int, const char *, ...);
 /* main.c */
 void server_terminate();
 
-extern char program_name [MAXPATHLEN];
-extern char runcmd_file [MAXPATHLEN];
+extern char program_name[MAXPATHLEN];
+extern char runcmd_file[MAXPATHLEN];
 extern int daemon_enable;
 extern char pid_file[MAXPATHLEN];
-extern char chuser_name[BUFSIZ];
+extern char chuser_name[MAXLOGNAME];
 extern int chroot_enable;
 extern char chroot_dir[MAXPATHLEN];
 extern int strict_auth_enable;