head	1.1;
access;
symbols;
locks; strict;
comment	@# @;


1.1
date	2002.12.25.23.26.18;	author swiergot;	state Exp;
branches;
next	;


desc
@@


1.1
log
@- Initial release.
- Version 1.27.
@
text
@diff -ruN troll-ftpd-1.27.orig/ftpd.8 troll-ftpd-1.27/ftpd.8
--- troll-ftpd-1.27.orig/ftpd.8	2001-07-19 14:40:23.000000000 +0200
+++ troll-ftpd-1.27/ftpd.8	2002-07-19 21:56:54.000000000 +0200
@@@@ -149,7 +149,7 @@@@
 .PP
 2. The user connects to an IP address which resolves to the name of a
 directory in
-.I /var/adm/ftp
+.I /var/lib/ftp
 (or a symlink in that directory to a real directory), and there is an
 account called "ftp" (which does not need to have a valid home
 directory).  See
@@@@ -176,9 +176,9 @@@@
 The internal
 .B ls
 (see below) uses two files,
-.I /var/adm/ftp/users
+.I /var/lib/ftp/users
 and
-.IR /var/adm/ftp/groups ,
+.IR /var/lib/ftp/groups ,
 to look up file owner and group names quickly.  These files are
 written by
 .B mkusers
@@@@ -302,7 +302,7 @@@@
 2. Create a directory as described in
 .B Anonymous FTP
 and make a symlink called
-.I /var/adm/ftp/ftp.example.com
+.I /var/lib/ftp/ftp.example.com
 which points to this directory.
 .PP
 3. Make sure your kernel has support for IP aliases.
@@@@ -337,7 +337,7 @@@@
 try.
 .PP
 First, symlink
-.I /var/adm/ftp/localhost
+.I /var/lib/ftp/localhost
 to some directory and say "ftp localhost".  If that doesn't log you
 in, the problem is with
 .B ftpd.
@@@@ -374,9 +374,9 @@@@
 .B -p
 options are used
 .PP
-.I /var/adm/ftp/users
+.I /var/lib/ftp/users
 and
-.I /var/adm/ftp/groups
+.I /var/lib/ftp/groups
 are used to list the names of users and groups by the LIST command,
 and are updated by
 .BR mkusers (8).
@@@@ -384,7 +384,7 @@@@
 they are mostly unallocated space.  Use "ls -s" to find the true
 size of the files (in kbytes).
 .PP
-.I /var/adm/ftp/[hostname]
+.I /var/lib/ftp/[hostname]
 is the base directory for the [hostname] virtual ftp server, or a
 symbolic link to its base directory.
 .B Ftpd
diff -ruN troll-ftpd-1.27.orig/ftpd.c troll-ftpd-1.27/ftpd.c
--- troll-ftpd-1.27.orig/ftpd.c	2001-07-19 14:40:23.000000000 +0200
+++ troll-ftpd-1.27/ftpd.c	2002-07-19 21:56:02.000000000 +0200
@@@@ -1687,7 +1687,7 @@@@
     if ( he && he->h_name ) {
 	char name[PATH_MAX];
 
-	if ( snprintf( name, PATH_MAX, "/var/adm/ftp/%s/.", he->h_name ) < 0 ){
+	if ( snprintf( name, PATH_MAX, "/var/lib/ftp/%s/.", he->h_name ) < 0 ){
 	    syslog( LOG_ERR, "host name far too long for %s",
 		    inet_ntoa( ctrlconn.sin_addr ) );
 	    exit( 15 );
diff -ruN troll-ftpd-1.27.orig/ls.c troll-ftpd-1.27/ls.c
--- troll-ftpd-1.27.orig/ls.c	2001-07-19 14:40:23.000000000 +0200
+++ troll-ftpd-1.27/ls.c	2002-07-19 21:56:15.000000000 +0200
@@@@ -88,7 +88,7 @@@@
 
     /* uid_t can have 65536 values on linux */
 
-    f = open( "/var/adm/ftp/users", O_RDONLY );
+    f = open( "/var/lib/ftp/users", O_RDONLY );
     if ( f >= 0 ) {
 	users = mmap( 0, (size_t) 9 * 65536,
 		      PROT_READ, MAP_FILE | MAP_SHARED, f, 0 );
@@@@ -97,7 +97,7 @@@@
 	    close( f );
 	}
     }
-    f = open( "/var/adm/ftp/groups", O_RDONLY );
+    f = open( "/var/lib/ftp/groups", O_RDONLY );
     if ( f >= 0 ) {
 	groups = mmap( 0, ( size_t ) 9 * 65536,
 		       PROT_READ, MAP_FILE | MAP_SHARED, f, 0 );
diff -ruN troll-ftpd-1.27.orig/mkusers.8 troll-ftpd-1.27/mkusers.8
--- troll-ftpd-1.27.orig/mkusers.8	2001-07-19 14:40:23.000000000 +0200
+++ troll-ftpd-1.27/mkusers.8	2002-07-19 21:57:21.000000000 +0200
@@@@ -48,12 +48,12 @@@@
 .I /etc/yp.conf
 are common examples.
 .PP
-.I /var/adm/ftp/users
+.I /var/lib/ftp/users
 is used to store user names in an efficient format.  Each user name is
 stored as a null-terminated string at offset (9*uid).  (If user names
 are longer than 8 characters, they are truncated.)
 .PP
-.I /var/adm/ftp/groups
+.I /var/lib/ftp/groups
 is used to store groups names in an efficient format.  Each group name
 is stored as a null-terminated string at offset (9*gid).  (If group
 names are longer than 8 characters, they are truncated.)
@@@@ -62,9 +62,9 @@@@
 takes care to use
 .BR seek (3)
 so that
-.I /var/adm/ftp/users
+.I /var/lib/ftp/users
 and
-.I /var/adm/ftp/groups
+.I /var/lib/ftp/groups
 are sparse if possible.  Use "ls -s" to find the true size of these
 files (in kbytes) rather than "ls -l".
 
diff -ruN troll-ftpd-1.27.orig/mkusers.c troll-ftpd-1.27/mkusers.c
--- troll-ftpd-1.27.orig/mkusers.c	2001-07-19 14:40:23.000000000 +0200
+++ troll-ftpd-1.27/mkusers.c	2002-07-19 21:57:02.000000000 +0200
@@@@ -11,7 +11,7 @@@@
     int f;
     char dummy[17];
 
-    f = open("/var/adm/ftp/users", O_WRONLY|O_CREAT|O_TRUNC, 0644);
+    f = open("/var/lib/ftp/users", O_WRONLY|O_CREAT|O_TRUNC, 0644);
     if (f>=0) {
 	struct passwd * pw;
 	while((pw = getpwent()) != NULL) {
@@@@ -24,7 +24,7 @@@@
 	exit( 1 );
     }
 
-    f = open("/var/adm/ftp/groups", O_WRONLY|O_CREAT|O_TRUNC, 0644);
+    f = open("/var/lib/ftp/groups", O_WRONLY|O_CREAT|O_TRUNC, 0644);
     if (f>=0) {
 	struct group * gr;
 	while((gr = getgrent()) != NULL) {
@

.