don't hide version info in logfiles; hide program name and version in network messages

Changed files:
    proftpd-release.patch -> 1.4

diff --git a/proftpd-release.patch b/proftpd-release.patch
index 219eb5dddc76b560a8b0f9d591a84c48b36f4b52..3ac0ba25f2c6751961390504058e852a5ecca1de 100644 (file)
--- a/proftpd-release.patch
+++ b/proftpd-release.patch
@@ -1,51 +1,16 @@
 diff -ur proftpd-1.2.0rc1.orig/src/main.c proftpd-1.2.0rc1/src/main.c
 --- proftpd-1.2.0rc1.orig/src/main.c   Wed Jul 12 20:16:38 2000
 +++ proftpd-1.2.0rc1/src/main.c        Wed Jul 12 20:18:42 2000
 diff -ur proftpd-1.2.0rc1.orig/src/main.c proftpd-1.2.0rc1/src/main.c
 --- proftpd-1.2.0rc1.orig/src/main.c   Wed Jul 12 20:16:38 2000
 +++ proftpd-1.2.0rc1/src/main.c        Wed Jul 12 20:18:42 2000

-@@ -665,7 +665,7 @@
-   log_pri(pri, log);
-   
-   if(standalone && master) {
--    log_pri(LOG_NOTICE, "ProFTPD %s standalone mode SHUTDOWN", VERSION);
-+    log_pri(LOG_NOTICE, "ProFTPD %s standalone mode SHUTDOWN", "PLD Linux");
-     if(!nodaemon) {
-       PRIVS_ROOT;
-       unlink(PID_FILE_PATH);

 @@ -981,9 +981,9 @@
      if(id && id->argc > 1)
        send_response("220","%s",(char*)id->argv[1]);
      else if(get_param_int(server->conf,"DeferWelcome",FALSE) == 1)
 -      send_response("220", "ProFTPD " VERSION " Server ready.");
 @@ -981,9 +981,9 @@
      if(id && id->argc > 1)
        send_response("220","%s",(char*)id->argv[1]);
      else if(get_param_int(server->conf,"DeferWelcome",FALSE) == 1)
 -      send_response("220", "ProFTPD " VERSION " Server ready.");

-+      send_response("220", "ProFTPD " "PLD Linux" " Server ready.");
++      send_response("220", " Server ready.");

      else
 -      send_response("220", "ProFTPD " VERSION " Server (%s) [%s]",
      else
 -      send_response("220", "ProFTPD " VERSION " Server (%s) [%s]",

-+      send_response("220", "ProFTPD " "PLD Linux" " Server (%s) [%s]",
++      send_response("220", " Server (%s) [%s]",

             server->ServerName,server->ServerAddress);
    } else {
      send_response("220", "%s FTP server ready.", server->ServerAddress);
             server->ServerName,server->ServerAddress);
    } else {
      send_response("220", "%s FTP server ready.", server->ServerAddress);

-@@ -1676,7 +1676,7 @@
-       unlink(PID_FILE_PATH);
-     PRIVS_RELINQUISH
-     if(standalone)
--      log_pri(LOG_NOTICE,"ProFTPD %s standalone mode SHUTDOWN",VERSION);
-+      log_pri(LOG_NOTICE,"ProFTPD %s standalone mode SHUTDOWN","PLD Linux");
-   }
- 
- #ifdef DEBUG_CORE
-@@ -2017,7 +2017,7 @@
-       addl_bindings(s);
-     }
- 
--  log_pri(LOG_NOTICE,"ProFTPD %s standalone mode STARTUP",VERSION);
-+  log_pri(LOG_NOTICE,"ProFTPD %s standalone mode STARTUP","PLD Linux");
-   server_loop();
- }
- 
-@@ -2207,7 +2207,7 @@
-       break;
- #endif /* DEBUG_CORE */
-     case 'v':
--      log_pri(LOG_NOTICE,"ProFTPD Version " VERSION);
-+      log_pri(LOG_NOTICE,"ProFTPD Version " "PLD Linux");
-       exit(0);
-     case 'h':
-       show_usage(0);
+