diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb5/krb/ChangeLog | 11 | ||||
| -rw-r--r-- | src/lib/krb5/krb/get_in_tkt.c | 16 | ||||
| -rw-r--r-- | src/lib/krb5/krb/t_ser.c | 2 |
3 files changed, 24 insertions, 5 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 3d0784c846..434459f9ac 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,14 @@ +1998-05-06 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * t_ser.c (main): POSIX states that getopt returns -1 + when it is done parsing options, not EOF. + +1998-05-05 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * get_in_tkt.c (krb5_get_init_creds): If + libdefaults/{REALM}/noaddresses is true, then don't put + any addresses in the ticket request. + Mon May 4 15:54:07 1998 Tom Yu <tlyu@mit.edu> * get_in_tkt.c: Add prototype for make_preauth_list. diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c index c593e12cc5..679ecc492d 100644 --- a/src/lib/krb5/krb/get_in_tkt.c +++ b/src/lib/krb5/krb/get_in_tkt.c @@ -620,7 +620,7 @@ krb5_appdefault_string(context, realm, option, ret_value) /* * Try number one: * - * [appdefaults] + * [libdefaults] * REALM = { * option = <boolean> * } @@ -636,7 +636,7 @@ krb5_appdefault_string(context, realm, option, ret_value) /* * Try number two: * - * [appdefaults] + * [libdefaults] * option = <boolean> */ @@ -855,11 +855,19 @@ krb5_get_init_creds(context, creds, client, prompter, prompter_data, goto cleanup; } - if (options && (options->flags & KRB5_GET_INIT_CREDS_OPT_ADDRESS_LIST)) + if (options && (options->flags & KRB5_GET_INIT_CREDS_OPT_ADDRESS_LIST)) { request.addresses = options->address_list; - else + } + /* it would be nice if this parsed out an address list, but + that would be work. */ + else if (((ret = krb5_appdefault_boolean(context, &client->realm, + "noaddresses", &tempint)) == 0) + && tempint) { + ; + } else { if ((ret = krb5_os_localaddr(context, &request.addresses))) goto cleanup; + } request.authorization_data.ciphertext.length = 0; request.authorization_data.ciphertext.data = 0; diff --git a/src/lib/krb5/krb/t_ser.c b/src/lib/krb5/krb/t_ser.c index 9248f6d67e..4ca3b5399a 100644 --- a/src/lib/krb5/krb/t_ser.c +++ b/src/lib/krb5/krb/t_ser.c @@ -641,7 +641,7 @@ main(argc, argv) do_ptest = 1; do_rtest = 1; do_stest = 1; - while ((option = getopt(argc, argv, "acekprsxvACEKPRSX")) != EOF) { + while ((option = getopt(argc, argv, "acekprsxvACEKPRSX")) != -1) { switch (option) { case 'a': do_atest = 0; |