File pidentd-3.1a25-fmt.diff of Package pidentd

Overview Repositories Revisions Requests Users Attributes Meta

File pidentd-3.1a25-fmt.diff of Package pidentd

--- plib/aalloc.c
+++ plib/aalloc.c
@@ -85,7 +85,7 @@
     {
 	p = (unsigned char *) (ap+1);
 	
-	fprintf(fp, "%08p:  magic=%04x:%02x, size=%lu, function=%s, object=%s\n",
+	fprintf(fp, "%p:  magic=%04x:%02x, size=%liz, function=%s, object=%s\n",
 	       ap, ap->magic, p[ap->size], ap->size,
 		ap->fun ? ap->fun : "<null>",
 		ap->what ? ap->what : "<null>");
--- plib/daemon.c
+++ plib/daemon.c
@@ -96,7 +96,7 @@
 
     s_snprintf(buf, sizeof(buf), "%ld\n", (long) getpid());
     if (s_write(fd, buf, strlen(buf)) < 0)
-	syslog(LOG_ERR, "s_write(fd, ..., %d): %m", fd, strlen(buf));
+	syslog(LOG_ERR, "s_write(%d, ..., %ld): %m", fd, strlen(buf));
     
     s_close(fd);
 }
--- plib/safestr.c
+++ plib/safestr.c
@@ -42,7 +42,7 @@
 
     if (bufsize < 1)
     {
-	syslog(LOG_ERR, "s_snprintf(..., %d, ...): illegal bufsize",
+	syslog(LOG_ERR, "s_snprintf(..., %ld, ...): illegal bufsize",
 	       bufsize);
 	s_abort();
     }
@@ -71,7 +71,7 @@
     if (retcode > 0 && (buf[bufsize-1] != '\0' ||
 			retcode > bufsize-1))
     {
-	syslog(LOG_ERR, "s_snprintf(..., %d, ...) = %d: buffer overrun\n",
+	syslog(LOG_ERR, "s_snprintf(..., %ld, ...) = %d: buffer overrun\n",
 	       bufsize, retcode);
 	
 	s_abort();
--- src/k_linux.c
+++ src/k_linux.c
@@ -113,7 +113,7 @@
 
     while (fgets(buf, sizeof(buf)-1, fp) != NULL)
     {
-	if (sscanf(buf, "%d: %lX:%x %lX:%x %x %lX:%lX %x:%lX %lx %d %ld %d",
+	if (sscanf(buf, "%ld: %lX:%x %lX:%x %lx %lX:%lX %lx:%lX %lx %d %ld %ld",
 		   &dummy, &myladdr, &mylport, &myraddr, &myrport,
 		   &dummy, &dummy, &dummy, &dummy, &dummy, &dummy,
 		   &euid, &dummy, &dummy) >= 12)
@@ -135,6 +135,7 @@
 {
     FILE *fp;
     long dummy;
+    unsigned dummy2;
     char buf[512];
     int r_lport, r_rport, mylport, myrport;
     int euid;
@@ -179,12 +180,12 @@
 	;
     while (fgets(buf, sizeof(buf)-1, fp) != NULL)
     {
-	if (sscanf(buf,"%d: %8x%8x%8x%8x:%x %8x%8x%8x%8x:%x %x %lX:%lX %x:%lX %lx %d %ld %d",
+	if (sscanf(buf,"%ld: %8x%8x%8x%8x:%x %8x%8x%8x%8x:%x %lx %lX:%lX %x:%lX %lx %d %ld %ld",
 		   &dummy, &myladdr.s6_addr32[0], &myladdr.s6_addr32[1],
 		   &myladdr.s6_addr32[2], &myladdr.s6_addr32[3], &mylport,
 		   &myraddr.s6_addr32[0], &myraddr.s6_addr32[1],
 		   &myraddr.s6_addr32[2], &myraddr.s6_addr32[3], &myrport,
-		   &dummy, &dummy, &dummy, &dummy, &dummy, &dummy,
+		   &dummy, &dummy, &dummy, &dummy2, &dummy, &dummy,
 		   &euid, &dummy, &dummy) >= 18)
 	{
 	    if (!memcmp(&myladdr, r_laddr, sizeof(struct in6_addr)) &&

Places

File pidentd-3.1a25-fmt.diff of Package pidentd

Places