From: <n-...@us...> - 2010-04-14 03:01:22
|
Revision: 4651 http://gfarm.svn.sourceforge.net/gfarm/?rev=4651&view=rev Author: n-soda Date: 2010-04-14 03:01:13 +0000 (Wed, 14 Apr 2010) Log Message: ----------- assign message numbers Modified Paths: -------------- gfarm_v2/trunk/include/gfarm/gfarm_msg_enums.h gfarm_v2/trunk/lib/libgfarm/gfarm/auth_common.c gfarm_v2/trunk/lib/libgfarm/gfarm/auth_server.c gfarm_v2/trunk/makes/.msgno gfarm_v2/trunk/server/gfmd/back_channel.c gfarm_v2/trunk/server/gfmd/db_ldap.c gfarm_v2/trunk/server/gfmd/db_pgsql.c gfarm_v2/trunk/server/gfmd/gfmd.c gfarm_v2/trunk/server/gfmd/subr.c gfarm_v2/trunk/server/gfsd/gfsd.c Modified: gfarm_v2/trunk/include/gfarm/gfarm_msg_enums.h =================================================================== --- gfarm_v2/trunk/include/gfarm/gfarm_msg_enums.h 2010-04-14 02:11:45 UTC (rev 4650) +++ gfarm_v2/trunk/include/gfarm/gfarm_msg_enums.h 2010-04-14 03:01:13 UTC (rev 4651) @@ -2338,3 +2338,71 @@ #define GFARM_MSG_1002336 1002336 #define GFARM_MSG_1002337 1002337 #define GFARM_MSG_1002338 1002338 +#define GFARM_MSG_1002339 1002339 +#define GFARM_MSG_1002340 1002340 +#define GFARM_MSG_1002341 1002341 +#define GFARM_MSG_1002342 1002342 +#define GFARM_MSG_1002343 1002343 +#define GFARM_MSG_1002344 1002344 +#define GFARM_MSG_1002345 1002345 +#define GFARM_MSG_1002346 1002346 +#define GFARM_MSG_1002347 1002347 +#define GFARM_MSG_1002348 1002348 +#define GFARM_MSG_1002349 1002349 +#define GFARM_MSG_1002350 1002350 +#define GFARM_MSG_1002351 1002351 +#define GFARM_MSG_1002352 1002352 +#define GFARM_MSG_1002353 1002353 +#define GFARM_MSG_1002354 1002354 +#define GFARM_MSG_1002355 1002355 +#define GFARM_MSG_1002356 1002356 +#define GFARM_MSG_1002357 1002357 +#define GFARM_MSG_1002358 1002358 +#define GFARM_MSG_1002359 1002359 +#define GFARM_MSG_1002360 1002360 +#define GFARM_MSG_1002361 1002361 +#define GFARM_MSG_1002362 1002362 +#define GFARM_MSG_1002363 1002363 +#define GFARM_MSG_1002364 1002364 +#define GFARM_MSG_1002365 1002365 +#define GFARM_MSG_1002366 1002366 +#define GFARM_MSG_1002367 1002367 +#define GFARM_MSG_1002368 1002368 +#define GFARM_MSG_1002369 1002369 +#define GFARM_MSG_1002370 1002370 +#define GFARM_MSG_1002371 1002371 +#define GFARM_MSG_1002372 1002372 +#define GFARM_MSG_1002373 1002373 +#define GFARM_MSG_1002374 1002374 +#define GFARM_MSG_1002375 1002375 +#define GFARM_MSG_1002376 1002376 +#define GFARM_MSG_1002377 1002377 +#define GFARM_MSG_1002378 1002378 +#define GFARM_MSG_1002379 1002379 +#define GFARM_MSG_1002380 1002380 +#define GFARM_MSG_1002381 1002381 +#define GFARM_MSG_1002382 1002382 +#define GFARM_MSG_1002383 1002383 +#define GFARM_MSG_1002384 1002384 +#define GFARM_MSG_1002385 1002385 +#define GFARM_MSG_1002386 1002386 +#define GFARM_MSG_1002387 1002387 +#define GFARM_MSG_1002388 1002388 +#define GFARM_MSG_1002389 1002389 +#define GFARM_MSG_1002390 1002390 +#define GFARM_MSG_1002391 1002391 +#define GFARM_MSG_1002392 1002392 +#define GFARM_MSG_1002393 1002393 +#define GFARM_MSG_1002394 1002394 +#define GFARM_MSG_1002395 1002395 +#define GFARM_MSG_1002396 1002396 +#define GFARM_MSG_1002397 1002397 +#define GFARM_MSG_1002398 1002398 +#define GFARM_MSG_1002399 1002399 +#define GFARM_MSG_1002400 1002400 +#define GFARM_MSG_1002401 1002401 +#define GFARM_MSG_1002402 1002402 +#define GFARM_MSG_1002403 1002403 +#define GFARM_MSG_1002404 1002404 +#define GFARM_MSG_1002405 1002405 +#define GFARM_MSG_1002406 1002406 Modified: gfarm_v2/trunk/lib/libgfarm/gfarm/auth_common.c =================================================================== --- gfarm_v2/trunk/lib/libgfarm/gfarm/auth_common.c 2010-04-14 02:11:45 UTC (rev 4650) +++ gfarm_v2/trunk/lib/libgfarm/gfarm/auth_common.c 2010-04-14 03:01:13 UTC (rev 4651) @@ -181,14 +181,14 @@ if (seteuid(0) == 0) /* recover root privilege */ is_root = 1; if (initgroups(pwd->pw_name, pwd->pw_gid) == -1 && is_root) - gflog_error_errno(GFARM_MSG_UNFIXED, + gflog_error_errno(GFARM_MSG_1002339, "inigroups(%s, %d)", pwd->pw_name, (int)pwd->pw_gid); if (setegid(pwd->pw_gid) == -1 && is_root) - gflog_error_errno(GFARM_MSG_UNFIXED, + gflog_error_errno(GFARM_MSG_1002340, "setegid(%d)", (int)pwd->pw_gid); if (seteuid(pwd->pw_uid) == -1 && is_root) - gflog_error_errno(GFARM_MSG_UNFIXED, + gflog_error_errno(GFARM_MSG_1002341, "seteuid(%d)", (int)pwd->pw_uid); } @@ -263,17 +263,17 @@ finish: if (pwd != NULL) { if (seteuid(0) == -1 && is_root) /* recover root privilege */ - gflog_error_errno(GFARM_MSG_UNFIXED, "seteuid(0)"); + gflog_error_errno(GFARM_MSG_1002342, "seteuid(0)"); /* abandon group privileges */ if (setgroups(1, &o_gid) == -1 && is_root) - gflog_error_errno(GFARM_MSG_UNFIXED, + gflog_error_errno(GFARM_MSG_1002343, "setgroups(%d)", (int)o_gid); if (setegid(o_gid) == -1 && is_root) - gflog_error_errno(GFARM_MSG_UNFIXED, + gflog_error_errno(GFARM_MSG_1002344, "setegid(%d)", (int)o_gid); /* suppress root privilege, if possible */ if (seteuid(o_uid) == -1 && is_root) - gflog_error_errno(GFARM_MSG_UNFIXED, + gflog_error_errno(GFARM_MSG_1002345, "seteuid(%d)", (int)o_uid); gfarm_mutex_unlock(&privilege_mutex, diag, privilege_diag); } Modified: gfarm_v2/trunk/lib/libgfarm/gfarm/auth_server.c =================================================================== --- gfarm_v2/trunk/lib/libgfarm/gfarm/auth_server.c 2010-04-14 02:11:45 UTC (rev 4650) +++ gfarm_v2/trunk/lib/libgfarm/gfarm/auth_server.c 2010-04-14 03:01:13 UTC (rev 4651) @@ -399,21 +399,21 @@ if (seteuid(0) == 0) /* make sure to have root privilege */ is_root = 1; if (setsid() == -1) - gflog_debug_errno(GFARM_MSG_UNFIXED, "setsid()"); + gflog_debug_errno(GFARM_MSG_1002346, "setsid()"); #ifdef HAVE_SETLOGIN if (setlogin(pwd->pw_name) == -1 && is_root) - gflog_warning_errno(GFARM_MSG_UNFIXED, + gflog_warning_errno(GFARM_MSG_1002347, "setlogin(%s)", pwd->pw_name); #endif if (initgroups(pwd->pw_name, pwd->pw_gid) == -1 && is_root) - gflog_error_errno(GFARM_MSG_UNFIXED, + gflog_error_errno(GFARM_MSG_1002348, "initgroups(%s, %d)", pwd->pw_name, (int)pwd->pw_gid); if (setgid(pwd->pw_gid) == -1 && is_root) - gflog_error_errno(GFARM_MSG_UNFIXED, + gflog_error_errno(GFARM_MSG_1002349, "setgid(%d)", (int)pwd->pw_gid); if (setuid(pwd->pw_uid) == -1 && is_root) - gflog_error_errno(GFARM_MSG_UNFIXED, + gflog_error_errno(GFARM_MSG_1002350, "setuid(%d)", (int)pwd->pw_uid); gfarm_set_global_username(global_username); Modified: gfarm_v2/trunk/makes/.msgno =================================================================== --- gfarm_v2/trunk/makes/.msgno 2010-04-14 02:11:45 UTC (rev 4650) +++ gfarm_v2/trunk/makes/.msgno 2010-04-14 03:01:13 UTC (rev 4651) @@ -1 +1 @@ -1002338 \ No newline at end of file +1002406 \ No newline at end of file Modified: gfarm_v2/trunk/server/gfmd/back_channel.c =================================================================== --- gfarm_v2/trunk/server/gfmd/back_channel.c 2010-04-14 02:11:45 UTC (rev 4650) +++ gfarm_v2/trunk/server/gfmd/back_channel.c 2010-04-14 03:01:13 UTC (rev 4651) @@ -415,7 +415,7 @@ ino = inode_get_number(fr->inode); gen = fr->igen; e2 = host_replicated(dst, ino, gen, -1, 0, e, -1); - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1002359, "%s: (%s, %lld:%lld): aborted: %s (%s)", diag, host_name(dst), (long long)ino, (long long)gen, gfarm_error_string(e), gfarm_error_string(e2)); @@ -440,7 +440,7 @@ e = host_replicated(dst, ino, gen, -1, 0, GFARM_ERR_CONNECTION_ABORTED, -1); - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1002360, "%s: (%s, %lld:%lld): connection aborted: %s", diag, host_name(dst), (long long)ino, (long long)gen, gfarm_error_string(e)); @@ -480,7 +480,7 @@ giant_lock(); /* XXX FIXME: deadlock */ e2 = host_replicated(dst, ino, gen, -1, 0, e, -1); giant_unlock(); - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1002361, "%s: %s->(%s, %lld:%lld): aborted: %s (%s)", diag, srchost, host_name(dst), (long long)ino, (long long)gen, gfarm_error_string(e), gfarm_error_string(e2)); Modified: gfarm_v2/trunk/server/gfmd/db_ldap.c =================================================================== --- gfarm_v2/trunk/server/gfmd/db_ldap.c 2010-04-14 02:11:45 UTC (rev 4650) +++ gfarm_v2/trunk/server/gfmd/db_ldap.c 2010-04-14 03:01:13 UTC (rev 4651) @@ -568,7 +568,7 @@ int rv = ldap_get_option(gfarm_ldap_server, LDAP_OPT_RESULT_CODE, &e); if (rv != LDAP_OPT_SUCCESS) { - gflog_fatal(GFARM_MSG_UNFIXED, "ldap_get_option: %d", rv); + gflog_fatal(GFARM_MSG_1002362, "ldap_get_option: %d", rv); } return (ldap_err2string(e)); } @@ -579,7 +579,7 @@ char **dst = gfarm_strarray_dup(src); if (dst == NULL) - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1002363, "%s: gfarm_strarray_dup(): no memory", diag); return (dst); } @@ -714,7 +714,7 @@ ops->gen_ops->clear(info); e = ldap_first_entry(gfarm_ldap_server, res); if (e == NULL) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1002364, "ldap_first_entry: %s", ldap_err2string(gfarm_ldap_server->ld_errno)); error = GFARM_ERR_UNKNOWN; @@ -726,7 +726,7 @@ a = ldap_next_attribute(gfarm_ldap_server, e, ber)) { vals = ldap_get_values(gfarm_ldap_server, e, a); if (vals == NULL) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1002365, "ldap_get_values: %s", gfarm_ldap_session_error()); error = GFARM_ERR_UNKNOWN; } else { @@ -746,7 +746,7 @@ ops->gen_ops->free(info); /* should check all fields are filled */ } else if (!ops->gen_ops->validate(info)) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1002366, "gfarm_ldap_generic_info_get: validation error"); ops->gen_ops->free(info); /* XXX - different error code is better ? */ @@ -967,7 +967,7 @@ a = ldap_next_attribute(gfarm_ldap_server, e, ber)) { vals = ldap_get_values(gfarm_ldap_server, e, a); if (vals == NULL) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1002367, "ldap_get_values: %s", gfarm_ldap_session_error()); error = GFARM_ERR_UNKNOWN; @@ -1066,7 +1066,7 @@ ber)) { vals = ldap_get_values(gfarm_ldap_server, e, a); if (vals == NULL) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1002368, "ldap_get_values: %s", gfarm_ldap_session_error()); error = GFARM_ERR_UNKNOWN; @@ -2914,12 +2914,12 @@ "ldap_count_messages() != 2"); } else if ((m = ldap_first_message(gfarm_ldap_server, res)) == NULL) { e = GFARM_ERR_UNKNOWN; - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1002369, "ldap_first_message: %s", gfarm_ldap_session_error()); } else if ((vals = ldap_get_values_len(gfarm_ldap_server, m, attrs[0])) == NULL) { e = GFARM_ERR_UNKNOWN; - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1002370, "ldap_get_values_len: %s", gfarm_ldap_session_error()); } else { if ((vals[0] != NULL) && (vals[1] == NULL)) { Modified: gfarm_v2/trunk/server/gfmd/db_pgsql.c =================================================================== --- gfarm_v2/trunk/server/gfmd/db_pgsql.c 2010-04-14 02:11:45 UTC (rev 4650) +++ gfarm_v2/trunk/server/gfmd/db_pgsql.c 2010-04-14 03:01:13 UTC (rev 4651) @@ -244,7 +244,7 @@ char *s = strdup(v); if (s == NULL) { - gflog_fatal(GFARM_MSG_UNFIXED, + gflog_fatal(GFARM_MSG_1002371, "pgsql_get_string_ck(%s): %s: no memory", field_name, v); } return (s); @@ -607,7 +607,7 @@ e = (*set_fields)(res, i, results + i * ops->info_size); if (e != GFARM_ERR_NO_ERROR) { - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1002372, "gfarm_pgsql_generic_get_all: " "%s: %d/%d: %s", sql, i, n, gfarm_error_string(e)); @@ -987,7 +987,7 @@ info->nhostaliases = nhostaliases; GFARM_MALLOC_ARRAY(info->hostaliases, nhostaliases + 1); if (info->hostaliases == NULL) { - gflog_fatal(GFARM_MSG_UNFIXED, + gflog_fatal(GFARM_MSG_1002373, "host_info_set_fields_with_grouping(%s, %d): no memory", info->hostname, nhostaliases + 1); } @@ -1317,7 +1317,7 @@ info->nusers = nusers; GFARM_MALLOC_ARRAY(info->usernames, nusers + 1); if (info->usernames == NULL) { - gflog_fatal(GFARM_MSG_UNFIXED, + gflog_fatal(GFARM_MSG_1002374, "group_info_set_fields_with_grouping(%s, %d): no memory", info->groupname, nusers + 1); } Modified: gfarm_v2/trunk/server/gfmd/gfmd.c =================================================================== --- gfarm_v2/trunk/server/gfmd/gfmd.c 2010-04-14 02:11:45 UTC (rev 4650) +++ gfarm_v2/trunk/server/gfmd/gfmd.c 2010-04-14 03:01:13 UTC (rev 4651) @@ -929,32 +929,32 @@ gflog_fatal_errno(GFARM_MSG_1000196, "open: %s", pid_file); if (fprintf(pid_fp, "%ld\n", (long)getpid()) == -1) - gflog_error_errno(GFARM_MSG_UNFIXED, + gflog_error_errno(GFARM_MSG_1002351, "writing PID to %s", pid_file); if (fclose(pid_fp) != 0) - gflog_error_errno(GFARM_MSG_UNFIXED, "fclose(%s)", pid_file); + gflog_error_errno(GFARM_MSG_1002352, "fclose(%s)", pid_file); } void sigs_set(sigset_t *sigs) { if (sigemptyset(sigs) == -1) - gflog_fatal_errno(GFARM_MSG_UNFIXED, "sigemptyset()"); + gflog_fatal_errno(GFARM_MSG_1002353, "sigemptyset()"); sigaddset(sigs, SIGHUP); #ifdef __NetBSD__ /* NetBSD 4 delivers SIGINT to gfmd even under gdb */ if (!debug_mode) #endif if (sigaddset(sigs, SIGINT) == -1) - gflog_fatal_errno(GFARM_MSG_UNFIXED, + gflog_fatal_errno(GFARM_MSG_1002354, "sigaddset(SIGINT)"); if (sigaddset(sigs, SIGTERM) == -1) - gflog_fatal_errno(GFARM_MSG_UNFIXED, "sigaddset(SIGTERM)"); + gflog_fatal_errno(GFARM_MSG_1002355, "sigaddset(SIGTERM)"); #ifdef SIGINFO if (sigaddset(sigs, SIGINFO) == -1) - gflog_fatal_errno(GFARM_MSG_UNFIXED, "sigaddset(SIGINFO)"); + gflog_fatal_errno(GFARM_MSG_1002356, "sigaddset(SIGINFO)"); #endif if (sigaddset(sigs, SIGUSR2) == -1) - gflog_fatal_errno(GFARM_MSG_UNFIXED, "sigaddset(SIGUSR2)"); + gflog_fatal_errno(GFARM_MSG_1002357, "sigaddset(SIGUSR2)"); } void * Modified: gfarm_v2/trunk/server/gfmd/subr.c =================================================================== --- gfarm_v2/trunk/server/gfmd/subr.c 2010-04-14 02:11:45 UTC (rev 4650) +++ gfarm_v2/trunk/server/gfmd/subr.c 2010-04-14 03:01:13 UTC (rev 4651) @@ -127,7 +127,7 @@ char *d = strdup(s); if (d == NULL) - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1002358, "%s: strdup(%s): no memory", diag, s); return (d); } Modified: gfarm_v2/trunk/server/gfsd/gfsd.c =================================================================== --- gfarm_v2/trunk/server/gfsd/gfsd.c 2010-04-14 02:11:45 UTC (rev 4650) +++ gfarm_v2/trunk/server/gfsd/gfsd.c 2010-04-14 03:01:13 UTC (rev 4651) @@ -154,14 +154,14 @@ { if (getpid() == master_gfsd_pid) { if (unlink(local_sockname.sun_path) == -1 && !sighandler) - gflog_warning_errno(GFARM_MSG_UNFIXED, + gflog_warning_errno(GFARM_MSG_1002375, "unlink(%s)", local_sockname.sun_path); if (rmdir(local_sockdir) == -1 && !sighandler) - gflog_warning_errno(GFARM_MSG_UNFIXED, + gflog_warning_errno(GFARM_MSG_1002376, "rmdir(%s)", local_sockdir); /* send terminate signal to a back channel process */ if (kill(back_channel_gfsd_pid, SIGTERM) == -1 && !sighandler) - gflog_warning_errno(GFARM_MSG_UNFIXED, + gflog_warning_errno(GFARM_MSG_1002377, "kill(%d)", back_channel_gfsd_pid); } @@ -257,10 +257,10 @@ for (i = 0; i < accepting.local_socks_count; i++) { if (unlink(accepting.local_socks[i].name) == -1) - gflog_warning(GFARM_MSG_UNFIXED, + gflog_warning(GFARM_MSG_1002378, "unlink(%s)", accepting.local_socks[i].name); if (rmdir(accepting.local_socks[i].dir) == -1) - gflog_warning(GFARM_MSG_UNFIXED, + gflog_warning(GFARM_MSG_1002379, "rmdir(%s)", accepting.local_socks[i].dir); } } @@ -444,7 +444,7 @@ e = gfp_xdr_vrecv_request_parameters(client, 0, &size, format, &ap); va_end(ap); if (e != GFARM_ERR_NO_ERROR) - gflog_error(GFARM_MSG_UNFIXED, "%s get request: %s", + gflog_error(GFARM_MSG_1002380, "%s get request: %s", diag, gfarm_error_string(e)); return (e); } @@ -456,7 +456,7 @@ gfarm_error_t e; if (debug_mode) - gflog_debug(GFARM_MSG_UNFIXED, "async_reply: %s: %d (%s)", + gflog_debug(GFARM_MSG_1002381, "async_reply: %s: %d (%s)", diag, (int)ecode, gfarm_error_string(ecode)); e = gfp_xdr_vsend_async_result(client, xid, ecode, format, app); @@ -464,7 +464,7 @@ if (e == GFARM_ERR_NO_ERROR) e = gfp_xdr_flush(client); if (e != GFARM_ERR_NO_ERROR) - gflog_error(GFARM_MSG_UNFIXED, "%s put reply: %s", + gflog_error(GFARM_MSG_1002382, "%s put reply: %s", diag, gfarm_error_string(e)); return (e); } @@ -492,7 +492,7 @@ gfarm_error_t e; if (ecode == GFARM_ERR_UNKNOWN) - gflog_warning(GFARM_MSG_UNFIXED, "%s: %s", diag, strerror(eno)); + gflog_warning(GFARM_MSG_1002383, "%s: %s", diag, strerror(eno)); va_start(ap, format); e = gfs_async_server_put_reply_common(client, xid, diag, ecode, @@ -3287,7 +3287,7 @@ close(i); /* re-install default signal handler (see main) */ if (signal(SIGPIPE, SIG_DFL) == SIG_ERR) - gflog_error_errno(GFARM_MSG_UNFIXED, + gflog_error_errno(GFARM_MSG_1002384, "signal(SIGPIPE, SIG_DFL)"); /* * create a process group @@ -3783,7 +3783,7 @@ if (FD_ISSET(rep->pipe_fd, &fds)) { e = replication_result_notify(conn, async, rep); if (e != GFARM_ERR_NO_ERROR) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1002385, "back channel: " "communication error: %s", gfarm_error_string(e)); @@ -3849,10 +3849,10 @@ &type, &xid, &size); if (e != GFARM_ERR_NO_ERROR) { if (e == GFARM_ERR_UNEXPECTED_EOF) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1002386, "back channel disconnected"); } else { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1002387, "back channel RPC protocol error, " "reset: %s", gfarm_error_string(e)); } @@ -4044,7 +4044,7 @@ if (sock < 0) { save_errno = errno; if (rmdir(sock_dir) == -1) - gflog_error_errno(GFARM_MSG_UNFIXED, + gflog_error_errno(GFARM_MSG_1002388, "rmdir(%s)", sock_dir); accepting_fatal(GFARM_MSG_1000578, "creating UNIX domain socket: %s", @@ -4053,7 +4053,7 @@ if (bind(sock, (struct sockaddr *)&self_addr, self_addr_size) == -1) { save_errno = errno; if (rmdir(sock_dir) == -1) - gflog_error_errno(GFARM_MSG_UNFIXED, + gflog_error_errno(GFARM_MSG_1002389, "rmdir(%s)", sock_dir); accepting_fatal(GFARM_MSG_1000579, "%s: cannot bind UNIX domain socket: %s", @@ -4064,16 +4064,16 @@ sock_name, gfsd_uid); /* ensure access from all user, Linux at least since 2.4 needs this. */ if (chmod(sock_name, LOCAL_SOCKET_MODE) == -1) - gflog_debug_errno(GFARM_MSG_UNFIXED, "chmod(%s, 0%o)", + gflog_debug_errno(GFARM_MSG_1002390, "chmod(%s, 0%o)", sock_name, (int)LOCAL_SOCKET_MODE); if (listen(sock, LISTEN_BACKLOG) == -1) { save_errno = errno; if (unlink(sock_name) == -1) - gflog_error_errno(GFARM_MSG_UNFIXED, + gflog_error_errno(GFARM_MSG_1002391, "unlink(%s)", sock_name); if (rmdir(sock_dir) == -1) - gflog_error_errno(GFARM_MSG_UNFIXED, + gflog_error_errno(GFARM_MSG_1002392, "rmdir(%s)", sock_dir); accepting_fatal(GFARM_MSG_1000580, "listen UNIX domain socket: %s", strerror(save_errno)); @@ -4269,7 +4269,7 @@ gfsd_uid = gfsd_pw->pw_uid; if (seteuid(gfsd_uid) == -1 && is_root) - gflog_error_errno(GFARM_MSG_UNFIXED, + gflog_error_errno(GFARM_MSG_1002393, "seteuid(%d)", (int)gfsd_uid); e = gfarm_set_local_user_for_this_local_account(); @@ -4299,10 +4299,10 @@ * to print the error message to stderr. */ if (seteuid(0) == -1 && is_root) - gflog_error_errno(GFARM_MSG_UNFIXED, "seteuid(0)"); + gflog_error_errno(GFARM_MSG_1002394, "seteuid(0)"); pid_fp = fopen(pid_file, "w"); if (seteuid(gfsd_uid) == -1 && is_root) - gflog_error_errno(GFARM_MSG_UNFIXED, + gflog_error_errno(GFARM_MSG_1002395, "seteuid(%d)", (int)gfsd_uid); if (pid_fp == NULL) accepting_fatal_errno(GFARM_MSG_1000590, @@ -4319,21 +4319,21 @@ master_gfsd_pid = getpid(); sa.sa_handler = cleanup_handler; if (sigemptyset(&sa.sa_mask) == -1) - gflog_fatal_errno(GFARM_MSG_UNFIXED, "sigemptyset()"); + gflog_fatal_errno(GFARM_MSG_1002396, "sigemptyset()"); sa.sa_flags = 0; if (sigaction(SIGHUP, &sa, NULL) == -1) /* XXX - need to restart gfsd */ - gflog_fatal_errno(GFARM_MSG_UNFIXED, "sigaction(SIGHUP)"); + gflog_fatal_errno(GFARM_MSG_1002397, "sigaction(SIGHUP)"); if (sigaction(SIGINT, &sa, NULL) == -1) - gflog_fatal_errno(GFARM_MSG_UNFIXED, "sigaction(SIGINT)"); + gflog_fatal_errno(GFARM_MSG_1002398, "sigaction(SIGINT)"); if (sigaction(SIGTERM, &sa, NULL) == -1) - gflog_fatal_errno(GFARM_MSG_UNFIXED, "sigaction(SIGTERM)"); + gflog_fatal_errno(GFARM_MSG_1002399, "sigaction(SIGTERM)"); if (pid_file != NULL) { if (fprintf(pid_fp, "%ld\n", (long)master_gfsd_pid) == -1) - gflog_error_errno(GFARM_MSG_UNFIXED, + gflog_error_errno(GFARM_MSG_1002400, "writing PID to %s", pid_file); if (fclose(pid_fp) != 0) - gflog_error_errno(GFARM_MSG_UNFIXED, + gflog_error_errno(GFARM_MSG_1002401, "fclose(%s)", pid_file); } @@ -4368,7 +4368,7 @@ } if (seteuid(0) == -1 && is_root) - gflog_error_errno(GFARM_MSG_UNFIXED, "seteuid(0)"); + gflog_error_errno(GFARM_MSG_1002402, "seteuid(0)"); if (listen_addrname == NULL) listen_addrname = gfarm_spool_server_listen_address; @@ -4433,7 +4433,7 @@ int save_errno = errno; if (geteuid() == 0) - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1002403, "seteuid(%d): %s", gfsd_uid, strerror(save_errno)); } @@ -4451,7 +4451,7 @@ * We don't want SIGPIPE, but want EPIPE on write(2)/close(2). */ if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) - gflog_fatal_errno(GFARM_MSG_UNFIXED, + gflog_fatal_errno(GFARM_MSG_1002404, "signal(SIGPIPE, SIG_IGN)"); /* start back channel server */ @@ -4470,10 +4470,10 @@ */ sa.sa_handler = sigchld_handler; if (sigemptyset(&sa.sa_mask) == -1) - gflog_fatal_errno(GFARM_MSG_UNFIXED, "sigemptyset"); + gflog_fatal_errno(GFARM_MSG_1002405, "sigemptyset"); sa.sa_flags = SA_NOCLDSTOP; if (sigaction(SIGCHLD, &sa, NULL) == -1) - gflog_fatal_errno(GFARM_MSG_UNFIXED, "sigaction(SIGCHLD)"); + gflog_fatal_errno(GFARM_MSG_1002406, "sigaction(SIGCHLD)"); /* * To deal with race condition which may be caused by RST, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |