Attachment 155698 Details for Bug 234249 – RHEL5 patch

[patch] RHEL5 patch

rgmanager-234249-rhel5.patch (text/plain), 2.31 KB, created by Lon Hohberger on 2007-05-30 14:55:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lon Hohberger

Created: 2007-05-30 14:55:31 UTC

Size: 2.31 KB

patch

obsolete

>Index: resrules.c
>===================================================================
>RCS file: /cvs/cluster/cluster/rgmanager/src/daemons/resrules.c,v
>retrieving revision 1.16.2.3
>diff -u -r1.16.2.3 resrules.c
>--- resrules.c	10 May 2007 16:23:43 -0000	1.16.2.3
>+++ resrules.c	30 May 2007 14:54:02 -0000
>@@ -262,6 +262,7 @@
> 		acts[0].ra_depth = depth;
> 		acts[0].ra_timeout = timeout;
> 		acts[0].ra_interval = interval;
>+		acts[0].ra_last = 0;
> 		acts[1].ra_name = NULL;
> 
> 		*actsp = acts;
>@@ -271,7 +272,7 @@
> 	for (x = 0; acts[x].ra_name; x++) {
> 		if (!strcmp(acts[x].ra_name, name) &&
> 		    (depth == acts[x].ra_depth || depth == -1)) {
>-			printf("Replacing action '%s' depth %d: ",
>+			fprintf(stderr, "Replacing action '%s' depth %d: ",
> 			       name, acts[x].ra_depth);
> 			if (timeout >= 0) {
> 				printf("timeout: %d->%d ",
>@@ -306,6 +307,7 @@
> 	acts[x].ra_depth = depth;
> 	acts[x].ra_timeout = timeout;
> 	acts[x].ra_interval = interval;
>+	acts[x].ra_last = 0;
> 
> 	acts[x+1].ra_name = NULL;
> 
>@@ -1010,8 +1012,9 @@
> {
> 	DIR *dir;
> 	struct dirent *de;
>-	char *fn;//, *dot;
>+	char *fn, *dot;
> 	char path[2048];
>+	struct stat st_buf;
> 
> 	dir = opendir(rpath);
> 	if (!dir)
>@@ -1024,14 +1027,46 @@
> 		if (!fn)
> 			continue;
> 		
>+		/* Ignore files with common backup extension */
> 		if ((fn != NULL) && (strlen(fn) > 0) && 
> 			(fn[strlen(fn)-1] == '~')) 
> 			continue;
> 
>+		/* Ignore hidden files */
>+		if (*fn == '.')
>+			continue;
>+
>+		dot = strrchr(fn);
>+		if (dot) {
>+			/* Ignore RPM installed save files, patches,
>+			   diffs, etc. */
>+			if (!strcasecmp(dot, ".rpmorig") ||
>+			    !strcasecmp(dot, ".rpmsave") ||
>+			    !strcasecmp(dot, ".rpmnew")  ||
>+			    !strcasecmp(dot, ".old")     ||
>+			    !strcasecmp(dot, ".new")     ||
>+			    !strcasecmp(dot, ".orig")    ||
>+			    !strcasecmp(dot, ".patch")   ||
>+			    !strcasecmp(dot, ".diff") ){
>+				fprintf(stderr, "Warning: "
>+					"Ignoring %s/%s: Bad extension %s\n",
>+					rpath, de->d_name, dot);
>+			}
>+		}
>+
> 		snprintf(path, sizeof(path), "%s/%s",
> 			 rpath, de->d_name);
> 
>-		load_resource_rulefile(path, rules);
>+		if (stat(path, &st_buf) < 0)
>+			continue;
>+
>+		if (S_ISDIR(st_buf.st_mode))
>+			continue;
>+
>+ 		if (st_buf.st_mode & (S_IXUSR|S_IXOTH|S_IXGRP)) {
>+ 			fprintf(stderr, "Loading %s\n", path);
>+  			load_resource_rulefile(path, rules);
>+ 		}
> 	}
> 	xmlCleanupParser();
>

Actions: View | Diff

Attachments on bug 234249: 155696 | 155698 | 155699 | 155700 | 155747 | 155748