oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(main): only fetch stuff from krb5.conf when no option has been given

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8919 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-08-09 19:52:22 +00:00
parent ffd71fd396
commit 986d4dc7a8
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
appl/rsh/rsh.c
View File

@@ -35,9 +35,9 @@
RCSID("$Id$"); RCSID("$Id$");
enum auth_method auth_method; enum auth_method auth_method;
int do_encrypt; int do_encrypt = -1;
int do_forward; int do_forward = -1;
int do_forwardable; int do_forwardable = -1;
int do_unique_tkfile = 0; int do_unique_tkfile = 0;
char *unique_tkfile = NULL; char *unique_tkfile = NULL;
char tkfile[MAXPATHLEN]; char tkfile[MAXPATHLEN];
@@ -404,7 +404,7 @@ proto (int s, int errsock,
struct sockaddr *thataddr = (struct sockaddr *)&thataddr_ss; struct sockaddr *thataddr = (struct sockaddr *)&thataddr_ss;
struct sockaddr_storage erraddr_ss; struct sockaddr_storage erraddr_ss;
struct sockaddr *erraddr = (struct sockaddr *)&erraddr_ss; struct sockaddr *erraddr = (struct sockaddr *)&erraddr_ss;
int addrlen; socklen_t addrlen;
int ret; int ret;
addrlen = sizeof(thisaddr_ss); addrlen = sizeof(thisaddr_ss);
@@ -841,20 +841,23 @@ main(int argc, char **argv)
if (status) if (status)
errx(1, "krb5_init_context failed: %u", status); errx(1, "krb5_init_context failed: %u", status);
do_forwardable = krb5_config_get_bool (context, NULL, if (do_forwardable == -1)
"libdefaults", do_forwardable = krb5_config_get_bool (context, NULL,
"forwardable", "libdefaults",
NULL); "forwardable",
NULL);
do_forward = krb5_config_get_bool (context, NULL, if (do_forward == -1)
"libdefaults", do_forward = krb5_config_get_bool (context, NULL,
"forward", "libdefaults",
NULL); "forward",
NULL);
do_encrypt = krb5_config_get_bool (context, NULL, if (do_encrypt == -1)
"libdefaults", do_encrypt = krb5_config_get_bool (context, NULL,
"encrypt", "libdefaults",
NULL); "encrypt",
NULL);
if (getarg (args, sizeof(args) / sizeof(args[0]), argc, argv, if (getarg (args, sizeof(args) / sizeof(args[0]), argc, argv,
&optind)) &optind))