Book a Demo!
CoCalc Logo Icon
StoreFeaturesDocsShareSupportNewsAboutPoliciesSign UpSign In
freebsd
GitHub Repository: freebsd/freebsd-ports-kde
 Path: blob/main/ftp/freebsd-ftpd/files/libblacklist-patches/patch-ftpd.c
49061 views
1
--- ftpd.c.orig	2026-05-07 15:15:50 UTC

2
+++ ftpd.c

3
@@ -77,7 +77,7 @@

4
 #include <security/pam_appl.h>

5
 #endif

6
 

7
-#include "blocklist_client.h"

8
+#include "blacklist_client.h"

9
 #include "pathnames.h"

10
 #include "extern.h"

11
 

12
@@ -126,7 +126,7 @@ int	noguestmod = 1;		/* anon users may not modify exis

13
 int	noguestretr = 0;	/* RETR command is disabled for anon users. */

14
 int	noguestmkd = 0;		/* MKD command is disabled for anon users. */

15
 int	noguestmod = 1;		/* anon users may not modify existing files. */

16
-int	use_blocklist = 0;

17
+int	use_blacklist = 0;

18
 

19
 off_t	file_size;

20
 off_t	byte_count;

21
@@ -293,10 +293,10 @@ main(int argc, char *argv[], char **envp)

22
 			break;

23
 

24
 		case 'B':

25
-#ifdef USE_BLOCKLIST

26
-			use_blocklist = 1;

27
+#ifdef USE_BLACKLIST

28
+			use_blacklist = 1;

29
 #else

30
-			syslog(LOG_WARNING, "not compiled with USE_BLOCKLIST support");

31
+			syslog(LOG_WARNING, "not compiled with USE_BLACKLIST support");

32
 #endif

33
 			break;

34
 

35
@@ -630,7 +630,7 @@ gotchild:

36
 		reply(220, "%s FTP server (%s) ready.", hostname, version);

37
 	else

38
 		reply(220, "FTP server ready.");

39
-	BLOCKLIST_INIT();

40
+	BLACKLIST_INIT();

41
 	for (;;)

42
 		(void) yyparse();

43
 	/* NOTREACHED */

44
@@ -1043,7 +1043,7 @@ user(char *name)

45
 		    (checkuser(_PATH_FTPUSERS, name, 1, NULL, &ecode) ||

46
 		    (ecode != 0 && ecode != ENOENT))) {

47
 			reply(530, "User %s access denied.", name);

48
-			BLOCKLIST_NOTIFY(BLOCKLIST_AUTH_FAIL, STDIN_FILENO, "Access denied");

49
+			BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, STDIN_FILENO, "Access denied");

50
 			if (logging)

51
 				syslog(LOG_NOTICE,

52
 				    "FTP LOGIN REFUSED FROM %s, %s",

53
@@ -1387,7 +1387,7 @@ skip:

54
 		 */

55
 		if (rval) {

56
 			reply(530, "Login incorrect.");

57
-			BLOCKLIST_NOTIFY(BLOCKLIST_AUTH_FAIL, STDIN_FILENO, "Login incorrect");

58
+			BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, STDIN_FILENO, "Login incorrect");

59
 			if (logging) {

60
 				syslog(LOG_NOTICE,

61
 				    "FTP LOGIN FAILED FROM %s",

62
@@ -1405,7 +1405,7 @@ skip:

63
 			}

64
 			return;

65
 		} else {

66
-			BLOCKLIST_NOTIFY(BLOCKLIST_AUTH_OK, STDIN_FILENO, "Login successful");

67
+			BLACKLIST_NOTIFY(BLACKLIST_AUTH_OK, STDIN_FILENO, "Login successful");

68
 		}

69
 	}

70
 	login_attempts = 0;		/* this time successful */

71
@@ -1425,7 +1425,7 @@ skip:

72
 				*remote_ip = 0;

73
 		remote_ip[sizeof(remote_ip) - 1] = 0;

74
 		if (!auth_hostok(lc, remotehost, remote_ip)) {

75
-			BLOCKLIST_NOTIFY(BLOCKLIST_AUTH_FAIL, STDIN_FILENO, "Permission denied");

76
+			BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, STDIN_FILENO, "Permission denied");

77
 			syslog(LOG_INFO|LOG_AUTH,

78
 			    "FTP LOGIN FAILED (HOST) as %s: permission denied.",

79
 			    pw->pw_name);

80


81