commit 4392baafea73e2c73ad9088196e17a61880e24ee
Author: Petter Reinholdtsen <pere@hungry.com>
Date:   Sat Oct 11 16:47:29 2025 +0200
Forwarded: https://github.com/jaygreig86/dmitry/pull/21
Bug-Debian: https://bugs.debian.org/1096529

    Adjust code to avoid multiple definitions and inconsistent prototypes.
    
    This fixes release critical build problem with GCC 15 required in Debian,
    see <URL: https://bugs.debian.org/1096529 >, and a few related issuses.

diff --git a/src/dmitry.c b/src/dmitry.c
index e4c9dc4..a19c445 100644
--- a/src/dmitry.c
+++ b/src/dmitry.c
@@ -15,6 +15,9 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+int optchar;
+int options[10];
+
 int main(int argc, char **argv)
 {
 	int ttl = 2;		/*Portscan TimeToLive*/
@@ -142,7 +145,7 @@ int main(int argc, char **argv)
 		case INADDR_NONE:
 			if (! get_host(argv[argc - 1], host_ip) ) {
 				print_line("ERROR: Unable to locate Host IP addr. for %s\n", argv[argc - 1]);
-				print_line("Continuing with limited modules\n");
+				print_line("Continuing with limited modules\n", NULL);
 			}
 			strncpy(host_name, argv[argc - 1], MAXNAMELEN - 1);
 			host_name[MAXNAMELEN - 1] = '\0';
@@ -150,7 +153,7 @@ int main(int argc, char **argv)
 		default:
 			if (! get_host(argv[argc - 1], host_name) ) {
 				print_line("ERROR: Unable to locate Host Name for %s\n", argv[argc - 1]);
-				print_line("Continuing with limited modules\n");
+				print_line("Continuing with limited modules\n", NULL);
 			}
 			strncpy(host_ip, argv[argc - 1], MAXIPLEN - 1);
 			host_ip[MAXIPLEN - 1] = '\0';
@@ -167,7 +170,7 @@ int main(int argc, char **argv)
 	if ( options[4] && strlen(host_name)) get_subdomains(host_name);
 	if ( options[5] && strlen(host_name)) get_emails(host_name);
 	if ( options[3] >= 1 && strlen(host_ip)) portscan(host_ip, ttl, options[3]);
-	print_line("\nAll scans completed, exiting\n");
+	print_line("\nAll scans completed, exiting\n", NULL);
 
 	return 0;
 }
diff --git a/src/file.c b/src/file.c
index 3714786..9594bf8 100644
--- a/src/file.c
+++ b/src/file.c
@@ -1,6 +1,9 @@
 #include "includes/file.h"
 #include <string.h>
 #include <stdlib.h>
