svn rev #21819: trunk/src/appl/gssftp/ftpd/

[raeburn@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21819
Commit By: raeburn
Log Message:
no more -r option for setting krb.conf path


Changed Files:
U   trunk/src/appl/gssftp/ftpd/ftpd.M
U   trunk/src/appl/gssftp/ftpd/ftpd.c
Modified: trunk/src/appl/gssftp/ftpd/ftpd.M
===================================================================
--- trunk/src/appl/gssftp/ftpd/ftpd.M	2009-01-28 05:37:10 UTC (rev 21818)
+++ trunk/src/appl/gssftp/ftpd/ftpd.M	2009-01-28 05:42:11 UTC (rev 21819)
@@ -122,12 +122,6 @@
 \fB\-u\fP \fIumask\fP
 Sets the umask for the ftpd process.  The default value is normally 027.
 .TP
-\fB\-r\fP \fIrealm-file\fP
-Sets the name of the
-.I krb.conf
-file to use.  The default value is normally set by
-.IR /etc/krb5.conf .
-.TP
 \fB\-w \fP{\fBip\fP|\fImaxhostlen\fP[\fB,\fP{\fBstriplocal\fP|\fBnostriplocal\fP}]}
 Controls the form of the remote hostname passed to login(1).
 Specifying \fBip\fP results in the numeric IP address always being

Modified: trunk/src/appl/gssftp/ftpd/ftpd.c
===================================================================
--- trunk/src/appl/gssftp/ftpd/ftpd.c	2009-01-28 05:37:10 UTC (rev 21818)
+++ trunk/src/appl/gssftp/ftpd/ftpd.c	2009-01-28 05:42:11 UTC (rev 21819)
@@ -276,7 +276,7 @@
 	int addrlen, c, on = 1, tos, port = -1;
 	extern char *optarg;
 	extern int optopt;
-	char *option_string = "AaCcdElp:r:T:t:U:u:vw:";
+	char *option_string = "AaCcdElp:T:t:U:u:vw:";
 	ftpusers = _PATH_FTPUSERS_DEFAULT;
 
 	debug = 0;
@@ -334,10 +334,6 @@
 			port = atoi(optarg);
 			break;
 
-		case 'r':
-			setenv("KRB_CONF", optarg, 1);
-			break;
-
 		case 't':
 			timeout = atoi(optarg);
 			if (maxtimeout < timeout)