Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge-o's

This commit is contained in:
assar 2001-09-17 15:06:48 +00:00
parent a50a963c06
commit c6cbe4853a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/dist/heimdal/kuser/kinit.c vendored
View File

@ -32,7 +32,7 @@
*/
#include "kuser_locl.h"
RCSID("$Id: kinit.c,v 1.5 2001/09/17 12:32:36 assar Exp $");
RCSID("$Id: kinit.c,v 1.6 2001/09/17 15:06:48 assar Exp $");
int forwardable_flag = -1;
int proxiable_flag = -1;
@ -620,7 +620,7 @@ main (int argc, char **argv)
#ifdef KRB4
if(get_v4_tgt == -1)
krb5_appdefault_boolean(context, "kinit",
krb5_principal_get_realm(context, principal),
(krb5_realm)krb5_principal_get_realm(context, principal),
"krb4_get_tickets", TRUE, &get_v4_tgt);
#endif

12
crypto/dist/heimdal/lib/krb5/init_creds.c vendored
View File

@ -33,7 +33,7 @@
#include "krb5_locl.h"
RCSID("$Id: init_creds.c,v 1.1.1.4 2001/09/17 12:25:03 assar Exp $");
RCSID("$Id: init_creds.c,v 1.2 2001/09/17 15:06:49 assar Exp $");
void
krb5_get_init_creds_opt_init(krb5_get_init_creds_opt *opt)
@ -103,26 +103,26 @@ krb5_get_init_creds_opt_set_default_flags(krb5_context context,
time_t t;
b = get_config_bool (context, realm, "forwardable");
krb5_appdefault_boolean(context, appname, realm, "forwardable", b, &b);
krb5_appdefault_boolean(context, appname, (krb5_realm)realm, "forwardable", b, &b);
krb5_get_init_creds_opt_set_forwardable(opt, b);
b = get_config_bool (context, realm, "proxiable");
krb5_appdefault_boolean(context, appname, realm, "proxiable", b, &b);
krb5_appdefault_boolean(context, appname, (krb5_realm)realm, "proxiable", b, &b);
krb5_get_init_creds_opt_set_proxiable (opt, b);
krb5_appdefault_time(context, appname, realm, "ticket_lifetime", 0, &t);
krb5_appdefault_time(context, appname, (krb5_realm)realm, "ticket_lifetime", 0, &t);
if (t == 0)
t = get_config_time (context, realm, "ticket_lifetime", 0);
if(t != 0)
krb5_get_init_creds_opt_set_tkt_life(opt, t);
krb5_appdefault_time(context, appname, realm, "renew_lifetime", 0, &t);
krb5_appdefault_time(context, appname, (krb5_realm)realm, "renew_lifetime", 0, &t);
if (t == 0)
t = get_config_time (context, realm, "renew_lifetime", 0);
if(t != 0)
krb5_get_init_creds_opt_set_renew_life(opt, t);
krb5_appdefault_boolean(context, appname, realm, "no-addresses", FALSE, &b);
krb5_appdefault_boolean(context, appname, (krb5_realm)realm, "no-addresses", FALSE, &b);
if (b)
krb5_get_init_creds_opt_set_address_list (opt, &no_addrs);

4
crypto/dist/krb4/lib/krb/get_krbrlm.c vendored
View File

@ -33,7 +33,7 @@
#include "krb_locl.h"
RCSID("$Id: get_krbrlm.c,v 1.4 2001/09/17 12:21:42 assar Exp $");
RCSID("$Id: get_krbrlm.c,v 1.5 2001/09/17 15:06:49 assar Exp $");
/*
* krb_get_lrealm takes a pointer to a string, and a number, n. It fills
@ -64,7 +64,7 @@ krb_get_lrealm_f(char *r, int n, FILE *f)
return KFAILURE;
/* We now have the n:th line, remove initial white space. */
rstart = p = buf + strspn(buf, " \t");
p = buf + strspn(buf, " \t");
/* Collect realmname. */
nchar = strcspn(p, " \t\n");