diff options
Diffstat (limited to 'src')
145 files changed, 1450 insertions, 2945 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3f66910710..6c7e18e73d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (update-autoconf-h): Don't go into krb5 + subdirectory; make specific files. + (CLEANUP): osconf.h has moved. + * configure.in: Build include/autoconf.h now. Don't create a + makefile in include/krb5. + 2006-03-10 Ken Raeburn <raeburn@mit.edu> * Makefile.in (generate-files-mac-prerecurse): Depend on diff --git a/src/Makefile.in b/src/Makefile.in index cc2706ca6b..050d3b686d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -24,7 +24,7 @@ all-unix:: krb5-config # that autoconf.h is up to date before going into any of the subdirectories. all-prerecurse generate-files-mac-prerecurse: update-autoconf-h update-autoconf-h: - (cd include/krb5 && $(MAKE) all) + (cd include && $(MAKE) autoconf.h osconf.h) ##DOS##!if 0 # This makefile doesn't use lib.in, but we still need shlib.conf here. @@ -413,7 +413,7 @@ ETOUT = \ HOUT = $(INC)krb5.h $(GG)gssapi.h $(PR)profile.h CLEANUP= Makefile $(ETOUT) $(HOUT) \ - include/profile.h include/krb5/osconf.h \ + include/profile.h include/osconf.h \ winfile.list diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in index 0efd0ca6a2..bda940dcaa 100644 --- a/src/appl/bsd/Makefile.in +++ b/src/appl/bsd/Makefile.in @@ -101,7 +101,7 @@ kcmd.o krcp.o krlogin.o krlogind.o krsh.o krshd.o forward.o: defines.h # the Makefile.in file # $(OUTPRE)krcp.$(OBJEXT): krcp.c $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-util.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-util.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(BUILDTOP)/include/profile.h defines.h \ $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/port-sockets.h \ @@ -111,46 +111,46 @@ $(OUTPRE)krlogin.$(OBJEXT): krlogin.c $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(BUILDTOP)/include/profile.h defines.h $(SRCTOP)/include/fake-addrinfo.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h rpaths.h $(OUTPRE)krsh.$(OBJEXT): krsh.c $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(BUILDTOP)/include/profile.h defines.h $(SRCTOP)/include/fake-addrinfo.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(OUTPRE)kcmd.$(OBJEXT): kcmd.c $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(BUILDTOP)/include/profile.h defines.h $(SRCTOP)/include/fake-addrinfo.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(OUTPRE)forward.$(OBJEXT): forward.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h defines.h $(SRCTOP)/include/fake-addrinfo.h $(OUTPRE)compat_recv.$(OBJEXT): compat_recv.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ defines.h $(SRCTOP)/include/fake-addrinfo.h $(OUTPRE)login.$(OBJEXT): login.c $(BUILDTOP)/include/libpty.h \ $(SRCTOP)/include/syslog.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ loginpaths.h @@ -159,19 +159,19 @@ $(OUTPRE)krshd.$(OBJEXT): krshd.c $(BUILDTOP)/include/libpty.h \ $(COM_ERR_DEPS) loginpaths.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(BUILDTOP)/include/profile.h $(SRCTOP)/include/k5-util.h \ - $(BUILDTOP)/include/krb5/autoconf.h defines.h $(SRCTOP)/include/fake-addrinfo.h \ + $(BUILDTOP)/include/autoconf.h defines.h $(SRCTOP)/include/fake-addrinfo.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h $(OUTPRE)krlogind.$(OBJEXT): krlogind.c $(SRCTOP)/include/syslog.h \ $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/socket-utils.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/socket-utils.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/libpty.h \ $(SRCTOP)/include/k5-util.h defines.h $(OUTPRE)v4rcp.$(OBJEXT): v4rcp.c $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-util.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/k5-util.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(BUILDTOP)/include/profile.h $(SRCTOP)/include/kerberosIV/krbports.h \ diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in index 97d1d89011..e655f31bc9 100644 --- a/src/appl/gss-sample/Makefile.in +++ b/src/appl/gss-sample/Makefile.in @@ -41,5 +41,5 @@ $(OUTPRE)gss-client.$(OBJEXT): gss-client.c $(BUILDTOP)/include/gssapi/gssapi_ge $(OUTPRE)gss-misc.$(OBJEXT): gss-misc.c $(BUILDTOP)/include/gssapi/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h gss-misc.h $(OUTPRE)gss-server.$(OBJEXT): gss-server.c $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(BUILDTOP)/include/gssapi/gssapi_generic.h \ + $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/gssapi/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h gss-misc.h diff --git a/src/appl/gssftp/ftp/Makefile.in b/src/appl/gssftp/ftp/Makefile.in index 9355f7c403..ac924be10f 100644 --- a/src/appl/gssftp/ftp/Makefile.in +++ b/src/appl/gssftp/ftp/Makefile.in @@ -75,13 +75,13 @@ secure.o: $(srcdir)/secure.c # the Makefile.in file # $(OUTPRE)cmds.$(OBJEXT): cmds.c $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(srcdir)/../arpa/ftp.h \ + $(BUILDTOP)/include/autoconf.h $(srcdir)/../arpa/ftp.h \ ftp_var.h pathnames.h $(OUTPRE)cmdtab.$(OBJEXT): cmdtab.c ftp_var.h $(OUTPRE)domacro.$(OBJEXT): domacro.c ftp_var.h $(OUTPRE)ftp.$(OBJEXT): ftp.c $(srcdir)/../arpa/ftp.h \ $(srcdir)/../arpa/telnet.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/kerberosIV/krb.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssapi/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi_krb5.h \ @@ -89,7 +89,7 @@ $(OUTPRE)ftp.$(OBJEXT): ftp.c $(srcdir)/../arpa/ftp.h \ $(OUTPRE)getpass.$(OBJEXT): getpass.c ftp_var.h $(OUTPRE)glob.$(OBJEXT): glob.c ftp_var.h $(OUTPRE)main.$(OBJEXT): main.c ftp_var.h $(srcdir)/../arpa/ftp.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(OUTPRE)radix.$(OBJEXT): radix.c ftp_var.h diff --git a/src/appl/gssftp/ftpd/Makefile.in b/src/appl/gssftp/ftpd/Makefile.in index 6b12fc9ca0..2506d418f8 100644 --- a/src/appl/gssftp/ftpd/Makefile.in +++ b/src/appl/gssftp/ftpd/Makefile.in @@ -84,7 +84,7 @@ vers.o: $(srcdir)/vers.c $(OUTPRE)ftpd.$(OBJEXT): ftpd.c $(srcdir)/../arpa/ftp.h \ $(srcdir)/../arpa/telnet.h $(SRCTOP)/include/syslog.h \ pathnames.h $(BUILDTOP)/include/libpty.h $(SRCTOP)/include/k5-util.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/port-sockets.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/port-sockets.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/gssapi/gssapi.h \ diff --git a/src/appl/telnet/telnet/Makefile.in b/src/appl/telnet/telnet/Makefile.in index 7c3d81e501..19dbe3057e 100644 --- a/src/appl/telnet/telnet/Makefile.in +++ b/src/appl/telnet/telnet/Makefile.in @@ -86,7 +86,7 @@ $(OUTPRE)commands.$(OBJEXT): commands.c $(srcdir)/../arpa/telnet.h \ $(srcdir)/../libtelnet/auth-proto.h $(srcdir)/../libtelnet/encrypt.h \ $(srcdir)/../libtelnet/enc-proto.h $(srcdir)/../libtelnet/misc-proto.h \ $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/socket-utils.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/socket-utils.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h $(OUTPRE)main.$(OBJEXT): main.c $(srcdir)/../libtelnet/auth.h \ $(srcdir)/../libtelnet/auth-proto.h $(srcdir)/../libtelnet/encrypt.h \ diff --git a/src/appl/telnet/telnetd/Makefile.in b/src/appl/telnet/telnetd/Makefile.in index 6adaaca051..95a6786429 100644 --- a/src/appl/telnet/telnetd/Makefile.in +++ b/src/appl/telnet/telnetd/Makefile.in @@ -89,7 +89,7 @@ utility.o: telnetd.h defs.h ext.h $(ARPA_TELNET) # $(OUTPRE)telnetd.$(OBJEXT): telnetd.c telnetd.h defs.h \ $(srcdir)/../arpa/telnet.h $(SRCTOP)/include/socket-utils.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/port-sockets.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/syslog.h ext.h pathnames.h $(BUILDTOP)/include/libpty.h \ $(COM_ERR_DEPS) $(SRCTOP)/include/fake-addrinfo.h $(BUILDTOP)/include/krb5.h \ @@ -100,46 +100,46 @@ $(OUTPRE)termio-tn.$(OBJEXT): termio-tn.c $(OUTPRE)termios-tn.$(OBJEXT): termios-tn.c $(OUTPRE)state.$(OBJEXT): state.c telnetd.h defs.h \ $(srcdir)/../arpa/telnet.h $(SRCTOP)/include/socket-utils.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/port-sockets.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/syslog.h ext.h $(srcdir)/../libtelnet/auth.h \ $(srcdir)/../libtelnet/auth-proto.h $(srcdir)/../libtelnet/encrypt.h \ $(srcdir)/../libtelnet/enc-proto.h $(OUTPRE)termstat.$(OBJEXT): termstat.c telnetd.h defs.h \ $(srcdir)/../arpa/telnet.h $(SRCTOP)/include/socket-utils.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/port-sockets.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/syslog.h ext.h $(OUTPRE)slc.$(OBJEXT): slc.c telnetd.h defs.h $(srcdir)/../arpa/telnet.h \ - $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/syslog.h \ ext.h $(OUTPRE)sys_term.$(OBJEXT): sys_term.c telnetd.h defs.h \ $(srcdir)/../arpa/telnet.h $(SRCTOP)/include/socket-utils.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/port-sockets.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/syslog.h ext.h pathnames.h $(COM_ERR_DEPS) \ $(BUILDTOP)/include/libpty.h $(srcdir)/../libtelnet/auth.h \ $(srcdir)/../libtelnet/auth-proto.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/krb5.h \ $(BUILDTOP)/include/profile.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h $(OUTPRE)utility.$(OBJEXT): utility.c telnetd.h defs.h \ $(srcdir)/../arpa/telnet.h $(SRCTOP)/include/socket-utils.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/port-sockets.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/syslog.h ext.h $(srcdir)/../libtelnet/auth.h \ $(srcdir)/../libtelnet/auth-proto.h $(srcdir)/../libtelnet/encrypt.h \ $(srcdir)/../libtelnet/enc-proto.h $(OUTPRE)global.$(OBJEXT): global.c defs.h $(srcdir)/../arpa/telnet.h \ - $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/socket-utils.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/syslog.h \ ext.h $(OUTPRE)authenc.$(OBJEXT): authenc.c telnetd.h defs.h \ $(srcdir)/../arpa/telnet.h $(SRCTOP)/include/socket-utils.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/port-sockets.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/syslog.h ext.h $(srcdir)/../libtelnet/misc.h \ $(srcdir)/../libtelnet/misc-proto.h diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in index 4f279c4d6f..242b11fa42 100644 --- a/src/clients/klist/Makefile.in +++ b/src/clients/klist/Makefile.in @@ -36,7 +36,7 @@ install-unix:: $(OUTPRE)klist.$(OBJEXT): klist.c $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ - $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/fake-addrinfo.h diff --git a/src/clients/ksu/Makefile.in b/src/clients/ksu/Makefile.in index 89db13a69f..05edb2194a 100644 --- a/src/clients/ksu/Makefile.in +++ b/src/clients/ksu/Makefile.in @@ -46,51 +46,51 @@ install:: # the Makefile.in file # $(OUTPRE)krb_auth_su.$(OBJEXT): krb_auth_su.c ksu.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-util.h $(SRCTOP)/include/syslog.h $(OUTPRE)ccache.$(OBJEXT): ccache.c ksu.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-util.h \ - $(SRCTOP)/include/syslog.h $(SRCTOP)/include/krb5/adm_proto.h + $(SRCTOP)/include/syslog.h $(SRCTOP)/include/adm_proto.h $(OUTPRE)authorization.$(OBJEXT): authorization.c ksu.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/k5-util.h $(SRCTOP)/include/syslog.h $(OUTPRE)main.$(OBJEXT): main.c ksu.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-util.h \ - $(SRCTOP)/include/syslog.h $(SRCTOP)/include/krb5/adm_proto.h + $(SRCTOP)/include/syslog.h $(SRCTOP)/include/adm_proto.h $(OUTPRE)heuristic.$(OBJEXT): heuristic.c ksu.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-util.h \ $(SRCTOP)/include/syslog.h $(OUTPRE)xmalloc.$(OBJEXT): xmalloc.c ksu.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-util.h \ $(SRCTOP)/include/syslog.h $(OUTPRE)setenv.$(OBJEXT): setenv.c diff --git a/src/config/ChangeLog b/src/config/ChangeLog index 2daa788829..481de61ade 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * pre.in (KRB_INCLUDES): Drop include/krb5 directories. + 2006-03-10 Ken Raeburn <raeburn@mit.edu> * pre.in (generate-files-mac): New target. diff --git a/src/config/pre.in b/src/config/pre.in index 31a84b1eca..02aa754613 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -169,8 +169,7 @@ DEFS = @DEFS@ CC = @CC@ LD = $(PURE) @LD@ DEPLIBS = @DEPLIBS@ -KRB_INCLUDES = -I$(BUILDTOP)/include -I$(SRCTOP)/include \ - -I$(BUILDTOP)/include/krb5 -I$(SRCTOP)/include/krb5 +KRB_INCLUDES = -I$(BUILDTOP)/include -I$(SRCTOP)/include LDFLAGS = @LDFLAGS@ LD_UNRESOLVED_PREFIX = @LD_UNRESOLVED_PREFIX@ LD_SHLIBDIR_PREFIX = @LD_SHLIBDIR_PREFIX@ diff --git a/src/configure.in b/src/configure.in index 1364043674..3b36dcc6b8 100644 --- a/src/configure.in +++ b/src/configure.in @@ -125,7 +125,7 @@ dnl from old include/configure.in AH_TEMPLATE([HAVE_STRUCT_SOCKADDR_STORAGE], [Define if "struct sockaddr_storage" is available.]) dnl -AC_CONFIG_HEADER(include/krb5/autoconf.h) +AC_CONFIG_HEADER(include/autoconf.h) AC_PROG_INSTALL AC_PROG_AWK AC_PROG_LEX @@ -572,4 +572,4 @@ dnl fi AC_CONFIG_SUBDIRS(kadmin clients plugins/kdb/db2 appl tests) AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config]) -V5_AC_OUTPUT_MAKEFILE(. util util/support util/send-pr lib kdc slave krb524 config-files gen-manpages include include/krb5 include/kerberosIV) +V5_AC_OUTPUT_MAKEFILE(. util util/support util/send-pr lib kdc slave krb524 config-files gen-manpages include include/kerberosIV) diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 1a6b913060..fcb0588087 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,12 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * adm.h, adm_defs.h, adm_proto.h, copyright.h, kdb.h, kdb_dbc.h, + kdb_kt.h, stock: Moved from krb5/ subdirectory. + * k5-util.h, port-sockets.h, socket-utils.h: Updated for + autoconf.h move from krb5/. + * Makefile.in: Merge all targets from krb5/Makefile.in; don't go + into krb5/ subdir while building. + 2006-03-10 Ken Raeburn <raeburn@mit.edu> * Makefile.in (generate-files-mac): Depend on krb5.h. diff --git a/src/include/Makefile.in b/src/include/Makefile.in index 15fe54b6a0..e13fca61f6 100644 --- a/src/include/Makefile.in +++ b/src/include/Makefile.in @@ -1,19 +1,14 @@ thisconfigdir=.. myfulldir=include mydir=include -LOCAL_SUBDIRS=krb5 @maybe_kerberosIV@ +LOCAL_SUBDIRS=@maybe_kerberosIV@ BUILDTOP=$(REL).. +KRB5RCTMPDIR= @KRB5_RCTMPDIR@ ##DOSBUILDTOP = .. NO_OUTPRE=1 all-unix:: krb5.h -all-windows:: - @echo Making in include\krb5 - cd krb5 - $(MAKE) -$(MFLAGS) - cd .. - all-unix:: maybe-make-db.h-@DB_HEADER_VERSION@ generate-files-mac: krb5.h @@ -25,18 +20,58 @@ maybe-make-db.h-sys: maybe-make-db.h-redirect: test -r db.h || echo '#include <@DB_HEADER@>' > db.h -all-recurse: krb5/autoconf.h -krb5/autoconf.h: $(srcdir)/krb5/autoconf.h.in - (cd krb5; $(MAKE) autoconf.h) -$(srcdir)/krb5/autoconf.h.in: @MAINT@ $(srcdir)/krb5/autoconf.stmp -$(srcdir)/krb5/autoconf.stmp: $(srcdir)/$(thisconfigdir)/configure.in $(SRCTOP)/aclocal.m4 +ET_HEADERS = adm_err.h asn1_err.h kdb5_err.h krb5_err.h +BUILT_HEADERS = osconf.h + +all-unix:: autoconf.h $(BUILT_HEADERS) +all-windows:: autoconf.h $(BUILT_HEADERS) + +$(srcdir)/autoconf.h.in: @MAINT@ $(srcdir)/autoconf.stmp +$(srcdir)/autoconf.stmp: $(srcdir)/$(thisconfigdir)/configure.in $(SRCTOP)/aclocal.m4 $(RM) -r $(srcdir)/$(thisconfigdir)/autom4te.cache cd $(srcdir)/$(thisconfigdir) && $(AUTOHEADER) --include=$(CONFIG_RELTOPDIR) $(AUTOHEADERFLAGS) - touch $(srcdir)/krb5/autoconf.stmp + touch $(srcdir)/autoconf.stmp $(RM) -r $(srcdir)/$(thisconfigdir)/autom4te.cache -krb5.h: krb5/autoconf.h $(srcdir)/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h \ - asn1_err.h +##DOS##autoconf.h: win-mac.h +##DOS## $(CP) win-mac.h $@ +##DOS##osconf.h: stock\osconf.h +##DOS## $(CP) stock\osconf.h $@ + +############################################################################### +##DOS##!if 0 +autoconf.h: autoconf.stamp +autoconf.stamp: $(srcdir)/autoconf.h.in $(thisconfigdir)/config.status + (cd $(thisconfigdir) && $(SHELL) config.status $(mydir)/autoconf.h) + touch autoconf.stamp + +SYSCONFDIR = @sysconfdir@ +LOCALSTATEDIR = @localstatedir@ +BINDIR = @bindir@ +SBINDIR = @sbindir@ +LIBDIR = @libdir@ + +PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \ + -e "s+@PREFIX+$(INSTALL_PREFIX)+" \ + -e "s+@EXEC_PREFIX+$(INSTALL_EXEC_PREFIX)+" \ + -e "s+@BINDIR+$(BINDIR)+" \ + -e "s+@LIBDIR+$(LIBDIR)+" \ + -e "s+@SBINDIR+$(SBINDIR)+" \ + -e "s+@MODULEDIR+$(MODULE_DIR)+" \ + -e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \ + -e 's+@SYSCONFDIR+$(SYSCONFDIR)+' + +OSCONFSRC = $(srcdir)/stock/osconf.h + +osconf.h: $(OSCONFSRC) Makefile + cat $(OSCONFSRC) | sed $(PROCESS_REPLACE) > osconf.new + @set -x ; if cmp -s osconf.new osconf.h ; then : osconf.h is current ; \ + else ($(RM) osconf.h ; $(CP) osconf.new osconf.h) fi + $(RM) osconf.new +##DOS##!endif +############################################################################### + +krb5.h: $(srcdir)/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h asn1_err.h echo "/* This file is generated, please don't edit it directly. */" > krb5.h cat $(srcdir)/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h \ asn1_err.h >> krb5.h @@ -62,17 +97,18 @@ krb524_err.h: $(SRCTOP)/lib/krb5/error_tables/krb524_err.et clean-unix:: $(RM) krb5.h krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h \ asn1_err.h + $(RM) $(ET_HEADERS) autoconf.stamp clean-windows:: $(RM) com_err.h profile.h $(RM) gssapi\gssapi.h gssapi\gssapi_generic.h gssapi\gssapi_krb5.h gssapi\timestamp if exist gssapi\nul rmdir gssapi - cd krb5 - @echo Making clean in include\krb5 - $(MAKE) -$(MFLAGS) clean - cd .. + $(RM) osconf.h autoconf.h autoconf.stamp @echo Making clean in include +clean:: + $(RM) osconf.new $(BUILT_HEADERS) + install-headers-unix install:: krb5.h profile.h $(INSTALL_DATA) krb5.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5.h $(INSTALL_DATA) profile.h $(DESTDIR)$(KRB5_INCDIR)$(S)profile.h diff --git a/src/include/krb5/adm.h b/src/include/adm.h index 86798a8300..86798a8300 100644 --- a/src/include/krb5/adm.h +++ b/src/include/adm.h diff --git a/src/include/krb5/adm_defs.h b/src/include/adm_defs.h index b2b747446e..b2b747446e 100644 --- a/src/include/krb5/adm_defs.h +++ b/src/include/adm_defs.h diff --git a/src/include/krb5/adm_proto.h b/src/include/adm_proto.h index 65b116bc4a..65b116bc4a 100644 --- a/src/include/krb5/adm_proto.h +++ b/src/include/adm_proto.h diff --git a/src/include/krb5/copyright.h b/src/include/copyright.h index b1740ce3ce..b1740ce3ce 100644 --- a/src/include/krb5/copyright.h +++ b/src/include/copyright.h diff --git a/src/include/k5-util.h b/src/include/k5-util.h index 4255c8f650..7bb8cfbe96 100644 --- a/src/include/k5-util.h +++ b/src/include/k5-util.h @@ -44,7 +44,7 @@ * They live in libkrb5util. */ -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> diff --git a/src/include/krb5/kdb.h b/src/include/kdb.h index c8327657fc..c8327657fc 100644 --- a/src/include/krb5/kdb.h +++ b/src/include/kdb.h diff --git a/src/include/krb5/kdb_dbc.h b/src/include/kdb_dbc.h index e2b300288f..e2b300288f 100644 --- a/src/include/krb5/kdb_dbc.h +++ b/src/include/kdb_dbc.h diff --git a/src/include/krb5/kdb_kt.h b/src/include/kdb_kt.h index 1dbd7f30da..1dbd7f30da 100644 --- a/src/include/krb5/kdb_kt.h +++ b/src/include/kdb_kt.h diff --git a/src/include/krb5/.Sanitize b/src/include/krb5/.Sanitize deleted file mode 100644 index 2dcb284b33..0000000000 --- a/src/include/krb5/.Sanitize +++ /dev/null @@ -1,50 +0,0 @@ -# Sanitize.in for Kerberos V5 - -# Each directory to survive it's way into a release will need a file -# like this one called "./.Sanitize". All keyword lines must exist, -# and must exist in the order specified by this file. Each directory -# in the tree will be processed, top down, in the following order. - -# Hash started lines like this one are comments and will be deleted -# before anything else is done. Blank lines will also be squashed -# out. - -# The lines between the "Do-first:" line and the "Things-to-keep:" -# line are executed as a /bin/sh shell script before anything else is -# done in this - -Do-first: - -# All files listed between the "Things-to-keep:" line and the -# "Files-to-sed:" line will be kept. All other files will be removed. -# Directories listed in this section will have their own Sanitize -# called. Directories not listed will be removed in their entirety -# with rm -rf. - -Things-to-keep: - -.cvsignore -.rconf -AddressXlation.h -ChangeLog -MacTCP.h -Makefile.in -adm.h -adm_defs.h -adm_proto.h -asn.1 -autoconf.h.in -configure -configure.in -copyright.h -kdb.h -kdb_dbc.h -kdb_dbm.h -stock -winsock.h - -Things-to-lose: - -Do-last: - -# End of file. diff --git a/src/include/krb5/.rconf b/src/include/krb5/.rconf deleted file mode 100644 index 0278bafa07..0000000000 --- a/src/include/krb5/.rconf +++ /dev/null @@ -1,5 +0,0 @@ -ignore README.encryption -copy error_tables -link stock -ignore config.h -ignore osconf.h diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog deleted file mode 100644 index 2a7ca9a321..0000000000 --- a/src/include/krb5/ChangeLog +++ /dev/null @@ -1,1322 +0,0 @@ -2006-03-07 Ken Raeburn <raeburn@mit.edu> - - * kdb.h: Include k5-platform.h. - (krb5_kdb_decode_int16, krb5_kdb_decode_int32): Use load_*_le - helper functions. - (krb5_kdb_encode_int16, krb5_kdb_encode_int32): Use store_*_le - helper functions. - -2006-03-06 Ken Raeburn <raeburn@mit.edu> - - * Makefile.in (PROCESS_REPLACE): Use MODULE_DIR instead of - KRB5_DB_MODULE_DIR. - -2005-11-17 Ken Raeburn <raeburn@mit.edu> - - * Makefile.in (osconf.h): Always remove osconf.new. - -2005-10-06 Ken Raeburn <raeburn@mit.edu> - - * Makefile.in (autoconf.stamp): When running config.status, only - rebuild autoconf.h. - -2005-09-14 Ken Raeburn <raeburn@mit.edu> - - * adm_proto.h (krb5_adm_connect, krb5_adm_disconnect, - krb5_adm_dbent_to_proto, krb5_adm_proto_to_dbent, - krb5_adm_proto_to_ktent, krb5_adm_ktent_to_proto, - krb5_free_adm_data, krb5_send_adm_cmd, krb5_send_adm_reply, - krb5_read_adm_cmd, krb5_read_adm_reply): Delete declarations, - since none of these functions exist. - -2005-06-29 Ken Raeburn <raeburn@mit.edu> - - * Makefile.in (osconf.h): Depend on Makefile. Always display - commands executed for replace-if-newer sequence. - (PROCESS_REPLACE): Replace @MODULEDIR with $(KRB5_DB_MODULE_DIR). - -2005-06-20 Ken Raeburn <raeburn@mit.edu> - - * Makefile.in (clean-unix): Don't remove autoconf.h. - - Novell merge. - * Makefile.in (LIBDIR): New variable. - (PROCESS_REPLACE): Replace @LIBDIR. - * adm_proto.h (krb5_key_salt_tuple): Conditionalize incomplete - typedef on KRB5_KDB5__ instead of KRB5_ADM_H__ and - __KADM5_ADMIN_H__. - * adm.h (krb5_key_salt_tuple): Move type definition... - * kdb.h (krb5_key_salt_tuple): ...to here. - (krb5_dbe_apw, krb5_dbe_ark, krb5_dbe_cpw, krb5_dbe_crk): Use - krb5_key_salt_tuple instead of struct __krb5_key_salt_tuple in - prototype declarations. - (osa_policy_ent_t): Move type definition here from kadm5/adb.h. - Change element types from uint32_t to krb5_ui_4. - (osa_adb_iter_policy_func): Move type definition here from - kadm5/adb.h. - (KRB5_TL_DB_ARGS): New macro, defined only if SECURID is defined. - (KRB5_KDB_OPEN_RW, KRB5_KDB_OPEN_RO, KRB5_KDB_OPT_SET_DB_NAME, - KRB5_KDB_OPT_SET_LOCK_MODE): New macros. - (KRB5_DB_LOCKMODE_SHARED, KRB5_DB_LOCKMODE_EXCLUSIVE, - KRB5_DB_LOCKMODE_DONTBLOCK, KRB5_DB_LOCKMODE_PERMANENT): New - macros. - (kdb5_db_create, kdb_def_get_mkey, kdb_def_set_mkey, - krb5_db_alloc, krb5_db_clr_error, krb5_db_create_policy, - krb5_db_def_fetch_mkey, krb5_db_delete_policy, - krb5_db_errcode2string, krb5_db_free, krb5_db_free_master_key, - krb5_db_free_policy, krb5_db_get_policy, krb5_db_inited, - krb5_db_iter_policy, krb5_db_open, krb5_db_put_policy, - krb5_db_set_master_key_ext, krb5_db_set_option, - krb5_db_store_master_key, krb5_dbe_def_cpw, - krb5_dbe_def_search_enctype, krb5_dbe_update_last_pwd_change, - krb5_def_store_mkey, krb5_def_verify_master_key, - krb5_free_supported_realms, krb5_key_salt_tuple, - krb5_supported_realms, osa_adb_iter_policy_func, - osa_policy_ent_rec, osa_policy_ent_t): New (or moved) - declarations. - (krb5_db_close_database, krb5_db_iterate_ext, - krb5_db_open_database, krb5_db_rename, krb5_db_set_lockmode, - krb5_db_set_name, krb5_db_set_nonblocking, krb5_db_store_mkey, - krb5_dbe_free_contents, krb5_decode_princ_contents, - krb5_encode_princ_contents, krb5_encode_princ_dbkey, - krb5_free_princ_contents, krb5_free_princ_dbkey, - krb5_ser_db_context_init): Declarations deleted (or moved). - (krb5_db_create): Changed signature, just one char** arg in - addition to context. - (krb5_db_delete_principal): Changed argument 1 to non-const - principal. - (krb5_db_destroy): Changed argument 1 to char**. - (krb5_db_free_principal): Changed return type from void to - krb5_error_code. - (krb5_db_iterate): Changed signature, new char* argument, - pointed-to function returns int instead of krb5_error_code. - -2005-05-13 Ken Raeburn <raeburn@mit.edu> - - * Makefile.in (thisconfigdir, mydir): Updated for configure - change. - -2004-06-22 Ken Raeburn <raeburn@mit.edu> - - * adm_proto.h, kdb.h, kdb_dbc.h, kdb_kt.h: Don't test macintosh. - -2004-06-16 Ken Raeburn <raeburn@mit.edu> - - * Makefile.in (all-mac, clean-mac): Targets deleted. - -2004-03-08 Ken Raeburn <raeburn@mit.edu> - - * Makefile.in (MY_SUBDIRS): Deleted. - -2003-08-26 Ken Raeburn <raeburn@mit.edu> - - * k5-config.h: Unused file deleted. - -2003-05-25 Ezra Peisach <epeisach@mit.edu> - - * kdb.h: Add prototype for krb5_db_iterate_ext. - -2003-03-05 Tom Yu <tlyu@mit.edu> - - * kdb_kt.h: Add krb5_ktkdb_set_context. Update prototype of - krb5_ktdb_resolve. Add krb5_kt_kdb_ops. - -2003-03-05 Sam Hartman <hartmans@mit.edu> - - * Remove kdb_dbm.h - -2002-11-05 Tom Yu <tlyu@mit.edu> - - * kdb.h (KRB5_KDC_MKEY_1, KRB5_KDC_MKEY_2): Remove trailing colon, - as new implementation of krb5_read_password() appends it. - -2002-09-18 Ken Raeburn <raeburn@mit.edu> - - * adm.h (struct __krb5_realm_params): New field - realm_kdc_tcp_ports. - -2002-08-29 Ken Raeburn <raeburn@mit.edu> - - * Makefile.in: Revert $(S)=>/ change, for Windows support. - -2002-08-23 Ken Raeburn <raeburn@mit.edu> - - * Makefile.in: Change $(S)=>/ and $(U)=>.. globally. - -2002-06-12 Ken Raeburn <raeburn@mit.edu> - - * kwinsock.h, macsock.h: Deleted. - -2002-05-29 Ken Raeburn <raeburn@mit.edu> - - * MacTCP.h, AddressXlation.h: Deleted. - -2001-10-09 Ken Raeburn <raeburn@mit.edu> - - * macsock.h (PROTOTYPE): Don't define. - -2001-10-05 Ken Raeburn <raeburn@mit.edu> - - * adm_defs.h, kdb.h, kdb_dbc.h, kdb_dbm.h, kdb_kt.h, kwinsock.h: - Don't explicitly declare pointers or functions FAR any more. Drop - _MSDOS support. - -2001-10-03 Ken Raeburn <raeburn@mit.edu> - - * adm_proto.h: Don't use KRB5_DLLIMP. - -2001-09-25 Ken Raeburn <raeburn@mit.edu> - - * adm.h (struct __krb5_realm_params): Added fields - realm_reject_bad_transit, realm_reject_bad_transit_valid; deleted - field realm_filler. - -2001-07-25 Ezra Peisach <epeisach@mit.edu> - - * kdb.h: For structs krb5_tl_data (tl_data_length), krb5_key_data - (key-data_length), krb5_db_entry (len, e_length) change the - storage types from krb5_int16 to krb5_ui_2. This does not require - a database version change as the field sizes are the same. Remove - the code ifdefed under KRB5_OLD_AND_KRUFTY. - -2001-04-27 Ezra Peisach <epeisach@mit.edu> - - * .cvsignore: Add stamp-h.in - -2001-02-26 Ezra Peisach <epeisach@mit.edu> - - * adm_proto.h (krb5_adm_connect): Declare prompt string const char *. - -2001-01-16 Ken Raeburn <raeburn@mit.edu> - - * adm_proto.h, kdb.h, kdb_dbc.h, kdb_dbm.h, kdb_kt.h: Make all - prototypes unconditional. - -2000-05-30 Wilfredo Sanchez <tritan@mit.edu> - - * Makefile.in, osconf.h: Use bindir and sbindir from configure - rather than building them up from EXEC_PREFIX. - -2000-5-18 Alexandra Ellwood <lxs@mit.edu> - - * macsock.h: local_addr_fallback_kludge defined to 0 - again... fixed gethostname - -2000-5-9 Alexandra Ellwood <lxs@mit.edu> - - * macsock.h: local_addr_fallback_kludge now defined to magic gethostaddr function - in the Sockets Library, which does exactly what we want if the search domain is not - specified. - -1998-11-22 Miro Jurisic <meeroh@.mit.edu> - - * macsock.h: MacOS: only #define MACHOSTNAMELEN when not - already defined - -Wed May 19 11:35:18 1999 Danilo Almeida <dalmeida@mit.edu> - - * Makefile.in: Create build rules for windows instead of blindly - copying files. Wrap Unix build rules with !if 0/!endif - that get used only in windows build. People need to - remember to keep this !if/!endif in the proper place when - they modify this file. - -Mon May 17 12:33:58 1999 Danilo Almeida <dalmeida@mit.edu> - - * Makefile.in: Add NO_OUTPRE flag to prevent creation of output - directory under win32. - -Fri May 7 15:26:44 1999 Theodore Y. Ts'o <tytso@mit.edu> - - * adm_proto.h: Fix the existing kludge to deal with the fact that - krb5_realm_params is defined in two, count them two, - header files. There's real ugliness here that needs - cleaning up eventually, but I don't have the time now to - deal with it. - -Fri Apr 16 17:07:47 1999 Theodore Y. Ts'o <tytso@mit.edu> - - * Makefile.in (all-windows): Don't constantly recreate autoconf.h - with #include "win-mac.h" - -1999-04-09 Theodore Ts'o <tytso@rsts-11.mit.edu> - - * kdb.h: Add new TL types provided by Frank Cusack's preauth patch - (PR# [krb5-kdc/662]) - -Tue Nov 17 15:39:32 1998 Tom Yu <tlyu@mit.edu> - - * kdb.h: Update dbe_crk and dbe_cpw to take a boolean to indicate - whether old keys should be retained. - - * Makefile.in (autoconf.stamp): Fix up to deal with config.status - not being in the current directory anymore. - -1998-11-13 Theodore Ts'o <tytso@rsts-11.mit.edu> - - * Makefile.in: Set the myfulldir and mydir variables (which are - relative to buildtop and thisconfigdir, respectively.) - Add a MY_SUBDIRS macro set to '.' to indicate that there - are no subdirectories to be processed by the Makefile. - - * configure.in: Removed and tests moved to parent directory. - -1998-10-26 Marc Horowitz <marc@mit.edu> - - * kdb_dbc.h, kdb.h: update kdb api to be compatible with the new - crypto api. - -Wed Jul 8 04:30:22 1998 Geoffrey King <gjking@mit.edu> - - * adm_proto.h: Added prototype for new function krb5_klog_reopen() - -Thu Apr 16 23:50:08 1998 Tom Yu <tlyu@mit.edu> - - * configure.in: Search for /var/tmp first when determining rcache - directory. [krb5-libs/548] - -Wed Feb 18 15:52:36 1998 Tom Yu <tlyu@mit.edu> - - * Makefile.in: Remove trailing slash from thisconfigdir. Fix up - BUILDTOP for new conventions. - -Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> - - * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile - -Tue Sep 30 17:19:16 1997 Tom Yu <tlyu@mit.edu> - - * configure.in: Remove references to dbm and ndbm. Replace - HAS_STDLIB_H and NO_STDLIB_H with something more sane. Replace - AC_TIME_WITH_SYS_TIME with more a recent form. Use AC_CHECK_TYPE - to check for time_t instead of erroneously named POSIX_TYPES. - -Thu Sep 25 21:50:44 1997 Tom Yu <tlyu@mit.edu> - - * configure.in: Replace KRB5_USE_INET, HAS_UNISTD_H, HAS_SETVBUF. - -Thu Sep 18 20:42:03 1997 Tom Yu <tlyu@mit.edu> - - * configure.in: Replace USE_STRING_H, HAS_STRDUP, HAS_LABS - -Mon Sep 15 15:01:49 1997 Ezra Peisach <epeisach@mit.edu> - - * kdb_dbm.h: Add const to argument of krb5_dbm_db_get_principal. - Add prototype for krb5_dbm_db_delete_principal. - - * kdb.h: Prototypes for krb5_db_get_principal, - krb5_db_delete_principal, krb5_dbe_update_mod_princ_data, - krb5_encode_princ_dbkey modified to use const krb5_principals. - -Fri Jul 25 15:18:25 1997 Tom Yu <tlyu@mit.edu> - - * kdb_kt.h: Move support for "kdb" keytab here. - - * kdb.h: Add support for modified kdb API; remove extra arguments - for db_set_mkey and db_get_mkey. Remove all (hopefully) mentions - of any particular backend database implementation. Add flags - argument for db_create, allowing caller to specify whether btree - or hash methods are to be used in the backend. - -Thu Nov 21 11:55:16 EST 1996 Richard Basch <basch@lehman.com> - - * Makefile.in: - all-windows needed :: not : - clean up various generated files on all platforms, not just unix - -Wed Oct 30 18:55:21 1996 Sam Hartman <hartmans@mit.edu> - - * Makefile.in (LOCALSTATEDIR): Add localstatedir a and sysconfidr - to substitutions [37] -for osconf.h -Mon Aug 26 17:01:11 1996 Barry Jaspan <bjaspan@mit.edu> - - * kdb.h: add KRB5_TL_KADM5_E_DATA - -Fri Aug 23 16:20:54 1996 Theodore Ts'o <tytso@rsts-11.mit.edu> - - * kdb.h: Remove dbm_error and dbm_clearerr from the dispatch table - (which eventually should be completely removed.) - -Wed Jun 12 00:40:29 1996 Theodore Ts'o <tytso@rsts-11.mit.edu> - - * adm_proto.h: Change usage of INTERFACE to use KRB5_CALLCONV and - KRB5_DLLIMP. - -Mon Jun 10 17:31:29 1996 Theodore Ts'o <tytso@rsts-11.mit.edu> - - * winsock.h: Rename to kwinsock.h. Recent versions of Microsoft - compilers include winsock.h, and the one we have collides - with NT errno definitions. Using the one provided by the - compiler is preferable. If you are using an old version - of MSVC that doesn't include winsock.h, then rename - kwinsock.h to winsock.h - - * kdb_dbm.h: Don't include kdb_dbm.h for Win-32. - - * kdb.h: Don't include most of kdb.h for Win-32. - -Mon May 20 17:57:15 1996 Theodore Ts'o <tytso@rsts-11.mit.edu> - - * configure.in: Remove support for ODBM. - -Sun May 19 14:32:19 1996 Sam Hartman <hartmans@tertius.mit.edu> - - * configure.in: Check for uid_t. - -Sun May 12 00:46:05 1996 Marc Horowitz <marc@mit.edu> - - * kdb.h: convert to use new krb5_dbe_* tl_data functions. - - * adm.h (struct __krb5_realm_params): add realm_acl_file - -Tue Apr 30 17:15:57 1996 Ken Raeburn <raeburn@cygnus.com> - - * configure.in: Invoke AC_C_CROSS before AC_TRY_RUN to pretty up - output format. - - * Makefile.in (autoconf.h): Use timestamp file to prevent repeated - rebuilding if file timestamp is out of date but contents wouldn't - change. - -Tue Apr 30 15:03:34 1996 Theodore Y. Ts'o <tytso@mit.edu> - - * macsock.h: Added prototype for getpeername(). - -Thu Mar 28 17:57:04 1996 Theodore Y. Ts'o <tytso@dcl> - - * AddressXlation.h: Updated to use latest versions from the Apple's - MacTCP Universal Interface. (For PowerPC port). - - * MacTCP.h: New header file from Apple's Universal Interface - - * GetMyIPAddr.h, MacTCPCommonTypes.h, TCPPB.h, UDPPB.h: Removed - old MacTCP header files. - -Wed Mar 13 17:43:35 1996 Ken Raeburn <raeburn@cygnus.com> - - * configure.in: Use AC_HEADER_STDARG. - -Wed Jan 24 14:23:07 1996 Theodore Y. Ts'o <tytso@dcl> - - * adm.h: Added lines to adm.h which Chris had removed while - working on the kadmin revisions. This allows the existing - code to compile. - -Mon Jan 22 17:36:00 1996 Ezra Peisach <epeisach@kangaroo.mit.edu> - - * configure.in: Use KRB5_CHECK_PROTOS instead of inlining - prototype checking. - -Wed Dec 13 03:51:53 1995 Chris Provenzano (proven@mit.edu) - - * kdb.h : Remove mkvno for krb5_db_entry - -Tue Dec 12 00:59:17 1995 Chris Provenzano (proven@mit.edu) - - * adm.h: Added principal flag keywords KRB5_ADM_KW_SETFLAGS and - KRB5_ADM_KW_UNSETFLAGS because relative flag modification - is just a good idea. - * kdb.h: typedef kdb5_dispatch_table so prototypes that need it - compile even if KDB5_DISPATCH isn't defined. - * kdb_dbc.h: The start of the database context, which should be - removed from the krb5_context. - -Sun Dec 10 11:02:35 1995 Ezra Peisach <epeisach@kangaroo.mit.edu> - - * adm_proto.h: Add prototype for krb5_input_flag_to_string. - -Fri Dec 1 17:16:05 1995 Theodore Y. Ts'o <tytso@dcl> - - * adm.h: Added temporary definition of KRB5_ADM_M_EXTRADATA so - that we have a tree which compiles. - -Tue Nov 7 16:41:14 1995 Theodore Y. Ts'o <tytso@dcl> - - * kdb.h: Added prototype for krb5_dbe_search_enctype(). Changed - prototype of krb5_dbe_find_enctype() so that ktype is of - type krb5_int32. (krb5_enctype is unsigned, so -1 doesn't - work!) - -Fri Nov 03 04:37:56 1995 Chris Provenzano (proven@mit.edu) - - * adm.h : Constant changes for the new kadmin code. - * kdb.h : Added attribute bit KRB5_KDB_NEW_PRINC. This will - allow kadmin administrators with add acls to modify a - principal until this bit is cleared. - -Fri Oct 6 21:58:05 1995 Theodore Y. Ts'o <tytso@dcl> - - * Makefile.in: Remove ##DOS!include of config/windows.in. - config/windows.in is now included by wconfig. - -Thu Oct 5 21:33:27 1995 Theodore Y. Ts'o <tytso@dcl> - - * adm.h: Remove pport and sport from the krb5_realm_params file, - and replace it with ports, which is a char * list of all - of the ports which should be listed to for this realm. - -Fri Sep 29 14:37:41 1995 Theodore Y. Ts'o <tytso@dcl> - - * Makefile.in (clean-unix): Remove autoconf.h on make clean - -Wed Sep 27 16:00:00 1995 John Rivlin <jrivlin@fusion.com> - - * adm_proto.h: Removed use of prototypes using krb5_db_entry - on the Macintosh. - -Tue Sep 26 15:36:20 1995 <tytso@rsts-11.mit.edu> - - * kdb.h, kdb_dbm.h: Add #if !defined(_MSDOS) && - !defined(_MACINTOSH) to prevent these #includes from being - used by Mac and PC machines. - -Mon Sep 25 16:39:36 1995 Theodore Y. Ts'o <tytso@dcl> - - * Makefile.in: Removed "foo:: foo-$(WHAT)" lines from the - Makefile. - -Thu Sep 20 12:00:00 1995 James Mattly <mattly@fusion.com> - - * macsock.h: Changes to support TCP streams and change password. - -Thu Sep 8 12:00:00 1995 James Mattly <mattly@fusion.com> - - * k5-config.h: defined MPW fake stat.h out for metrowerks compiler - * macsock.h: changed SOCKET definition for MACINTOSH to start support for - TCP streams - * TCPBP.h: fixed up some prototype problems with out customized tcp sockets - for macintosh - -Thu Sep 7 15:53:28 1995 Theodore Y. Ts'o <tytso@dcl> - - * adm.h (KRB5_ADM_SERVICE_NAME): Use official IANA assigned name - for the port, which is kpasswd, not changepw. Add new - define, KRB5_ADM_SERVICE_INSTANCE, which defines the - instance name used for the kadmin name. - -Wed Sep 06 14:20:57 1995 Chris Provenzano (proven@mit.edu) - - * adm.h, adm_proto.h kdb.h : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g - -Tue Sep 05 22:10:34 1995 Chris Provenzano (proven@mit.edu) - - * adm_proto.h : Remove krb5_enctype references, and replace with - krb5_keytype where appropriate. - -Thu Aug 31 11:38:58 EDT 1995 Paul Park (pjpark@mit.edu) - * configure.in - Add checks for stddef.h and xom.h for use by GSSAPI-V2 - - -Tue Aug 29 13:28:10 EDT 1995 Paul Park (pjpark@mit.edu) - * kdb.h - Add prototype for krb5_ser_db_context_init(). - - -Mon Aug 21 17:00:58 EDT 1995 Paul Park (pjpark@mit.edu) - * adm_proto.h - Add krb5_timestamp_to_sfstring() prototype. - - -Tue Aug 15 14:27:02 EDT 1995 Paul Park (pjpark@mit.edu) - * kdb.h - Add prototype for krb5_dbe_find_keytype(). - - -Thu Aug 10 14:33:51 EDT 1995 Paul Park (pjpark@mit.edu) - * kdb.h - Always define KRB5_MAX_FAIL_COUNT. - - -Mon Aug 07 11:22:57 1995 Chris Provenzano (proven@mit.edu) - - * kdb.h : Add prototypes for krb5_dbe_{en,de}code_last_pwd_change(), - krb5_dbe_{apw,cpw,ark,crk}(), - -Fri Aug 4 16:10:34 EDT 1995 Paul Park (pjpark@mit.edu) - * adm_proto.h - Add prototype definitions for new libkadm functions in - keysalt.c dealing with key/salt tuples. - * kdb.h - Add encode/decode macros for integers for use between kdb - modules. - -Thu Aug 03 12:19:52 1995 Chris Provenzano (proven@mit.edu) - - * kdb.h : Added prototype for krb5_dbe_cpw() the new dd entry - change password routine. - -Mon Jul 31 15:50:25 EDT 1995 Paul Park (pjpark@mit.edu) - * adm.h - Add new protocol definitions. Also, add krb5_key_salt_tuple - and add it to the krb5_read_realm_params structure so that - we have a list of supported key/salt pairs. Convert keytype - and enctype to be the correct datatype. - * adm_proto.h - Add string conversion prototypes. - - -Thu Jul 27 15:06:35 EDT 1995 Paul Park (pjpark@mit.edu) - * {asn1,dbm,ext-proto,k5-{config,errors,sockets},libos,los-proto, - mit-des,preauth,rsa-md5,sysincl}.h - Deleted. - * Makefile.in - Remove these headers from KRB5_HEADERS. - * configure.in - Change AC_INIT to look for kdb.h. - - -Thu Jul 27 02:59:05 1995 Chris Provenzano (proven@mit.edu) - - * kdb.h - Define new kdb format. - -Mon Jul 17 15:03:43 EDT 1995 Paul Park (pjpark@mit.edu) - * adm.h - Add per-realm parameter block data structure - (krb5_realm_params). - * adm_proto.h - Add dummy declaration for krb5_realm_params if adm.h - not included. Add prototypes for realm parameter functions. - * kdb.h - Add stash file parameter to krb5_db_fetch_mkey(). - -Sun Jul 9 21:47:49 1995 Ezra Peisach <epeisach@kangaroo.mit.edu> - - * los-proto.h: Add krb5_auth_con_genaddrs prototype - -Fri Jul 7 15:58:07 EDT 1995 Paul Park (pjpark@mit.edu) - * rsa-md5.h - Add RSA_MD5_DES_CONFOUND_LENGTH - the length of the - confounder for RSA_MD5_DES per RFC1510. - -Wed July 5 15:52:31 1995 James Mattly <mattly@fusion.com> - * k5-config.h Added _MACINTOSH for macintosh build conditions - * macsock.h made definition of PROTOTYPE conditional - -Fri Jun 30 16:13:41 EDT 1995 Paul Park (pjpark@mit.edu) - * kdb.h - Add kdb dispatch table and set routine under KDB5_DISPATCH. - - -Tue Jun 27 16:12:09 EDT 1995 Paul Park (pjpark@mit.edu) - * adm_proto.h - Change second argument of aprof_get... routines to be - const char *. - * configure.in, k5-config.h - Reinstate KRB5_PROVIDE_PROTOTYPES. This - is needed for compilers which recognize prototypes but don't - set __STDC__ or _WINDOWS. - -Thu Jun 22 16:11:07 1995 Tom Yu (tlyu@dragons-lair) - - * k5-config.h: remove definition for KRB5_PROVIDE_PROTOTYPES - because we've reversed the sense - - * configure.in: KBR5_PROVIDE_PROTOTYPES -> KRB5_NO_PROTOTYPES; - NO_NESTED_PROTOTYPES -> KRB5_NO_NESTED_PROTOTYPES - - * rsa-md5.h: reverse sense of KRB5_PROVIDE_PROTOTYPES - -Thu Jun 22 11:52:07 EDT 1995 Paul Park (pjpark@mit.edu) - * adm_proto.h - Add prototypes for kadm library profile handling - routines. These are wrappers for profile routines. - * kdb.h - Remove KDB_CONVERT_KEY_{TO,OUTOF}_DB. - -Wed Jun 21 17:39:25 1995 Ezra Peisach <epeisach@kangaroo.mit.edu> - - * configure.in: Replace krb5_sigtype tests with KRB5_SIGTYPE which - has been moved to aclocal.m4 - -Wed Jun 21 10:44:06 1995 <tytso@rsx-11.mit.edu> - - * Makefile.in: Don't remove autoconf.h when doing a make clean; - it's an autoconf generated file. - - * adm_proto.h, asn1.h, ext-proto.h, kdb.h, kdb_dbm.h, los-proto.h, - preauth.c: Change PROTOTYPE -> KRB5_PROTOTYPE - -Sat Jun 10 22:11:45 1995 Tom Yu (tlyu@dragons-lair) - - * adm_proto.h: update krb5_auth_context stuff - -Fri Jun 9 18:42:30 1995 <tytso@rsx-11.mit.edu> - - * configure.in: Remove standardized set of autoconf macros, which - are now handled by CONFIG_RULES. - -Thu Jun 8 14:41:00 EDT 1995 Paul Park (pjpark@mit.edu) - * adm_proto.h - Add prototypes for logging routines. Also, if - kdb.h has not been included, add null structure for entry - data structure so that we don't strictly require kdb.h. - -Thu Jun 8 11:11:24 1995 Theodore Y. Ts'o <tytso@lurch.mit.edu> - - * Makefile.in (install): Don't install the install/krb5 header files. - -Wed Jun 7 16:23:51 1995 <tytso@rsx-11.mit.edu> - - * Makefile.in: Process osconf.h using PREFIX and EXEC_PREFIX - instead of KRB5ROOT. - - * k5-config.h: Remove old defines for krb.conf and krb.realms, - which are now obsolete. - -Mon Jun 5 13:47:30 EDT 1995 Paul Park (pjpark@mit.edu) - * adm_proto.h - Add new arguments to krb5_adm_connect() for support - of specifiable credentials caches and ticket lifetimes. - - -Thu Jun 1 14:28:40 EDT 1995 Paul Park (pjpark@mit.edu) - * adm.h: Change the default admin port to 464. - -Tue May 30 17:33:09 1995 Keith Vetter (keithv@fusion.com) - - * adm_proto.h: removed INTERFACE from 2 non-exported functions. - -Tue May 30 10:22:57 1995 Keith Vetter (keithv@fusion.com) - - * adm_proto.h: conditionally removed for Windows two prototypes - that use the database. - * k5-config.h: bumped MAXPATHLEN and removed need for the kdb.h file. - -Fri May 26 10:17:12 1995 Keith Vetter (keithv@fusion.com) - - * adm_proto.h: added more missing INTERFACE. - * los-proto.h: moved in prototype for gmt_mktime(). - -Thu May 25 19:27:45 1995 Keith Vetter (keithv@fusion.com) - - * adm_proto.h: two function's prototype were missing INTERFACE. - * k5-config.h: kadm needs the kdb.h file. - -Thu May 25 15:39:31 1995 Keith Vetter (keithv@fusion.com) - - * los-proto.h: moved in the prototype for krb5_make_fulladdr. - -Tue May 23 15:33:00 1995 Theodore Y. Ts'o (tytso@dcl) - - * k5-config.h, k5-sockets.h: Move the sockets specific setup out - of k5-config.h to k5-sockets.h, and modify k5-int to - include k5-sockets.h (if it is requested by - NEED_SOCKETS) after including krb5.h. This keeps the - gdb type numbers the same across .o files, so that - recent binuntils can compress the debugging information - in executables linked with a debugging library. - -Mon May 22 09:41:39 EDT 1995 Paul Park (pjpark@mit.edu) - * Makefile.in - (install) Always perform install actions using - $(INSTALL_DATA). - * configure.in - Locate install program. - -Sun May 21 15:25:45 1995 Ezra Peisach <epeisach@kangaroo.mit.edu> - - * Makefile.in (PROCESS_REPLACE): Replace the RCTMPDIR in stock.h - with a configuration determined directory - - * configure.in: Determine which directory to use for the replay - cache. (/usr/tmp does not exist on netbsd). - -Wed May 10 13:20:47 1995 Ezra Peisach <epeisach@kangaroo.mit.edu> - - * Makefile.in (install): Install ET_HEADERS... - -Tue May 9 15:17:00 EDT 1995 Paul Park (pjpark@mit.edu) - Add definitions and prototypes for new administrative protocol. - -Mon May 8 22:13:15 1995 Ezra Peisach <epeisach@kangaroo.mit.edu> - - * los-proto.h: krb5_read_password - prompt strings should be const - char *. - Remove krb5_init_os_context and krb5_free_os_context. (The - proper prototypes are already in place i.e. - krb5_os_init_context). - -Fri Apr 28 15:14:38 EDT 1995 Paul Park (pjpark@mit.edu) - Remove INTERFACE from prototype definitions in adm_proto.h - -Fri Apr 28 11:11:54 1995 Mark Eichin <eichin@cygnus.com> - - * configure.in: correct use of --with-krb4 to match top level. - -Thu Apr 27 17:39:04 1995 Keith Vetter (keithv@fusion.com) - - * k5-config.h: Added MAXPATHLEN constant. - * adm_prot.h: updated prototype. - -Thu Apr 27 11:24:24 1995 Keith Vetter (keithv@fusion.com) - - * k5-config.h: Changed over to the new single config file on the PC. - -Wed Apr 26 10:41:08 1995 Ezra Peisach <epeisach@kangaroo.mit.edu> - - * Makefile.in: Reflect current list of headers to be installed. - -Thu Apr 20 11:35:07 1995 <tytso@rsx-11.mit.edu> - - * k5-config.h, configure.in: Remove support for HAS_ANSI_CONST - (that was needed only for compatibility with the old imake - build; autoconf uses -Dconst=), and HAS_ANSI_VOLATILE, - which isn't used at all. - -Wed Apr 19 13:25:56 1995 Ezra Peisach <epeisach@kangaroo.mit.edu> - - * func-proto.h: Remove global_context hack. Added prototype for - krb5_set_default_realm. - -Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) - - * asn1.h, ccache.h, encryption.h, func-pro.h, hostaddr.h, keytab.h, - los-prot.h, preauth.h, rcache.h: - removed unneeded INTERFACE from non-api functions. - * adm_defs.h, ccache.h, encryption.h, hostaddr.h, k5-free.h, keytab.h, - macros.h, rcache.h: - Added FAR to pointers visible to the world. - * base-def.h, ext-prot.h, rsa-md5.h: __STDC__ condition also - checks for the _WINDOWS define. - -Wed Apr 5 16:41:41 1995 Keith Vetter (keithv@fusion.com) - - * los-proto.h, func-proto.h: moved krb5_us_timeofday and - krb5_sname_to_principal from the former to the latter. - * base-def.h: added FAR to pointer types for the PC. - * func-proto.h: added FAR to pointer types in prototypes but - only for functions which are exported. - -Fri Mar 31 19:34:47 1995 Keith Vetter (keithv@fusion.com) - - * k5-config.h: defined dup to _dup for STDC stuff on Windows - -Fri Mar 31 16:12:28 1995 Theodore Y. Ts'o (tytso@dcl) - - * configure.in (CONFIG_RULES): Replaced. - -Thu Mar 30 15:57:22 1995 Keith Vetter (keithv@fusion.com) - - * func-proto.h: added 2 missing prototypes dealing with auth_con. - -Tue Mar 28 19:53:09 1995 Keith Vetter (keithv@fusion.com) - - * Makefile.in: changed to reflect deletion of stock/osconf.win. - * k5-config.h: added constants for reading default values - out of Windows ini files. - * los-proto.h: added new prototype for Windows ini stuff. - -Tue Mar 28 18:02:41 1995 John Gilmore (gnu at toad.com) - - * Makefile.in (KRB5_HEADERS, install): Account for file renames. - (all-mac): Add. - * configure.in (CONFIG_RULES): Remove. - (krb5_sigtype): Define as either void or int. - * encryption.h: Insert parentheses in macros to avoid mis-expansion. - * k5-config.h: Further parameterize socket support. - * macsock.h: Support connect(), recv(), send(), getmyipaddr(). - (WSAGetLastError): Fix typo -- there's no argument to this macro. - - * k5-errors.h: Rename errors.h (which duplicated a standard Mac - header name, causing a problem). - * AddressXlation.h, GetMyIPAddr.h, MacTCPCommonTypes.h, TCPPB.h, - UDPPB.h: Add MacTCP header files. - -Mon Mar 27 09:33:10 1995 Chris Provenzano (proven@mit.edu) - - * func-proto.h (krb5_rd_req(), krb5_rd_req_decode(), krb5_mk_rep(), - krb5_recvauth(), and krb5_compat_recvauth(). Added a - krb5_auth_context argument and eliminated many of the - other arguments because they are included in the - krb5_auth_context structure. - -Fri Mar 24 14:15:51 1995 <tytso@rsx-11.mit.edu> - - * adm_defs.h (ADM5_DEFAULT_PORT): Add definition of default - administration port. - - * Makefile.in (install): Delete the destination header files - before copying in the new ones. Also install autoconf.h. - Only install header files if the header file has changed. - -Wed Mar 22 11:37:24 1995 Keith Vetter (keithv@fusion.com) - - * k5-config.h: added HAVE_SYS_TYPES_H. Cleaned up the loading - of sys/types.h which john added earlier. Specifically, we always - have it and it's missing some typedefs used by this code. - -Tue Mar 21 18:42:23 1995 Keith Vetter (keithv@fusion.com) - - * k5-config.h: PC: NO_PASSWORD defined and files opened in binary mode. - * func-proto.h: added new prototype for notify programs when the - ccache changes, and moved krb5_get_default_realm from los-proto.h. - * los-proto.h: moved krb5_get_default_realm into func-proto.h. - -Sun Mar 19 12:51:59 1995 John Gilmore (gnu at toad.com) - - * base-defs.h: Fix comment that referred to STDARG_PROTOTYPES. - -Fri Mar 17 19:12:13 1995 John Gilmore (gnu at toad.com) - - * k5-config.h: Move <sys/types.h> handling from ../krb5.h to - here, because we need <sys/types.h> or the u_* types to be defined - before we include the Unix socket include files a little later in - k5-config.h. We actually add this code twice, once in the MSDOS - section and once in the Unix/Mac section. - (NEED_SOCKETS): Also include <net/if.h>, for localaddr.c. - * Makefile.in (clean-mac): Add. - -Tue Mar 14 16:50:54 1995 <tytso@rsx-11.mit.edu> - - * Makefile.in: Delete definition for KRB5ROOT and KRB5_INCDIR, - since those are defined in pre/config.in. - -Thu Mar 16 20:58:22 1995 John Gilmore (gnu at toad.com) - - * configure.in: Replace nonstandard CHECK_STDARG with - AC_CHECK_HEADERS. Also check for header file macsock.h, which - is a dummy test -- it's false on Unix and PC's, but on the Mac - we hand-configure it to be true, to indicate that we want Mac - socket support rather than Unix socket support. - * base-defs.h, k5-config.h: Use HAVE_STDARG_H, not STDARG_PROTOTYPES. - * k5-config.h (NEED_SOCKETS): Add new section which brings in - socket include files for the appropriate compilation environment - (Mac or Unix; Windows already did this). - * macsock.h: New include file, derived from Cygnus Network Security - Mac K4 release, for simulating sockets under MacTCP. - -Thu Mar 16 12:12:17 1995 Keith Vetter (keithv@fusion.com) - - * k5-config.h: PC change, getting sys_nerr and sys_errlist to work. - -Tue Mar 14 17:38:28 1995 Keith Vetter (keithv@fusion.com) - - * k5-config.h: more PC changes, mostly dealing with chmod not - working as it should on the PC. - * func-proto.h, los-proto.h: moved prototypes for krb5_timeofday and - krb5_os_localaddr from los-proto to func-proto. They are needed by - the outside world, specifically kinit.c - -Fri Mar 10 14:23:12 1995 Theodore Y. Ts'o <tytso@dcl> - - * sysincl.h: Removed definition of FD_SETSIZE, FD_SET, FD_CLR, - FD_ISSET, and FD_ZERO. Defining them in favor of using - the system include files is almost always wrong. - -Fri Mar 10 10:04:41 1995 Chris Provenzano (proven@mit.edu) - - * func-proto.h (krb5_mk_req(), krb5_mk_req_extended(), krb5_rd_rep(), - krb5_sendauth(), krb5_mk_priv(), krb5_rd_priv(), krb5_mk_safe(), - and krb5_rd_safe()). Added a krb5_auth_context argument and - eliminated many of the other arguments because they are - included in the krb5_auth_context structure. - - * fieldbits.h Added #define AP_OPTS_USE_SUBKEY 0x00000001 for a - new option to an ap req message. This is mainly a clean way - to inform krb5_mk_req() and krb5_mk_req_extended() to - create the subkey without adding an extra argument. - - * safepriv.h Replace safe/priv flags with flags for krb5_auth_context - and add krb5_replay_data structure for when the appilication - want to do it's own replay detection for safe and priv calls. - - -Thu Mar 9 18:29:24 1995 Mark Eichin <eichin@cygnus.com> - - * Makefile.in (all-windows): tabs, not spaces. - -Tue Mar 7 14:54:02 1995 Keith Vetter (keithv@fusion.com) - - * ccache.h: added windows INTERFACE keyword to all functions. - * encryption.h: more segment games for the PC--added NEAR to three - external data objects. - * wordsize.h: added constants VALID_INT_BTIS and VALID_UINT_BITS for - detecting overflow when casting a long to an int. - * k5-config.h: numerous PC changes such as adding NEED_LOWLEVEL_IO - which enables the read/write level of I/O. - * Makefile.in: osconf.h now pulled in from stock/osconf.win. - -Thu Mar 2 23:21:46 1995 John Gilmore (gnu at toad.com) - - Make include files start to work on the Macintosh. - - * configure.in: Add checks for sys/types.h and sys/stat.h. - * k5-config.h: Remove krb5/ from #include. - * sysincl.h: Avoid <sys/types.h>. Conditional-include <sys/stat.h>. - -Thu Mar 2 13:30:00 1995 Keith Vetter (keithv@fusion.com) - - * k5-config.h: changed NEED_WINSOCK_H to NEED_SOCKETS - -Wed Mar 1 20:00:00 1995 Keith Vetter (keithv@fusion.com) - - * func-proto.h: fixed up a const attribute to krb5_send_tgs. - -Wed Mar 1 17:40:00 1995 Keith Vetter (keithv@fusion.com) - - * func-proto.h: added missing prototype for krb5_mk_cred. - * los-proto.h: added windows INTERFACE keyword to all functions, - plus added 2 missing prototypes: krb5_os_init_context and - krb5_os_free_context. - -Wed Mar 1 12:48:20 1995 Keith Vetter (keithv@fusion.com) - - * config.h: added defines to pull in winsock.h as needed - * rcache.h: added windows INTERFACE keyword to all functions - * winsock.h: new file--for windows socket stuff - -Wed Mar 1 17:45:13 1995 Theodore Y. Ts'o <tytso@dcl> - - * configure.in, k5-config.h: Only define labs(x) -> abs(x) if - labs() is not defined elsewhere. (This really shouldn't - be here at all, but is the expedient way to deal with lack - of labs().) - - * Makefile.in: Change config.h -> k5-config.h and free.h -> - k5-free.h to reflect renamed header files for Mac/PC port. - -Mon Feb 27 23:47:58 1995 John Gilmore (gnu at toad.com) - - * Makefile.in (osconf.h): Remove temp file osconf.new. - - * krb5.h: Rename to ../krb5.h so it can be #included by end users - without the use of slashes or extra -I options. First step in - making it stand alone without a train of a dozen other include - files tagging along behind. - - * base-defs.h, dbm.h, error_def.h, sysincl.h: Avoid #include - <krb5/...> form; use "..." form. - - * config.h: Rename to k5-config.h. This is too common a - name, now that we use -I..../include/krb5. - * free.h: Rename to k5-free.h. - - * configure.in (AC_INIT): Use another file (not krb5.h) as src test. - -Mon Feb 27 11:35:49 1995 Keith Vetter (keithv@fusion.com) - - * config.h: added windows interface keyword for varargs functions, - added defines to allows <windows.h> to be stdc compliant. - * func-proto.h: added windows INTERFACE_C keyword for functions - with varargs, and fixed const in prototype for krb5_send_tgs. - * preauth.h: added windows INTERFACE keyword to prototypes - -Wed Feb 22 17:39:46 1995 Chris Provenzano (proven@mit.edu) - - * func-proto.h (krb5_get_credentials(), krb5_get_cred_from_kdc(), - and krb5_sendauth()) replaced krb5_cred * IN/OUT arg with - a krb5_cred * IN and a krb5_cred ** OUT arg. - * func-proto.h (krb5_mk_req_extended()) Remove kdc_options flag arg - and krb5_ccache arg. They are no longer necessary. - -Wed Feb 22 01:45:17 1995 Keith Vetter (keithv@fusion.com) - - * keytab.h: added windows INTERFACE keyword to prototypes - -Tue Feb 21 17:31:06 1995 Keith Vetter (keithv@fusion.com) - - * config.h: added HAVE_ERRNO for the windows section - changed windows manifest constant from __windows__ - to _MSDOS so that DOS test programs will compile. - -Tue Feb 21 12:00:32 1995 Keith Vetter (keithv@fusion.com) - - * asn1.h: added windows INTERFACE keyword to all functions. - -Tue Feb 21 17:49:41 1995 Mark Eichin (eichin@cygnus.com) - - * config.h: get krb5/autoconf.h. - * Makefile.in (KRB5_HEADERS): add config.h, remove rsa-md4.h and - crc-32.h which aren't here anymore. - -Tue Feb 21 0:0:32 1995 Keith Vetter (keithv@fusion.com) - - * func-proto.h: added windows INTERFACE keyword to all functions. - * krb5.h: moved two typedefs before inclusion of func-proto.h - -Mon Feb 20 16:54:51 1995 Keith Vetter (keithv@fusion.com) - - * encryption.h, los-proto.h, rsa-md5.h: added windows - INTERFACE keyword. - * Makefile.in: removed isode cruft ala Feb 10 changes but for windows - -Mon Feb 20 12:32:34 1995 John Gilmore (gnu at toad.com) - - * configure.in: Flip again. Use AC_CHECK_HEADERS, but default the - symbol-setting. This is Modern Autoconf Style. - - * config.h: Create from stock/config.h and stock/config.win. - * Makefile.in (BUILT_HEADERS): Remove config.h. - (CONF_REPLACE, CONFSRC, config.h rule): Remove. Config.h is - a static header file, ever since imake died. Now it really is. - (clean): Don't remove config.new any more. - -Thu Feb 16 20:12:23 1995 John Gilmore (gnu at toad.com) - - * configure.in: Use AC_HAVE_HEADER rather than AC_HEADER_CHECK. - (Fixes resulting #define names to HAVE_XXX rather than HAS_XXX, - which is not only consistent but also matches what's in sysincl.h.) - -Mon Feb 6 19:42:7 1995 Keith Vetter (keithv@fusion.com) - - * configure.in: added header checks for sys/param.h and sys/file.h. - * encryption.h: added typedef prototype for sum_func function - with the windows api to make microsoft compiler happy. - * sysincl.h: conditionally include sys/file.h and sys/param.h since - windows doesn't have them. - * Makefile.in: - - changed macros with ${...} to $(...) since nmake barfs on {}. - - added windows only make preamble - - split the all target into unix and windows branches - -Fri Feb 10 14:54:26 1995 Theodore Y. Ts'o <tytso@dcl> - - * asn1.h: Removed ISODE cruft -- moved included .h files into - asn1.h, to simplify the krb5 header file structure. - - * Makefile.in (ET_HEADERS): Remove isode cruft. - -Mon Feb 06 17:19:04 1995 Chris Provenzano (proven@mit.edu) - - * func-proto.h (krb5_get_in_tkt()) Changed key_proc args to be the - following (krb5_context, const krb5_keytype, krb5_data *, - krb5_const_pointer, krb5_keyblock **) - - * func-proto.h (krb5_get_in_tkt_*()) Removed krb5_keytype, changed - krb5_enctype to krb5_enctype *, changed krb5_preauthtype to - krb5_preauthtype *. - - * func-proto.h Added new routine krb5_get_in_tkt_with_keytab(). - -Fri Feb 3 07:57:31 1995 Theodore Y. Ts'o (tytso@dcl) - - * configure.in: Use politically correct name of AC_CHECK_SIZEOF - instead of AC_SIZEOF_TYPE. - - * configure.in: - * wordsize.h: Don't use BITS16, BITS32, etc. anymore. Use - autoconf's SIZEOF_INT and SIZEOF_LONG definitions to make - things work. - -Mon Jan 30 15:43:19 1995 Chris Provenzano (proven@mit.edu) - - * func-proto.h Added krb5_keytype arg to rb5_rdreq_key_proc. - - * func-proto.h (krb5_send_tgs()) Changed krb5_enctype arg to - krb5_enctype *, a NULL terminated array of encryption types. - - * func-proto.h Added prototypes for krb5_get_for_creds(), - krb5_set_default_in_tkt_etypes(), and - krb5_get_default_in_tkt_etypes(). - - * krb5.h Added fields to krb5_context to support default etypes. - -Fri Jan 27 00:56:12 1995 Chris Provenzano (proven@mit.edu) - - * func-proto.h (krb5_kt_read_service_key()) Added krb5_keytype arg. - * keytab.h (krb5_kt_get_entry()) Add krb5_keytype arg. - -Fri Jan 27 00:56:12 1995 Chris Provenzano (proven@mit.edu) - - * base-defs.h Typedef krb5_boolean, krb5_msgtype, krb5_kvno, - krb5_addrtype, krb5_keytyp, krb5_enctype, krb5_cksumtype, - and krb5_authdatatype as unsigned int. - * kdb_dbm.h krb5_dbm_db_set_lockmode(), krb5_dbm_db_set_nonblocking() - Fix prototypes to use krb5_boolean and not int. - * kdb.h krb5_db_set_lockmode(), krb5_db_set_nonblocking() - Fix prototypes to use krb5_boolean and not int. - -Wed Jan 25 19:26:57 1995 John Gilmore (gnu at toad.com) - - * crc-32.h: Move to lib/crypto/crc32; only gets local use. - * rsa-md4.h: Move to lib/crypto/md4; only gets local use. - -Wed Jan 25 20:01:36 1995 Mark Eichin (eichin@cygnus.com) - - * configure.in: rewrote remaining tests to use AC_TRY_COMPILE and - caching. Added cross-compile case for ANSI stdio test. - -Wed Jan 25 17:50:35 1995 Chris Provenzano (proven@mit.edu) - - * Removed narrow.h and widen.h - -Wed Jan 25 17:07:17 1995 Chris Provenzano (proven@mit.edu) - - * Removed all narrow types and references to wide.h and narrow.h - * base-defs.h Typedef krb5_boolean, krb5_msgtype, krb5_kvno, - krb5_addrtype, krb5_keytyp, krb5_enctype, krb5_cksumtype, - and krb5_authdatatype as int. - * kdb.h Made keytype in krb5_encrypted_keyblock explicitly short - for backwards compatibility. - -Sun Jan 22 18:17:06 1995 John Gilmore (gnu@cygnus.com) - - * preauth.h, rsa-md5.h: Protect against multiple inclusion. - -Fri Jan 13 15:23:47 1995 Chris Provenzano (proven@mit.edu) - - * Added krb5_context to all krb5_routines - - * Removed DECLARG and OLDDECLARG from base-defs.h (and any file that - was using it.) The next thing to do is make all narrow types - wide types and remove narrow.h and wide.h. - -Thu Jan 12 01:55:54 1995 Mark Eichin <eichin@cygnus.com> - - * Makefile.in (install): constructed headers come from the build - tree, not the source tree. - -Fri Dec 23 22:29:43 1994 Theodore Y. Ts'o (tytso@dcl) - - * krb5.h (krb5_cred): Add enc_part2 member which may point to the - unecrypted version, if it's available. - -Mon Dec 19 21:53:33 1994 Theodore Y. Ts'o (tytso@dcl) - - * krb5.h (krb5_context): Add new typdef for krb5_context. - - * libos.h (krb5_os_context): Add new typedef for krb5_os_context. - - * func-proto.h (krb5_init_context, krb5_free_context): Add new - declarations. - - * los-proto.h (krb5_init_os_context, krb5_free_os_context): Add new - declarations. - -Wed Nov 30 16:16:54 1994 Theodore Y. Ts'o (tytso@dcl) - - * configure.in: Add support for --enable-athena and --with-krb4 - (to set KRB5_KRB4_COMPAT). - - * Makefile.in: Remove remnants of unifdef support for building - osconf.h and config.h, left over from the imake build system. - -Mon Nov 21 14:43:14 1994 Theodore Y. Ts'o (tytso@dcl) - - * func-proto.h (krb5_encode_kdc_rep, krb5_encrypt_tkt_part): - Change to use new function prototypes. - - * encryption.h (krb5_eblock_keytype, krb5_eblock_enctype): Define - new macros for finding the key type and encryption type of - an encrypion block. - -Fri Nov 18 17:53:38 1994 Theodore Y. Ts'o (tytso@dcl) - - * kdb.h (KRB5_KDB_SUPPORT_DESMD5): Add new attribute which defines - whether or not a server supports DES/MD5. - -Fri Nov 18 01:28:47 1994 Mark Eichin <eichin@cygnus.com> - - * Makefile.in (install): elide dependency so $(srcdir) works; use - $(INSTALL_DATA). - (ET_HEADERS): new variable for the names of the headers that - lib/krb5/error_tables builds and installs here (so that they get - pushed out to the installed include directory.) - (BUILT_HEADERS): locally built headers, for all, install, and - clean. - (clean): delete built and et headers. - -Fri Nov 18 01:15:00 1994 Mark Eichin <eichin@cygnus.com> - - * configure.in: use KRB5_POSIX_LOCKS, AC_EGREP_HEADER. (from - epeisach). - -Thu Nov 10 22:04:19 1994 Theodore Y. Ts'o (tytso@dcl) - - * hostaddr.h (krb5_address): Add magic number field. - -Tue Nov 8 17:55:47 1994 Theodore Y. Ts'o (tytso@dcl) - - * encryption.h (krb5_string_to_key, krb5_random_key): Change - internal calling signature to pass in the encryption - block, so that the encryption type in the keyblock - structure can be properly initialized. - -Thu Nov 3 16:38:44 1994 Theodore Y. Ts'o (tytso@dcl) - - * encryption.h (krb5_keyblock): Added a field to hold an - encryption type in the keyblock field --- so routines have - a hint of which encryption type they should use. - - * error_def.h: Add support for the kv5m error table. (For magic - numbers.) - -Mon Oct 31 14:43:07 1994 Theodore Y. Ts'o (tytso@dcl) - - * configure.in: Move WITH_CCOPTS and WITH_KRB5ROOT to the - beginning of the file. Otherwise the other tests won't - get the CCOPTS flags correct while doing the feature - tests. - -Tue Oct 25 23:54:25 1994 Theodore Y. Ts'o (tytso@dcl) - - * ext-proto.h (strdup): If the header files have strdup, don't try - to redefine it. - -Fri Oct 14 00:40:01 1994 Theodore Y. Ts'o (tytso@dcl) - - * mit-des.h: Add declaration for krb5_des_md5_cst_entry. - - * mit-des.h: Change name of the des_crc cryptosystem from - krb5_des_cst_entry to krb5_des_crc_cst_entry. - -Tue Oct 4 14:51:32 1994 Theodore Y. Ts'o (tytso@dcl) - - * encryption.h: Cast various potential shorts to ints. This is - not quite right either, but the whole encryption interface - needs to be fixed. - - * keytab.h (krb5_kt_ops.resolv): Resolve's first argument is a const. - - * encryption.h: Add magic number to encryption structures. - -Mon Oct 3 18:45:55 1994 Theodore Y. Ts'o (tytso@dcl) - - * kdb.h: Add magic number to _krb5_db_entry. (This among other - things will cause a backwards incompatible change to the database - format.) The previous magic number changes also force a database - format change; we will eventually need to completely redo how we - encode the database format, so that it isn't structure layout - dependent! - - * Makefile.in: Fix install to obey ${DESTDIR}, copy conf.h and - osconf.h from build tree. - - * Makefile.in: Fix "make install" to use $(srcdir) for header files. - -Thu Sep 29 15:07:30 1994 Theodore Y. Ts'o (tytso@dcl) - - * func_proto.h (krb5_realm_compare): Added prototype for functin - donated by OpenVision. (Compares two realms). - -Wed Sep 21 18:10:55 1994 Theodore Y. Ts'o (tytso@dcl) - - * func_proto.h (krb5_check_transited_list): Added prototype for - function donated by Cybersafe. - -Wed Aug 17 16:33:22 1994 Theodore Y. Ts'o (tytso at tsx-11) - - * krb5.h (krb5_enc_kdc_rep_part): Added msg_type field. Needed - for the ASN.1 routines. - -Tue Aug 16 22:01:56 1994 Mark Eichin (eichin@cygnus.com) - - * configure.in: change test for USE_SYS_TIME_H to consistent - (autoconf style) check for HAVE_SYS_TIME_H with - TIME_WITH_SYS_TIME, and use them everywhere. - * stock/osauto.h: get rid of USE_TIME_H. - * stock/osconf.h: get rid of USE_TIME_H, rename USE_SYS_TIME_H. - -Tue Aug 9 02:17:40 1994 Tom Yu (tlyu@dragons-lair) - - * preauth.h: fix preauth function names as well (timestamp -> - unixtime) - -Mon Aug 8 22:36:24 1994 Theodore Y. Ts'o (tytso at tsx-11) - - * proto.h: Change preauthentication names to match official names - which bcn and I agreed upon. - -Tue Aug 2 03:39:14 1994 Tom Yu (tlyu@dragons-lair) - - * acconfig.h: add HAVE_SETVBUF - - * configure.in: changes to make things saner when checking for - ANSI_STDIO - -Thu Jul 14 03:31:06 1994 Tom Yu (tlyu at dragons-lair) - - * Makefile.in: some cleanup to not echo cruft - -Tue Jun 28 19:09:21 1994 Tom Yu (tlyu at dragons-lair) - - * error_def.h: folding in Harry's changes - * asn1.h: ditto - * configure.in: adding ISODE_DEFS, fixing ISODE_INCLUDE to dtrt - -Tue Jun 21 23:54:40 1994 Tom Yu (tlyu at dragons-lair) - - * pulling SEEK_SET, etc. out to avoid redef'ing in unistd.h - -Tue Jun 21 00:50:46 1994 Mark W. Eichin (eichin at mit.edu) - - * sysincl.h: SEEK_SET et. al. defined in terms of L_SET et. al. if - they don't already exist. - diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in deleted file mode 100644 index 7ef43d413f..0000000000 --- a/src/include/krb5/Makefile.in +++ /dev/null @@ -1,74 +0,0 @@ -thisconfigdir=./../.. -myfulldir=include/krb5 -mydir=include/krb5 -BUILDTOP=$(REL)..$(S).. -KRB5RCTMPDIR= @KRB5_RCTMPDIR@ - -##DOSBUILDTOP = ..\.. -NO_OUTPRE=1 - -KRB5_HEADERS = adm.h adm_proto.h kdb.h kdb_dbm.h winsock.h - -# these are installed here for the build from lib/krb5/error_tables but -# also need to be in the installed tree -ET_HEADERS = adm_err.h asn1_err.h kdb5_err.h krb5_err.h -BUILT_HEADERS = osconf.h - -all-unix:: autoconf.h $(BUILT_HEADERS) -all-windows:: autoconf.h $(BUILT_HEADERS) - -##DOS##autoconf.h: ..\win-mac.h -##DOS## $(CP) ..\win-mac.h $@ -##DOS##osconf.h: stock\osconf.h -##DOS## $(CP) stock\osconf.h $@ - -# We need to comment out the Unix autoconf.h and osconf.h block below -# if we're building for Windows. Thus, we need to enclose them -# between the lines "##DOS##!if 0" and "##DOS##!endif". We enclosed -# the entire section between the long hashed lines to make the block -# stand out. - -############################################################################### -##DOS##!if 0 -autoconf.h: autoconf.stamp -autoconf.stamp: $(srcdir)/autoconf.h.in $(thisconfigdir)/config.status - (cd $(thisconfigdir) && $(SHELL) config.status $(mydir)/autoconf.h) - touch autoconf.stamp - -SYSCONFDIR = @sysconfdir@ -LOCALSTATEDIR = @localstatedir@ -BINDIR = @bindir@ -SBINDIR = @sbindir@ -LIBDIR = @libdir@ - -PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \ - -e "s+@PREFIX+$(INSTALL_PREFIX)+" \ - -e "s+@EXEC_PREFIX+$(INSTALL_EXEC_PREFIX)+" \ - -e "s+@BINDIR+$(BINDIR)+" \ - -e "s+@LIBDIR+$(LIBDIR)+" \ - -e "s+@SBINDIR+$(SBINDIR)+" \ - -e "s+@MODULEDIR+$(MODULE_DIR)+" \ - -e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \ - -e 's+@SYSCONFDIR+$(SYSCONFDIR)+' - -OSCONFSRC = $(srcdir)/stock/osconf.h - -osconf.h: $(OSCONFSRC) Makefile - cat $(OSCONFSRC) | sed $(PROCESS_REPLACE) > osconf.new - @set -x ; if cmp -s osconf.new osconf.h ; then : osconf.h is current ; \ - else ($(RM) osconf.h ; $(CP) osconf.new osconf.h) fi - $(RM) osconf.new -##DOS##!endif -############################################################################### - -depend:: - -install:: - -clean:: - $(RM) osconf.new $(BUILT_HEADERS) - -clean-unix:: - $(RM) $(ET_HEADERS) autoconf.stamp -clean-windows:: - $(RM) osconf.h autoconf.h autoconf.stamp diff --git a/src/include/port-sockets.h b/src/include/port-sockets.h index d1cf9e6f9e..35ed2b4c42 100644 --- a/src/include/port-sockets.h +++ b/src/include/port-sockets.h @@ -70,13 +70,13 @@ typedef WSABUF sg_buf; /* If this source file requires it, define struct sockaddr_in (and possibly other things related to network I/O). */ -#include "krb5/autoconf.h" +#include "autoconf.h" #include <netdb.h> typedef int socklen_t; #else /* UNIX variants */ -#include "krb5/autoconf.h" +#include "autoconf.h" #include <sys/types.h> #include <netinet/in.h> /* For struct sockaddr_in and in_addr */ diff --git a/src/include/socket-utils.h b/src/include/socket-utils.h index dcd24ebc76..070bb2ff13 100644 --- a/src/include/socket-utils.h +++ b/src/include/socket-utils.h @@ -51,7 +51,7 @@ Do NOT install this file. */ /* for HAVE_SOCKLEN_T, KRB5_USE_INET6, etc */ -#include "krb5/autoconf.h" +#include "autoconf.h" /* for sockaddr_storage */ #include "port-sockets.h" /* for "inline" if needed */ diff --git a/src/include/krb5/stock/.Sanitize b/src/include/stock/.Sanitize index 9a91ab33a8..9a91ab33a8 100644 --- a/src/include/krb5/stock/.Sanitize +++ b/src/include/stock/.Sanitize diff --git a/src/include/krb5/stock/ChangeLog b/src/include/stock/ChangeLog index c341acea63..c341acea63 100644 --- a/src/include/krb5/stock/ChangeLog +++ b/src/include/stock/ChangeLog diff --git a/src/include/krb5/stock/osconf.h b/src/include/stock/osconf.h index 03b2ce651d..03b2ce651d 100644 --- a/src/include/krb5/stock/osconf.h +++ b/src/include/stock/osconf.h diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog index fa76590c56..57ced5fd64 100644 --- a/src/kadmin/cli/ChangeLog +++ b/src/kadmin/cli/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * kadmin.c: Don't look for headers in krb5/. + * memmove.c: Unused file deleted. + 2006-03-10 Ken Raeburn <raeburn@mit.edu> * Makefile.in (generate-files-mac): Depend on kadmin_ct.c and diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c index 7af39a661b..7d950fc267 100644 --- a/src/kadmin/cli/kadmin.c +++ b/src/kadmin/cli/kadmin.c @@ -27,7 +27,7 @@ #include <krb5.h> #include <kadm5/admin.h> -#include <krb5/adm_proto.h> +#include <adm_proto.h> #include <errno.h> #include <stdio.h> #include <string.h> diff --git a/src/kadmin/cli/keytab.c b/src/kadmin/cli/keytab.c index 77034fedd0..f6c167ce80 100644 --- a/src/kadmin/cli/keytab.c +++ b/src/kadmin/cli/keytab.c @@ -42,7 +42,7 @@ static char *rcsid = "$Header$"; #include <krb5.h> #include <kadm5/admin.h> -#include <krb5/adm_proto.h> +#include <adm_proto.h> #include "kadmin.h" static int add_principal(void *lhandle, char *keytab_str, krb5_keytab keytab, diff --git a/src/kadmin/cli/memmove.c b/src/kadmin/cli/memmove.c deleted file mode 100644 index 71f5861556..0000000000 --- a/src/kadmin/cli/memmove.c +++ /dev/null @@ -1,144 +0,0 @@ -/*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Chris Torek. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#define MEMMOVE - -/* based on @(#)bcopy.c 5.11 (Berkeley) 6/21/91 */ - -#include <krb5/osconf.h> -#include <krb5/config.h> -#ifdef HAVE_STRING_H -#include <string.h> -#else -#include <strings.h> -#endif - -/* - * sizeof(word) MUST BE A POWER OF TWO - * SO THAT wmask BELOW IS ALL ONES - */ -typedef int word; /* "word" used for optimal copy speed */ - -#define wsize sizeof(word) -#define wmask (wsize - 1) - -/* - * Copy a block of memory, handling overlap. - * This is the routine that actually implements - * (the portable versions of) bcopy, memcpy, and memmove. - */ -#ifdef MEMCOPY -void * -memcpy(dst0, src0, length) -#else -#ifdef MEMMOVE -void * -memmove(dst0, src0, length) -#else -void -bcopy(src0, dst0, length) -#endif -#endif - void *dst0; - const void *src0; - register size_t length; -{ - register char *dst = dst0; - register const char *src = src0; - register size_t t; - - if (length == 0 || dst == src) /* nothing to do */ - goto done; - - /* - * Macros: loop-t-times; and loop-t-times, t>0 - */ -#define TLOOP(s) if (t) TLOOP1(s) -#define TLOOP1(s) do { s; } while (--t) - - if ((unsigned long)dst < (unsigned long)src) { - /* - * Copy forward. - */ - t = (int)src; /* only need low bits */ - if ((t | (int)dst) & wmask) { - /* - * Try to align operands. This cannot be done - * unless the low bits match. - */ - if ((t ^ (int)dst) & wmask || length < wsize) - t = length; - else - t = wsize - (t & wmask); - length -= t; - TLOOP1(*dst++ = *src++); - } - /* - * Copy whole words, then mop up any trailing bytes. - */ - t = length / wsize; - TLOOP(*(word *)dst = *(word *)src; src += wsize; dst += wsize); - t = length & wmask; - TLOOP(*dst++ = *src++); - } else { - /* - * Copy backwards. Otherwise essentially the same. - * Alignment works as before, except that it takes - * (t&wmask) bytes to align, not wsize-(t&wmask). - */ - src += length; - dst += length; - t = (int)src; - if ((t | (int)dst) & wmask) { - if ((t ^ (int)dst) & wmask || length <= wsize) - t = length; - else - t &= wmask; - length -= t; - TLOOP1(*--dst = *--src); - } - t = length / wsize; - TLOOP(src -= wsize; dst -= wsize; *(word *)dst = *(word *)src); - t = length & wmask; - TLOOP(*--dst = *--src); - } -done: -#if defined(MEMCOPY) || defined(MEMMOVE) - return (dst0); -#else - return; -#endif -} diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog index 7d110fb7db..90fe0f7284 100644 --- a/src/kadmin/dbutil/ChangeLog +++ b/src/kadmin/dbutil/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * dump.c, kdb5_create.c, kdb5_destroy.c, kdb5_util.c, ovload.c, + kadm5_create.c: Don't look for headers in krb5/. + 2005-06-20 Ken Raeburn <raeburn@mit.edu> * Makefile.in (KDB_DEP_LIB): Use DL_LIB and THREAD_LINKOPTS diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c index 74f2cde68b..9e2394a9f8 100644 --- a/src/kadmin/dbutil/dump.c +++ b/src/kadmin/dbutil/dump.c @@ -31,7 +31,7 @@ #include <k5-int.h> #include <kadm5/admin.h> #include <kadm5/server_internal.h> -#include <krb5/kdb.h> +#include <kdb.h> #include <com_err.h> #include "kdb5_util.h" #if defined(HAVE_REGEX_H) && defined(HAVE_REGCOMP) diff --git a/src/kadmin/dbutil/kadm5_create.c b/src/kadmin/dbutil/kadm5_create.c index a9a9df0cdb..fe68a02122 100644 --- a/src/kadmin/dbutil/kadm5_create.c +++ b/src/kadmin/dbutil/kadm5_create.c @@ -36,13 +36,13 @@ #include <stdlib.h> #include <string.h> #include <k5-int.h> -#include <krb5/kdb.h> +#include <kdb.h> #include <kadm5/admin.h> -#include <krb5/adm_proto.h> +#include <adm_proto.h> #include <krb5.h> -#include <krb5/kdb.h> +#include <kdb.h> #include "kdb5_util.h" static int add_admin_princ(void *handle, krb5_context context, diff --git a/src/kadmin/dbutil/kdb5_create.c b/src/kadmin/dbutil/kdb5_create.c index 5bd337e47e..b04595d65c 100644 --- a/src/kadmin/dbutil/kdb5_create.c +++ b/src/kadmin/dbutil/kdb5_create.c @@ -55,10 +55,10 @@ #include <stdio.h> #include <k5-int.h> -#include <krb5/kdb.h> +#include <kdb.h> #include <kadm5/server_internal.h> #include <kadm5/admin.h> -#include <krb5/adm_proto.h> +#include <adm_proto.h> #include "kdb5_util.h" enum ap_op { diff --git a/src/kadmin/dbutil/kdb5_destroy.c b/src/kadmin/dbutil/kdb5_destroy.c index ea1011b407..2f5f376cd7 100644 --- a/src/kadmin/dbutil/kdb5_destroy.c +++ b/src/kadmin/dbutil/kdb5_destroy.c @@ -33,7 +33,7 @@ #include <stdio.h> #include "com_err.h" #include <kadm5/admin.h> -#include <krb5/kdb.h> +#include <kdb.h> #include "kdb5_util.h" extern int exit_status; diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c index a95dff702d..42201a9134 100644 --- a/src/kadmin/dbutil/kdb5_util.c +++ b/src/kadmin/dbutil/kdb5_util.c @@ -56,7 +56,7 @@ #include <stdio.h> #include <k5-int.h> #include <kadm5/admin.h> -#include <krb5/adm_proto.h> +#include <adm_proto.h> #include <time.h> #include "kdb5_util.h" diff --git a/src/kadmin/dbutil/ovload.c b/src/kadmin/dbutil/ovload.c index f4338bc906..8813f6662a 100644 --- a/src/kadmin/dbutil/ovload.c +++ b/src/kadmin/dbutil/ovload.c @@ -8,7 +8,7 @@ #include <k5-int.h> #include <kadm5/admin.h> #include <kadm5/server_internal.h> -#include <krb5/kdb.h> +#include <kdb.h> #include "import_err.h" #include "kdb5_util.h" #include "nstrtok.h" diff --git a/src/kadmin/ktutil/Makefile.in b/src/kadmin/ktutil/Makefile.in index 6917735df5..71c002a107 100644 --- a/src/kadmin/ktutil/Makefile.in +++ b/src/kadmin/ktutil/Makefile.in @@ -43,20 +43,20 @@ clean:: # the Makefile.in file # $(OUTPRE)ktutil.$(OBJEXT): ktutil.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ - $(SRCTOP)/include/k5-plugin.h ktutil.h $(SRCTOP)/include/krb5/adm_proto.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ + $(SRCTOP)/include/k5-plugin.h ktutil.h $(SRCTOP)/include/adm_proto.h \ $(SS_DEPS) $(OUTPRE)ktutil_ct.$(OBJEXT): ktutil_ct.c $(SS_DEPS) \ $(COM_ERR_DEPS) $(OUTPRE)ktutil_funcs.$(OBJEXT): ktutil_funcs.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h ktutil.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog index a84ddc8f03..bbfb357601 100644 --- a/src/kadmin/server/ChangeLog +++ b/src/kadmin/server/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * ovsec_kadmd.c, schpw.c, server_stubs.c, misc.c: Don't look for + headers in krb5/. + 2005-10-12 Tom Yu <tlyu@mit.edu> * misc.h, misc.c (schpw_util_wrapper): Rename from diff --git a/src/kadmin/server/misc.c b/src/kadmin/server/misc.c index c623e55bd9..fa4ca914c0 100644 --- a/src/kadmin/server/misc.c +++ b/src/kadmin/server/misc.c @@ -4,7 +4,7 @@ */ #include <k5-int.h> -#include <krb5/kdb.h> +#include <kdb.h> #include <kadm5/server_internal.h> #include "misc.h" diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c index 31cc252231..9acb95d1b3 100644 --- a/src/kadmin/server/ovsec_kadmd.c +++ b/src/kadmin/server/ovsec_kadmd.c @@ -49,8 +49,8 @@ #include <kadm5/admin.h> #include <kadm5/kadm_rpc.h> #include <kadm5/server_acl.h> -#include <krb5/adm_proto.h> -#include "krb5/kdb_kt.h" /* for krb5_ktkdb_set_context */ +#include <adm_proto.h> +#include "kdb_kt.h" /* for krb5_ktkdb_set_context */ #include <string.h> #include "kadm5/server_internal.h" /* XXX for kadm5_server_handle_t */ diff --git a/src/kadmin/server/schpw.c b/src/kadmin/server/schpw.c index 8c676c08ca..28cf75c2f8 100644 --- a/src/kadmin/server/schpw.c +++ b/src/kadmin/server/schpw.c @@ -1,7 +1,7 @@ #include "k5-int.h" #include <kadm5/admin.h> #include <syslog.h> -#include <krb5/adm_proto.h> /* krb5_klog_syslog */ +#include <adm_proto.h> /* krb5_klog_syslog */ #include <stdio.h> #include <errno.h> diff --git a/src/kadmin/server/server_stubs.c b/src/kadmin/server/server_stubs.c index e3d6709cf5..c26ed697be 100644 --- a/src/kadmin/server/server_stubs.c +++ b/src/kadmin/server/server_stubs.c @@ -12,7 +12,7 @@ #include <kadm5/server_acl.h> #include <syslog.h> #include <arpa/inet.h> /* inet_ntoa */ -#include <krb5/adm_proto.h> /* krb5_klog_syslog */ +#include <adm_proto.h> /* krb5_klog_syslog */ #include "misc.h" #define LOG_UNAUTH "Unauthorized request: %s, %s, client=%s, service=%s, addr=%s" diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in index 2251b46c95..6f4e2ba5df 100644 --- a/src/kadmin/testing/util/Makefile.in +++ b/src/kadmin/testing/util/Makefile.in @@ -54,8 +54,8 @@ $(OUTPRE)tcl_ovsec_kadm.$(OBJEXT): tcl_ovsec_kadm.c \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ tcl_kadm5.h $(BUILDTOP)/lib/kdb/adb_err.h $(OUTPRE)tcl_kadm5.$(OBJEXT): tcl_kadm5.c $(BUILDTOP)/include/kadm5/admin.h \ @@ -65,8 +65,8 @@ $(OUTPRE)tcl_kadm5.$(OBJEXT): tcl_kadm5.c $(BUILDTOP)/include/kadm5/admin.h \ $(BUILDTOP)/include/gssrpc/rpc_msg.h $(BUILDTOP)/include/gssrpc/auth_unix.h \ $(BUILDTOP)/include/gssrpc/auth_gss.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/svc_auth.h $(BUILDTOP)/include/gssrpc/svc.h \ - $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h \ - $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h \ + $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/kadm5/kadm_err.h \ $(BUILDTOP)/include/kadm5/chpass_util_strings.h $(BUILDTOP)/lib/kdb/adb_err.h \ tcl_kadm5.h diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index d0b588580b..8f0c3d9558 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * kerberos_v4.c: Don't get autoconf.h from krb5/. + 2005-11-28 Ken Raeburn <raeburn@mit.edu> * network.c (listen_and_process): Make local variable 'sout' diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in index bfa6de4087..e4b085eacb 100644 --- a/src/kdc/Makefile.in +++ b/src/kdc/Makefile.in @@ -101,102 +101,102 @@ clean:: # $(OUTPRE)kdc5_err.$(OBJEXT): kdc5_err.c $(COM_ERR_DEPS) $(OUTPRE)dispatch.$(OBJEXT): dispatch.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/syslog.h \ - kdc_util.h extern.h $(SRCTOP)/include/krb5/adm_proto.h + kdc_util.h extern.h $(SRCTOP)/include/adm_proto.h $(OUTPRE)do_as_req.$(OBJEXT): do_as_req.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/syslog.h \ - kdc_util.h policy.h $(SRCTOP)/include/krb5/adm.h $(SRCTOP)/include/krb5/adm_proto.h \ + kdc_util.h policy.h $(SRCTOP)/include/adm.h $(SRCTOP)/include/adm_proto.h \ extern.h $(OUTPRE)do_tgs_req.$(OBJEXT): do_tgs_req.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/syslog.h \ - kdc_util.h policy.h extern.h $(SRCTOP)/include/krb5/adm_proto.h + kdc_util.h policy.h extern.h $(SRCTOP)/include/adm_proto.h $(OUTPRE)kdc_util.$(OBJEXT): kdc_util.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h kdc_util.h extern.h $(SRCTOP)/include/syslog.h \ - $(SRCTOP)/include/krb5/adm.h $(SRCTOP)/include/krb5/adm_proto.h + $(SRCTOP)/include/adm.h $(SRCTOP)/include/adm_proto.h $(OUTPRE)kdc_preauth.$(OBJEXT): kdc_preauth.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ - $(SRCTOP)/include/k5-plugin.h kdc_util.h extern.h $(SRCTOP)/include/krb5/adm_proto.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ + $(SRCTOP)/include/k5-plugin.h kdc_util.h extern.h $(SRCTOP)/include/adm_proto.h \ $(SRCTOP)/include/syslog.h $(OUTPRE)logger.$(OBJEXT): $(SRCTOP)/lib/kadm5/logger.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/krb5/adm_proto.h $(SRCTOP)/include/syslog.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/adm_proto.h $(SRCTOP)/include/syslog.h $(OUTPRE)main.$(OBJEXT): main.c $(SRCTOP)/include/syslog.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/krb5/adm.h $(SRCTOP)/include/krb5/adm_proto.h \ - kdc_util.h extern.h kdc5_err.h $(SRCTOP)/include/krb5/kdb_kt.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/adm.h $(SRCTOP)/include/adm_proto.h \ + kdc_util.h extern.h kdc5_err.h $(SRCTOP)/include/kdb_kt.h \ $(SRCTOP)/include/kerberosIV/des.h $(OUTPRE)network.$(OBJEXT): network.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h kdc_util.h extern.h kdc5_err.h \ - $(SRCTOP)/include/krb5/adm_proto.h $(SRCTOP)/include/syslog.h \ + $(SRCTOP)/include/adm_proto.h $(SRCTOP)/include/syslog.h \ $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/cm.h \ $(SRCTOP)/include/foreachaddr.h $(OUTPRE)policy.$(OBJEXT): policy.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h kdc_util.h $(OUTPRE)extern.$(OBJEXT): extern.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h extern.h $(OUTPRE)replay.$(OBJEXT): replay.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h kdc_util.h extern.h -$(OUTPRE)kerberos_v4.$(OBJEXT): kerberos_v4.c $(BUILDTOP)/include/krb5/autoconf.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ +$(OUTPRE)kerberos_v4.$(OBJEXT): kerberos_v4.c $(BUILDTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ - $(SRCTOP)/include/k5-plugin.h kdc_util.h $(SRCTOP)/include/krb5/adm_proto.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ + $(SRCTOP)/include/k5-plugin.h kdc_util.h $(SRCTOP)/include/adm_proto.h \ $(SRCTOP)/include/syslog.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(SRCTOP)/include/kerberosIV/klog.h $(SRCTOP)/include/kerberosIV/prot.h \ diff --git a/src/kdc/kerberos_v4.c b/src/kdc/kerberos_v4.c index 72db8a5d75..7bb6dfde16 100644 --- a/src/kdc/kerberos_v4.c +++ b/src/kdc/kerberos_v4.c @@ -26,7 +26,7 @@ * */ -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef KRB5_KRB4_COMPAT #define BACKWARD_COMPAT diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog index 58534ccec3..1790495dea 100644 --- a/src/krb524/ChangeLog +++ b/src/krb524/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * krb524d.c: Don't look for adm_proto.h in krb5/. + 2006-02-24 Jeffrey Altman <jaltman@mit.edu> * Makefile.in: support for 64-bit Windows builds diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in index b33ceac2d9..6be1109cb9 100644 --- a/src/krb524/Makefile.in +++ b/src/krb524/Makefile.in @@ -111,22 +111,22 @@ $(OUTPRE)conv_princ.$(OBJEXT): conv_princ.c $(BUILDTOP)/include/krb5.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(BUILDTOP)/include/profile.h $(OUTPRE)cnv_tkt_skey.$(OBJEXT): cnv_tkt_skey.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ krb524d.h $(OUTPRE)libinit.$(OBJEXT): libinit.c $(OUTPRE)krb524.$(OBJEXT): krb524.c $(OUTPRE)test.$(OBJEXT): test.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h \ $(SRCTOP)/include/kerberosIV/krb.h $(KRB_ERR_H_DEP) $(OUTPRE)k524init.$(OBJEXT): k524init.c $(BUILDTOP)/include/krb5.h \ @@ -134,11 +134,11 @@ $(OUTPRE)k524init.$(OBJEXT): k524init.c $(BUILDTOP)/include/krb5.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(BUILDTOP)/include/profile.h $(OUTPRE)krb524d.$(OBJEXT): krb524d.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(BUILDTOP)/include/kadm5/admin.h \ $(BUILDTOP)/include/gssrpc/rpc.h $(BUILDTOP)/include/gssrpc/types.h \ $(BUILDTOP)/include/gssrpc/rename.h $(BUILDTOP)/include/gssrpc/xdr.h \ @@ -147,6 +147,6 @@ $(OUTPRE)krb524d.$(OBJEXT): krb524d.c $(SRCTOP)/include/k5-int.h \ $(BUILDTOP)/include/gssrpc/auth_gss.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/svc_auth.h $(BUILDTOP)/include/gssrpc/svc.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ - $(SRCTOP)/include/krb5/adm_proto.h $(SRCTOP)/include/kerberosIV/krb.h \ + $(SRCTOP)/include/adm_proto.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ krb524d.h diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c index 7572af4190..df50b4ad5e 100644 --- a/src/krb524/krb524d.c +++ b/src/krb524/krb524d.c @@ -43,7 +43,7 @@ #include <k5-int.h> #include <kadm5/admin.h> -#include <krb5/adm_proto.h> +#include <adm_proto.h> #include <com_err.h> #include <stdarg.h> diff --git a/src/lib/apputils/Makefile.in b/src/lib/apputils/Makefile.in index 97c845f2b1..9421d49c98 100644 --- a/src/lib/apputils/Makefile.in +++ b/src/lib/apputils/Makefile.in @@ -40,10 +40,10 @@ SRCS= $(srcdir)/daemon.c \ # the Makefile.in file # daemon.so daemon.po $(OUTPRE)daemon.$(OBJEXT): daemon.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h dummy.so dummy.po $(OUTPRE)dummy.$(OBJEXT): dummy.c diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index 7080d06657..b24a67ddbc 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -362,323 +362,323 @@ check-windows:: # the Makefile.in file # block_size.so block_size.po $(OUTPRE)block_size.$(OBJEXT): \ - block_size.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + block_size.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h checksum_length.so checksum_length.po $(OUTPRE)checksum_length.$(OBJEXT): \ - checksum_length.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + checksum_length.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cksumtypes.h cksumtype_to_string.so cksumtype_to_string.po $(OUTPRE)cksumtype_to_string.$(OBJEXT): \ - cksumtype_to_string.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + cksumtype_to_string.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cksumtypes.h cksumtypes.so cksumtypes.po $(OUTPRE)cksumtypes.$(OBJEXT): \ - cksumtypes.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + cksumtypes.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/hash_provider/hash_provider.h $(srcdir)/keyhash_provider/keyhash_provider.h \ cksumtypes.h coll_proof_cksum.so coll_proof_cksum.po $(OUTPRE)coll_proof_cksum.$(OBJEXT): \ - coll_proof_cksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + coll_proof_cksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cksumtypes.h combine_keys.so combine_keys.po $(OUTPRE)combine_keys.$(OBJEXT): \ - combine_keys.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + combine_keys.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h $(srcdir)/dk/dk.h crypto_libinit.so crypto_libinit.po $(OUTPRE)crypto_libinit.$(OBJEXT): \ - crypto_libinit.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + crypto_libinit.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h default_state.so default_state.po $(OUTPRE)default_state.$(OBJEXT): \ - default_state.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + default_state.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h decrypt.so decrypt.po $(OUTPRE)decrypt.$(OBJEXT): decrypt.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h encrypt.so encrypt.po $(OUTPRE)encrypt.$(OBJEXT): encrypt.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h encrypt_length.so encrypt_length.po $(OUTPRE)encrypt_length.$(OBJEXT): \ - encrypt_length.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + encrypt_length.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h enctype_compare.so enctype_compare.po $(OUTPRE)enctype_compare.$(OBJEXT): \ - enctype_compare.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + enctype_compare.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h enctype_to_string.so enctype_to_string.po $(OUTPRE)enctype_to_string.$(OBJEXT): \ - enctype_to_string.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + enctype_to_string.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h etypes.so etypes.po $(OUTPRE)etypes.$(OBJEXT): etypes.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/enc_provider/enc_provider.h $(srcdir)/hash_provider/hash_provider.h \ etypes.h $(srcdir)/old/old.h $(srcdir)/raw/raw.h $(srcdir)/dk/dk.h \ $(srcdir)/arcfour/arcfour.h $(srcdir)/aes/aes_s2k.h hmac.so hmac.po $(OUTPRE)hmac.$(OBJEXT): hmac.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h keyblocks.so keyblocks.po $(OUTPRE)keyblocks.$(OBJEXT): \ - keyblocks.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + keyblocks.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h keyed_cksum.so keyed_cksum.po $(OUTPRE)keyed_cksum.$(OBJEXT): \ - keyed_cksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + keyed_cksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cksumtypes.h keyed_checksum_types.so keyed_checksum_types.po $(OUTPRE)keyed_checksum_types.$(OBJEXT): \ - keyed_checksum_types.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + keyed_checksum_types.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h cksumtypes.h make_checksum.so make_checksum.po $(OUTPRE)make_checksum.$(OBJEXT): \ - make_checksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + make_checksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cksumtypes.h etypes.h $(srcdir)/dk/dk.h make_random_key.so make_random_key.po $(OUTPRE)make_random_key.$(OBJEXT): \ - make_random_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + make_random_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h mandatory_sumtype.so mandatory_sumtype.po $(OUTPRE)mandatory_sumtype.$(OBJEXT): \ - mandatory_sumtype.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + mandatory_sumtype.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h nfold.so nfold.po $(OUTPRE)nfold.$(OBJEXT): nfold.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h old_api_glue.so old_api_glue.po $(OUTPRE)old_api_glue.$(OBJEXT): \ - old_api_glue.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + old_api_glue.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h pbkdf2.so pbkdf2.po $(OUTPRE)pbkdf2.$(OBJEXT): pbkdf2.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/hash_provider/hash_provider.h prf.so prf.po $(OUTPRE)prf.$(OBJEXT): prf.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h etypes.h prng.so prng.po $(OUTPRE)prng.$(OBJEXT): prng.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/enc_provider/enc_provider.h \ $(srcdir)/yarrow/yarrow.h $(srcdir)/yarrow/ytypes.h \ $(srcdir)/yarrow/yhash.h $(srcdir)/sha1/shs.h $(srcdir)/yarrow/ycipher.h state.so state.po $(OUTPRE)state.$(OBJEXT): state.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h string_to_cksumtype.so string_to_cksumtype.po $(OUTPRE)string_to_cksumtype.$(OBJEXT): \ - string_to_cksumtype.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + string_to_cksumtype.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cksumtypes.h string_to_enctype.so string_to_enctype.po $(OUTPRE)string_to_enctype.$(OBJEXT): \ - string_to_enctype.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + string_to_enctype.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h string_to_key.so string_to_key.po $(OUTPRE)string_to_key.$(OBJEXT): \ - string_to_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + string_to_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h valid_cksumtype.so valid_cksumtype.po $(OUTPRE)valid_cksumtype.$(OBJEXT): \ - valid_cksumtype.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + valid_cksumtype.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cksumtypes.h valid_enctype.so valid_enctype.po $(OUTPRE)valid_enctype.$(OBJEXT): \ - valid_enctype.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + valid_enctype.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h verify_checksum.so verify_checksum.po $(OUTPRE)verify_checksum.$(OBJEXT): \ - verify_checksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + verify_checksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cksumtypes.h t_nfold.so t_nfold.po $(OUTPRE)t_nfold.$(OBJEXT): t_nfold.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h t_encrypt.so t_encrypt.po $(OUTPRE)t_encrypt.$(OBJEXT): \ - t_encrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + t_encrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ etypes.h t_prf.so t_prf.po $(OUTPRE)t_prf.$(OBJEXT): t_prf.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h t_prng.so t_prng.po $(OUTPRE)t_prng.$(OBJEXT): t_prng.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h t_hmac.so t_hmac.po $(OUTPRE)t_hmac.$(OBJEXT): t_hmac.c \ $(srcdir)/hash_provider/hash_provider.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h t_pkcs5.so t_pkcs5.po $(OUTPRE)t_pkcs5.$(OBJEXT): t_pkcs5.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h t_cts.so t_cts.po $(OUTPRE)t_cts.$(OBJEXT): t_cts.c \ $(srcdir)/hash_provider/hash_provider.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h vectors.so vectors.po $(OUTPRE)vectors.$(OBJEXT): vectors.c \ $(srcdir)/hash_provider/hash_provider.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h diff --git a/src/lib/crypto/aes/Makefile.in b/src/lib/crypto/aes/Makefile.in index 8ba5534a23..3fe224a1da 100644 --- a/src/lib/crypto/aes/Makefile.in +++ b/src/lib/crypto/aes/Makefile.in @@ -81,10 +81,10 @@ aestab.so aestab.po $(OUTPRE)aestab.$(OBJEXT): aestab.c \ aeskey.so aeskey.po $(OUTPRE)aeskey.$(OBJEXT): aeskey.c \ aesopt.h aes.h uitypes.h aes_s2k.so aes_s2k.po $(OUTPRE)aes_s2k.$(OBJEXT): aes_s2k.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../dk/dk.h aes_s2k.h diff --git a/src/lib/crypto/arcfour/Makefile.in b/src/lib/crypto/arcfour/Makefile.in index 11be8e9408..f7e1fc7d78 100644 --- a/src/lib/crypto/arcfour/Makefile.in +++ b/src/lib/crypto/arcfour/Makefile.in @@ -43,18 +43,18 @@ clean-unix:: clean-libobjs # the Makefile.in file # arcfour.so arcfour.po $(OUTPRE)arcfour.$(OBJEXT): arcfour.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ arcfour-int.h arcfour.h arcfour_s2k.so arcfour_s2k.po $(OUTPRE)arcfour_s2k.$(OBJEXT): \ - arcfour_s2k.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + arcfour_s2k.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../md4/rsa-md4.h arcfour-int.h arcfour.h diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in index 1dc58fde1d..25ee158ad6 100644 --- a/src/lib/crypto/crc32/Makefile.in +++ b/src/lib/crypto/crc32/Makefile.in @@ -44,10 +44,10 @@ t_crc: t_crc.o crc32.o $(SUPPORT_DEPLIB) # the Makefile.in file # crc32.so crc32.po $(OUTPRE)crc32.$(OBJEXT): crc32.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ crc-32.h diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in index 1ee3f5f476..325dd7d234 100644 --- a/src/lib/crypto/des/Makefile.in +++ b/src/lib/crypto/des/Makefile.in @@ -98,90 +98,90 @@ clean-unix:: clean-libobjs # the Makefile.in file # afsstring2key.so afsstring2key.po $(OUTPRE)afsstring2key.$(OBJEXT): \ - afsstring2key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + afsstring2key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ des_int.h $(SRCTOP)/include/kerberosIV/des.h d3_cbc.so d3_cbc.po $(OUTPRE)d3_cbc.$(OBJEXT): d3_cbc.c \ - des_int.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + des_int.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/kerberosIV/des.h f_tables.h d3_kysched.so d3_kysched.po $(OUTPRE)d3_kysched.$(OBJEXT): \ - d3_kysched.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + d3_kysched.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ des_int.h $(SRCTOP)/include/kerberosIV/des.h f_cbc.so f_cbc.po $(OUTPRE)f_cbc.$(OBJEXT): f_cbc.c \ - des_int.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + des_int.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/kerberosIV/des.h f_tables.h f_cksum.so f_cksum.po $(OUTPRE)f_cksum.$(OBJEXT): f_cksum.c \ - des_int.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + des_int.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/kerberosIV/des.h f_tables.h f_parity.so f_parity.po $(OUTPRE)f_parity.$(OBJEXT): \ - f_parity.c des_int.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + f_parity.c des_int.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/kerberosIV/des.h f_sched.so f_sched.po $(OUTPRE)f_sched.$(OBJEXT): f_sched.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ des_int.h $(SRCTOP)/include/kerberosIV/des.h f_tables.so f_tables.po $(OUTPRE)f_tables.$(OBJEXT): \ - f_tables.c des_int.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + f_tables.c des_int.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/kerberosIV/des.h f_tables.h key_sched.so key_sched.po $(OUTPRE)key_sched.$(OBJEXT): \ - key_sched.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + key_sched.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ des_int.h $(SRCTOP)/include/kerberosIV/des.h weak_key.so weak_key.po $(OUTPRE)weak_key.$(OBJEXT): \ - weak_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + weak_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ des_int.h $(SRCTOP)/include/kerberosIV/des.h string2key.so string2key.po $(OUTPRE)string2key.$(OBJEXT): \ - string2key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + string2key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ des_int.h $(SRCTOP)/include/kerberosIV/des.h diff --git a/src/lib/crypto/dk/Makefile.in b/src/lib/crypto/dk/Makefile.in index 30880697ee..7e8cff6b28 100644 --- a/src/lib/crypto/dk/Makefile.in +++ b/src/lib/crypto/dk/Makefile.in @@ -55,49 +55,49 @@ clean-unix:: clean-libobjs # the Makefile.in file # checksum.so checksum.po $(OUTPRE)checksum.$(OBJEXT): \ - checksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + checksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../etypes.h dk.h dk_decrypt.so dk_decrypt.po $(OUTPRE)dk_decrypt.$(OBJEXT): \ - dk_decrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + dk_decrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ dk.h dk_encrypt.so dk_encrypt.po $(OUTPRE)dk_encrypt.$(OBJEXT): \ - dk_encrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + dk_encrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ dk.h dk_prf.so dk_prf.po $(OUTPRE)dk_prf.$(OBJEXT): dk_prf.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ dk.h derive.so derive.po $(OUTPRE)derive.$(OBJEXT): derive.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ dk.h stringtokey.so stringtokey.po $(OUTPRE)stringtokey.$(OBJEXT): \ - stringtokey.c dk.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + stringtokey.c dk.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h diff --git a/src/lib/crypto/enc_provider/Makefile.in b/src/lib/crypto/enc_provider/Makefile.in index 87c8cb234e..425aaee735 100644 --- a/src/lib/crypto/enc_provider/Makefile.in +++ b/src/lib/crypto/enc_provider/Makefile.in @@ -45,34 +45,34 @@ clean-unix:: clean-libobjs # the Makefile.in file # des.so des.po $(OUTPRE)des.$(OBJEXT): des.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../des/des_int.h \ $(SRCTOP)/include/kerberosIV/des.h enc_provider.h des3.so des3.po $(OUTPRE)des3.$(OBJEXT): des3.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../des/des_int.h \ $(SRCTOP)/include/kerberosIV/des.h aes.so aes.po $(OUTPRE)aes.$(OBJEXT): aes.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h enc_provider.h $(srcdir)/../aes/aes.h \ $(srcdir)/../aes/uitypes.h rc4.so rc4.po $(OUTPRE)rc4.$(OBJEXT): rc4.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../arcfour/arcfour-int.h \ $(srcdir)/../arcfour/arcfour.h enc_provider.h diff --git a/src/lib/crypto/hash_provider/Makefile.in b/src/lib/crypto/hash_provider/Makefile.in index b651fedc0d..d9e3880b25 100644 --- a/src/lib/crypto/hash_provider/Makefile.in +++ b/src/lib/crypto/hash_provider/Makefile.in @@ -40,34 +40,34 @@ clean-unix:: clean-libobjs # the Makefile.in file # hash_crc32.so hash_crc32.po $(OUTPRE)hash_crc32.$(OBJEXT): \ - hash_crc32.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + hash_crc32.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../crc32/crc-32.h hash_provider.h hash_md4.so hash_md4.po $(OUTPRE)hash_md4.$(OBJEXT): \ - hash_md4.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + hash_md4.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../md4/rsa-md4.h hash_provider.h hash_md5.so hash_md5.po $(OUTPRE)hash_md5.$(OBJEXT): \ - hash_md5.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + hash_md5.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../md5/rsa-md5.h hash_provider.h hash_sha1.so hash_sha1.po $(OUTPRE)hash_sha1.$(OBJEXT): \ - hash_sha1.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + hash_sha1.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../sha1/shs.h hash_provider.h diff --git a/src/lib/crypto/keyhash_provider/Makefile.in b/src/lib/crypto/keyhash_provider/Makefile.in index c323a69e1a..4c4eb51b80 100644 --- a/src/lib/crypto/keyhash_provider/Makefile.in +++ b/src/lib/crypto/keyhash_provider/Makefile.in @@ -59,39 +59,39 @@ clean-unix:: clean-libobjs # the Makefile.in file # descbc.so descbc.po $(OUTPRE)descbc.$(OBJEXT): descbc.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../des/des_int.h $(SRCTOP)/include/kerberosIV/des.h \ keyhash_provider.h k5_md4des.so k5_md4des.po $(OUTPRE)k5_md4des.$(OBJEXT): \ - k5_md4des.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + k5_md4des.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../des/des_int.h $(SRCTOP)/include/kerberosIV/des.h \ $(srcdir)/../md4/rsa-md4.h keyhash_provider.h k5_md5des.so k5_md5des.po $(OUTPRE)k5_md5des.$(OBJEXT): \ - k5_md5des.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + k5_md5des.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../des/des_int.h $(SRCTOP)/include/kerberosIV/des.h \ $(srcdir)/../md5/rsa-md5.h keyhash_provider.h hmac_md5.so hmac_md5.po $(OUTPRE)hmac_md5.$(OBJEXT): \ - hmac_md5.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + hmac_md5.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ keyhash_provider.h $(srcdir)/../arcfour/arcfour-int.h \ $(srcdir)/../arcfour/arcfour.h $(srcdir)/../md5/rsa-md5.h \ $(srcdir)/../hash_provider/hash_provider.h diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in index a8c1110fa1..c87ee787b9 100644 --- a/src/lib/crypto/md4/Makefile.in +++ b/src/lib/crypto/md4/Makefile.in @@ -61,9 +61,9 @@ clean-unix:: clean-libobjs # the Makefile.in file # md4.so md4.po $(OUTPRE)md4.$(OBJEXT): md4.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h rsa-md4.h diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in index 2b894ed63f..ac72ac93be 100644 --- a/src/lib/crypto/md5/Makefile.in +++ b/src/lib/crypto/md5/Makefile.in @@ -51,9 +51,9 @@ clean-unix:: clean-libobjs # the Makefile.in file # md5.so md5.po $(OUTPRE)md5.$(OBJEXT): md5.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h rsa-md5.h diff --git a/src/lib/crypto/old/Makefile.in b/src/lib/crypto/old/Makefile.in index 5a21d81ed0..e263a0263d 100644 --- a/src/lib/crypto/old/Makefile.in +++ b/src/lib/crypto/old/Makefile.in @@ -38,26 +38,26 @@ clean-unix:: clean-libobjs # the Makefile.in file # des_stringtokey.so des_stringtokey.po $(OUTPRE)des_stringtokey.$(OBJEXT): \ - des_stringtokey.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + des_stringtokey.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ old.h $(srcdir)/../des/des_int.h $(SRCTOP)/include/kerberosIV/des.h old_decrypt.so old_decrypt.po $(OUTPRE)old_decrypt.$(OBJEXT): \ - old_decrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + old_decrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ old.h old_encrypt.so old_encrypt.po $(OUTPRE)old_encrypt.$(OBJEXT): \ - old_encrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + old_encrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ old.h diff --git a/src/lib/crypto/raw/Makefile.in b/src/lib/crypto/raw/Makefile.in index fcf53e413a..88ebda1b9c 100644 --- a/src/lib/crypto/raw/Makefile.in +++ b/src/lib/crypto/raw/Makefile.in @@ -36,18 +36,18 @@ clean-unix:: clean-libobjs # the Makefile.in file # raw_decrypt.so raw_decrypt.po $(OUTPRE)raw_decrypt.$(OBJEXT): \ - raw_decrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + raw_decrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ raw.h raw_encrypt.so raw_encrypt.po $(OUTPRE)raw_encrypt.$(OBJEXT): \ - raw_encrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + raw_encrypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ raw.h diff --git a/src/lib/crypto/sha1/Makefile.in b/src/lib/crypto/sha1/Makefile.in index f005fd35c9..bacd69aa95 100644 --- a/src/lib/crypto/sha1/Makefile.in +++ b/src/lib/crypto/sha1/Makefile.in @@ -56,9 +56,9 @@ t_shs3: t_shs3.o shs.o $(SUPPORT_DEPLIB) # the Makefile.in file # shs.so shs.po $(OUTPRE)shs.$(OBJEXT): shs.c shs.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h diff --git a/src/lib/crypto/yarrow/ChangeLog b/src/lib/crypto/yarrow/ChangeLog index 30eae99edb..1f9f68ae05 100644 --- a/src/lib/crypto/yarrow/ChangeLog +++ b/src/lib/crypto/yarrow/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * ytypes.h: Don't look for autoconf.h in krb5/. + 2005-05-01 Ken Raeburn <raeburn@mit.edu> * ytypes.h: Include autoconf.h. Include sys/types.h only if it diff --git a/src/lib/crypto/yarrow/Makefile.in b/src/lib/crypto/yarrow/Makefile.in index 06dc95cc65..ec2f4df629 100644 --- a/src/lib/crypto/yarrow/Makefile.in +++ b/src/lib/crypto/yarrow/Makefile.in @@ -42,20 +42,20 @@ clean-unix:: clean-libobjs # the Makefile.in file # yarrow.so yarrow.po $(OUTPRE)yarrow.$(OBJEXT): yarrow.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ yarrow.h ytypes.h yhash.h $(srcdir)/../sha1/shs.h ycipher.h \ ylock.h ystate.h yexcep.h ycipher.so ycipher.po $(OUTPRE)ycipher.$(OBJEXT): ycipher.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ yarrow.h ytypes.h yhash.h $(srcdir)/../sha1/shs.h ycipher.h \ $(srcdir)/../enc_provider/enc_provider.h diff --git a/src/lib/crypto/yarrow/ytypes.h b/src/lib/crypto/yarrow/ytypes.h index b7a30c76d0..9265e5a849 100644 --- a/src/lib/crypto/yarrow/ytypes.h +++ b/src/lib/crypto/yarrow/ytypes.h @@ -5,7 +5,7 @@ #include <limits.h> #include <stddef.h> -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in index 33e3ab2e73..ce841a2d59 100644 --- a/src/lib/des425/Makefile.in +++ b/src/lib/des425/Makefile.in @@ -118,113 +118,113 @@ install-unix:: install-libs # cksum.so cksum.po $(OUTPRE)cksum.$(OBJEXT): cksum.c \ $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h des.so des.po $(OUTPRE)des.$(OBJEXT): des.c $(srcdir)/../crypto/des/des_int.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/kerberosIV/des.h enc_dec.so enc_dec.po $(OUTPRE)enc_dec.$(OBJEXT): enc_dec.c \ $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h key_parity.so key_parity.po $(OUTPRE)key_parity.$(OBJEXT): \ key_parity.c $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h key_sched.so key_sched.po $(OUTPRE)key_sched.$(OBJEXT): \ key_sched.c $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h new_rnd_key.so new_rnd_key.po $(OUTPRE)new_rnd_key.$(OBJEXT): \ new_rnd_key.c $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h pcbc_encrypt.so pcbc_encrypt.po $(OUTPRE)pcbc_encrypt.$(OBJEXT): \ pcbc_encrypt.c $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h \ $(srcdir)/../crypto/des/f_tables.h quad_cksum.so quad_cksum.po $(OUTPRE)quad_cksum.$(OBJEXT): \ quad_cksum.c $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h random_key.so random_key.po $(OUTPRE)random_key.$(OBJEXT): \ random_key.c $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h read_passwd.so read_passwd.po $(OUTPRE)read_passwd.$(OBJEXT): \ read_passwd.c $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h str_to_key.so str_to_key.po $(OUTPRE)str_to_key.$(OBJEXT): \ str_to_key.c $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h unix_time.so unix_time.po $(OUTPRE)unix_time.$(OBJEXT): \ - unix_time.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + unix_time.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h util.so util.po $(OUTPRE)util.$(OBJEXT): util.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../crypto/des/des_int.h \ $(SRCTOP)/include/kerberosIV/des.h weak_key.so weak_key.po $(OUTPRE)weak_key.$(OBJEXT): \ weak_key.c $(srcdir)/../crypto/des/des_int.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/kerberosIV/des.h diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in index 8260ce847b..91418b6c94 100644 --- a/src/lib/gssapi/Makefile.in +++ b/src/lib/gssapi/Makefile.in @@ -125,12 +125,12 @@ $(BUILDTOP)/include/gssapi/gssapi.h generic/gssapi.h krb5/gssapi_err_krb5.h gene gss_libinit.so gss_libinit.po $(OUTPRE)gss_libinit.$(OBJEXT): \ gss_libinit.c generic/gssapi_err_generic.h $(COM_ERR_DEPS) \ krb5/gssapi_err_krb5.h $(srcdir)/krb5/gssapiP_krb5.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/generic/gssapiP_generic.h $(srcdir)/generic/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h krb5/gssapi_krb5.h \ gss_libinit.h generic/gssapi.h diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog index 9d71b7b0ea..b32fe92e6a 100644 --- a/src/lib/gssapi/generic/ChangeLog +++ b/src/lib/gssapi/generic/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * gssapi.h: Use autoconf.h from include rather than include/krb5. + If sed fails, error out. + 2006-03-10 Ken Raeburn <raeburn@mit.edu> * Makefile.in (generate-files-mac): Depend on gssapi.h. diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in index a2b9e90458..d7530e94c4 100644 --- a/src/lib/gssapi/generic/Makefile.in +++ b/src/lib/gssapi/generic/Makefile.in @@ -39,14 +39,14 @@ gssapi_err_generic.c: gssapi_err_generic.et include_xom=@include_xom@ ##DOS##include_xom= -gssapi.h: gssapi.hin +gssapi.h: gssapi.hin $(BUILDTOP)/include/autoconf.h @echo "Creating gssapi.h" ; \ h=gss$$$$; $(RM) $$h; \ (echo "/* This is the gssapi.h prologue. */"; \ echo "/* It contains some choice pieces of autoconf.h */"; \ - sed -n "/SIZEOF/s//GSS_&/p" < $(BUILDTOP)/include/krb5/autoconf.h; \ - $(include_xom); \ - echo "/* End of gssapi.h prologue. */"; \ + sed -n "/SIZEOF/s//GSS_&/p" < $(BUILDTOP)/include/autoconf.h && \ + $(include_xom)&& \ + echo "/* End of gssapi.h prologue. */"&& \ cat $(srcdir)/gssapi.hin )> $$h && \ (set -x; $(MV) $$h $@) ; e=$$?; $(RM) $$h; exit $$e @@ -152,62 +152,51 @@ depend:: $(ETSRCS) # disp_com_err_status.so disp_com_err_status.po $(OUTPRE)disp_com_err_status.$(OBJEXT): \ disp_com_err_status.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h disp_major_status.so disp_major_status.po $(OUTPRE)disp_major_status.$(OBJEXT): \ disp_major_status.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h gssapi_generic.so gssapi_generic.po $(OUTPRE)gssapi_generic.$(OBJEXT): \ gssapi_generic.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h oid_ops.so oid_ops.po $(OUTPRE)oid_ops.$(OBJEXT): oid_ops.c \ - gssapiP_generic.h $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5/autoconf.h \ + gssapiP_generic.h $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/autoconf.h \ gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h rel_buffer.so rel_buffer.po $(OUTPRE)rel_buffer.$(OBJEXT): \ rel_buffer.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h rel_oid_set.so rel_oid_set.po $(OUTPRE)rel_oid_set.$(OBJEXT): \ rel_oid_set.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h util_buffer.so util_buffer.po $(OUTPRE)util_buffer.$(OBJEXT): \ util_buffer.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h util_oid.so util_oid.po $(OUTPRE)util_oid.$(OBJEXT): \ util_oid.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h util_ordering.so util_ordering.po $(OUTPRE)util_ordering.$(OBJEXT): \ util_ordering.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h util_set.so util_set.po $(OUTPRE)util_set.$(OBJEXT): \ util_set.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h util_token.so util_token.po $(OUTPRE)util_token.$(OBJEXT): \ util_token.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h util_validate.so util_validate.po $(OUTPRE)util_validate.$(OBJEXT): \ util_validate.c gssapiP_generic.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h gssapi_generic.h \ - $(BUILDTOP)/include/gssapi/gssapi.h gssapi_err_generic.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h + $(BUILDTOP)/include/autoconf.h gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ + gssapi_err_generic.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-platform.h gssapi_err_generic.so gssapi_err_generic.po $(OUTPRE)gssapi_err_generic.$(OBJEXT): \ gssapi_err_generic.c $(COM_ERR_DEPS) diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in index 7e76561a1d..46053b04f1 100644 --- a/src/lib/gssapi/krb5/Makefile.in +++ b/src/lib/gssapi/krb5/Makefile.in @@ -242,445 +242,445 @@ install:: # the Makefile.in file # accept_sec_context.so accept_sec_context.po $(OUTPRE)accept_sec_context.$(OBJEXT): \ - accept_sec_context.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + accept_sec_context.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ gssapiP_krb5.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h acquire_cred.so acquire_cred.po $(OUTPRE)acquire_cred.$(OBJEXT): \ - acquire_cred.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + acquire_cred.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../gss_libinit.h ../generic/gssapi.h gssapiP_krb5.h \ $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \ gssapi_krb5.h gssapi_err_krb5.h add_cred.so add_cred.po $(OUTPRE)add_cred.$(OBJEXT): \ add_cred.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h canon_name.so canon_name.po $(OUTPRE)canon_name.$(OBJEXT): \ canon_name.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h compare_name.so compare_name.po $(OUTPRE)compare_name.$(OBJEXT): \ compare_name.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h context_time.so context_time.po $(OUTPRE)context_time.$(OBJEXT): \ context_time.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h copy_ccache.so copy_ccache.po $(OUTPRE)copy_ccache.$(OBJEXT): \ copy_ccache.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h delete_sec_context.so delete_sec_context.po $(OUTPRE)delete_sec_context.$(OBJEXT): \ delete_sec_context.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h disp_name.so disp_name.po $(OUTPRE)disp_name.$(OBJEXT): \ disp_name.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h disp_status.so disp_status.po $(OUTPRE)disp_status.$(OBJEXT): \ disp_status.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h \ $(srcdir)/../gss_libinit.h ../generic/gssapi.h duplicate_name.so duplicate_name.po $(OUTPRE)duplicate_name.$(OBJEXT): \ duplicate_name.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h export_name.so export_name.po $(OUTPRE)export_name.$(OBJEXT): \ export_name.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h export_sec_context.so export_sec_context.po $(OUTPRE)export_sec_context.$(OBJEXT): \ export_sec_context.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h get_tkt_flags.so get_tkt_flags.po $(OUTPRE)get_tkt_flags.$(OBJEXT): \ get_tkt_flags.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h gssapi_krb5.so gssapi_krb5.po $(OUTPRE)gssapi_krb5.$(OBJEXT): \ - gssapi_krb5.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gssapi_krb5.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ gssapiP_krb5.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h import_name.so import_name.po $(OUTPRE)import_name.$(OBJEXT): \ import_name.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h import_sec_context.so import_sec_context.po $(OUTPRE)import_sec_context.$(OBJEXT): \ import_sec_context.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h indicate_mechs.so indicate_mechs.po $(OUTPRE)indicate_mechs.$(OBJEXT): \ indicate_mechs.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h init_sec_context.so init_sec_context.po $(OUTPRE)init_sec_context.$(OBJEXT): \ - init_sec_context.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + init_sec_context.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ gssapiP_krb5.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h inq_context.so inq_context.po $(OUTPRE)inq_context.$(OBJEXT): \ inq_context.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h inq_cred.so inq_cred.po $(OUTPRE)inq_cred.$(OBJEXT): \ inq_cred.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h inq_names.so inq_names.po $(OUTPRE)inq_names.$(OBJEXT): \ inq_names.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h k5seal.so k5seal.po $(OUTPRE)k5seal.$(OBJEXT): k5seal.c \ - gssapiP_krb5.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gssapiP_krb5.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \ gssapi_krb5.h gssapi_err_krb5.h k5sealv3.so k5sealv3.po $(OUTPRE)k5sealv3.$(OBJEXT): \ - k5sealv3.c $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5/autoconf.h \ + k5sealv3.c $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ gssapiP_krb5.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h k5unseal.so k5unseal.po $(OUTPRE)k5unseal.$(OBJEXT): \ k5unseal.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h krb5_gss_glue.so krb5_gss_glue.po $(OUTPRE)krb5_gss_glue.$(OBJEXT): \ krb5_gss_glue.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h lucid_context.so lucid_context.po $(OUTPRE)lucid_context.$(OBJEXT): \ lucid_context.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h process_context_token.so process_context_token.po $(OUTPRE)process_context_token.$(OBJEXT): \ process_context_token.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h rel_cred.so rel_cred.po $(OUTPRE)rel_cred.$(OBJEXT): \ rel_cred.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h rel_oid.so rel_oid.po $(OUTPRE)rel_oid.$(OBJEXT): rel_oid.c \ - gssapiP_krb5.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gssapiP_krb5.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \ gssapi_krb5.h gssapi_err_krb5.h rel_name.so rel_name.po $(OUTPRE)rel_name.$(OBJEXT): \ rel_name.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h seal.so seal.po $(OUTPRE)seal.$(OBJEXT): seal.c gssapiP_krb5.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \ gssapi_krb5.h gssapi_err_krb5.h set_allowable_enctypes.so set_allowable_enctypes.po \ $(OUTPRE)set_allowable_enctypes.$(OBJEXT): set_allowable_enctypes.c \ - gssapiP_krb5.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gssapiP_krb5.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \ gssapi_krb5.h gssapi_err_krb5.h ser_sctx.so ser_sctx.po $(OUTPRE)ser_sctx.$(OBJEXT): \ - ser_sctx.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ser_sctx.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ gssapiP_krb5.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h set_ccache.so set_ccache.po $(OUTPRE)set_ccache.$(OBJEXT): \ set_ccache.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h sign.so sign.po $(OUTPRE)sign.$(OBJEXT): sign.c gssapiP_krb5.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \ gssapi_krb5.h gssapi_err_krb5.h unseal.so unseal.po $(OUTPRE)unseal.$(OBJEXT): unseal.c \ - gssapiP_krb5.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gssapiP_krb5.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \ gssapi_krb5.h gssapi_err_krb5.h util_cksum.so util_cksum.po $(OUTPRE)util_cksum.$(OBJEXT): \ util_cksum.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h util_crypt.so util_crypt.po $(OUTPRE)util_crypt.$(OBJEXT): \ - util_crypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + util_crypt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ gssapiP_krb5.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h util_seed.so util_seed.po $(OUTPRE)util_seed.$(OBJEXT): \ util_seed.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h util_seqnum.so util_seqnum.po $(OUTPRE)util_seqnum.$(OBJEXT): \ util_seqnum.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h val_cred.so val_cred.po $(OUTPRE)val_cred.$(OBJEXT): \ val_cred.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h verify.so verify.po $(OUTPRE)verify.$(OBJEXT): verify.c \ - gssapiP_krb5.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gssapiP_krb5.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h ../generic/gssapi_err_generic.h \ gssapi_krb5.h gssapi_err_krb5.h wrap_size_limit.so wrap_size_limit.po $(OUTPRE)wrap_size_limit.$(OBJEXT): \ wrap_size_limit.c gssapiP_krb5.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(srcdir)/../generic/gssapiP_generic.h \ $(srcdir)/../generic/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ ../generic/gssapi_err_generic.h gssapi_krb5.h gssapi_err_krb5.h diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog index 15bdaca53c..ba9fe5a97f 100644 --- a/src/lib/kadm5/ChangeLog +++ b/src/lib/kadm5/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * server_internal.h, adb.h: Don't look for kdb.h in krb5/. + 2005-11-17 Ken Raeburn <raeburn@mit.edu> * admin.h: Include kdb.h instead of k5-int.h. diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in index 71a2b418dd..3ab0162eb6 100644 --- a/src/lib/kadm5/Makefile.in +++ b/src/lib/kadm5/Makefile.in @@ -114,8 +114,8 @@ ovsec_glue.so ovsec_glue.po $(OUTPRE)ovsec_glue.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h misc_free.so misc_free.po $(OUTPRE)misc_free.$(OBJEXT): \ misc_free.c $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/gssrpc/rpc.h \ @@ -125,8 +125,8 @@ misc_free.so misc_free.po $(OUTPRE)misc_free.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ server_internal.h admin_internal.h kadm_rpc_xdr.so kadm_rpc_xdr.po $(OUTPRE)kadm_rpc_xdr.$(OBJEXT): \ @@ -137,8 +137,8 @@ kadm_rpc_xdr.so kadm_rpc_xdr.po $(OUTPRE)kadm_rpc_xdr.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_gss.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/svc_auth.h $(BUILDTOP)/include/gssrpc/svc.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/kadm5/admin.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ $(BUILDTOP)/include/kadm5/kadm_rpc.h $(BUILDTOP)/include/kadm5/admin_xdr.h \ $(BUILDTOP)/include/kadm5/server_internal.h $(BUILDTOP)/include/kadm5/admin_internal.h @@ -150,17 +150,17 @@ chpass_util.so chpass_util.po $(OUTPRE)chpass_util.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ admin_internal.h alt_prof.so alt_prof.po $(OUTPRE)alt_prof.$(OBJEXT): \ - alt_prof.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + alt_prof.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/gssrpc/rpc.h \ $(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/gssrpc/rename.h \ $(BUILDTOP)/include/gssrpc/xdr.h $(BUILDTOP)/include/gssrpc/auth.h \ @@ -168,14 +168,14 @@ alt_prof.so alt_prof.po $(OUTPRE)alt_prof.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/kadm5/kadm_err.h \ - $(BUILDTOP)/include/kadm5/chpass_util_strings.h $(SRCTOP)/include/krb5/adm_proto.h + $(BUILDTOP)/include/kadm5/chpass_util_strings.h $(SRCTOP)/include/adm_proto.h str_conv.so str_conv.po $(OUTPRE)str_conv.$(OBJEXT): \ - str_conv.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + str_conv.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ admin_internal.h $(BUILDTOP)/include/kadm5/admin.h \ $(BUILDTOP)/include/gssrpc/rpc.h $(BUILDTOP)/include/gssrpc/types.h \ $(BUILDTOP)/include/gssrpc/rename.h $(BUILDTOP)/include/gssrpc/xdr.h \ @@ -184,12 +184,12 @@ str_conv.so str_conv.po $(OUTPRE)str_conv.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_gss.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/svc_auth.h $(BUILDTOP)/include/gssrpc/svc.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ - $(SRCTOP)/include/krb5/adm_proto.h + $(SRCTOP)/include/adm_proto.h logger.so logger.po $(OUTPRE)logger.$(OBJEXT): logger.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/krb5/adm_proto.h $(SRCTOP)/include/syslog.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/adm_proto.h $(SRCTOP)/include/syslog.h diff --git a/src/lib/kadm5/adb.h b/src/lib/kadm5/adb.h index 8b53b55014..66eadfc3b6 100644 --- a/src/lib/kadm5/adb.h +++ b/src/lib/kadm5/adb.h @@ -13,7 +13,7 @@ #include <sys/types.h> #include <gssrpc/types.h> #include "k5-int.h" -#include <krb5/kdb.h> +#include <kdb.h> #include <db.h> #include <kadm5/admin.h> #include <kadm5/adb_err.h> diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in index 578b4fcc6b..5526726359 100644 --- a/src/lib/kadm5/clnt/Makefile.in +++ b/src/lib/kadm5/clnt/Makefile.in @@ -90,8 +90,8 @@ clnt_policy.so clnt_policy.po $(OUTPRE)clnt_policy.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_gss.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/svc_auth.h $(BUILDTOP)/include/gssrpc/svc.h \ $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ $(BUILDTOP)/include/kadm5/kadm_rpc.h client_internal.h \ $(BUILDTOP)/include/kadm5/admin_internal.h err_handle.h @@ -103,8 +103,8 @@ client_rpc.so client_rpc.po $(OUTPRE)client_rpc.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_gss.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/svc_auth.h $(BUILDTOP)/include/gssrpc/svc.h \ $(BUILDTOP)/include/kadm5/kadm_rpc.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(BUILDTOP)/include/kadm5/admin.h $(SRCTOP)/include/krb5/kdb.h \ - $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(COM_ERR_DEPS) $(BUILDTOP)/include/kadm5/admin.h $(SRCTOP)/include/kdb.h \ + $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/kadm5/kadm_err.h \ $(BUILDTOP)/include/kadm5/chpass_util_strings.h client_principal.so client_principal.po $(OUTPRE)client_principal.$(OBJEXT): \ @@ -115,19 +115,19 @@ client_principal.so client_principal.po $(OUTPRE)client_principal.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/kadm5/admin.h \ - $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h \ - $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h \ + $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/kadm5/kadm_err.h \ $(BUILDTOP)/include/kadm5/chpass_util_strings.h $(BUILDTOP)/include/kadm5/kadm_rpc.h \ client_internal.h $(BUILDTOP)/include/kadm5/admin_internal.h \ err_handle.h client_init.so client_init.po $(OUTPRE)client_init.$(OBJEXT): \ client_init.c $(COM_ERR_DEPS) $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(BUILDTOP)/include/kadm5/admin.h \ $(BUILDTOP)/include/gssrpc/rpc.h $(BUILDTOP)/include/gssrpc/types.h \ $(BUILDTOP)/include/gssrpc/rename.h $(BUILDTOP)/include/gssrpc/xdr.h \ @@ -147,8 +147,8 @@ clnt_privs.so clnt_privs.po $(OUTPRE)clnt_privs.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_gss.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/svc_auth.h $(BUILDTOP)/include/gssrpc/svc.h \ $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ $(BUILDTOP)/include/kadm5/kadm_rpc.h client_internal.h \ $(BUILDTOP)/include/kadm5/admin_internal.h err_handle.h @@ -162,8 +162,8 @@ clnt_chpass_util.so clnt_chpass_util.po $(OUTPRE)clnt_chpass_util.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/rpc_msg.h $(BUILDTOP)/include/gssrpc/auth_unix.h \ $(BUILDTOP)/include/gssrpc/auth_gss.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/svc_auth.h $(BUILDTOP)/include/gssrpc/svc.h \ - $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h \ - $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h \ + $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/kadm5/kadm_err.h \ $(BUILDTOP)/include/kadm5/chpass_util_strings.h client_internal.h \ $(BUILDTOP)/include/kadm5/admin_internal.h diff --git a/src/lib/kadm5/server_internal.h b/src/lib/kadm5/server_internal.h index cf4755b6df..f26f131a55 100644 --- a/src/lib/kadm5/server_internal.h +++ b/src/lib/kadm5/server_internal.h @@ -18,7 +18,7 @@ #endif #include <stdlib.h> #include <errno.h> -#include <krb5/kdb.h> +#include <kdb.h> #include <kadm5/admin.h> #include "admin_internal.h" diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog index 39fb06e3ae..a2b3394d38 100644 --- a/src/lib/kadm5/srv/ChangeLog +++ b/src/lib/kadm5/srv/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * svr_principal.c, server_misc.c: Don't look for kdb.h in krb5/. + 2005-11-17 Ken Raeburn <raeburn@mit.edu> * server_init.c, svr_policy.c: Include errno.h. diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in index 25fc772d0a..156730a346 100644 --- a/src/lib/kadm5/srv/Makefile.in +++ b/src/lib/kadm5/srv/Makefile.in @@ -100,8 +100,8 @@ svr_policy.so svr_policy.po $(OUTPRE)svr_policy.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ $(BUILDTOP)/include/kadm5/server_internal.h $(BUILDTOP)/include/kadm5/admin_internal.h svr_principal.so svr_principal.po $(OUTPRE)svr_principal.$(OBJEXT): \ @@ -112,18 +112,18 @@ svr_principal.so svr_principal.po $(OUTPRE)svr_principal.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ $(BUILDTOP)/include/kadm5/server_internal.h $(BUILDTOP)/include/kadm5/admin_internal.h server_acl.so server_acl.po $(OUTPRE)server_acl.$(OBJEXT): \ server_acl.c $(SRCTOP)/include/syslog.h $(BUILDTOP)/include/gssapi/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(BUILDTOP)/include/kadm5/server_internal.h \ $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/gssrpc/rpc.h \ $(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/gssrpc/rename.h \ @@ -132,15 +132,15 @@ server_acl.so server_acl.po $(OUTPRE)server_acl.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssrpc/svc_auth.h $(BUILDTOP)/include/gssrpc/svc.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ - $(BUILDTOP)/include/kadm5/admin_internal.h $(SRCTOP)/include/krb5/adm_proto.h \ + $(BUILDTOP)/include/kadm5/admin_internal.h $(SRCTOP)/include/adm_proto.h \ server_acl.h server_kdb.so server_kdb.po $(OUTPRE)server_kdb.$(OBJEXT): \ - server_kdb.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + server_kdb.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/gssrpc/rpc.h \ $(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/gssrpc/rename.h \ $(BUILDTOP)/include/gssrpc/xdr.h $(BUILDTOP)/include/gssrpc/auth.h \ @@ -151,12 +151,12 @@ server_kdb.so server_kdb.po $(OUTPRE)server_kdb.$(OBJEXT): \ $(BUILDTOP)/include/kadm5/chpass_util_strings.h $(BUILDTOP)/include/kadm5/server_internal.h \ $(BUILDTOP)/include/kadm5/admin_internal.h server_misc.so server_misc.po $(OUTPRE)server_misc.$(OBJEXT): \ - server_misc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + server_misc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(BUILDTOP)/include/kadm5/server_internal.h $(BUILDTOP)/include/kadm5/admin.h \ $(BUILDTOP)/include/gssrpc/rpc.h $(BUILDTOP)/include/gssrpc/types.h \ $(BUILDTOP)/include/gssrpc/rename.h $(BUILDTOP)/include/gssrpc/xdr.h \ @@ -174,8 +174,8 @@ server_init.so server_init.po $(OUTPRE)server_init.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/rpc_msg.h $(BUILDTOP)/include/gssrpc/auth_unix.h \ $(BUILDTOP)/include/gssrpc/auth_gss.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/svc_auth.h $(BUILDTOP)/include/gssrpc/svc.h \ - $(BUILDTOP)/include/krb5.h $(SRCTOP)/include/krb5/kdb.h \ - $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/krb5.h $(SRCTOP)/include/kdb.h \ + $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/kadm5/kadm_err.h \ $(BUILDTOP)/include/kadm5/chpass_util_strings.h $(BUILDTOP)/include/kadm5/server_internal.h \ $(BUILDTOP)/include/kadm5/admin_internal.h @@ -187,10 +187,10 @@ server_dict.so server_dict.po $(OUTPRE)server_dict.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ - $(SRCTOP)/include/krb5/adm_proto.h $(SRCTOP)/include/syslog.h \ + $(SRCTOP)/include/adm_proto.h $(SRCTOP)/include/syslog.h \ $(BUILDTOP)/include/kadm5/server_internal.h $(BUILDTOP)/include/kadm5/admin_internal.h svr_iters.so svr_iters.po $(OUTPRE)svr_iters.$(OBJEXT): \ svr_iters.c $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/gssrpc/rpc.h \ @@ -200,8 +200,8 @@ svr_iters.so svr_iters.po $(OUTPRE)svr_iters.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/kadm_err.h $(BUILDTOP)/include/kadm5/chpass_util_strings.h \ $(BUILDTOP)/include/kadm5/server_internal.h $(BUILDTOP)/include/kadm5/admin_internal.h svr_chpass_util.so svr_chpass_util.po $(OUTPRE)svr_chpass_util.$(OBJEXT): \ @@ -212,8 +212,8 @@ svr_chpass_util.so svr_chpass_util.po $(OUTPRE)svr_chpass_util.$(OBJEXT): \ $(BUILDTOP)/include/gssrpc/rpc_msg.h $(BUILDTOP)/include/gssrpc/auth_unix.h \ $(BUILDTOP)/include/gssrpc/auth_gss.h $(BUILDTOP)/include/gssapi/gssapi.h \ $(BUILDTOP)/include/gssrpc/svc_auth.h $(BUILDTOP)/include/gssrpc/svc.h \ - $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h \ - $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h \ + $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/kadm5/kadm_err.h \ $(BUILDTOP)/include/kadm5/chpass_util_strings.h $(BUILDTOP)/include/kadm5/server_internal.h \ $(BUILDTOP)/include/kadm5/admin_internal.h @@ -225,8 +225,8 @@ adb_xdr.so adb_xdr.po $(OUTPRE)adb_xdr.$(OBJEXT): adb_xdr.c \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ $(BUILDTOP)/include/gssrpc/svc.h $(BUILDTOP)/include/kadm5/server_internal.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/kadm5/admin.h $(BUILDTOP)/include/kadm5/kadm_err.h \ $(BUILDTOP)/include/kadm5/chpass_util_strings.h $(BUILDTOP)/include/kadm5/admin_internal.h \ $(BUILDTOP)/include/kadm5/admin_xdr.h $(BUILDTOP)/include/kadm5/kadm_rpc.h diff --git a/src/lib/kadm5/srv/server_misc.c b/src/lib/kadm5/srv/server_misc.c index 4f15fd3b29..f7bfd585c6 100644 --- a/src/lib/kadm5/srv/server_misc.c +++ b/src/lib/kadm5/srv/server_misc.c @@ -9,7 +9,7 @@ static char *rcsid = "$Header$"; #endif #include "k5-int.h" -#include <krb5/kdb.h> +#include <kdb.h> #include <ctype.h> #include <pwd.h> diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c index 6cecbb5d24..18ab480bca 100644 --- a/src/lib/kadm5/srv/svr_principal.c +++ b/src/lib/kadm5/srv/svr_principal.c @@ -12,7 +12,7 @@ static char *rcsid = "$Header$"; #include <sys/time.h> #include <errno.h> #include <kadm5/admin.h> -#include <krb5/kdb.h> +#include <kdb.h> #include <stdio.h> #include <string.h> #include "server_internal.h" diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog index f3bbd0afe6..07bb4e4ea8 100644 --- a/src/lib/kadm5/unit-test/ChangeLog +++ b/src/lib/kadm5/unit-test/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * lock-test.c: Don't look for kdb.h in krb5/. + 2005-11-17 Ken Raeburn <raeburn@mit.edu> * setkey-test.c: Include k5-int.h instead of krb5.h. diff --git a/src/lib/kadm5/unit-test/lock-test.c b/src/lib/kadm5/unit-test/lock-test.c index 4da6aead89..3b6edd6d8b 100644 --- a/src/lib/kadm5/unit-test/lock-test.c +++ b/src/lib/kadm5/unit-test/lock-test.c @@ -6,7 +6,7 @@ #include <stdio.h> #include <krb5.h> #include <kadm5/admin.h> -#include <krb5/kdb.h> +#include <kdb.h> char *whoami; diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in index ceb013e63b..e40efe6980 100644 --- a/src/lib/kdb/Makefile.in +++ b/src/lib/kdb/Makefile.in @@ -63,55 +63,55 @@ clean-unix:: clean-liblinks clean-libs clean-libobjs # the Makefile.in file # kdb5.so kdb5.po $(OUTPRE)kdb5.$(OBJEXT): kdb5.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h kdb5.h err_handle.h adb_err.h encrypt_key.so encrypt_key.po $(OUTPRE)encrypt_key.$(OBJEXT): \ - encrypt_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + encrypt_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h decrypt_key.so decrypt_key.po $(OUTPRE)decrypt_key.$(OBJEXT): \ - decrypt_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + decrypt_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h kdb_default.so kdb_default.po $(OUTPRE)kdb_default.$(OBJEXT): \ - kdb_default.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + kdb_default.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h kdb_cpw.so kdb_cpw.po $(OUTPRE)kdb_cpw.$(OBJEXT): kdb_cpw.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h adb_err.so adb_err.po $(OUTPRE)adb_err.$(OBJEXT): adb_err.c \ $(COM_ERR_DEPS) err_handle.so err_handle.po $(OUTPRE)err_handle.$(OBJEXT): \ err_handle.c err_handle.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h keytab.so keytab.po $(OUTPRE)keytab.$(OBJEXT): keytab.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ - $(SRCTOP)/include/krb5/kdb_kt.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb_kt.h diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index a7e3fbe431..78cbf0230a 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,3 +1,10 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * send_to_kdc.c, mk_preauth.c, memcache.c, recvauth.c, netread.c, + tkt_string.c, put_svc_key.c, klog.c, netwrite.c, gethostname.c, + log.c, kadm_net.c, kuserok.c, kparse.c, getst.c: Don't look for + autoconf.h in krb5/. + 2005-08-20 Ken Raeburn <raeburn@mit.edu> * configure.in: Use K5_AC_INIT instead of AC_INIT. diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in index 077042a57c..3856e6d226 100644 --- a/src/lib/krb4/Makefile.in +++ b/src/lib/krb4/Makefile.in @@ -275,24 +275,24 @@ change_password.so change_password.po $(OUTPRE)change_password.$(OBJEXT): \ change_password.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h krb4int.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/kerberosIV/kadm.h $(SRCTOP)/include/kerberosIV/prot.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h cr_auth_repl.so cr_auth_repl.po $(OUTPRE)cr_auth_repl.$(OBJEXT): \ cr_auth_repl.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h cr_ciph.so cr_ciph.po $(OUTPRE)cr_ciph.$(OBJEXT): cr_ciph.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h cr_tkt.so cr_tkt.po $(OUTPRE)cr_tkt.$(OBJEXT): cr_tkt.c \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/kerberosIV/des.h \ $(SRCTOP)/include/kerberosIV/krb.h $(KRB_ERR_H_DEP) \ $(BUILDTOP)/include/profile.h $(SRCTOP)/include/kerberosIV/prot.h \ - $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/port-sockets.h debug.so debug.po $(OUTPRE)debug.$(OBJEXT): debug.c \ $(SRCTOP)/include/kerberosIV/mit-copyright.h @@ -300,26 +300,26 @@ decomp_tkt.so decomp_tkt.po $(OUTPRE)decomp_tkt.$(OBJEXT): \ decomp_tkt.c $(SRCTOP)/include/kerberosIV/des.h $(SRCTOP)/include/kerberosIV/krb.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(SRCTOP)/include/krb54proto.h \ $(SRCTOP)/include/port-sockets.h g_ad_tkt.so g_ad_tkt.po $(OUTPRE)g_ad_tkt.$(OBJEXT): \ g_ad_tkt.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h g_pw_in_tkt.so g_pw_in_tkt.po $(OUTPRE)g_pw_in_tkt.$(OBJEXT): \ g_pw_in_tkt.c $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(BUILDTOP)/include/profile.h krb4int.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h g_phost.so g_phost.po $(OUTPRE)g_phost.$(OBJEXT): g_phost.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h g_pw_tkt.so g_pw_tkt.po $(OUTPRE)g_pw_tkt.$(OBJEXT): \ g_pw_tkt.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ @@ -327,21 +327,21 @@ g_pw_tkt.so g_pw_tkt.po $(OUTPRE)g_pw_tkt.$(OBJEXT): \ g_tkt_svc.so g_tkt_svc.po $(OUTPRE)g_tkt_svc.$(OBJEXT): \ g_tkt_svc.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h getst.so getst.po $(OUTPRE)getst.$(OBJEXT): getst.c \ $(SRCTOP)/include/kerberosIV/mit-copyright.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h krb4int.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h gethostname.so gethostname.po $(OUTPRE)gethostname.$(OBJEXT): \ gethostname.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h kadm_err.so kadm_err.po $(OUTPRE)kadm_err.$(OBJEXT): \ kadm_err.c $(COM_ERR_DEPS) kadm_net.so kadm_net.po $(OUTPRE)kadm_net.$(OBJEXT): \ - kadm_net.c $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/port-sockets.h \ + kadm_net.c $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/krbports.h $(SRCTOP)/include/kerberosIV/kadm.h \ @@ -349,7 +349,7 @@ kadm_net.so kadm_net.po $(OUTPRE)kadm_net.$(OBJEXT): \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h kadm_stream.so kadm_stream.po $(OUTPRE)kadm_stream.$(OBJEXT): \ kadm_stream.c $(SRCTOP)/include/kerberosIV/kadm.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/kerberosIV/krb.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/kerberosIV/kadm_err.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ @@ -360,162 +360,162 @@ kname_parse.so kname_parse.po $(OUTPRE)kname_parse.$(OBJEXT): \ err_txt.so err_txt.po $(OUTPRE)err_txt.$(OBJEXT): err_txt.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h lifetime.so lifetime.po $(OUTPRE)lifetime.$(OBJEXT): \ lifetime.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h g_in_tkt.so g_in_tkt.po $(OUTPRE)g_in_tkt.$(OBJEXT): \ g_in_tkt.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h mk_auth.so mk_auth.po $(OUTPRE)mk_auth.$(OBJEXT): mk_auth.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h mk_err.so mk_err.po $(OUTPRE)mk_err.$(OBJEXT): mk_err.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h mk_priv.so mk_priv.po $(OUTPRE)mk_priv.$(OBJEXT): mk_priv.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/kerberosIV/lsb_addr_cmp.h $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/port-sockets.h mk_req.so mk_req.po $(OUTPRE)mk_req.$(OBJEXT): mk_req.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ krb4int.h $(SRCTOP)/include/port-sockets.h mk_safe.so mk_safe.po $(OUTPRE)mk_safe.$(OBJEXT): mk_safe.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/kerberosIV/lsb_addr_cmp.h $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/port-sockets.h month_sname.so month_sname.po $(OUTPRE)month_sname.$(OBJEXT): \ month_sname.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h password_to_key.so password_to_key.po $(OUTPRE)password_to_key.$(OBJEXT): \ password_to_key.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h krb4int.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h pkt_cipher.so pkt_cipher.po $(OUTPRE)pkt_cipher.$(OBJEXT): \ pkt_cipher.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h pkt_clen.so pkt_clen.po $(OUTPRE)pkt_clen.$(OBJEXT): \ pkt_clen.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h prot_client.so prot_client.po $(OUTPRE)prot_client.$(OBJEXT): \ prot_client.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h prot_common.so prot_common.po $(OUTPRE)prot_common.$(OBJEXT): \ prot_common.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h prot_kdc.so prot_kdc.po $(OUTPRE)prot_kdc.$(OBJEXT): \ prot_kdc.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/port-sockets.h rd_err.so rd_err.po $(OUTPRE)rd_err.$(OBJEXT): rd_err.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h rd_priv.so rd_priv.po $(OUTPRE)rd_priv.$(OBJEXT): rd_priv.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/kerberosIV/lsb_addr_cmp.h $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/port-sockets.h rd_safe.so rd_safe.po $(OUTPRE)rd_safe.$(OBJEXT): rd_safe.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(SRCTOP)/include/kerberosIV/lsb_addr_cmp.h $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/port-sockets.h send_to_kdc.so send_to_kdc.po $(OUTPRE)send_to_kdc.$(OBJEXT): \ send_to_kdc.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/krbports.h $(SRCTOP)/include/kerberosIV/prot.h \ - $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ $(BUILDTOP)/include/krb5.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ krb4int.h stime.so stime.po $(OUTPRE)stime.$(OBJEXT): stime.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h strnlen.so strnlen.po $(OUTPRE)strnlen.$(OBJEXT): strnlen.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h rd_preauth.so rd_preauth.po $(OUTPRE)rd_preauth.$(OBJEXT): \ rd_preauth.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/krb_db.h $(SRCTOP)/include/kerberosIV/prot.h \ - $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h krb4int.h $(SRCTOP)/include/port-sockets.h mk_preauth.so mk_preauth.po $(OUTPRE)mk_preauth.$(OBJEXT): \ mk_preauth.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(BUILDTOP)/include/krb5/autoconf.h + $(BUILDTOP)/include/autoconf.h unix_time.so unix_time.po $(OUTPRE)unix_time.$(OBJEXT): \ unix_time.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h tf_util.so tf_util.po $(OUTPRE)tf_util.$(OBJEXT): tf_util.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h krb4int.h dest_tkt.so dest_tkt.po $(OUTPRE)dest_tkt.$(OBJEXT): \ dest_tkt.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/k5-util.h $(BUILDTOP)/include/krb5/autoconf.h + $(SRCTOP)/include/k5-util.h $(BUILDTOP)/include/autoconf.h in_tkt.so in_tkt.po $(OUTPRE)in_tkt.$(OBJEXT): in_tkt.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/k5-util.h $(BUILDTOP)/include/krb5/autoconf.h + $(SRCTOP)/include/k5-util.h $(BUILDTOP)/include/autoconf.h tkt_string.so tkt_string.po $(OUTPRE)tkt_string.$(OBJEXT): \ tkt_string.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/port-sockets.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/port-sockets.h g_tf_fname.so g_tf_fname.po $(OUTPRE)g_tf_fname.$(OBJEXT): \ g_tf_fname.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ @@ -530,22 +530,22 @@ g_cred.so g_cred.po $(OUTPRE)g_cred.$(OBJEXT): g_cred.c \ save_creds.so save_creds.po $(OUTPRE)save_creds.$(OBJEXT): \ save_creds.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h unix_glue.so unix_glue.po $(OUTPRE)unix_glue.$(OBJEXT): \ unix_glue.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h klog.so klog.po $(OUTPRE)klog.$(OBJEXT): klog.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ - $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/autoconf.h \ krb4int.h $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/kerberosIV/klog.h kuserok.so kuserok.po $(OUTPRE)kuserok.$(OBJEXT): kuserok.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(BUILDTOP)/include/krb5/autoconf.h + $(BUILDTOP)/include/autoconf.h log.so log.po $(OUTPRE)log.$(OBJEXT): log.c $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ - $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(BUILDTOP)/include/autoconf.h \ krb4int.h $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/kerberosIV/klog.h kntoln.so kntoln.po $(OUTPRE)kntoln.$(OBJEXT): kntoln.c \ $(SRCTOP)/include/kerberosIV/mit-copyright.h $(SRCTOP)/include/kerberosIV/krb.h \ @@ -555,85 +555,85 @@ fgetst.so fgetst.po $(OUTPRE)fgetst.$(OBJEXT): fgetst.c \ $(SRCTOP)/include/kerberosIV/mit-copyright.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h krb4int.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h rd_svc_key.so rd_svc_key.po $(OUTPRE)rd_svc_key.$(OBJEXT): \ rd_svc_key.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/krb54proto.h \ $(SRCTOP)/include/kerberosIV/prot.h cr_err_repl.so cr_err_repl.po $(OUTPRE)cr_err_repl.$(OBJEXT): \ cr_err_repl.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h rd_req.so rd_req.po $(OUTPRE)rd_req.$(OBJEXT): rd_req.c \ $(SRCTOP)/include/kerberosIV/des.h $(SRCTOP)/include/kerberosIV/krb.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(SRCTOP)/include/krb54proto.h g_svc_in_tkt.so g_svc_in_tkt.po $(OUTPRE)g_svc_in_tkt.$(OBJEXT): \ g_svc_in_tkt.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ krb4int.h $(SRCTOP)/include/port-sockets.h recvauth.so recvauth.po $(OUTPRE)recvauth.$(OBJEXT): \ recvauth.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/port-sockets.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/port-sockets.h ad_print.so ad_print.po $(OUTPRE)ad_print.$(OBJEXT): \ ad_print.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h cr_death_pkt.so cr_death_pkt.po $(OUTPRE)cr_death_pkt.$(OBJEXT): \ cr_death_pkt.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/kerberosIV/prot.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h kparse.so kparse.po $(OUTPRE)kparse.$(OBJEXT): kparse.c \ $(SRCTOP)/include/kerberosIV/mit-copyright.h $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/kerberosIV/kparse.h \ - $(BUILDTOP)/include/krb5/autoconf.h + $(BUILDTOP)/include/autoconf.h put_svc_key.so put_svc_key.po $(OUTPRE)put_svc_key.$(OBJEXT): \ put_svc_key.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h sendauth.so sendauth.po $(OUTPRE)sendauth.$(OBJEXT): \ sendauth.c $(SRCTOP)/include/kerberosIV/mit-copyright.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + krb4int.h $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h netread.so netread.po $(OUTPRE)netread.$(OBJEXT): netread.c \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/port-sockets.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/port-sockets.h netwrite.so netwrite.po $(OUTPRE)netwrite.$(OBJEXT): \ netwrite.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/port-sockets.h + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/port-sockets.h g_cnffile.so g_cnffile.po $(OUTPRE)g_cnffile.$(OBJEXT): \ g_cnffile.c $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h krb4int.h RealmsConfig-glue.so RealmsConfig-glue.po $(OUTPRE)RealmsConfig-glue.$(OBJEXT): \ RealmsConfig-glue.c $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) krb4int.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-int.h \ + $(BUILDTOP)/include/osconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h diff --git a/src/lib/krb4/gethostname.c b/src/lib/krb4/gethostname.c index c09be7299d..cc40dd0781 100644 --- a/src/lib/krb4/gethostname.c +++ b/src/lib/krb4/gethostname.c @@ -10,7 +10,7 @@ #include "mit-copyright.h" #include "krb.h" #include "krb4int.h" -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/src/lib/krb4/getst.c b/src/lib/krb4/getst.c index 252571eaff..336170d419 100644 --- a/src/lib/krb4/getst.c +++ b/src/lib/krb4/getst.c @@ -10,7 +10,7 @@ #include "mit-copyright.h" #include "krb.h" #include "krb4int.h" -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/lib/krb4/kadm_net.c b/src/lib/krb4/kadm_net.c index 4173af2b0a..1838834c0b 100644 --- a/src/lib/krb4/kadm_net.c +++ b/src/lib/krb4/kadm_net.c @@ -31,7 +31,7 @@ #include <signal.h> #include <string.h> #include <stdlib.h> -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/lib/krb4/klog.c b/src/lib/krb4/klog.c index f0b87631a5..da48efeb2c 100644 --- a/src/lib/krb4/klog.c +++ b/src/lib/krb4/klog.c @@ -25,7 +25,7 @@ */ #include "krb.h" -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_TIME_H #include <time.h> #endif diff --git a/src/lib/krb4/kparse.c b/src/lib/krb4/kparse.c index 94e5b935e3..190518ad91 100644 --- a/src/lib/krb4/kparse.c +++ b/src/lib/krb4/kparse.c @@ -38,7 +38,7 @@ #include <ctype.h> #include <kparse.h> #include <string.h> -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_STDLIB_H #include <stdlib.h> #endif diff --git a/src/lib/krb4/kuserok.c b/src/lib/krb4/kuserok.c index e2f673001e..32620db1ae 100644 --- a/src/lib/krb4/kuserok.c +++ b/src/lib/krb4/kuserok.c @@ -37,7 +37,7 @@ #include <sys/stat.h> #include <sys/file.h> #include <string.h> -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/lib/krb4/log.c b/src/lib/krb4/log.c index d7447aebb2..ada6fdfe0b 100644 --- a/src/lib/krb4/log.c +++ b/src/lib/krb4/log.c @@ -31,7 +31,7 @@ #endif #include "krb.h" -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_TIME_H #include <time.h> #endif diff --git a/src/lib/krb4/memcache.c b/src/lib/krb4/memcache.c index 6a7b48a70f..47244dd95a 100644 --- a/src/lib/krb4/memcache.c +++ b/src/lib/krb4/memcache.c @@ -14,7 +14,7 @@ #include "krb.h" #include "krb4int.h" -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef _WIN32 #include <errno.h> diff --git a/src/lib/krb4/mk_preauth.c b/src/lib/krb4/mk_preauth.c index 342654adae..1215e1145d 100644 --- a/src/lib/krb4/mk_preauth.c +++ b/src/lib/krb4/mk_preauth.c @@ -15,7 +15,7 @@ #include "krb.h" #include <string.h> -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_STDLIB_H #include <stdlib.h> #else diff --git a/src/lib/krb4/netread.c b/src/lib/krb4/netread.c index 87ead207fc..b366df3d2c 100644 --- a/src/lib/krb4/netread.c +++ b/src/lib/krb4/netread.c @@ -26,7 +26,7 @@ #include <errno.h> #include "krb.h" -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/lib/krb4/netwrite.c b/src/lib/krb4/netwrite.c index 1447b7c3c2..31832488dd 100644 --- a/src/lib/krb4/netwrite.c +++ b/src/lib/krb4/netwrite.c @@ -26,7 +26,7 @@ #include <errno.h> #include "krb.h" -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/lib/krb4/put_svc_key.c b/src/lib/krb4/put_svc_key.c index 80561cc4fa..dda60163db 100644 --- a/src/lib/krb4/put_svc_key.c +++ b/src/lib/krb4/put_svc_key.c @@ -28,7 +28,7 @@ #include <string.h> #include <stdio.h> #include <fcntl.h> -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/lib/krb4/recvauth.c b/src/lib/krb4/recvauth.c index bd2aca56a0..c5f857e980 100644 --- a/src/lib/krb4/recvauth.c +++ b/src/lib/krb4/recvauth.c @@ -28,7 +28,7 @@ #include <errno.h> #include <stdio.h> #include <string.h> -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_STDLIB_H #include <stdlib.h> #endif diff --git a/src/lib/krb4/send_to_kdc.c b/src/lib/krb4/send_to_kdc.c index 3a2544d574..3be677b6c3 100644 --- a/src/lib/krb4/send_to_kdc.c +++ b/src/lib/krb4/send_to_kdc.c @@ -30,7 +30,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> #endif diff --git a/src/lib/krb4/tkt_string.c b/src/lib/krb4/tkt_string.c index 97a62d174e..123596ca24 100644 --- a/src/lib/krb4/tkt_string.c +++ b/src/lib/krb4/tkt_string.c @@ -28,7 +28,7 @@ #include <stdio.h> #include <string.h> #include <sys/types.h> -#include "krb5/autoconf.h" +#include "autoconf.h" #include "port-sockets.h" /* XXX this gets us MAXPATHLEN but we should find a better way */ diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in index 8bf48ba5d8..ee1c890d21 100644 --- a/src/lib/krb5/Makefile.in +++ b/src/lib/krb5/Makefile.in @@ -135,12 +135,12 @@ install-unix:: install-libs # the Makefile.in file # krb5_libinit.so krb5_libinit.po $(OUTPRE)krb5_libinit.$(OBJEXT): \ - krb5_libinit.c $(BUILDTOP)/include/krb5/autoconf.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ + krb5_libinit.c $(BUILDTOP)/include/autoconf.h $(COM_ERR_DEPS) \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(BUILDTOP)/include/krb5_err.h \ $(BUILDTOP)/include/kv5m_err.h $(BUILDTOP)/include/asn1_err.h \ $(BUILDTOP)/include/kdb5_err.h krb5_libinit.h $(srcdir)/ccache/cc-int.h \ diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in index ac51178ad1..73f7329047 100644 --- a/src/lib/krb5/asn.1/Makefile.in +++ b/src/lib/krb5/asn.1/Makefile.in @@ -60,83 +60,83 @@ clean-unix:: clean-libobjs # asn1_decode.so asn1_decode.po $(OUTPRE)asn1_decode.$(OBJEXT): \ asn1_decode.c asn1_decode.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h krbasn1.h asn1buf.h asn1_get.h asn1_k_decode.so asn1_k_decode.po $(OUTPRE)asn1_k_decode.$(OBJEXT): \ asn1_k_decode.c asn1_k_decode.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h krbasn1.h asn1buf.h asn1_decode.h \ asn1_get.h asn1_misc.h asn1_encode.so asn1_encode.po $(OUTPRE)asn1_encode.$(OBJEXT): \ asn1_encode.c asn1_encode.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h krbasn1.h asn1buf.h asn1_make.h asn1_get.so asn1_get.po $(OUTPRE)asn1_get.$(OBJEXT): \ - asn1_get.c asn1_get.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + asn1_get.c asn1_get.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ krbasn1.h asn1buf.h asn1_make.so asn1_make.po $(OUTPRE)asn1_make.$(OBJEXT): \ asn1_make.c asn1_make.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h krbasn1.h asn1buf.h asn1buf.so asn1buf.po $(OUTPRE)asn1buf.$(OBJEXT): asn1buf.c \ - asn1buf.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + asn1buf.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ krbasn1.h asn1_get.h krb5_decode.so krb5_decode.po $(OUTPRE)krb5_decode.$(OBJEXT): \ - krb5_decode.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + krb5_decode.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ krbasn1.h asn1_k_decode.h asn1buf.h asn1_decode.h asn1_get.h krb5_encode.so krb5_encode.po $(OUTPRE)krb5_encode.$(OBJEXT): \ - krb5_encode.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + krb5_encode.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ asn1_k_encode.h asn1buf.h krbasn1.h asn1_encode.h asn1_make.h asn1_k_encode.so asn1_k_encode.po $(OUTPRE)asn1_k_encode.$(OBJEXT): \ asn1_k_encode.c asn1_k_encode.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h asn1buf.h krbasn1.h asn1_make.h \ asn1_encode.h asn1_misc.so asn1_misc.po $(OUTPRE)asn1_misc.$(OBJEXT): \ asn1_misc.c asn1_misc.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h krbasn1.h diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in index df41e2934b..76859881b8 100644 --- a/src/lib/krb5/ccache/Makefile.in +++ b/src/lib/krb5/ccache/Makefile.in @@ -101,68 +101,68 @@ clean-unix:: # the Makefile.in file # ccbase.so ccbase.po $(OUTPRE)ccbase.$(OBJEXT): ccbase.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ fcc.h cc-int.h cccopy.so cccopy.po $(OUTPRE)cccopy.$(OBJEXT): cccopy.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ccdefault.so ccdefault.po $(OUTPRE)ccdefault.$(OBJEXT): \ - ccdefault.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ccdefault.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ccdefops.so ccdefops.po $(OUTPRE)ccdefops.$(OBJEXT): \ - ccdefops.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ccdefops.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ fcc.h cc_retr.so cc_retr.po $(OUTPRE)cc_retr.$(OBJEXT): cc_retr.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cc-int.h cc_file.so cc_file.po $(OUTPRE)cc_file.$(OBJEXT): cc_file.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h cc_memory.so cc_memory.po $(OUTPRE)cc_memory.$(OBJEXT): \ - cc_memory.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + cc_memory.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ccfns.so ccfns.po $(OUTPRE)ccfns.$(OBJEXT): ccfns.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ser_cc.so ser_cc.po $(OUTPRE)ser_cc.$(OBJEXT): ser_cc.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog index e84f292d35..6fe4ad4ae9 100644 --- a/src/lib/krb5/error_tables/ChangeLog +++ b/src/lib/krb5/error_tables/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (EHDRDIR): Don't use krb5 subdirectory. + 2006-03-06 Ken Raeburn <raeburn@mit.edu> * krb5_err.et (KRB5_PLUGIN_NO_HANDLE): New error code. diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in index cbcc3360d9..e1eaf9900e 100644 --- a/src/lib/krb5/error_tables/Makefile.in +++ b/src/lib/krb5/error_tables/Makefile.in @@ -8,7 +8,7 @@ BUILDTOP=$(REL)..$(S)..$(S).. ##DOS##OBJFILE=..\$(OUTPRE)err_tbls.lst THDRDIR=$(BUILDTOP)$(S)include -EHDRDIR=$(BUILDTOP)$(S)include$(S)krb5 +EHDRDIR=$(BUILDTOP)$(S)include STLIBOBJS= asn1_err.o kdb5_err.o krb5_err.o \ kv5m_err.o krb524_err.o diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in index 59378d76c1..481413495c 100644 --- a/src/lib/krb5/keytab/Makefile.in +++ b/src/lib/krb5/keytab/Makefile.in @@ -62,66 +62,66 @@ clean-windows:: # the Makefile.in file # ktadd.so ktadd.po $(OUTPRE)ktadd.$(OBJEXT): ktadd.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ktbase.so ktbase.po $(OUTPRE)ktbase.$(OBJEXT): ktbase.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ kt-int.h ktdefault.so ktdefault.po $(OUTPRE)ktdefault.$(OBJEXT): \ - ktdefault.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ktdefault.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ktfr_entry.so ktfr_entry.po $(OUTPRE)ktfr_entry.$(OBJEXT): \ - ktfr_entry.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ktfr_entry.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ktremove.so ktremove.po $(OUTPRE)ktremove.$(OBJEXT): \ - ktremove.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ktremove.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ktfns.so ktfns.po $(OUTPRE)ktfns.$(OBJEXT): ktfns.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h kt_file.so kt_file.po $(OUTPRE)kt_file.$(OBJEXT): kt_file.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h kt_srvtab.so kt_srvtab.po $(OUTPRE)kt_srvtab.$(OBJEXT): \ - kt_srvtab.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + kt_srvtab.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h read_servi.so read_servi.po $(OUTPRE)read_servi.$(OBJEXT): \ - read_servi.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + read_servi.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in index 1a9a63b9a1..186b591f3c 100644 --- a/src/lib/krb5/krb/Makefile.in +++ b/src/lib/krb5/krb/Makefile.in @@ -365,657 +365,657 @@ clean:: # the Makefile.in file # addr_comp.so addr_comp.po $(OUTPRE)addr_comp.$(OBJEXT): \ - addr_comp.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + addr_comp.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h addr_order.so addr_order.po $(OUTPRE)addr_order.$(OBJEXT): \ - addr_order.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + addr_order.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h addr_srch.so addr_srch.po $(OUTPRE)addr_srch.$(OBJEXT): \ - addr_srch.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + addr_srch.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h appdefault.so appdefault.po $(OUTPRE)appdefault.$(OBJEXT): \ - appdefault.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + appdefault.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h auth_con.so auth_con.po $(OUTPRE)auth_con.$(OBJEXT): \ - auth_con.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + auth_con.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ auth_con.h bld_pr_ext.so bld_pr_ext.po $(OUTPRE)bld_pr_ext.$(OBJEXT): \ - bld_pr_ext.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + bld_pr_ext.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h bld_princ.so bld_princ.po $(OUTPRE)bld_princ.$(OBJEXT): \ - bld_princ.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + bld_princ.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h brand.so brand.po $(OUTPRE)brand.$(OBJEXT): brand.c \ $(SRCTOP)/patchlevel.h chk_trans.so chk_trans.po $(OUTPRE)chk_trans.$(OBJEXT): \ - chk_trans.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + chk_trans.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h chpw.so chpw.po $(OUTPRE)chpw.$(OBJEXT): chpw.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(BUILDTOP)/include/krb5_err.h \ auth_con.h conv_creds.so conv_creds.po $(OUTPRE)conv_creds.$(OBJEXT): \ - conv_creds.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + conv_creds.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/kerberosIV/krb.h $(SRCTOP)/include/kerberosIV/des.h \ $(KRB_ERR_H_DEP) conv_princ.so conv_princ.po $(OUTPRE)conv_princ.$(OBJEXT): \ - conv_princ.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + conv_princ.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h copy_addrs.so copy_addrs.po $(OUTPRE)copy_addrs.$(OBJEXT): \ - copy_addrs.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + copy_addrs.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h copy_auth.so copy_auth.po $(OUTPRE)copy_auth.$(OBJEXT): \ - copy_auth.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + copy_auth.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h copy_athctr.so copy_athctr.po $(OUTPRE)copy_athctr.$(OBJEXT): \ - copy_athctr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + copy_athctr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h copy_cksum.so copy_cksum.po $(OUTPRE)copy_cksum.$(OBJEXT): \ - copy_cksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + copy_cksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h copy_creds.so copy_creds.po $(OUTPRE)copy_creds.$(OBJEXT): \ - copy_creds.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + copy_creds.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h copy_data.so copy_data.po $(OUTPRE)copy_data.$(OBJEXT): \ - copy_data.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + copy_data.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h copy_key.so copy_key.po $(OUTPRE)copy_key.$(OBJEXT): \ - copy_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + copy_key.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h copy_princ.so copy_princ.po $(OUTPRE)copy_princ.$(OBJEXT): \ - copy_princ.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + copy_princ.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h copy_tick.so copy_tick.po $(OUTPRE)copy_tick.$(OBJEXT): \ - copy_tick.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + copy_tick.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h cp_key_cnt.so cp_key_cnt.po $(OUTPRE)cp_key_cnt.$(OBJEXT): \ - cp_key_cnt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + cp_key_cnt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h decode_kdc.so decode_kdc.po $(OUTPRE)decode_kdc.$(OBJEXT): \ - decode_kdc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + decode_kdc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h decrypt_tk.so decrypt_tk.po $(OUTPRE)decrypt_tk.$(OBJEXT): \ - decrypt_tk.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + decrypt_tk.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h deltat.so deltat.po $(OUTPRE)deltat.$(OBJEXT): deltat.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h enc_helper.so enc_helper.po $(OUTPRE)enc_helper.$(OBJEXT): \ - enc_helper.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + enc_helper.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h encode_kdc.so encode_kdc.po $(OUTPRE)encode_kdc.$(OBJEXT): \ - encode_kdc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + encode_kdc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h encrypt_tk.so encrypt_tk.po $(OUTPRE)encrypt_tk.$(OBJEXT): \ - encrypt_tk.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + encrypt_tk.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h free_rtree.so free_rtree.po $(OUTPRE)free_rtree.$(OBJEXT): \ - free_rtree.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + free_rtree.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h fwd_tgt.so fwd_tgt.po $(OUTPRE)fwd_tgt.$(OBJEXT): fwd_tgt.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h gc_frm_kdc.so gc_frm_kdc.po $(OUTPRE)gc_frm_kdc.$(OBJEXT): \ - gc_frm_kdc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gc_frm_kdc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h gc_via_tkt.so gc_via_tkt.po $(OUTPRE)gc_via_tkt.$(OBJEXT): \ - gc_via_tkt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gc_via_tkt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h gen_seqnum.so gen_seqnum.po $(OUTPRE)gen_seqnum.$(OBJEXT): \ - gen_seqnum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gen_seqnum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h gen_subkey.so gen_subkey.po $(OUTPRE)gen_subkey.$(OBJEXT): \ - gen_subkey.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gen_subkey.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h get_creds.so get_creds.po $(OUTPRE)get_creds.$(OBJEXT): \ - get_creds.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + get_creds.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h get_in_tkt.so get_in_tkt.po $(OUTPRE)get_in_tkt.$(OBJEXT): \ - get_in_tkt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + get_in_tkt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h $(srcdir)/../os/os-proto.h gic_keytab.so gic_keytab.po $(OUTPRE)gic_keytab.$(OBJEXT): \ - gic_keytab.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gic_keytab.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h gic_opt.so gic_opt.po $(OUTPRE)gic_opt.$(OBJEXT): gic_opt.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h gic_pwd.so gic_pwd.po $(OUTPRE)gic_pwd.$(OBJEXT): gic_pwd.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h in_tkt_sky.so in_tkt_sky.po $(OUTPRE)in_tkt_sky.$(OBJEXT): \ - in_tkt_sky.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + in_tkt_sky.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h init_ctx.so init_ctx.po $(OUTPRE)init_ctx.$(OBJEXT): \ - init_ctx.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + init_ctx.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ brand.c $(SRCTOP)/patchlevel.h $(srcdir)/../krb5_libinit.h init_keyblock.so init_keyblock.po $(OUTPRE)init_keyblock.$(OBJEXT): \ - init_keyblock.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + init_keyblock.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h kdc_rep_dc.so kdc_rep_dc.po $(OUTPRE)kdc_rep_dc.$(OBJEXT): \ - kdc_rep_dc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + kdc_rep_dc.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h kfree.so kfree.po $(OUTPRE)kfree.$(OBJEXT): kfree.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h mk_cred.so mk_cred.po $(OUTPRE)mk_cred.$(OBJEXT): mk_cred.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cleanup.h auth_con.h mk_error.so mk_error.po $(OUTPRE)mk_error.$(OBJEXT): \ - mk_error.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + mk_error.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h mk_priv.so mk_priv.po $(OUTPRE)mk_priv.$(OBJEXT): mk_priv.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cleanup.h auth_con.h mk_rep.so mk_rep.po $(OUTPRE)mk_rep.$(OBJEXT): mk_rep.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ auth_con.h mk_req.so mk_req.po $(OUTPRE)mk_req.$(OBJEXT): mk_req.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ auth_con.h mk_req_ext.so mk_req_ext.po $(OUTPRE)mk_req_ext.$(OBJEXT): \ - mk_req_ext.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + mk_req_ext.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ auth_con.h mk_safe.so mk_safe.po $(OUTPRE)mk_safe.$(OBJEXT): mk_safe.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cleanup.h auth_con.h parse.so parse.po $(OUTPRE)parse.$(OBJEXT): parse.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h pr_to_salt.so pr_to_salt.po $(OUTPRE)pr_to_salt.$(OBJEXT): \ - pr_to_salt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + pr_to_salt.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h preauth.so preauth.po $(OUTPRE)preauth.$(OBJEXT): preauth.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h preauth2.so preauth2.po $(OUTPRE)preauth2.$(OBJEXT): \ - preauth2.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + preauth2.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h princ_comp.so princ_comp.po $(OUTPRE)princ_comp.$(OBJEXT): \ - princ_comp.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + princ_comp.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h rd_cred.so rd_cred.po $(OUTPRE)rd_cred.$(OBJEXT): rd_cred.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cleanup.h auth_con.h rd_error.so rd_error.po $(OUTPRE)rd_error.$(OBJEXT): \ - rd_error.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + rd_error.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h rd_priv.so rd_priv.po $(OUTPRE)rd_priv.$(OBJEXT): rd_priv.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cleanup.h auth_con.h rd_rep.so rd_rep.po $(OUTPRE)rd_rep.$(OBJEXT): rd_rep.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ auth_con.h rd_req.so rd_req.po $(OUTPRE)rd_req.$(OBJEXT): rd_req.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ auth_con.h rd_req_dec.so rd_req_dec.po $(OUTPRE)rd_req_dec.$(OBJEXT): \ - rd_req_dec.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + rd_req_dec.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ auth_con.h rd_safe.so rd_safe.po $(OUTPRE)rd_safe.$(OBJEXT): rd_safe.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ cleanup.h auth_con.h recvauth.so recvauth.po $(OUTPRE)recvauth.$(OBJEXT): \ - recvauth.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + recvauth.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ auth_con.h sendauth.so sendauth.po $(OUTPRE)sendauth.$(OBJEXT): \ - sendauth.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + sendauth.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ auth_con.h send_tgs.so send_tgs.po $(OUTPRE)send_tgs.$(OBJEXT): \ - send_tgs.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + send_tgs.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ser_actx.so ser_actx.po $(OUTPRE)ser_actx.$(OBJEXT): \ - ser_actx.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ser_actx.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h auth_con.h ser_adata.so ser_adata.po $(OUTPRE)ser_adata.$(OBJEXT): \ - ser_adata.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ser_adata.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h ser_addr.so ser_addr.po $(OUTPRE)ser_addr.$(OBJEXT): \ - ser_addr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ser_addr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h ser_auth.so ser_auth.po $(OUTPRE)ser_auth.$(OBJEXT): \ - ser_auth.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ser_auth.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h ser_cksum.so ser_cksum.po $(OUTPRE)ser_cksum.$(OBJEXT): \ - ser_cksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ser_cksum.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h ser_ctx.so ser_ctx.po $(OUTPRE)ser_ctx.$(OBJEXT): ser_ctx.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ser_key.so ser_key.po $(OUTPRE)ser_key.$(OBJEXT): ser_key.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h ser_princ.so ser_princ.po $(OUTPRE)ser_princ.$(OBJEXT): \ - ser_princ.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ser_princ.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h serialize.so serialize.po $(OUTPRE)serialize.$(OBJEXT): \ - serialize.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + serialize.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h set_realm.so set_realm.po $(OUTPRE)set_realm.$(OBJEXT): \ - set_realm.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + set_realm.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h srv_rcache.so srv_rcache.po $(OUTPRE)srv_rcache.$(OBJEXT): \ - srv_rcache.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + srv_rcache.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h str_conv.so str_conv.po $(OUTPRE)str_conv.$(OBJEXT): \ - str_conv.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + str_conv.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h tgtname.so tgtname.po $(OUTPRE)tgtname.$(OBJEXT): tgtname.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h unparse.so unparse.po $(OUTPRE)unparse.$(OBJEXT): unparse.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h v4lifetime.so v4lifetime.po $(OUTPRE)v4lifetime.$(OBJEXT): \ - v4lifetime.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + v4lifetime.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h valid_times.so valid_times.po $(OUTPRE)valid_times.$(OBJEXT): \ - valid_times.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + valid_times.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h vfy_increds.so vfy_increds.po $(OUTPRE)vfy_increds.$(OBJEXT): \ - vfy_increds.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + vfy_increds.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h vic_opt.so vic_opt.po $(OUTPRE)vic_opt.$(OBJEXT): vic_opt.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h walk_rtree.so walk_rtree.po $(OUTPRE)walk_rtree.$(OBJEXT): \ - walk_rtree.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + walk_rtree.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ int-proto.h t_walk_rtree.so t_walk_rtree.po $(OUTPRE)t_walk_rtree.$(OBJEXT): \ - t_walk_rtree.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + t_walk_rtree.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h t_kerb.so t_kerb.po $(OUTPRE)t_kerb.$(OBJEXT): t_kerb.c \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/kerberosIV/krb.h \ $(SRCTOP)/include/kerberosIV/des.h $(KRB_ERR_H_DEP) \ $(BUILDTOP)/include/profile.h t_ser.so t_ser.po $(OUTPRE)t_ser.$(OBJEXT): t_ser.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ auth_con.h t_deltat.so t_deltat.po $(OUTPRE)t_deltat.$(OBJEXT): \ - t_deltat.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + t_deltat.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h t_expand.so t_expand.po $(OUTPRE)t_expand.$(OBJEXT): \ - t_expand.c chk_trans.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + t_expand.c chk_trans.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in index 0726e9c801..0a94fc29ab 100644 --- a/src/lib/krb5/os/Makefile.in +++ b/src/lib/krb5/os/Makefile.in @@ -253,352 +253,352 @@ clean:: # the Makefile.in file # accessor.so accessor.po $(OUTPRE)accessor.$(OBJEXT): \ - accessor.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + accessor.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h an_to_ln.so an_to_ln.po $(OUTPRE)an_to_ln.$(OBJEXT): \ - an_to_ln.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + an_to_ln.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h c_ustime.so c_ustime.po $(OUTPRE)c_ustime.$(OBJEXT): \ - c_ustime.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + c_ustime.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h def_realm.so def_realm.po $(OUTPRE)def_realm.$(OBJEXT): \ - def_realm.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + def_realm.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h ccdefname.so ccdefname.po $(OUTPRE)ccdefname.$(OBJEXT): \ - ccdefname.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ccdefname.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h changepw.so changepw.po $(OUTPRE)changepw.$(OBJEXT): \ changepw.c $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/socket-utils.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/socket-utils.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h os-proto.h dnsglue.so dnsglue.po $(OUTPRE)dnsglue.$(OBJEXT): dnsglue.c \ - dnsglue.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + dnsglue.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h dnssrv.so dnssrv.po $(OUTPRE)dnssrv.$(OBJEXT): dnssrv.c \ - dnsglue.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + dnsglue.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h free_krbhs.so free_krbhs.po $(OUTPRE)free_krbhs.$(OBJEXT): \ - free_krbhs.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + free_krbhs.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h free_hstrl.so free_hstrl.po $(OUTPRE)free_hstrl.$(OBJEXT): \ - free_hstrl.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + free_hstrl.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h full_ipadr.so full_ipadr.po $(OUTPRE)full_ipadr.$(OBJEXT): \ - full_ipadr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + full_ipadr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h get_krbhst.so get_krbhst.po $(OUTPRE)get_krbhst.$(OBJEXT): \ - get_krbhst.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + get_krbhst.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h gen_port.so gen_port.po $(OUTPRE)gen_port.$(OBJEXT): \ - gen_port.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gen_port.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h genaddrs.so genaddrs.po $(OUTPRE)genaddrs.$(OBJEXT): \ - genaddrs.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + genaddrs.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h gen_rname.so gen_rname.po $(OUTPRE)gen_rname.$(OBJEXT): \ - gen_rname.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gen_rname.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h gmt_mktime.so gmt_mktime.po $(OUTPRE)gmt_mktime.$(OBJEXT): \ - gmt_mktime.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + gmt_mktime.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h hostaddr.so hostaddr.po $(OUTPRE)hostaddr.$(OBJEXT): \ - hostaddr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + hostaddr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/fake-addrinfo.h hst_realm.so hst_realm.po $(OUTPRE)hst_realm.$(OBJEXT): \ - hst_realm.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + hst_realm.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h $(SRCTOP)/include/fake-addrinfo.h dnsglue.h init_os_ctx.so init_os_ctx.po $(OUTPRE)init_os_ctx.$(OBJEXT): \ - init_os_ctx.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + init_os_ctx.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h krbfileio.so krbfileio.po $(OUTPRE)krbfileio.$(OBJEXT): \ - krbfileio.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + krbfileio.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ktdefname.so ktdefname.po $(OUTPRE)ktdefname.$(OBJEXT): \ - ktdefname.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + ktdefname.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h kuserok.so kuserok.po $(OUTPRE)kuserok.$(OBJEXT): kuserok.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h mk_faddr.so mk_faddr.po $(OUTPRE)mk_faddr.$(OBJEXT): \ - mk_faddr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + mk_faddr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h localaddr.so localaddr.po $(OUTPRE)localaddr.$(OBJEXT): \ - localaddr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + localaddr.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/foreachaddr.h locate_kdc.so locate_kdc.po $(OUTPRE)locate_kdc.$(OBJEXT): \ locate_kdc.c $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/socket-utils.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/socket-utils.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h os-proto.h lock_file.so lock_file.po $(OUTPRE)lock_file.$(OBJEXT): \ - lock_file.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + lock_file.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h net_read.so net_read.po $(OUTPRE)net_read.$(OBJEXT): \ - net_read.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + net_read.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h net_write.so net_write.po $(OUTPRE)net_write.$(OBJEXT): \ - net_write.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + net_write.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h osconfig.so osconfig.po $(OUTPRE)osconfig.$(OBJEXT): \ - osconfig.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + osconfig.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h prompter.so prompter.po $(OUTPRE)prompter.$(OBJEXT): \ - prompter.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + prompter.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h read_msg.so read_msg.po $(OUTPRE)read_msg.$(OBJEXT): \ - read_msg.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + read_msg.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h read_pwd.so read_pwd.po $(OUTPRE)read_pwd.$(OBJEXT): \ - read_pwd.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + read_pwd.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h realm_dom.so realm_dom.po $(OUTPRE)realm_dom.$(OBJEXT): \ - realm_dom.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + realm_dom.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h realm_iter.so realm_iter.po $(OUTPRE)realm_iter.$(OBJEXT): \ - realm_iter.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + realm_iter.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h port2ip.so port2ip.po $(OUTPRE)port2ip.$(OBJEXT): port2ip.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ os-proto.h send524.so send524.po $(OUTPRE)send524.$(OBJEXT): send524.c \ $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/socket-utils.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/socket-utils.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h os-proto.h sendto_kdc.so sendto_kdc.po $(OUTPRE)sendto_kdc.$(OBJEXT): \ sendto_kdc.c $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/socket-utils.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/socket-utils.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h os-proto.h $(SRCTOP)/include/cm.h sn2princ.so sn2princ.po $(OUTPRE)sn2princ.$(OBJEXT): \ - sn2princ.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + sn2princ.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/include/fake-addrinfo.h thread_safe.so thread_safe.po $(OUTPRE)thread_safe.$(OBJEXT): \ - thread_safe.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + thread_safe.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h timeofday.so timeofday.po $(OUTPRE)timeofday.$(OBJEXT): \ - timeofday.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + timeofday.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h toffset.so toffset.po $(OUTPRE)toffset.$(OBJEXT): toffset.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h unlck_file.so unlck_file.po $(OUTPRE)unlck_file.$(OBJEXT): \ - unlck_file.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + unlck_file.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ustime.so ustime.po $(OUTPRE)ustime.$(OBJEXT): ustime.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h write_msg.so write_msg.po $(OUTPRE)write_msg.$(OBJEXT): \ - write_msg.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + write_msg.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h t_an_to_ln.so t_an_to_ln.po $(OUTPRE)t_an_to_ln.$(OBJEXT): \ t_an_to_ln.c $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) t_gifconf.so t_gifconf.po $(OUTPRE)t_gifconf.$(OBJEXT): \ t_gifconf.c t_locate_kdc.so t_locate_kdc.po $(OUTPRE)t_locate_kdc.$(OBJEXT): \ - t_locate_kdc.c $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ + t_locate_kdc.c $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \ $(COM_ERR_DEPS) dnsglue.c dnsglue.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/osconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(BUILDTOP)/include/profile.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h os-proto.h dnssrv.c locate_kdc.c \ $(SRCTOP)/include/fake-addrinfo.h t_realm_iter.so t_realm_iter.po $(OUTPRE)t_realm_iter.$(OBJEXT): \ t_realm_iter.c $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) t_std_conf.so t_std_conf.po $(OUTPRE)t_std_conf.$(OBJEXT): \ t_std_conf.c $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/socket-utils.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/socket-utils.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h os-proto.h diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in index d9d6460066..903757459e 100644 --- a/src/lib/krb5/rcache/Makefile.in +++ b/src/lib/krb5/rcache/Makefile.in @@ -50,65 +50,65 @@ clean-unix:: clean-libobjs # the Makefile.in file # rc_base.so rc_base.po $(OUTPRE)rc_base.$(OBJEXT): rc_base.c \ - rc_base.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + rc_base.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ rc-int.h rc_dfl.so rc_dfl.po $(OUTPRE)rc_dfl.$(OBJEXT): rc_dfl.c \ - rc_base.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + rc_base.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ rc_dfl.h rc_io.h rc-int.h rc_io.so rc_io.po $(OUTPRE)rc_io.$(OBJEXT): rc_io.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ rc_base.h rc_dfl.h rc_io.h rcdef.so rcdef.po $(OUTPRE)rcdef.$(OBJEXT): rcdef.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ rc-int.h rc_dfl.h rc_none.so rc_none.po $(OUTPRE)rc_none.$(OBJEXT): rc_none.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ rc-int.h rc_conv.so rc_conv.po $(OUTPRE)rc_conv.$(OBJEXT): rc_conv.c \ - rc_base.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + rc_base.h $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h ser_rc.so ser_rc.po $(OUTPRE)ser_rc.$(OBJEXT): ser_rc.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ rc-int.h rcfns.so rcfns.po $(OUTPRE)rcfns.$(OBJEXT): rcfns.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ rc-int.h diff --git a/src/lib/rpc/unit-test/ChangeLog b/src/lib/rpc/unit-test/ChangeLog index f97c77fc53..5da06fe528 100644 --- a/src/lib/rpc/unit-test/ChangeLog +++ b/src/lib/rpc/unit-test/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * server.c (krb5_kt_default_name): Deleted unused function. + 2005-08-20 Ken Raeburn <raeburn@mit.edu> * configure.in: Use K5_AC_INIT instead of AC_INIT. diff --git a/src/lib/rpc/unit-test/server.c b/src/lib/rpc/unit-test/server.c index df8f4c9936..e831a0d343 100644 --- a/src/lib/rpc/unit-test/server.c +++ b/src/lib/rpc/unit-test/server.c @@ -258,32 +258,3 @@ void log_badauth_display_status_1(OM_uint32 code, int type, int rec) break; } } - - -#if 0 - -/* this hack is no longer necessary, since the library supports it - internally */ - -/* This is a hack to change the default keytab name */ - -#include <krb5/krb5.h> -extern char *krb5_defkeyname; - -krb5_error_code -krb5_kt_default_name(char *name, int namesize) -{ - char *ktname; - - if ((ktname = getenv("KRB5KTNAME")) == NULL) - ktname = krb5_defkeyname; - - if (namesize < strlen(ktname)+1) - return(KRB5_CONFIG_NOTENUFSPACE); - - strcpy(name, ktname); - - return(0); -} - -#endif diff --git a/src/plugins/kdb/db2/ChangeLog b/src/plugins/kdb/db2/ChangeLog index df039d0637..64c72308f1 100644 --- a/src/plugins/kdb/db2/ChangeLog +++ b/src/plugins/kdb/db2/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * pol_xdr.c, policy_db.h: Don't get headers from krb5/. + 2006-03-06 Ken Raeburn <raeburn@mit.edu> * Makefile.in (MODULE_INSTALL_DIR): New variable. diff --git a/src/plugins/kdb/db2/Makefile.in b/src/plugins/kdb/db2/Makefile.in index 6745af2667..da23e13936 100644 --- a/src/plugins/kdb/db2/Makefile.in +++ b/src/plugins/kdb/db2/Makefile.in @@ -95,35 +95,35 @@ depend-verify-db-sys: # the Makefile.in file # kdb_xdr.so kdb_xdr.po $(OUTPRE)kdb_xdr.$(OBJEXT): kdb_xdr.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ kdb_xdr.h adb_openclose.so adb_openclose.po $(OUTPRE)adb_openclose.$(OBJEXT): \ - adb_openclose.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + adb_openclose.c $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ policy_db.h $(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/gssrpc/rename.h \ $(BUILDTOP)/include/gssrpc/xdr.h $(DB_DEPS) $(BUILDTOP)/lib/kdb/adb_err.h adb_policy.so adb_policy.po $(OUTPRE)adb_policy.$(OBJEXT): \ adb_policy.c policy_db.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-platform.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-thread.h \ + $(COM_ERR_DEPS) $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/gssrpc/types.h $(BUILDTOP)/include/gssrpc/rename.h \ $(BUILDTOP)/include/gssrpc/xdr.h $(DB_DEPS) $(BUILDTOP)/lib/kdb/adb_err.h kdb_db2.so kdb_db2.po $(OUTPRE)kdb_db2.$(OBJEXT): kdb_db2.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(DB_DEPS) $(SRCTOP)/lib/kdb/kdb5.h $(SRCTOP)/lib/kdb/err_handle.h \ kdb_db2.h policy_db.h $(BUILDTOP)/include/gssrpc/types.h \ $(BUILDTOP)/include/gssrpc/rename.h $(BUILDTOP)/include/gssrpc/xdr.h \ @@ -135,17 +135,17 @@ pol_xdr.so pol_xdr.po $(OUTPRE)pol_xdr.$(OBJEXT): pol_xdr.c \ $(BUILDTOP)/include/gssrpc/clnt.h $(BUILDTOP)/include/gssrpc/rpc_msg.h \ $(BUILDTOP)/include/gssrpc/auth_unix.h $(BUILDTOP)/include/gssrpc/auth_gss.h \ $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssrpc/svc_auth.h \ - $(BUILDTOP)/include/gssrpc/svc.h $(SRCTOP)/include/krb5/kdb.h \ - $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/gssrpc/svc.h $(SRCTOP)/include/kdb.h \ + $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-thread.h policy_db.h $(DB_DEPS) \ $(BUILDTOP)/lib/kdb/adb_err.h db2_exp.so db2_exp.po $(OUTPRE)db2_exp.$(OBJEXT): db2_exp.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(DB_DEPS) $(SRCTOP)/lib/kdb/kdb5.h $(SRCTOP)/lib/kdb/err_handle.h \ kdb_db2.h policy_db.h $(BUILDTOP)/include/gssrpc/types.h \ $(BUILDTOP)/include/gssrpc/rename.h $(BUILDTOP)/include/gssrpc/xdr.h \ diff --git a/src/plugins/kdb/db2/pol_xdr.c b/src/plugins/kdb/db2/pol_xdr.c index 37761080a8..969259ec23 100644 --- a/src/plugins/kdb/db2/pol_xdr.c +++ b/src/plugins/kdb/db2/pol_xdr.c @@ -1,7 +1,7 @@ #include <sys/types.h> #include <krb5.h> #include <gssrpc/rpc.h> -#include <krb5/kdb.h> +#include <kdb.h> #include "policy_db.h" #ifdef HAVE_MEMORY_H #include <memory.h> diff --git a/src/plugins/kdb/db2/policy_db.h b/src/plugins/kdb/db2/policy_db.h index 8bbef800b5..11fece3df2 100644 --- a/src/plugins/kdb/db2/policy_db.h +++ b/src/plugins/kdb/db2/policy_db.h @@ -13,7 +13,7 @@ #include <sys/types.h> #include <errno.h> #include <krb5.h> -#include <krb5/kdb.h> +#include <kdb.h> /* Okay, this is a bit obscure. The libdb2 configure script doesn't detect it, but on Tru64 5.1, netinet/in.h causes sys/bittypes.h to be included, and that has a typedef for u_int32_t. Because the diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in index 86dc0358f3..dac156d78e 100644 --- a/src/slave/Makefile.in +++ b/src/slave/Makefile.in @@ -42,17 +42,17 @@ clean:: # the Makefile.in file # $(OUTPRE)kprop.$(OBJEXT): kprop.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h kprop.h $(OUTPRE)kpropd.$(OBJEXT): kpropd.c $(SRCTOP)/include/syslog.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ kprop.h diff --git a/src/tests/asn.1/Makefile.in b/src/tests/asn.1/Makefile.in index bbdc4bfc40..3ddc3137db 100644 --- a/src/tests/asn.1/Makefile.in +++ b/src/tests/asn.1/Makefile.in @@ -65,35 +65,35 @@ ktest_equal.o: ktest_equal.h # the Makefile.in file # $(OUTPRE)krb5_encode_test.$(OBJEXT): krb5_encode_test.c \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ utility.h $(SRCTOP)/lib/krb5/asn.1/krbasn1.h $(SRCTOP)/lib/krb5/asn.1/asn1buf.h \ ktest.h debug.h $(OUTPRE)ktest.$(OBJEXT): ktest.c ktest.h $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h utility.h $(SRCTOP)/lib/krb5/asn.1/krbasn1.h \ $(SRCTOP)/lib/krb5/asn.1/asn1buf.h $(OUTPRE)ktest_equal.$(OBJEXT): ktest_equal.c ktest_equal.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h $(OUTPRE)utility.$(OBJEXT): utility.c utility.h $(SRCTOP)/lib/krb5/asn.1/krbasn1.h \ - $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/krb5/osconf.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(SRCTOP)/include/k5-int.h $(BUILDTOP)/include/osconf.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-locate.h \ - $(SRCTOP)/include/krb5/kdb.h $(SRCTOP)/include/k5-plugin.h \ + $(SRCTOP)/include/kdb.h $(SRCTOP)/include/k5-plugin.h \ $(SRCTOP)/lib/krb5/asn.1/asn1buf.h $(OUTPRE)trval.$(OBJEXT): trval.c diff --git a/src/tests/create/Makefile.in b/src/tests/create/Makefile.in index 5a628fcf52..175bc0f1f5 100644 --- a/src/tests/create/Makefile.in +++ b/src/tests/create/Makefile.in @@ -25,9 +25,9 @@ clean:: # the Makefile.in file # $(OUTPRE)kdb5_mkdums.$(OBJEXT): kdb5_mkdums.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SS_DEPS) diff --git a/src/tests/gss-threads/ChangeLog b/src/tests/gss-threads/ChangeLog index ae92cd9262..1c8a3bb3da 100644 --- a/src/tests/gss-threads/ChangeLog +++ b/src/tests/gss-threads/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * gss-misc.c: Don't get autoconf.h from krb5/. + 2005-06-20 Ken Raeburn <raeburn@mit.edu> * Makefile.in (gss-client, gss-server): Use THREAD_LINKOPTS diff --git a/src/tests/gss-threads/Makefile.in b/src/tests/gss-threads/Makefile.in index 827399ee91..727a3ad106 100644 --- a/src/tests/gss-threads/Makefile.in +++ b/src/tests/gss-threads/Makefile.in @@ -43,12 +43,12 @@ install-unix:: # $(OUTPRE)gss-client.$(OBJEXT): gss-client.c $(BUILDTOP)/include/gssapi/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h gss-misc.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/fake-addrinfo.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/fake-addrinfo.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h -$(OUTPRE)gss-misc.$(OBJEXT): gss-misc.c $(BUILDTOP)/include/krb5/autoconf.h \ +$(OUTPRE)gss-misc.$(OBJEXT): gss-misc.c $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/gssapi/gssapi_generic.h $(BUILDTOP)/include/gssapi/gssapi.h \ gss-misc.h $(OUTPRE)gss-server.$(OBJEXT): gss-server.c $(BUILDTOP)/include/gssapi/gssapi_generic.h \ $(BUILDTOP)/include/gssapi/gssapi.h gss-misc.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h + $(BUILDTOP)/include/autoconf.h diff --git a/src/tests/gss-threads/gss-misc.c b/src/tests/gss-threads/gss-misc.c index 3405275fa5..3016db2208 100644 --- a/src/tests/gss-threads/gss-misc.c +++ b/src/tests/gss-threads/gss-misc.c @@ -57,7 +57,7 @@ static char *rcsid = "$Header$"; #include <sys/socket.h> #endif #include <errno.h> -#include "krb5/autoconf.h" +#include "autoconf.h" #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/tests/hammer/Makefile.in b/src/tests/hammer/Makefile.in index bcbdf821e0..ca873dea45 100644 --- a/src/tests/hammer/Makefile.in +++ b/src/tests/hammer/Makefile.in @@ -23,9 +23,9 @@ clean:: # the Makefile.in file # $(OUTPRE)kdc5_hammer.$(OBJEXT): kdc5_hammer.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h diff --git a/src/tests/misc/ChangeLog b/src/tests/misc/ChangeLog index 559980a1f9..035fbee960 100644 --- a/src/tests/misc/ChangeLog +++ b/src/tests/misc/ChangeLog @@ -1,3 +1,10 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * test_getsockname.c, test_getpw.c: Don't get autoconf.h from + krb5/. + * Makefile.in (test_getpw.$(OBJEXT)): Drop explicit dependencies + outside of "make depend" section. + 2005-11-28 Ken Raeburn <raeburn@mit.edu> * Makefile.in (test_getpw.$(OBJEXT)): New intermediate target. diff --git a/src/tests/misc/Makefile.in b/src/tests/misc/Makefile.in index 3f5cf03a24..3438bf4a8d 100644 --- a/src/tests/misc/Makefile.in +++ b/src/tests/misc/Makefile.in @@ -16,7 +16,6 @@ check:: test_getpw test_getpw: $(OUTPRE)test_getpw.$(OBJEXT) $(SUPPORT_DEPLIB) $(CC_LINK) $(ALL_CFLAGS) -o test_getpw $(OUTPRE)test_getpw.$(OBJEXT) $(SUPPORT_LIB) -test_getpw.$(OBJEXT): $(srcdir)/../misc/test_getpw.c ../../include/krb5/autoconf.h test_getsockname: $(OUTPRE)test_getsockname.$(OBJEXT) $(CC_LINK) $(ALL_CFLAGS) -o test_getsockname $(OUTPRE)test_getsockname.$(OBJEXT) $(LIBS) @@ -31,5 +30,5 @@ clean:: # Makefile dependencies follow. This must be the last section in # the Makefile.in file # -$(OUTPRE)test_getpw.$(OBJEXT): test_getpw.c $(BUILDTOP)/include/krb5/autoconf.h \ +$(OUTPRE)test_getpw.$(OBJEXT): test_getpw.c $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h diff --git a/src/tests/misc/test_getpw.c b/src/tests/misc/test_getpw.c index cd5def6a9c..6d0fb1845a 100644 --- a/src/tests/misc/test_getpw.c +++ b/src/tests/misc/test_getpw.c @@ -1,4 +1,4 @@ -#include "krb5/autoconf.h" +#include "autoconf.h" #include "k5-platform.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/tests/misc/test_getsockname.c b/src/tests/misc/test_getsockname.c index 90bf68dfd9..7c85e74761 100644 --- a/src/tests/misc/test_getsockname.c +++ b/src/tests/misc/test_getsockname.c @@ -17,7 +17,7 @@ #include <netdb.h> #include <stdio.h> #include <string.h> -#include "krb5/autoconf.h" +#include "autoconf.h" int main(argc, argv) diff --git a/src/tests/resolve/Makefile.in b/src/tests/resolve/Makefile.in index a08706989d..94c85d7f82 100644 --- a/src/tests/resolve/Makefile.in +++ b/src/tests/resolve/Makefile.in @@ -40,5 +40,5 @@ $(OUTPRE)resolve.$(OBJEXT): resolve.c $(OUTPRE)addrinfo-test.$(OBJEXT): addrinfo-test.c $(OUTPRE)fake-addrinfo-test.$(OBJEXT): fake-addrinfo-test.c \ addrinfo-test.c $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/socket-utils.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/socket-utils.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h diff --git a/src/tests/shlib/ChangeLog b/src/tests/shlib/ChangeLog index bfea7ca78b..de8142fde8 100644 --- a/src/tests/shlib/ChangeLog +++ b/src/tests/shlib/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * t_loader.c: Don't get autoconf.h from krb5/. + 2005-06-20 Ken Raeburn <raeburn@mit.edu> * Makefile.in (t_loader): Use DL_LIB instead of -ldl. diff --git a/src/tests/shlib/Makefile.in b/src/tests/shlib/Makefile.in index 49cf20fa23..196e7a349d 100644 --- a/src/tests/shlib/Makefile.in +++ b/src/tests/shlib/Makefile.in @@ -35,5 +35,5 @@ clean:: # Makefile dependencies follow. This must be the last section in # the Makefile.in file # -$(OUTPRE)t_loader.$(OBJEXT): t_loader.c $(BUILDTOP)/include/krb5/autoconf.h \ +$(OUTPRE)t_loader.$(OBJEXT): t_loader.c $(BUILDTOP)/include/autoconf.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/gssapi/gssapi.h diff --git a/src/tests/shlib/t_loader.c b/src/tests/shlib/t_loader.c index ecd6a4e830..70cd6d13b8 100644 --- a/src/tests/shlib/t_loader.c +++ b/src/tests/shlib/t_loader.c @@ -2,7 +2,7 @@ #include <stdio.h> #include <string.h> #include <assert.h> -#include "krb5/autoconf.h" +#include "autoconf.h" #include "krb5.h" #include "gssapi/gssapi.h" #define HAVE_DLOPEN 1 diff --git a/src/tests/verify/Makefile.in b/src/tests/verify/Makefile.in index c1f6350d5b..59a922a090 100644 --- a/src/tests/verify/Makefile.in +++ b/src/tests/verify/Makefile.in @@ -24,9 +24,9 @@ clean:: # the Makefile.in file # $(OUTPRE)kdb5_verify.$(OBJEXT): kdb5_verify.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h $(SRCTOP)/include/k5-thread.h \ $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h \ $(SRCTOP)/include/port-sockets.h $(SRCTOP)/include/socket-utils.h \ - $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/krb5/kdb.h \ + $(SRCTOP)/include/k5-locate.h $(SRCTOP)/include/kdb.h \ $(SRCTOP)/include/k5-plugin.h $(SS_DEPS) diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in index 95b8fac248..1c7eafe175 100644 --- a/src/util/et/Makefile.in +++ b/src/util/et/Makefile.in @@ -253,12 +253,11 @@ depend:: et_lex.lex.c # the Makefile.in file # error_message.so error_message.po $(OUTPRE)error_message.$(OBJEXT): \ - error_message.c $(BUILDTOP)/include/krb5/autoconf.h \ - com_err.h error_table.h $(SRCTOP)/include/k5-thread.h \ - $(SRCTOP)/include/k5-platform.h + error_message.c $(BUILDTOP)/include/autoconf.h com_err.h \ + error_table.h $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/k5-platform.h et_name.so et_name.po $(OUTPRE)et_name.$(OBJEXT): et_name.c \ com_err.h error_table.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h + $(BUILDTOP)/include/autoconf.h com_err.so com_err.po $(OUTPRE)com_err.$(OBJEXT): com_err.c \ com_err.h error_table.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h + $(BUILDTOP)/include/autoconf.h diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in index b06b5bb61b..a80beb4818 100644 --- a/src/util/profile/Makefile.in +++ b/src/util/profile/Makefile.in @@ -159,35 +159,35 @@ check-windows:: $(OUTPRE)test_profile.exe $(OUTPRE)test_parse.exe # prof_tree.so prof_tree.po $(OUTPRE)prof_tree.$(OBJEXT): \ prof_tree.c prof_int.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h prof_file.so prof_file.po $(OUTPRE)prof_file.$(OBJEXT): \ prof_file.c prof_int.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h prof_parse.so prof_parse.po $(OUTPRE)prof_parse.$(OBJEXT): \ prof_parse.c prof_int.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h prof_get.so prof_get.po $(OUTPRE)prof_get.$(OBJEXT): \ prof_get.c prof_int.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h prof_set.so prof_set.po $(OUTPRE)prof_set.$(OBJEXT): \ prof_set.c prof_int.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h prof_err.so prof_err.po $(OUTPRE)prof_err.$(OBJEXT): \ prof_err.c $(COM_ERR_DEPS) prof_init.so prof_init.po $(OUTPRE)prof_init.$(OBJEXT): \ prof_init.c prof_int.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h test_parse.so test_parse.po $(OUTPRE)test_parse.$(OBJEXT): \ test_parse.c prof_int.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h test_profile.so test_profile.po $(OUTPRE)test_profile.$(OBJEXT): \ test_profile.c prof_int.h $(SRCTOP)/include/k5-thread.h \ - $(BUILDTOP)/include/krb5/autoconf.h $(SRCTOP)/include/k5-platform.h \ + $(BUILDTOP)/include/autoconf.h $(SRCTOP)/include/k5-platform.h \ $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h argv_parse.h diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog index 77868b1993..dc96068515 100644 --- a/src/util/pty/ChangeLog +++ b/src/util/pty/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (autoconf.h): Note location change. + 2005-08-20 Ken Raeburn <raeburn@mit.edu> * configure.in: Use K5_AC_INIT instead of AC_INIT. diff --git a/src/util/pty/Makefile.in b/src/util/pty/Makefile.in index 0e8f394c85..fd43a45723 100644 --- a/src/util/pty/Makefile.in +++ b/src/util/pty/Makefile.in @@ -79,7 +79,7 @@ includes:: libpty.h $(BUILDTOP)/include/libpty.h) ; \ fi -includes:: $(BUILDTOP)/include/krb5/autoconf.h +includes:: $(BUILDTOP)/include/autoconf.h clean-unix:: $(RM) $(BUILDTOP)/include/libpty.h @@ -103,8 +103,8 @@ pty_err.o: pty_err.c pty_err.h: pty_err.et pty_err.c: pty_err.et -$(BUILDTOP)/include/krb5/autoconf.h: $(SRCTOP)/include/krb5/autoconf.h.in - (cd $(BUILDTOP)/include; $(MAKE) krb5/autoconf.h) +$(BUILDTOP)/include/autoconf.h: $(SRCTOP)/include/autoconf.h.in + (cd $(BUILDTOP)/include; $(MAKE) autoconf.h) # @lib_frag@ @@ -119,39 +119,39 @@ pty_err.so pty_err.po $(OUTPRE)pty_err.$(OBJEXT): pty_err.c \ $(COM_ERR_DEPS) cleanup.so cleanup.po $(OUTPRE)cleanup.$(OBJEXT): cleanup.c \ $(COM_ERR_DEPS) libpty.h pty-int.h pty_err.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h + $(BUILDTOP)/include/autoconf.h getpty.so getpty.po $(OUTPRE)getpty.$(OBJEXT): getpty.c \ $(COM_ERR_DEPS) libpty.h pty-int.h pty_err.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h + $(BUILDTOP)/include/autoconf.h init_slave.so init_slave.po $(OUTPRE)init_slave.$(OBJEXT): \ init_slave.c $(COM_ERR_DEPS) libpty.h pty-int.h pty_err.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h open_ctty.so open_ctty.po $(OUTPRE)open_ctty.$(OBJEXT): \ open_ctty.c $(COM_ERR_DEPS) libpty.h pty-int.h pty_err.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h open_slave.so open_slave.po $(OUTPRE)open_slave.$(OBJEXT): \ open_slave.c $(COM_ERR_DEPS) libpty.h pty-int.h pty_err.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h update_utmp.so update_utmp.po $(OUTPRE)update_utmp.$(OBJEXT): \ update_utmp.c $(COM_ERR_DEPS) libpty.h pty-int.h pty_err.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h update_wtmp.so update_wtmp.po $(OUTPRE)update_wtmp.$(OBJEXT): \ update_wtmp.c $(COM_ERR_DEPS) libpty.h pty-int.h pty_err.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h vhangup.so vhangup.po $(OUTPRE)vhangup.$(OBJEXT): vhangup.c \ $(COM_ERR_DEPS) libpty.h pty-int.h pty_err.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h + $(BUILDTOP)/include/autoconf.h void_assoc.so void_assoc.po $(OUTPRE)void_assoc.$(OBJEXT): \ void_assoc.c $(COM_ERR_DEPS) libpty.h pty-int.h pty_err.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h logwtmp.so logwtmp.po $(OUTPRE)logwtmp.$(OBJEXT): logwtmp.c \ $(COM_ERR_DEPS) libpty.h pty-int.h pty_err.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h + $(BUILDTOP)/include/autoconf.h init.so init.po $(OUTPRE)init.$(OBJEXT): init.c $(COM_ERR_DEPS) \ libpty.h pty-int.h pty_err.h $(SRCTOP)/include/port-sockets.h \ - $(BUILDTOP)/include/krb5/autoconf.h + $(BUILDTOP)/include/autoconf.h sane_hostname.so sane_hostname.po $(OUTPRE)sane_hostname.$(OBJEXT): \ sane_hostname.c $(COM_ERR_DEPS) pty-int.h pty_err.h \ - $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \ libpty.h $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/fake-addrinfo.h diff --git a/src/util/support/ChangeLog b/src/util/support/ChangeLog index f46015e897..eb112f60d9 100644 --- a/src/util/support/ChangeLog +++ b/src/util/support/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (autoconf.h): Note location change. + 2006-03-08 Ken Raeburn <raeburn@mit.edu> * plugins.c: Only include dlfcn.h if USE_DLOPEN. diff --git a/src/util/support/Makefile.in b/src/util/support/Makefile.in index da71cad885..e6c75f5250 100644 --- a/src/util/support/Makefile.in +++ b/src/util/support/Makefile.in @@ -62,8 +62,8 @@ install-unix:: install-libs clean-unix:: clean-liblinks clean-libs clean-libobjs ##DOS##!if 0 -$(BUILDTOP)/include/krb5/autoconf.h: $(SRCTOP)/include/krb5/autoconf.h.in - (cd $(BUILDTOP)/include; $(MAKE) krb5/autoconf.h) +$(BUILDTOP)/include/autoconf.h: $(SRCTOP)/include/autoconf.h.in + (cd $(BUILDTOP)/include; $(MAKE) autoconf.h) ##DOS##!endif # @lib_frag@ @@ -75,16 +75,16 @@ $(BUILDTOP)/include/krb5/autoconf.h: $(SRCTOP)/include/krb5/autoconf.h.in # the Makefile.in file # threads.so threads.po $(OUTPRE)threads.$(OBJEXT): threads.c \ - $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/k5-thread.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/k5-platform.h cache-addrinfo.h $(SRCTOP)/include/port-sockets.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/fake-addrinfo.h init-addrinfo.so init-addrinfo.po $(OUTPRE)init-addrinfo.$(OBJEXT): \ - init-addrinfo.c $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ + init-addrinfo.c $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/fake-addrinfo.h \ cache-addrinfo.h fake-addrinfo.so fake-addrinfo.po $(OUTPRE)fake-addrinfo.$(OBJEXT): \ - fake-addrinfo.c $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/krb5/autoconf.h \ + fake-addrinfo.c $(SRCTOP)/include/port-sockets.h $(BUILDTOP)/include/autoconf.h \ $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/k5-platform.h \ $(SRCTOP)/include/k5-thread.h $(SRCTOP)/include/fake-addrinfo.h \ cache-addrinfo.h |