diff options
| author | Theodore Tso <tytso@mit.edu> | 1995-03-24 22:36:17 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1995-03-24 22:36:17 +0000 |
| commit | 3ce1015cb1c8bbfc7dcd0b9c55bc803364de56cd (patch) | |
| tree | d1eed67e75b7c1e6e51afe419a497d9febf88a1d | |
| parent | 95b937a6196fa9f68def7606a9fe9c1415c7568f (diff) | |
| download | krb5-3ce1015cb1c8bbfc7dcd0b9c55bc803364de56cd.tar.gz krb5-3ce1015cb1c8bbfc7dcd0b9c55bc803364de56cd.tar.xz krb5-3ce1015cb1c8bbfc7dcd0b9c55bc803364de56cd.zip | |
kpropd.c (PRS): Don't bother initializing server_addrs since
it's not used.
kprop.c (get_tickets): Remove the call to krb5_os_localaddr() since
get_in_tkt_XXXX will default appropriately.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5235 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/slave/ChangeLog | 8 | ||||
| -rw-r--r-- | src/slave/kprop.c | 12 | ||||
| -rw-r--r-- | src/slave/kpropd.c | 6 |
3 files changed, 9 insertions, 17 deletions
diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog index 9d7d06843..fd1219d63 100644 --- a/src/slave/ChangeLog +++ b/src/slave/ChangeLog @@ -1,3 +1,11 @@ +Fri Mar 24 14:49:41 1995 <tytso@rsx-11.mit.edu> + + * kpropd.c (PRS): Don't bother initializing server_addrs since + it's not used. + + * kprop.c (get_tickets): Remove the call to krb5_os_localaddr() since + get_in_tkt_XXXX will default appropriately. + Thu Mar 2 12:26:08 1995 Theodore Y. Ts'o <tytso@dcl> * Makefile.in (ISODELIB): Remove reference to $(ISODELIB). diff --git a/src/slave/kprop.c b/src/slave/kprop.c index b699cc7fc..5755a32bb 100644 --- a/src/slave/kprop.c +++ b/src/slave/kprop.c @@ -190,7 +190,6 @@ void get_tickets(context) char buf[BUFSIZ]; char *cp; struct hostent *hp; - krb5_address **my_addresses; krb5_error_code retval; static char tkstring[] = "/tmp/kproptktXXXXXX"; @@ -271,16 +270,7 @@ void get_tickets(context) com_err(progname, retval, "While copying client principal"); exit(1); } - /* - * Get my addresses - */ - retval = krb5_os_localaddr(&my_addresses); - if (retval != 0) { - com_err(progname, retval, - "when getting my address"); - exit(1); - } - retval = krb5_get_in_tkt_with_keytab(context, 0, my_addresses, NULL, + retval = krb5_get_in_tkt_with_keytab(context, 0, 0, NULL, NULL, NULL, ccache, &creds, 0); if (retval) { com_err(progname, retval, "while getting initial ticket\n"); diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c index de6ef5a4e..b28238aff 100644 --- a/src/slave/kpropd.c +++ b/src/slave/kpropd.c @@ -68,7 +68,6 @@ int standalone; krb5_principal server; /* This is our server principal name */ krb5_principal client; /* This is who we're talking to */ krb5_keyblock *session_key; /* Here is the session key */ -krb5_address **server_addrs; krb5_pointer kerb_keytab = 0; /* Use default */ krb5_context kpropd_context; char *realm = NULL; /* Our realm */ @@ -420,11 +419,6 @@ void PRS(argv) "While trying to parse %s for service name"); exit(1); } - if (retval = krb5_os_localaddr(&server_addrs)) { - com_err(progname, retval, - "While trying to get local server address"); - exit(1); - } /* * Construct the name of the temporary file. */ |