From 8b77149a4d6294e1afc7266ab89a59978352b8ee Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Mon, 8 Mar 1999 20:29:23 +0000
Subject: [PATCH] re-add version in greeting message

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5482 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/ftp/ftpd/ftpd.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/appl/ftp/ftpd/ftpd.c b/appl/ftp/ftpd/ftpd.c
index 52c66dfa4..2a8e4edc4 100644
--- a/appl/ftp/ftpd/ftpd.c
+++ b/appl/ftp/ftpd/ftpd.c
@@ -375,18 +375,21 @@ main(int argc, char **argv)
 		/* reply(220,) must follow */
 	}
 	gethostname(hostname, sizeof(hostname));
-#if 0
+	reply(220, "%s FTP server (%s"
 #ifdef KRB5
-	reply(220, "%s FTP server (%s+%s) ready.", hostname, 
-	      version, heimdal_version);
-#elif defined(KRB4)
-	reply(220, "%s FTP server (%s+%s) ready.", hostname, 
-	      version, krb4_version);
-#else
-	reply(220, "%s FTP server (%s) ready.", hostname, version);
+	      "+%s"
 #endif
+#ifdef KRB4
+	      "+%s"
 #endif
-	reply(220, "%s FTP server (%s) ready.", hostname, version);
+	      ") ready.", hostname, version
+#ifdef KRB5
+	      ,heimdal_version
+#endif
+#ifdef KRB4
+	      ,krb4_version
+#endif
+	      );
 	setjmp(errcatch);
 	for (;;)
 	    yyparse();