Am 10.04.2012 22:15, schrieb Patrick Matthäi: > Am 10.04.2012 22:10, schrieb Jeff Darcy: >> On 04/10/2012 03:59 PM, Patrick Matthäi wrote: >>> The "problem" is, that the % substitution is missing, so: >>> >>> gf_log (this->name, GF_LOG_ERROR, msg); >>> should become: >>> gf_log (this->name, GF_LOG_ERROR, "%s", msg); >>> >>> I didn't checked if this was introduced in other places, too. >>> >>> In 3.2.5 there was a simmilar fault, which my co-maintainer of the >>> glusterfs packaging has been fixed: >>> http://review.gluster.com/#change,2598 >> >> Yes, it's easy to work around, and patches to do just that would be welcome. >> I'll be the first to approve them. OTOH, false positives are the bane of any >> effort to improve software quality via static analysis. The fact that gcc has >> now generated two false positives for the same non-problem suggests that its >> format-security diagnostics are not the right basis for such an effort. > > I am currently on patching, since I have got two patches now and I am on > my third buildd run (just building on my cow-power-notebook atm) I may > need some minutes ;) Ok here they are: 02-gflog2.diff: FTBFS as described 03-gflog3.diff: Same applies here 03-spelling-errors.diff: Multiple spelling errors fixed (mostly @ log messages) 04-man-warnings.diff: A few man warnings fixes (hyphens used as minus signs) Additional I see: a) Why is a RPATH added to usr/lib/glusterfs/glusterfs/gsyncd for /usr/lib? b) Older but problematic licensing problem. The openssl license is not compatible with GPL{1,2,3}, so on glusterfs(!) needs to add an licensing exception. See: http://ftp-master.debian.org/REJECT-FAQ.html Point: OpenSSL -- /* Mit freundlichem Gruß / With kind regards, Patrick Matthäi GNU/Linux Debian Developer E-Mail: pmatthaei@xxxxxxxxxx patrick@xxxxxxxxxxxxx */
Author: Patrick Matthäi <pmatthaei@xxxxxxxxxx>
--- glusterfs-3.2.6.orig/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ glusterfs-3.2.6/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -3422,7 +3422,7 @@ done:
ret = -1;
snprintf (msg, sizeof (msg), "%s off and %s on is not "
"valid configuration", wb_key, el_key);
- gf_log ("glusterd", GF_LOG_ERROR, msg);
+ gf_log ("glusterd", GF_LOG_ERROR, "%s", msg);
if (op_errstr)
*op_errstr = gf_strdup (msg);
goto out;
Author: Patrick Matthäi <pmatthaei@xxxxxxxxxx>
--- glusterfs-3.2.6.orig/xlators/cluster/afr/src/afr-self-heald.c
+++ glusterfs-3.2.6/xlators/cluster/afr/src/afr-self-heald.c
@@ -395,7 +395,7 @@ _crawl_proceed (xlator_t *this, int chil
shd = &priv->shd;
if (!shd->enabled) {
msg = "Self-heal daemon is not enabled";
- gf_log (this->name, GF_LOG_ERROR, msg);
+ gf_log (this->name, GF_LOG_ERROR, "%s", msg);
goto out;
}
if (!priv->child_up[child]) {
Author: Patrick Matthäi <pmatthaei@xxxxxxxxxx>
--- glusterfs-3.2.6.orig/xlators/features/marker/utils/syncdaemon/resource.py
+++ glusterfs-3.2.6/xlators/features/marker/utils/syncdaemon/resource.py
@@ -108,7 +108,7 @@ Xattr = _MetaXattr()
class Popen(subprocess.Popen):
"""customized subclass of subprocess.Popen with a ring
- buffer for children error ouput"""
+ buffer for children error output"""
@classmethod
def init_errhandler(cls):
--- glusterfs-3.2.6.orig/xlators/storage/posix/src/posix.c
+++ glusterfs-3.2.6/xlators/storage/posix/src/posix.c
@@ -3937,7 +3937,7 @@ init (xlator_t *this)
if (op_ret == 16) {
if (uuid_compare (old_uuid, dict_uuid)) {
gf_log (this->name, GF_LOG_ERROR,
- "mismatching volume-id (%s) recieved. "
+ "mismatching volume-id (%s) received. "
"already is a part of volume %s ",
tmp_data->data, uuid_utoa (old_uuid));
ret = -1;
--- glusterfs-3.2.6.orig/xlators/protocol/server/src/server-handshake.c
+++ glusterfs-3.2.6/xlators/protocol/server/src/server-handshake.c
@@ -414,7 +414,7 @@ server_setvolume (rpcsvc_request_t *req)
ret = dict_get_uint32 (params, "clnt-lk-version", &lk_version);
if (ret < 0) {
ret = dict_set_str (reply, "ERROR",
- "lock state verison not supplied");
+ "lock state version not supplied");
if (ret < 0)
gf_log (this->name, GF_LOG_DEBUG,
"failed to set error msg");
--- glusterfs-3.2.6.orig/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ glusterfs-3.2.6/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -4398,7 +4398,7 @@ check_xattr:
if (uuid_compare (old_uuid, uuid)) {
uuid_utoa_r (old_uuid, old_uuid_buf);
gf_log (THIS->name, GF_LOG_WARNING,
- "%s: mismatching volume-id (%s) recieved. "
+ "%s: mismatching volume-id (%s) received. "
"already is a part of volume %s ",
path, uuid_utoa (uuid), old_uuid_buf);
snprintf (msg, sizeof (msg), "'%s:%s' has been part of "
@@ -4962,7 +4962,7 @@ glusterd_set_dump_options (char *dumpopt
goto out;
}
dup_options = gf_strdup (options);
- gf_log ("", GF_LOG_INFO, "Recieved following statedump options: %s",
+ gf_log ("", GF_LOG_INFO, "Received following statedump options: %s",
dup_options);
option = strtok_r (dup_options, " ", &tmpptr);
while (option) {
--- glusterfs-3.2.6.orig/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
+++ glusterfs-3.2.6/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
@@ -579,7 +579,7 @@ glusterd_handle_cli_statedump_volume (rp
}
- gf_log ("glusterd", GF_LOG_INFO, "Recieved statedump request for "
+ gf_log ("glusterd", GF_LOG_INFO, "Received statedump request for "
"volume %s with options %s", volname, options);
ret = glusterd_op_begin (req, GD_OP_STATEDUMP_VOLUME, dict);
--- glusterfs-3.2.6.orig/xlators/cluster/afr/src/afr-self-heal-algorithm.c
+++ glusterfs-3.2.6/xlators/cluster/afr/src/afr-self-heal-algorithm.c
@@ -174,7 +174,7 @@ sh_loop_lock_success (call_frame_t *loop
sh_loop_finish (loop_sh->old_loop_frame, this);
loop_sh->old_loop_frame = NULL;
- gf_log (this->name, GF_LOG_DEBUG, "Aquired lock for range %"PRIu64
+ gf_log (this->name, GF_LOG_DEBUG, "Acquired lock for range %"PRIu64
" %"PRIu64, loop_sh->offset, loop_sh->block_size);
loop_sh->data_lock_held = _gf_true;
loop_sh->sh_data_algo_start (loop_frame, this);
--- glusterfs-3.2.6.orig/glusterfsd/src/glusterfsd-mgmt.c
+++ glusterfs-3.2.6/glusterfsd/src/glusterfsd-mgmt.c
@@ -1210,7 +1210,7 @@ glusterfs_handle_nfs_profile (rpcsvc_req
(size_t *)&rsp.output.output_len);
if (ret) {
gf_log (THIS->name, GF_LOG_ERROR,
- "Failed to serialize ouput dict to rsp");
+ "Failed to serialize output dict to rsp");
goto out;
}
--- glusterfs-3.2.6.orig/cli/src/cli-rpc-ops.c
+++ glusterfs-3.2.6/cli/src/cli-rpc-ops.c
@@ -329,7 +329,7 @@ gf_cli3_1_list_friends_cbk (struct rpc_r
NULL);
if (ret)
gf_log ("cli", GF_LOG_ERROR,
- "Error ouputting to xml");
+ "Error outputting to xml");
goto out;
}
#endif
@@ -1602,7 +1602,7 @@ gf_cli3_1_remove_brick_cbk (struct rpc_r
cmd_str = "commit force";
break;
default:
- cmd_str = "unkown";
+ cmd_str = "unknown";
break;
}
@@ -5383,7 +5383,7 @@ gf_cli3_1_status_cbk (struct rpc_req *re
continue;
/* Brick/not-brick is handled seperately here as all
- * types of nodes are contained in the default ouput
+ * types of nodes are contained in the default output
*/
memset (status.brick, 0, PATH_MAX + 255);
if (!strcmp (hostname, "NFS Server") ||
@@ -5888,7 +5888,7 @@ gf_cli3_1_statedump_volume_cbk (struct r
gf_log (THIS->name, GF_LOG_ERROR, "XDR decoding failed");
goto out;
}
- gf_log ("cli", GF_LOG_DEBUG, "Recieved response to statedump");
+ gf_log ("cli", GF_LOG_DEBUG, "Received response to statedump");
if (rsp.op_ret)
snprintf (msg, sizeof(msg), "%s", rsp.op_errstr);
else
Author: Patrick Matthäi <pmatthaei@xxxxxxxxxx> --- glusterfs-3.2.6.orig/doc/glusterfsd.8 +++ glusterfs-3.2.6/doc/glusterfsd.8 @@ -131,7 +131,7 @@ Print program version .SH EXAMPLES Start a GlusterFS server on localhost with volume name foo -glusterfsd -s localhost --volfile-id foo.server.media-disk-1 -p /etc/glusterd/vols/foo/run/server-media-disk-1.pid -S /tmp/<uniqueid>.socket --brick-name /media/disk-1 -l /var/log/glusterfs/bricks/media-disk-1.log --brick-port 24009 --xlator-option foo-server.listen-port=24009 +glusterfsd \-s localhost \-\-volfile\-id foo.server.media-disk\-1 \-p /etc/glusterd/vols/foo/run/server\-media\-disk\-1.pid \-S /tmp/<uniqueid>.socket \-\-brick-name /media/disk\-1 \-l /var/log/glusterfs/bricks/media\-disk\-1.log \-\-brick\-port 24009 \-\-xlator\-option foo\-server.listen-port=24009 .SH SEE ALSO .nf --- glusterfs-3.2.6.orig/doc/glusterfs.8 +++ glusterfs-3.2.6/doc/glusterfs.8 @@ -115,7 +115,7 @@ Print the program version. mount a volume named foo on server bar with log level DEBUG on mount point /mnt/foo -# glusterfs --log-level=DEBUG --volfile-id=foo --volfile-server=bar /mnt/foo +# glusterfs \-\-log\-level=DEBUG \-\-volfile\-id=foo \-\-volfile\-server=bar /mnt/foo .SH SEE ALSO .nf
Attachment:
signature.asc
Description: OpenPGP digital signature
