rpms/chkrootkit/FC-3 chkrootkit-0.46a-warnings.patch,NONE,1.1
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Tue Nov 29 13:08:31 UTC 2005
Author: mschwendt
Update of /cvs/extras/rpms/chkrootkit/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9887/FC-3
Added Files:
chkrootkit-0.46a-warnings.patch
Log Message:
sync with devel
chkrootkit-0.46a-warnings.patch:
--- NEW FILE chkrootkit-0.46a-warnings.patch ---
diff -Nur chkrootkit-0.46a-orig/chklastlog.c chkrootkit-0.46a/chklastlog.c
--- chkrootkit-0.46a-orig/chklastlog.c 2005-10-19 19:32:23.000000000 +0200
+++ chkrootkit-0.46a/chklastlog.c 2005-11-10 22:15:31.000000000 +0100
@@ -164,7 +164,7 @@
{
if (*uid > MAX_ID)
{
- fprintf(stderr, "MAX_ID is %ld and current uid is %ld, please check\n\r", MAX_ID, *uid );
+ fprintf(stderr, "MAX_ID is %ld and current uid is %ld, please check\n\r", (long int)MAX_ID, (long int)*uid );
exit (1);
}
diff -Nur chkrootkit-0.46a-orig/chkproc.c chkrootkit-0.46a/chkproc.c
--- chkrootkit-0.46a-orig/chkproc.c 2005-10-28 17:23:24.000000000 +0200
+++ chkrootkit-0.46a/chkproc.c 2005-11-10 22:11:46.000000000 +0100
@@ -120,6 +120,7 @@
}
#if defined(__linux__)
else if (!memcmp(argv[i], "-p", 2))
+ {
if (i+1 < argc)
pv = atoi(argv[++i]);
else
@@ -127,6 +128,7 @@
printf("Usage: %s [-v] [-v] [-p procps version]\n", argv[0]);
return 0;
}
+ }
#endif
}
#if defined(__sun)
@@ -138,10 +140,10 @@
if (pv < 1 || pv > PS_MAX)
pv = 1;
pscmd = ps_cmds[pv];
-/* printf("pv = %d\n\r", pv); /* -- DEBUG */
+ /* printf("pv = %d\n\r", pv); */ /* -- DEBUG */
#endif
-/* printf("pscmd = %s\n\r", pscmd); /* -- DEBUG */
+/* printf("pscmd = %s\n\r", pscmd); */ /* -- DEBUG */
if (!(ps = popen(pscmd, "r")))
{
perror("ps");
@@ -186,11 +188,11 @@
p++;
while (isspace(*p)) /* Skip spaces */
p++;
-/* printf(">>%s<<\n", p); /* -- DEBUG */
+/* printf(">>%s<<\n", p); */ /* -- DEBUG */
ret = atol(p);
if ( ret < 0 || ret > MAX_PROCESSES )
{
- fprintf (stderr, " OooPS, not expected %d value\n", ret);
+ fprintf (stderr, " OooPS, not expected %ld value\n", ret);
exit (2);
}
psproc[ret] = 1;
@@ -217,11 +219,11 @@
else if (maybeathread) {
isathread[atol(tmp_d_name)] = 1; /* mark it as a linux NTPL thread if it's in the form of "\.[0-9]*" */
if (verbose)
- printf("%d is a Linux Thread, marking as such...\n", atol(tmp_d_name));
+ printf("%ld is a Linux Thread, marking as such...\n", atol(tmp_d_name));
}
#endif
-/* printf("%s\n", tmp_d_name); /* -- DEBUG */
+/* printf("%s\n", tmp_d_name); */ /* -- DEBUG */
dirproc[atol(tmp_d_name)] = 1;
}
closedir(proc);
@@ -234,7 +236,7 @@
snprintf(&buf[6], 6, "%d", i);
if (!chdir(buf))
{
-/* if (!dirproc[i] ) /* && !kill(i, 0)) */
+/* if (!dirproc[i] ) */ /* && !kill(i, 0)) */
if (!dirproc[i] && !psproc[i])
{
#if defined(__linux__)
More information about the fedora-extras-commits
mailing list