+
+FILE *wfp;
+
 int file_prep()
 {
 	outputfile[strlen(outputfile)] = '\0';
diff --git a/src/includes/dmitry.h b/src/includes/dmitry.h
index 738cec4..7aef196 100644
--- a/src/includes/dmitry.h
+++ b/src/includes/dmitry.h
@@ -1,16 +1,16 @@
-int optchar;
-int options[10];
-int ctr;
-extern void print_line();
+extern int optchar;
+extern int options[10];
+extern int ctr;
+extern void print_line(char *string, char *string2);
 extern int get_host(char *host, char *dest);
-extern int get_emails();
+extern int get_emails(char *host);
 extern int file_prep();
 extern int file_open();
 extern int file_close();
-extern int get_iwhois();
-extern int get_nwhois();
-extern int get_subdomains();
-extern int get_netcraft();
+extern int get_iwhois(char *host);
+extern int get_nwhois(char *host);
+extern int get_subdomains(char *host);
+extern int get_netcraft(char *host);
 extern int portscan(char *entry, int ttl, int options);
 char outputfile[64];
 
diff --git a/src/includes/dmitrybot.h b/src/includes/dmitrybot.h
index 46adfb4..37dc7b6 100644
--- a/src/includes/dmitrybot.h
+++ b/src/includes/dmitrybot.h
@@ -4,14 +4,14 @@ char host_name[255];
 extern int get_host();
 extern int file_prep();
 extern int get_nwhois();
-extern int get_iwhois();
+extern int get_iwhois(char *host);
 extern int get_subdomains();
 extern int get_emails();
 extern int get_netcraft();
 extern int portscan(char *entry, int ttl, int options);
-extern void print_line();
+extern void print_line(char *string, char *string2);
 char outputfile[64];
-extern int tcp_socket();
+extern int tcp_socket(char *host, int port);
 extern int irc_readData();
 extern int irc_sendData();
 extern int irc_sock;
diff --git a/src/includes/file.h b/src/includes/file.h
index 12c9961..8dce607 100644
--- a/src/includes/file.h
+++ b/src/includes/file.h
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #define OUTPUT_LOCALITY "output.txt"
-FILE *wfp;
-fpos_t file_loc;
-char filename[64];
+extern FILE *wfp;
+extern fpos_t file_loc;
+extern char filename[64];
 extern char outputfile[64];
diff --git a/src/includes/iwhois.h b/src/includes/iwhois.h
index 4135f63..2717066 100644
--- a/src/includes/iwhois.h
+++ b/src/includes/iwhois.h
@@ -5,29 +5,29 @@
 #include "tcp_sock.h"
 #include "file.h"
 #define MAXHOSTS 4
-int result;
-int check = 0;
-int ctr2 = 0;
-int check2 = 0;
-int tmp;
-int ctr3;
-int ctr4;
-int ctr;
-char ch;
-char netb[64];
-char filebuff[1024];
-char recvbuff[128];
-char sendbuff[255];
-extern int tcp_socket();
+extern int result;
+extern int check;
+extern int ctr2;
+extern int check2;
+extern int tmp;
+extern int ctr3;
+extern int ctr4;
+extern int ctr;
+extern char ch;
+extern char netb[64];
+extern char filebuff[1024];
+extern char recvbuff[128];
+extern char sendbuff[255];
+extern int tcp_socket(char *host, int port);
 extern void tcp_sockdcon();
-extern void readData();
-extern void print_line();
-extern void sendData();
-int ip_string_search();
-int get_iwhois();
-int ip_format_buff();
-int linetodo;   /* This is used to symbolise to ip_format_buff() that there is a line still to format */
-char query[26];
+extern void readData(char *readbuff, int readsize);
+extern void print_line(char *string, char *string2);
+extern void sendData(char *sendbuff, int sendsize);
+int ip_string_search(int server);
+extern int get_iwhois(char *host);
+int ip_format_buff(char *buff, int server);
+extern int linetodo;   /* This is used to symbolise to ip_format_buff() that there is a line still to format */
+extern char query[26];
 extern char outputfile[64];
 extern int file_open();
 extern void file_close();
diff --git a/src/includes/mailsearch.h b/src/includes/mailsearch.h
index 16fdca4..cb29369 100644
--- a/src/includes/mailsearch.h
+++ b/src/includes/mailsearch.h
@@ -2,21 +2,21 @@
 #include <string.h>
 #include <stdlib.h>
 #define NCOL 50
-extern int tcp_socket();
-extern void readData();
-extern void sendData();
+extern int tcp_socket(char *host, int port);
+extern void readData(char *readbuff, int readsize);
+extern void sendData(char *sendbuff, int sendsize);
 extern int get_host();
 extern void tcp_sockdcon();
 extern char outputfile[64];
 extern int file_open();
 extern void file_close();
-extern void print_line();
+extern void print_line(char *string, char *string2);
 extern int tcp_sock;
-int get_email_hoststring();
-int emailcount;
-int grab_emails();
-int emaillist();
-char **emailbuff;
-int pagenumber; /* Used as a variable to store current page number (of results)*/
-char pagestring[32]; /* The string to request a new page */
+extern int get_email_hoststring(char *host);
+extern int emailcount;
+extern int grab_emails(char *buff, int pointer, char *host);
+extern int emaillist(char *email, char *host);
+extern char **emailbuff;
+extern int pagenumber; /* Used as a variable to store current page number (of results)*/
+extern char pagestring[32]; /* The string to request a new page */
 
diff --git a/src/includes/netcraft.h b/src/includes/netcraft.h
index 270d845..7240766 100644
--- a/src/includes/netcraft.h
+++ b/src/includes/netcraft.h
@@ -1,18 +1,18 @@
 #include <string.h>
 #include "tcp_sock.h"
 #include "file.h"
-char ch;
-char write_l[128];
-char uptime[128];
-char os[32];
-char recvbuff[128];
-char sendbuff[255];
-char temp[1024];
-int check;
-int ctr;
-int ctr2;
-int ctr3;
-int tmp = 0;
+extern char ch;
+extern char write_l[128];
+extern char uptime[128];
+extern char os[32];
+extern char recvbuff[128];
+extern char sendbuff[255];
+extern char temp[1024];
+extern int check;
+extern int ctr;
+extern int ctr2;
+extern int ctr3;
+extern int tmp;
 extern int tcp_socket(char *host, int port);
 extern void readData(char *readbuff, int readsize);
 extern void sendData(char *sendbuff, int sendsize);
@@ -20,5 +20,5 @@ extern int file_open();
 extern int file_close();
 extern char outputfile[64];
 extern void tcp_sockdcon();
-extern void print_line();
+extern void print_line(char *string, char *string2);
 
diff --git a/src/includes/nwhois.h b/src/includes/nwhois.h
index 508b66f..cace1b5 100644
--- a/src/includes/nwhois.h
+++ b/src/includes/nwhois.h
@@ -2,18 +2,18 @@
 #include <string.h>
 #include "file.h"
 #include "tcp_sock.h"
-extern int tcp_socket();
+extern int tcp_socket(char *host, int port);
 extern void tcp_sockdcon();
-extern void readData();
-extern void print_line();
-extern void sendData();
-int nic_string_search();
-int get_td();
+extern void readData(char *readbuff, int readsize);
+extern void print_line(char *string, char *string2);
+extern void sendData(char *sendbuff, int sendsize);
+int nic_string_search(char *host);
+int get_td(char *host);
 int get_whois();
-int nic_format_buff();
-char td[10];
-char query[128];
-int linetodo;   /* This is used to symbolise to nic_format_buff() that there is a line still to format */
+extern int nic_format_buff(char *buff, int listn);
+extern char td[10];
+extern char query[128];
+extern int linetodo;   /* This is used to symbolise to nic_format_buff() that there is a line still to format */
 extern char outputfile[64];
 extern int file_open();
 extern void file_close();
diff --git a/src/includes/output.h b/src/includes/output.h
index b2e035e..a92bb02 100644
--- a/src/includes/output.h
+++ b/src/includes/output.h
@@ -6,6 +6,6 @@
 extern char user[10];
 extern int irc;
 extern void irc_sendData();
-extern void print_line();
+extern void print_line(char *string, char *string2);
 extern char outputfile[64];
 
diff --git a/src/includes/portscan.h b/src/includes/portscan.h
index 8c24b25..29c9119 100644
--- a/src/includes/portscan.h
+++ b/src/includes/portscan.h
@@ -1,7 +1,7 @@
 #include "file.h"
 #include "tcp_sock.h"
-char recvbuff[128];
-char filebuff[255];
-int tmp;
-int result;
-int closed;
+extern char recvbuff[128];
+extern char filebuff[255];
+extern int tmp;
+extern int result;
+extern int closed;
diff --git a/src/includes/subsearch.h b/src/includes/subsearch.h
index 7a9d1a7..6c5b832 100644
--- a/src/includes/subsearch.h
+++ b/src/includes/subsearch.h
@@ -3,21 +3,21 @@
 #include <stdlib.h>
 #define NCOL 40
 #define MAXIPLEN 17
-extern int tcp_socket();
-extern void readData();
-extern void sendData();
-extern int get_host();
+extern int tcp_socket(char *host, int port);
+extern void readData(char *readbuff, int readsize);
+extern void sendData(char *sendbuff, int sendsize);
+extern int get_host(char *host, char *dest);
 extern void tcp_sockdcon();
 extern char outputfile[64];
 extern int file_open();
 extern void file_close();
-extern void print_line();
+extern void print_line(char *string, char *string2);
 extern int tcp_sock;
-int get_hoststring();
-int subcount;
-int grab_sub();
-int sublist();
-char **subbuff;
-int pagenumber; /* Used as a variable to store current page number (of results)*/
-char pagestring[32]; /* The string to request a new page */
+extern int get_hoststring(char *host);
+extern int subcount;
+extern int grab_sub(char *buff, int pointer, char *host);
+extern int sublist(char *sub, char *host);
+extern char **subbuff;
+extern int pagenumber; /* Used as a variable to store current page number (of results)*/
+extern char pagestring[32]; /* The string to request a new page */
 
diff --git a/src/includes/tcp_sock.h b/src/includes/tcp_sock.h
index 37705b7..cce1341 100644
--- a/src/includes/tcp_sock.h
+++ b/src/includes/tcp_sock.h
@@ -8,13 +8,13 @@
 #define MAX_TCP_CON 9
 #define MAX_PART 20
 #define STD_MSN_PORT 1863
-        struct sockaddr_in sock;        /* Structure for socket address         */
-        long address;                   /* Remote IP (4 octet) address          */
-        struct hostent *ph;
-        int tcp_sock;
-        int args[2][1];
-        char print[512];
-	struct in_addr **pptr;
-	int bind_sock;
-	int con_sock;
-	int irc_sock;
+        extern struct sockaddr_in sock;        /* Structure for socket address         */
+        extern long address;                   /* Remote IP (4 octet) address          */
+        extern struct hostent *ph;
+        extern int tcp_sock;
+        extern int args[2][1];
+        extern char print[512];
+        extern struct in_addr **pptr;
+        extern int bind_sock;
+        extern int con_sock;
+        extern int irc_sock;
diff --git a/src/iwhois.c b/src/iwhois.c
index c629013..6b6bdd7 100644
--- a/src/iwhois.c
+++ b/src/iwhois.c
@@ -1,5 +1,18 @@
 #include "includes/iwhois.h"
 
+int result;
+int check = 0;
+int ctr2 = 0;
+int check2 = 0;
+int ctr3;
+int ctr4;
+int ctr;
+char ch;
+char netb[64];
+char filebuff[1024];
+char recvbuff[128];
+char sendbuff[255];
+
 int get_iwhois(char *host)
 {
 	int hostn;
@@ -15,7 +28,7 @@ int get_iwhois(char *host)
 	snprintf(linebuff, sizeof(linebuff), "---------------------------------\n\n");
 	print_line("%s", linebuff);
 	if (! host[0] ){
-		print_line("ERROR: No Host IP to work from\n");
+		print_line("ERROR: No Host IP to work from\n", NULL);
 		if ( strlen(outputfile) ) file_close();
 		return 0;
 	}
diff --git a/src/mailsearch.c b/src/mailsearch.c
index 4dcb734..f0e4335 100644
--- a/src/mailsearch.c
+++ b/src/mailsearch.c
@@ -1,5 +1,10 @@
 #include "includes/mailsearch.h"
 
+int emailcount;
+char **emailbuff;
+int pagenumber;
+char pagestring[32];
+
 int get_emails(char *host)
 {
 	char hostwww[64];
@@ -28,7 +33,7 @@ int get_emails(char *host)
 	if (strlen(outputfile)) file_open();
 
 	print_line("\nGathered E-Mail information for %s\n", hostwww);
-	print_line("---------------------------------\n");
+	print_line("---------------------------------\n", NULL);
 
 	
 	/* This constructs the string to signal a new page (if it's found that is) */
@@ -39,13 +44,13 @@ int get_emails(char *host)
 		memset(sendbuff, '\0', sizeof(sendbuff));
 		switch(engine){
 			case 1:
-				if (! pagenumber ) print_line("Searching Google.com:80...\n");
+				if (! pagenumber ) print_line("Searching Google.com:80...\n", NULL);
 				tcp_socket("google.com", 80);
 				snprintf(sendbuff, sizeof(sendbuff), "GET http://www.google.com/search?hl=en&lr=&ie=UTF-8&oe=UTF-8&q=allintext:+%%3Ca+href%%3Dmailto+%s&start=%d&sa=N&filter=1&num=100 HTTP/1.0\r\n\r\n", (char *)hostwww, pagenumber*100);
 				snprintf(pagestring, sizeof(pagestring), "rt=%d&sa=N", (pagenumber+1)*100);
 				break;
 			case 2:
-				if (! pagenumber ) print_line("Searching Altavista.com:80...\n");
+				if (! pagenumber ) print_line("Searching Altavista.com:80...\n", NULL);
 				tcp_socket("uk.altavista.com", 80);
 				snprintf(sendbuff, sizeof(sendbuff), "GET http://uk.altavista.com/web/results?q=%%3Ca+href%%3Dmailto+%s&kgs=0&kls=0&avkw=aapt&stq=%d&nbq=100 HTTP/1.0\r\n\r\n", hostwww, pagenumber*100);
 				snprintf(pagestring, sizeof(pagestring), "&stq=%d", (pagenumber+1)*100);
@@ -171,11 +176,11 @@ int emaillist(char *email, char *host)
 
 	emailbuff = realloc(emailbuff, (emailcount+1) * (sizeof(char) * NCOL));
 	if (!emailbuff){
-		print_line("ERROR: Realloc in E-MailSearch module failed\n");
+		print_line("ERROR: Realloc in E-MailSearch module failed\n", NULL);
 		return 1;
 	}
 	emailbuff[emailcount] = malloc(NCOL*sizeof(char));
-	if (!emailbuff[emailcount]) print_line("ERROR: Malloc in E-MailSearch module failed\n");	
+	if (!emailbuff[emailcount]) print_line("ERROR: Malloc in E-MailSearch module failed\n", NULL);
 
         strcpy(emailbuff[emailcount], email);
 
diff --git a/src/netcraft.c b/src/netcraft.c
index 4c81d86..1aa6cec 100644
--- a/src/netcraft.c
+++ b/src/netcraft.c
@@ -1,5 +1,11 @@
 #include "includes/netcraft.h"
 
+char write_l[128];
+char uptime[128];
+char os[32];
+int tmp = 0;
+char temp[1024];
+
 int format_c(char *host)
 {
         ctr = 0;
@@ -48,7 +54,7 @@ int format_c(char *host)
 		if ( temp[4] == '<' && temp[5] == 't' && temp[6] == 'd' && temp[7] == '>' ){
 			tmp++;
 			if ( tmp == 1 ){
-				print_line("Uptime Information:\n\n");
+				print_line("Uptime Information:\n\n", NULL);
 			}
 			memset(os, '\0', sizeof(os));
 			ctr3 = 10;
@@ -112,7 +118,7 @@ int get_netcraft(char *host)
 		format_c(host);
 			
 		if ( recvbuff[0] == '\0' ){
-			print_line("Netcraft.com Information gathered\n");
+			print_line("Netcraft.com Information gathered\n", NULL);
 			close(tcp_sock);
 			tcp_sock = 0;
 			if ( strlen(outputfile) ) file_close();
diff --git a/src/nwhois.c b/src/nwhois.c
index 54d574a..581a4fb 100644
--- a/src/nwhois.c
+++ b/src/nwhois.c
@@ -1,5 +1,9 @@
 #include "includes/nwhois.h"
 
+char td[10];
+char query[128];
+int linetodo;
+
 int get_nwhois(char *host)
 {
 	int hostn;
diff --git a/src/port_sock.c b/src/port_sock.c
index 2870b52..d6697e8 100644
--- a/src/port_sock.c
+++ b/src/port_sock.c
@@ -13,7 +13,7 @@
 #include <stdio.h>
 static sigjmp_buf jmpbuf;
 
-static void sig_alrm();
+static void sig_alrm(int);
 extern int tmp;
 int sock_con(char *host, int port, int ttl)
 {
@@ -54,7 +54,7 @@ void banner(char *readbuff, int readsize)
 	printf(">> %s\n", readbuff);
 }
 
-void sig_alrm()
+void sig_alrm(int)
 {
         siglongjmp(jmpbuf, 1);
 	printf("werd\n");
diff --git a/src/portscan.c b/src/portscan.c
index 2ea5980..5d1a118 100644
--- a/src/portscan.c
+++ b/src/portscan.c
@@ -1,5 +1,8 @@
 #include "includes/portscan.h"
 #include <string.h>
+
+int closed;
+
 int sock_con(char *host, int port, int ttl);
 extern int file_open();
 extern int file_close();
diff --git a/src/resolve.c b/src/resolve.c
index dd92ffe..d548573 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -6,7 +6,7 @@
 #include <ctype.h>
 #define MAXIPLEN 17
 #define MAXNAMELEN 128
-extern void print_line();
+extern void print_line(char *string, char *string2);
 extern char outputfile[64];
 extern int file_open();
 extern int file_close();
diff --git a/src/subsearch.c b/src/subsearch.c
index be42303..55a0451 100644
--- a/src/subsearch.c
+++ b/src/subsearch.c
@@ -1,5 +1,8 @@
 #include "includes/subsearch.h"
 
+int subcount;
+char **subbuff;
+
 int get_subdomains(char *host)
 {
 	char hostwww[64];
@@ -28,7 +31,7 @@ int get_subdomains(char *host)
 	if (strlen(outputfile)) file_open();
 
 	print_line("\nGathered Subdomain information for %s\n", hostwww);
-	print_line("---------------------------------\n");
+	print_line("---------------------------------\n", NULL);
 
 	
 	/* This constructs the string to signal a new page (if it's found that is) */
@@ -39,13 +42,13 @@ int get_subdomains(char *host)
 		memset(sendbuff, '\0', sizeof(sendbuff));
 		switch(engine){
 			case 1:
-				if (! pagenumber ) print_line("Searching Google.com:80...\n");
+				if (! pagenumber ) print_line("Searching Google.com:80...\n", NULL);
 				tcp_socket("google.com", 80);
 				snprintf(sendbuff, sizeof(sendbuff), "GET http://www.google.com/search?hl=en&lr=&ie=UTF-8&oe=UTF-8&q=%%2B%s&start=%d&sa=N&filter=0&num=100 HTTP/1.0\r\n\r\n", (char *)hostwww, pagenumber*100);
 				snprintf(pagestring, sizeof(pagestring), "rt=%d&sa=N", (pagenumber+1)*100);
 				break;
 			case 2:
-				if (! pagenumber ) print_line("Searching Altavista.com:80...\n");
+				if (! pagenumber ) print_line("Searching Altavista.com:80...\n", NULL);
 				tcp_socket("uk.altavista.com", 80);
 				snprintf(sendbuff, sizeof(sendbuff), "GET http://uk.altavista.com/web/results?q=%%2Bhost%%3A%s&kgs=0&kls=0&avkw=aapt&stq=%d&nbq=100 HTTP/1.0\r\n\r\n", hostwww, pagenumber*100);
 				snprintf(pagestring, sizeof(pagestring), "&stq=%d", (pagenumber+1)*100);
@@ -166,11 +169,11 @@ int sublist(char *sub, char *host)
 	print_line("HostIP:%s\n", host_ip);
 	subbuff = realloc(subbuff, (subcount+1) * (sizeof(char) * NCOL));
 	if (!subbuff){
-		print_line("ERROR: Realloc in SubSearch module failed\n");
+		print_line("ERROR: Realloc in SubSearch module failed\n", NULL);
 		return 1;
 	}
 	subbuff[subcount] = malloc((NCOL+1)*sizeof(char));
-	if (!subbuff[subcount]) print_line("ERROR: Malloc in SubSearch module failed\n");	
+	if (!subbuff[subcount]) print_line("ERROR: Malloc in SubSearch module failed\n", NULL);
 
         strcpy(subbuff[subcount], sub);
 	subcount++;