no more -r option for setting krb.conf path

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21819 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/gssftp/ftpd/ftpd.M b/src/appl/gssftp/ftpd/ftpd.M
index 33fc1d9c7853e4a037af2e6bc6ea0f11e01c6c1e..5cdc9b35374735a9d4c096647b81e63c43e5f44e 100644 (file)
--- a/src/appl/gssftp/ftpd/ftpd.M
+++ b/src/appl/gssftp/ftpd/ftpd.M
@@ -122,12 +122,6 @@ file to use.  The default value is normally
 \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

diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c
index 69f7ac392d759e81f1b5dd714eedb87553dde0e4..71e98552965af72c92a8cb0c4ea0660c0eed2a07 100644 (file)
--- a/src/appl/gssftp/ftpd/ftpd.c
+++ b/src/appl/gssftp/ftpd/ftpd.c
@@ -276,7 +276,7 @@ main(argc, argv, envp)
        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 @@ main(argc, argv, envp)
                        port = atoi(optarg);
                        break;
 
-               case 'r':
-                       setenv("KRB_CONF", optarg, 1);
-                       break;
-
                case 't':
                        timeout = atoi(optarg);
                        if (maxtimeout < timeout)