SOURCES: tftpd-hpa.init, tftpd-hpa.sysconfig - unconitionally use user tftp...

baggins baggins at pld-linux.org
Thu Apr 23 17:55:54 CEST 2009


Author: baggins                      Date: Thu Apr 23 15:55:54 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- unconitionally use user tftp
- use /var/lib/tftp if no directory is set

---- Files affected:
SOURCES:
   tftpd-hpa.init (1.2 -> 1.3) , tftpd-hpa.sysconfig (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/tftpd-hpa.init
diff -u SOURCES/tftpd-hpa.init:1.2 SOURCES/tftpd-hpa.init:1.3
--- SOURCES/tftpd-hpa.init:1.2	Thu Apr 23 17:35:43 2009
+++ SOURCES/tftpd-hpa.init	Thu Apr 23 17:55:48 2009
@@ -31,7 +31,7 @@
 start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/tftpd ]; then
-		TFTPD_OPTS="-l"
+		TFTPD_OPTS="-l -u tftp"
 		is_yes "$LISTEN_IPV4" && TFTPD_OPTS="$TFTPD_OPTS -4"
 		is_yes "$LISTEN_IPV6" && TFTPD_OPTS="$TFTPD_OPTS -6"
 		[ -n "$ADDRESS" ] &&  TFTPD_OPTS="$TFTPD_OPTS -a $ADDRESS"
@@ -44,10 +44,13 @@
 		is_yes "$VERBOSE" && TFTPD_OPTS="$TFTPD_OPTS -v"
 		[ -n "$VERBOSITY" ] &&  TFTPD_OPTS="$TFTPD_OPTS --verbosity $VERBOSITY"
 		[ -n "$REFUSE_OPTIONS" ] &&  TFTPD_OPTS="$TFTPD_OPTS -r $REFUSE_OPTIONS"
-		[ -n "$USER" ] &&  TFTPD_OPTS="$TFTPD_OPTS -u $USER"
 		is_yes "$SECURE" && TFTPD_OPTS="$TFTPD_OPTS -s"
 		is_yes "$PERMISSIVE" &&  TFTPD_OPTS="$TFTPD_OPTS -p"
-		TFTPD_OPTS="$TFTPD_OPTS $DIRECTORY"
+		if [ -z "$DIRECTORY" ]; then
+			TFTPD_OPTS="$TFTPD_OPTS /var/lib/tftp"
+		else
+			TFTPD_OPTS="$TFTPD_OPTS $DIRECTORY"
+		fi
 		msg_starting TFTPD
 		daemon tftpd $TFTPD_OPTS
 		RETVAL=$?

================================================================
Index: SOURCES/tftpd-hpa.sysconfig
diff -u SOURCES/tftpd-hpa.sysconfig:1.1 SOURCES/tftpd-hpa.sysconfig:1.2
--- SOURCES/tftpd-hpa.sysconfig:1.1	Thu Apr 23 17:00:48 2009
+++ SOURCES/tftpd-hpa.sysconfig	Thu Apr 23 17:55:49 2009
@@ -38,14 +38,11 @@
 # Valid options are: blksize, blksize2, tsize, timeout, utimeout
 #REFUSE_OPTIONS=
 
-# The username which tftpd will run as.
-USER=tftp
-
 # Change root directory on startup.
 SECURE=yes
 
 # Perform no additional permissions checks above the normal system-provided
-# access controls for the user specified via the $USER option
+# access controls for the user tftp
 #PERMISSIVE=no
 
 # Space separated list of directories that tftpd will serve.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/tftpd-hpa.init?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/tftpd-hpa.sysconfig?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list