diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2000-07-03 15:09:35 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2000-07-03 15:09:35 +0000 |
| commit | b5cc073cd6b17bc0571060524a2b84793a1aa3b7 (patch) | |
| tree | 86c6e863a1ff5d7555f891f20e70a0515b96bfdf /src/kadmin/ktutil | |
| parent | 50a2ffe72392b8dc24ec2d3be3bb0d610b013288 (diff) | |
| download | krb5-b5cc073cd6b17bc0571060524a2b84793a1aa3b7.tar.gz krb5-b5cc073cd6b17bc0571060524a2b84793a1aa3b7.tar.xz krb5-b5cc073cd6b17bc0571060524a2b84793a1aa3b7.zip | |
* Makefile.in (ktutil): Do not link with the V4
libraries. Although the program can write out a v4 srvtab, the one
necessary function is here.
* ktutil_funcs.c (ktutil_read_keytab): Add explicit braces to
avoid ambiguous `else'.
(getstr): register count -> register int count
* ktutil.c (main): ss_listen() takes only one argument.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12524 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/ktutil')
| -rw-r--r-- | src/kadmin/ktutil/ChangeLog | 12 | ||||
| -rw-r--r-- | src/kadmin/ktutil/Makefile.in | 4 | ||||
| -rw-r--r-- | src/kadmin/ktutil/ktutil.c | 2 | ||||
| -rw-r--r-- | src/kadmin/ktutil/ktutil_funcs.c | 5 |
4 files changed, 18 insertions, 5 deletions
diff --git a/src/kadmin/ktutil/ChangeLog b/src/kadmin/ktutil/ChangeLog index 3fa16b2bf..662855303 100644 --- a/src/kadmin/ktutil/ChangeLog +++ b/src/kadmin/ktutil/ChangeLog @@ -1,3 +1,15 @@ +2000-07-03 Ezra Peisach <epeisach@mit.edu> + + * Makefile.in (ktutil): Do not link with the V4 + libraries. Although the program can write out a v4 srvtab, the one + necessary function is here. + + * ktutil_funcs.c (ktutil_read_keytab): Add explicit braces to + avoid ambiguous `else'. + (getstr): register count -> register int count + + * ktutil.c (main): ss_listen() takes only one argument. + 2000-05-19 Ken Raeburn <raeburn@mit.edu> * ktutil_funcs.c (ktutil_write_keytab): Reject a filename that's diff --git a/src/kadmin/ktutil/Makefile.in b/src/kadmin/ktutil/Makefile.in index e0436182a..8588a877b 100644 --- a/src/kadmin/ktutil/Makefile.in +++ b/src/kadmin/ktutil/Makefile.in @@ -16,8 +16,8 @@ SRCS= $(srcdir)/ktutil.c \ all:: ktutil -ktutil: ktutil.o $(OBJS) $(SS_DEPLIB) $(KRB4COMPAT_DEPLIBS) - $(CC_LINK) -o ktutil $(OBJS) $(SS_LIB) $(KRB4COMPAT_LIBS) +ktutil: ktutil.o $(OBJS) $(SS_DEPLIB) $(KRB5_BASE_DEPLIBS) + $(CC_LINK) -o ktutil $(OBJS) $(SS_LIB) $(KRB5_BASE_LIBS) install:: $(INSTALL_PROGRAM) ktutil ${DESTDIR}$(ADMIN_BINDIR)/ktutil diff --git a/src/kadmin/ktutil/ktutil.c b/src/kadmin/ktutil/ktutil.c index f247fd7f3..2cc59f88f 100644 --- a/src/kadmin/ktutil/ktutil.c +++ b/src/kadmin/ktutil/ktutil.c @@ -65,7 +65,7 @@ int main(argc, argv) ss_perror(sci_idx, retval, "creating invocation"); exit(1); } - ss_listen(sci_idx, &retval); + retval = ss_listen(sci_idx); ktutil_free_kt_list(kcontext, ktlist); exit(0); } diff --git a/src/kadmin/ktutil/ktutil_funcs.c b/src/kadmin/ktutil/ktutil_funcs.c index c39173fe7..af4f37bf3 100644 --- a/src/kadmin/ktutil/ktutil_funcs.c +++ b/src/kadmin/ktutil/ktutil_funcs.c @@ -286,7 +286,7 @@ krb5_error_code ktutil_read_keytab(context, name, list) } if (entry) free((char *)entry); - if (retval) + if (retval) { if (retval == KRB5_KT_END) retval = 0; else { @@ -295,6 +295,7 @@ krb5_error_code ktutil_read_keytab(context, name, list) if (back) back->next = NULL; } + } if (!*list) *list = tail; krb5_kt_end_seq_get(context, kt, &cursor); @@ -348,7 +349,7 @@ int getstr(fp, s, n) register char *s; int n; { - register count = n; + register int count = n; while (fread(s, 1, 1, fp) > 0 && --count) if (*s++ == '\0') return (n - count); |