diff options
| author | Will Fiveash <will.fiveash@oracle.com> | 2009-01-28 21:15:46 +0000 |
|---|---|---|
| committer | Will Fiveash <will.fiveash@oracle.com> | 2009-01-28 21:15:46 +0000 |
| commit | d91a7ff0542f620a296e5718c1c5d33240efa67a (patch) | |
| tree | a7c1efa10a6a7f928c47d274307d5eaceffec107 /src/appl | |
| parent | 51049b194ad6d4c6ef088d9c277b59129888c1a9 (diff) | |
| download | krb5-d91a7ff0542f620a296e5718c1c5d33240efa67a.zip krb5-d91a7ff0542f620a296e5718c1c5d33240efa67a.tar.gz krb5-d91a7ff0542f620a296e5718c1c5d33240efa67a.tar.bz2 | |
svn merge -r21791:21820 svn+ssh://wfiveash@svn.mit.edu/krb5/trunk
All conflicts resolved, everything builds. Did a quick test, seems to
work ok.
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/mkey_migrate@21822 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl')
| -rw-r--r-- | src/appl/gssftp/ftpd/ftpd.M | 6 | ||||
| -rw-r--r-- | src/appl/gssftp/ftpd/ftpd.c | 6 |
2 files changed, 1 insertions, 11 deletions
diff --git a/src/appl/gssftp/ftpd/ftpd.M b/src/appl/gssftp/ftpd/ftpd.M index 33fc1d9..5cdc9b3 100644 --- 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 69f7ac3..71e9855 100644 --- 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) |