Changeset 806 for TI05-delivery/trunk

Timestamp:

20/04/06 16:22:50 (13 years ago)

Author:

spascoe

Message:

Server and Daemon will now compile and run on glue with the
trivial private authentication working.

Private authentication simply sends a version string from client to server. The
Version string is logged to syslog.

WARNING: The client is given the full privileges as the server daemon, so don't
run bbftpd as root.

Location:

TI05-delivery/trunk/src

Files:

• Makefile (modified) (1 diff)
• bbftp-client-3.2.0/includes/bbftp_private_user.h (modified) (1 diff)
• bbftp-server-3.2.0/bbftpd/bbftpd_private_user.c (modified) (2 diffs)

TI05-delivery/trunk/src/Makefile

@@ -3 +3 @@
 
 PREFIX=$(HOME)/opt/bbftp
-#!NOTE: Add --enable-authentication=private to activate private security hooks
-CONFIG_OPTS=--prefix=$(PREFIX) --without-gzip --without-rfio
+CONFIG_OPTS=--prefix=$(PREFIX) --without-gzip --without-rfio --enable-authentication=private
 
 BBFTPD=bbftp-server-3.2.0/bbftpd

TI05-delivery/trunk/src/bbftp-client-3.2.0/includes/bbftp_private_user.h

@@ -44 +44 @@
 
 #define NDG_FTP_VERSION "v0.0.1"
-#define NDG_FTP_PROTOCOL ("NDG-bbFTP" NDG_BBFTP_VERSION)
+#define NDG_FTP_PROTOCOL ("NDG-bbFTP" NDG_FTP_VERSION)
 
 #define NDG_MESSAGE_LEN 256

TI05-delivery/trunk/src/bbftp-server-3.2.0/bbftpd/bbftpd_private_user.c

@@ -33 +33 @@
 #include <daemon_proto.h>
 #include <structures.h>
+#include <syslog.h>
 
-#include <bbftp_private_user.h>
+#include <bbftpd_private_user.h>
 
 extern char currentusername[MAXLEN] ;
@@ -92 +93 @@
 int bbftpd_private_auth(char *logmessage) 
 {    
-  char msg[NDG_MESSAGE_LEN];
+  char msg[NDG_MESSAGE_LEN], logmsg[NDG_MESSAGE_LEN+64];
   /* Send version verification message.  */
-  if (bbftp_private_recv(msg, NDG_MESSAGE_LEN, logmessage) == -1) {
+  if (bbftpd_private_recv(msg, NDG_MESSAGE_LEN, logmessage) == -1) {
     return -1;
   }
-  
+  else {
+    sprintf(logmsg, "Received auth message: %s", msg);
+    syslog(LOG_INFO, logmsg);
+  }
+
   return 0 ; 
 }