diff options
Diffstat (limited to 'lib')
254 files changed, 31491 insertions, 25968 deletions
diff --git a/lib/Makefile.in b/lib/Makefile.in index c15b3a0955c1..828360c3c05d 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -97,7 +97,6 @@ subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ $(top_srcdir)/cf/auth-modules.m4 \ - $(top_srcdir)/cf/broken-getaddrinfo.m4 \ $(top_srcdir)/cf/broken-glob.m4 \ $(top_srcdir)/cf/broken-realloc.m4 \ $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ @@ -180,7 +179,7 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir + distdir distdir-am am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -198,8 +197,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = roken base vers libedit com_err sl wind asn1 sqlite \ hcrypto ipc hx509 krb5 ntlm kafs gssapi hdb kadm5 otp kdfs am__DIST_COMMON = $(srcdir)/Makefile.in \ @@ -251,9 +248,12 @@ CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLANG_FORMAT = @CLANG_FORMAT@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DB1LIB = @DB1LIB@ DB3LIB = @DB3LIB@ @@ -271,8 +271,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GCD_MIG = @GCD_MIG@ GREP = @GREP@ GROFF = @GROFF@ @@ -381,6 +383,11 @@ PKG_CONFIG = @PKG_CONFIG@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LDADD = @PTHREAD_LDADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -440,9 +447,14 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -534,8 +546,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty): @@ -652,8 +664,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -914,11 +928,20 @@ check-local:: test "$$failed" -eq 0 || exit 1; \ fi +# It's useful for debugging to format generated sources. The default for all +# clang-format styles is to sort includes, but in many cases in-tree we really +# don't want to do that. .x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @if [ -z "$(CLANG_FORMAT)" ]; then \ + cmp -s $< $@ 2> /dev/null || cp $< $@; \ + else \ + cp $< $@.tmp.c; \ + $(CLANG_FORMAT) -style='{BasedOnStyle: Chromium, SortIncludes: false}' -i $@.tmp.c; \ + cmp -s $@.tmp.c $@ 2> /dev/null || mv $@.tmp.c $@; \ + fi .hx.h: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @cmp -s $< $@ 2> /dev/null || cp $< $@; #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ diff --git a/lib/asn1/Makefile.in b/lib/asn1/Makefile.in index 6ab1aa514233..786a04eab8d6 100644 --- a/lib/asn1/Makefile.in +++ b/lib/asn1/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -106,7 +106,6 @@ subdir = lib/asn1 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ $(top_srcdir)/cf/auth-modules.m4 \ - $(top_srcdir)/cf/broken-getaddrinfo.m4 \ $(top_srcdir)/cf/broken-glob.m4 \ $(top_srcdir)/cf/broken-realloc.m4 \ $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ @@ -156,6 +155,13 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +am__EXEEXT_1 = check-der$(EXEEXT) check-gen$(EXEEXT) \ + check-timegm$(EXEEXT) check-ber$(EXEEXT) \ + check-template$(EXEEXT) +am__installdirs = "$(DESTDIR)$(libexec_heimdaldir)" \ + "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(includedir)" +PROGRAMS = $(libexec_heimdal_PROGRAMS) $(noinst_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -183,9 +189,6 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(libdir)" \ - "$(DESTDIR)$(libexec_heimdaldir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = libasn1_la_DEPENDENCIES = libasn1base.la $(am__DEPENDENCIES_1) @@ -217,10 +220,6 @@ dist_libasn1base_la_OBJECTS = der.lo der_get.lo der_put.lo der_free.lo \ nodist_libasn1base_la_OBJECTS = asn1_err.lo libasn1base_la_OBJECTS = $(dist_libasn1base_la_OBJECTS) \ $(nodist_libasn1base_la_OBJECTS) -am__EXEEXT_1 = check-der$(EXEEXT) check-gen$(EXEEXT) \ - check-timegm$(EXEEXT) check-ber$(EXEEXT) \ - check-template$(EXEEXT) -PROGRAMS = $(libexec_heimdal_PROGRAMS) $(noinst_PROGRAMS) am_asn1_compile_OBJECTS = asn1parse.$(OBJEXT) gen.$(OBJEXT) \ gen_copy.$(OBJEXT) gen_decode.$(OBJEXT) gen_encode.$(OBJEXT) \ gen_free.$(OBJEXT) gen_glue.$(OBJEXT) gen_length.$(OBJEXT) \ @@ -272,7 +271,34 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/asn1_cms_asn1.Plo \ + ./$(DEPDIR)/asn1_digest_asn1.Plo ./$(DEPDIR)/asn1_err.Plo \ + ./$(DEPDIR)/asn1_gen.Po ./$(DEPDIR)/asn1_krb5_asn1.Plo \ + ./$(DEPDIR)/asn1_kx509_asn1.Plo \ + ./$(DEPDIR)/asn1_pkcs12_asn1.Plo \ + ./$(DEPDIR)/asn1_pkcs8_asn1.Plo \ + ./$(DEPDIR)/asn1_pkcs9_asn1.Plo \ + ./$(DEPDIR)/asn1_pkinit_asn1.Plo ./$(DEPDIR)/asn1_print.Po \ + ./$(DEPDIR)/asn1_rfc2459_asn1.Plo \ + ./$(DEPDIR)/asn1_test_asn1.Po ./$(DEPDIR)/asn1parse.Po \ + ./$(DEPDIR)/check-ber.Po ./$(DEPDIR)/check-common.Po \ + ./$(DEPDIR)/check-der.Po ./$(DEPDIR)/check-gen.Po \ + ./$(DEPDIR)/check-template.Po ./$(DEPDIR)/check-timegm.Po \ + ./$(DEPDIR)/der.Plo ./$(DEPDIR)/der_cmp.Plo \ + ./$(DEPDIR)/der_copy.Plo ./$(DEPDIR)/der_format.Plo \ + ./$(DEPDIR)/der_free.Plo ./$(DEPDIR)/der_get.Plo \ + ./$(DEPDIR)/der_length.Plo ./$(DEPDIR)/der_put.Plo \ + ./$(DEPDIR)/extra.Plo ./$(DEPDIR)/fuzzer.Plo \ + ./$(DEPDIR)/gen.Po ./$(DEPDIR)/gen_copy.Po \ + ./$(DEPDIR)/gen_decode.Po ./$(DEPDIR)/gen_encode.Po \ + ./$(DEPDIR)/gen_free.Po ./$(DEPDIR)/gen_glue.Po \ + ./$(DEPDIR)/gen_length.Po ./$(DEPDIR)/gen_seq.Po \ + ./$(DEPDIR)/gen_template.Po ./$(DEPDIR)/hash.Po \ + ./$(DEPDIR)/lex.Po ./$(DEPDIR)/main.Po ./$(DEPDIR)/symbol.Po \ + ./$(DEPDIR)/template.Plo \ + ./$(DEPDIR)/test_template_asn1-template.Po \ + ./$(DEPDIR)/timegm.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -344,8 +370,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no @@ -501,6 +525,7 @@ am__set_TESTS_bases = \ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck TEST_SUITE_LOG = test-suite.log @@ -549,9 +574,12 @@ CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLANG_FORMAT = @CLANG_FORMAT@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DB1LIB = @DB1LIB@ DB3LIB = @DB3LIB@ @@ -569,8 +597,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GCD_MIG = @GCD_MIG@ GREP = @GREP@ GROFF = @GROFF@ @@ -679,6 +709,11 @@ PKG_CONFIG = @PKG_CONFIG@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LDADD = @PTHREAD_LDADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -738,9 +773,14 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -968,8 +1008,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty): @@ -982,58 +1022,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -libasn1.la: $(libasn1_la_OBJECTS) $(libasn1_la_DEPENDENCIES) $(EXTRA_libasn1_la_DEPENDENCIES) - $(AM_V_CCLD)$(libasn1_la_LINK) -rpath $(libdir) $(libasn1_la_OBJECTS) $(libasn1_la_LIBADD) $(LIBS) - -libasn1base.la: $(libasn1base_la_OBJECTS) $(libasn1base_la_DEPENDENCIES) $(EXTRA_libasn1base_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(libasn1base_la_OBJECTS) $(libasn1base_la_LIBADD) $(LIBS) - clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ echo " rm -f" $$list; \ @@ -1101,6 +1089,58 @@ clean-noinstPROGRAMS: echo " rm -f" $$list; \ rm -f $$list +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libasn1.la: $(libasn1_la_OBJECTS) $(libasn1_la_DEPENDENCIES) $(EXTRA_libasn1_la_DEPENDENCIES) + $(AM_V_CCLD)$(libasn1_la_LINK) -rpath $(libdir) $(libasn1_la_OBJECTS) $(libasn1_la_LIBADD) $(LIBS) + +libasn1base.la: $(libasn1base_la_OBJECTS) $(libasn1base_la_DEPENDENCIES) $(EXTRA_libasn1base_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(libasn1base_la_OBJECTS) $(libasn1base_la_LIBADD) $(LIBS) + asn1_compile$(EXEEXT): $(asn1_compile_OBJECTS) $(asn1_compile_DEPENDENCIES) $(EXTRA_asn1_compile_DEPENDENCIES) @rm -f asn1_compile$(EXEEXT) $(AM_V_CCLD)$(LINK) $(asn1_compile_OBJECTS) $(asn1_compile_LDADD) $(LIBS) @@ -1139,52 +1179,58 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_cms_asn1.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_digest_asn1.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_err.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_gen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_krb5_asn1.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_kx509_asn1.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_pkcs12_asn1.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_pkcs8_asn1.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_pkcs9_asn1.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_pkinit_asn1.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_print.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_rfc2459_asn1.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_test_asn1.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1parse.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-ber.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-common.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-der.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-gen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-template.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-timegm.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/der.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/der_cmp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/der_copy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/der_format.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/der_free.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/der_get.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/der_length.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/der_put.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extra.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fuzzer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_copy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_decode.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_encode.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_free.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_glue.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_length.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_seq.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_template.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lex.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symbol.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/template.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_template_asn1-template.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timegm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_cms_asn1.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_digest_asn1.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_err.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_gen.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_krb5_asn1.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_kx509_asn1.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_pkcs12_asn1.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_pkcs8_asn1.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_pkcs9_asn1.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_pkinit_asn1.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_print.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_rfc2459_asn1.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_test_asn1.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1parse.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-ber.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-common.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-der.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-gen.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-template.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-timegm.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/der.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/der_cmp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/der_copy.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/der_format.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/der_free.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/der_get.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/der_length.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/der_put.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extra.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fuzzer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_copy.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_decode.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_encode.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_free.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_glue.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_length.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_seq.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gen_template.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lex.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symbol.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/template.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_template_asn1-template.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timegm.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1420,7 +1466,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ @@ -1433,7 +1479,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: $(check_PROGRAMS) @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -1503,8 +1549,10 @@ check-template.log: check-template$(EXEEXT) @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1542,14 +1590,19 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-local +all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(HEADERS) all-local +install-checkPROGRAMS: install-libLTLIBRARIES + +install-libexecheimdalPROGRAMS: install-libLTLIBRARIES + installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libexec_heimdaldir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \ + for dir in "$(DESTDIR)$(libexec_heimdaldir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -1593,7 +1646,52 @@ clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-noinstLTLIBRARIES clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/asn1_cms_asn1.Plo + -rm -f ./$(DEPDIR)/asn1_digest_asn1.Plo + -rm -f ./$(DEPDIR)/asn1_err.Plo + -rm -f ./$(DEPDIR)/asn1_gen.Po + -rm -f ./$(DEPDIR)/asn1_krb5_asn1.Plo + -rm -f ./$(DEPDIR)/asn1_kx509_asn1.Plo + -rm -f ./$(DEPDIR)/asn1_pkcs12_asn1.Plo + -rm -f ./$(DEPDIR)/asn1_pkcs8_asn1.Plo + -rm -f ./$(DEPDIR)/asn1_pkcs9_asn1.Plo + -rm -f ./$(DEPDIR)/asn1_pkinit_asn1.Plo + -rm -f ./$(DEPDIR)/asn1_print.Po + -rm -f ./$(DEPDIR)/asn1_rfc2459_asn1.Plo + -rm -f ./$(DEPDIR)/asn1_test_asn1.Po + -rm -f ./$(DEPDIR)/asn1parse.Po + -rm -f ./$(DEPDIR)/check-ber.Po + -rm -f ./$(DEPDIR)/check-common.Po + -rm -f ./$(DEPDIR)/check-der.Po + -rm -f ./$(DEPDIR)/check-gen.Po + -rm -f ./$(DEPDIR)/check-template.Po + -rm -f ./$(DEPDIR)/check-timegm.Po + -rm -f ./$(DEPDIR)/der.Plo + -rm -f ./$(DEPDIR)/der_cmp.Plo + -rm -f ./$(DEPDIR)/der_copy.Plo + -rm -f ./$(DEPDIR)/der_format.Plo + -rm -f ./$(DEPDIR)/der_free.Plo + -rm -f ./$(DEPDIR)/der_get.Plo + -rm -f ./$(DEPDIR)/der_length.Plo + -rm -f ./$(DEPDIR)/der_put.Plo + -rm -f ./$(DEPDIR)/extra.Plo + -rm -f ./$(DEPDIR)/fuzzer.Plo + -rm -f ./$(DEPDIR)/gen.Po + -rm -f ./$(DEPDIR)/gen_copy.Po + -rm -f ./$(DEPDIR)/gen_decode.Po + -rm -f ./$(DEPDIR)/gen_encode.Po + -rm -f ./$(DEPDIR)/gen_free.Po + -rm -f ./$(DEPDIR)/gen_glue.Po + -rm -f ./$(DEPDIR)/gen_length.Po + -rm -f ./$(DEPDIR)/gen_seq.Po + -rm -f ./$(DEPDIR)/gen_template.Po + -rm -f ./$(DEPDIR)/hash.Po + -rm -f ./$(DEPDIR)/lex.Po + -rm -f ./$(DEPDIR)/main.Po + -rm -f ./$(DEPDIR)/symbol.Po + -rm -f ./$(DEPDIR)/template.Plo + -rm -f ./$(DEPDIR)/test_template_asn1-template.Po + -rm -f ./$(DEPDIR)/timegm.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1642,7 +1740,52 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/asn1_cms_asn1.Plo + -rm -f ./$(DEPDIR)/asn1_digest_asn1.Plo + -rm -f ./$(DEPDIR)/asn1_err.Plo + -rm -f ./$(DEPDIR)/asn1_gen.Po + -rm -f ./$(DEPDIR)/asn1_krb5_asn1.Plo + -rm -f ./$(DEPDIR)/asn1_kx509_asn1.Plo + -rm -f ./$(DEPDIR)/asn1_pkcs12_asn1.Plo + -rm -f ./$(DEPDIR)/asn1_pkcs8_asn1.Plo + -rm -f ./$(DEPDIR)/asn1_pkcs9_asn1.Plo + -rm -f ./$(DEPDIR)/asn1_pkinit_asn1.Plo + -rm -f ./$(DEPDIR)/asn1_print.Po + -rm -f ./$(DEPDIR)/asn1_rfc2459_asn1.Plo + -rm -f ./$(DEPDIR)/asn1_test_asn1.Po + -rm -f ./$(DEPDIR)/asn1parse.Po + -rm -f ./$(DEPDIR)/check-ber.Po + -rm -f ./$(DEPDIR)/check-common.Po + -rm -f ./$(DEPDIR)/check-der.Po + -rm -f ./$(DEPDIR)/check-gen.Po + -rm -f ./$(DEPDIR)/check-template.Po + -rm -f ./$(DEPDIR)/check-timegm.Po + -rm -f ./$(DEPDIR)/der.Plo + -rm -f ./$(DEPDIR)/der_cmp.Plo + -rm -f ./$(DEPDIR)/der_copy.Plo + -rm -f ./$(DEPDIR)/der_format.Plo + -rm -f ./$(DEPDIR)/der_free.Plo + -rm -f ./$(DEPDIR)/der_get.Plo + -rm -f ./$(DEPDIR)/der_length.Plo + -rm -f ./$(DEPDIR)/der_put.Plo + -rm -f ./$(DEPDIR)/extra.Plo + -rm -f ./$(DEPDIR)/fuzzer.Plo + -rm -f ./$(DEPDIR)/gen.Po + -rm -f ./$(DEPDIR)/gen_copy.Po + -rm -f ./$(DEPDIR)/gen_decode.Po + -rm -f ./$(DEPDIR)/gen_encode.Po + -rm -f ./$(DEPDIR)/gen_free.Po + -rm -f ./$(DEPDIR)/gen_glue.Po + -rm -f ./$(DEPDIR)/gen_length.Po + -rm -f ./$(DEPDIR)/gen_seq.Po + -rm -f ./$(DEPDIR)/gen_template.Po + -rm -f ./$(DEPDIR)/hash.Po + -rm -f ./$(DEPDIR)/lex.Po + -rm -f ./$(DEPDIR)/main.Po + -rm -f ./$(DEPDIR)/symbol.Po + -rm -f ./$(DEPDIR)/template.Plo + -rm -f ./$(DEPDIR)/test_template_asn1-template.Po + -rm -f ./$(DEPDIR)/timegm.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1665,19 +1808,20 @@ uninstall-am: uninstall-dist_includeHEADERS uninstall-libLTLIBRARIES \ @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: all check check-am install install-am install-data-am \ - install-strip uninstall-am - -.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \ - check-am check-local clean clean-checkPROGRAMS clean-generic \ - clean-libLTLIBRARIES clean-libexec_heimdalPROGRAMS \ - clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ - cscopelist-am ctags ctags-am dist-hook distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-data-hook install-dist_includeHEADERS install-dvi \ - install-dvi-am install-exec install-exec-am install-exec-local \ - install-html install-html-am install-info install-info-am \ + install-exec install-strip uninstall-am + +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \ + check-TESTS check-am check-local clean clean-checkPROGRAMS \ + clean-generic clean-libLTLIBRARIES \ + clean-libexec_heimdalPROGRAMS clean-libtool \ + clean-noinstLTLIBRARIES clean-noinstPROGRAMS cscopelist-am \ + ctags ctags-am dist-hook distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-hook \ + install-dist_includeHEADERS install-dvi install-dvi-am \ + install-exec install-exec-am install-exec-local install-html \ + install-html-am install-info install-info-am \ install-libLTLIBRARIES install-libexec_heimdalPROGRAMS \ install-man install-nodist_includeHEADERS install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ @@ -1770,11 +1914,20 @@ check-local:: test "$$failed" -eq 0 || exit 1; \ fi +# It's useful for debugging to format generated sources. The default for all +# clang-format styles is to sort includes, but in many cases in-tree we really +# don't want to do that. .x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @if [ -z "$(CLANG_FORMAT)" ]; then \ + cmp -s $< $@ 2> /dev/null || cp $< $@; \ + else \ + cp $< $@.tmp.c; \ + $(CLANG_FORMAT) -style='{BasedOnStyle: Chromium, SortIncludes: false}' -i $@.tmp.c; \ + cmp -s $@.tmp.c $@ 2> /dev/null || mv $@.tmp.c $@; \ + fi .hx.h: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @cmp -s $< $@ 2> /dev/null || cp $< $@; #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ diff --git a/lib/asn1/asn1parse.c b/lib/asn1/asn1parse.c index f05441eace9b..8b69e2e98bcf 100644 --- a/lib/asn1/asn1parse.c +++ b/lib/asn1/asn1parse.c @@ -1,14 +1,14 @@ -/* A Bison parser, made by GNU Bison 2.3. */ +/* A Bison parser, made by GNU Bison 3.8.2. */ -/* Skeleton implementation for Bison's Yacc-like parsers in C +/* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, + Inc. - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,9 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -36,6 +34,10 @@ /* C LALR(1) parser skeleton written by Richard Stallman, by simplifying the original so-called "semantic" parser. */ +/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, + especially those whose name start with YY_ or yy_. They are + private implementation details that can be changed or removed. */ + /* All symbols defined below should begin with yy or YY, to avoid infringing on user name space. This should be done even for local variables, as they might otherwise be expanded by user macros. @@ -43,11 +45,11 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ -/* Identify Bison output. */ -#define YYBISON 1 +/* Identify Bison output, and Bison version. */ +#define YYBISON 30802 -/* Bison version. */ -#define YYBISON_VERSION "2.3" +/* Bison version string. */ +#define YYBISON_VERSION "3.8.2" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -55,107 +57,189 @@ /* Pure parsers. */ #define YYPURE 0 -/* Using locations. */ -#define YYLSP_NEEDED 0 +/* Push parsers. */ +#define YYPUSH 0 + +/* Pull parsers. */ +#define YYPULL 1 + + + + +/* First part of user prologue. */ +#line 38 "asn1parse.y" + + +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <stdint.h> +#include <string.h> +#include "symbol.h" +#include "lex.h" +#include "gen_locl.h" +#include "der.h" + +static Type *new_type (Typetype t); +static struct constraint_spec *new_constraint_spec(enum ctype); +static Type *new_tag(int tagclass, int tagvalue, int tagenv, Type *oldtype); +void yyerror (const char *); +static struct objid *new_objid(const char *label, int value); +static void add_oid_to_tail(struct objid *, struct objid *); +static void fix_labels(Symbol *s); + +struct string_list { + char *string; + struct string_list *next; +}; + +static int default_tag_env = TE_EXPLICIT; + +/* Declarations for Bison */ +#define YYMALLOC malloc +#define YYFREE free + +#line 105 "asn1parse.c" + +# ifndef YY_CAST +# ifdef __cplusplus +# define YY_CAST(Type, Val) static_cast<Type> (Val) +# define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast<Type> (Val) +# else +# define YY_CAST(Type, Val) ((Type) (Val)) +# define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val)) +# endif +# endif +# ifndef YY_NULLPTR +# if defined __cplusplus +# if 201103L <= __cplusplus +# define YY_NULLPTR nullptr +# else +# define YY_NULLPTR 0 +# endif +# else +# define YY_NULLPTR ((void*)0) +# endif +# endif +/* Use api.header.include to #include this header + instead of duplicating it here. */ +#ifndef YY_YY_ASN_PARSE_H_INCLUDED +# define YY_YY_ASN_PARSE_H_INCLUDED +/* Debug traces. */ +#ifndef YYDEBUG +# define YYDEBUG 1 +#endif +#if YYDEBUG +extern int yydebug; +#endif -/* Tokens. */ +/* Token kinds. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - kw_ABSENT = 258, - kw_ABSTRACT_SYNTAX = 259, - kw_ALL = 260, - kw_APPLICATION = 261, - kw_AUTOMATIC = 262, - kw_BEGIN = 263, - kw_BIT = 264, - kw_BMPString = 265, - kw_BOOLEAN = 266, - kw_BY = 267, - kw_CHARACTER = 268, - kw_CHOICE = 269, - kw_CLASS = 270, - kw_COMPONENT = 271, - kw_COMPONENTS = 272, - kw_CONSTRAINED = 273, - kw_CONTAINING = 274, - kw_DEFAULT = 275, - kw_DEFINITIONS = 276, - kw_EMBEDDED = 277, - kw_ENCODED = 278, - kw_END = 279, - kw_ENUMERATED = 280, - kw_EXCEPT = 281, - kw_EXPLICIT = 282, - kw_EXPORTS = 283, - kw_EXTENSIBILITY = 284, - kw_EXTERNAL = 285, - kw_FALSE = 286, - kw_FROM = 287, - kw_GeneralString = 288, - kw_GeneralizedTime = 289, - kw_GraphicString = 290, - kw_IA5String = 291, - kw_IDENTIFIER = 292, - kw_IMPLICIT = 293, - kw_IMPLIED = 294, - kw_IMPORTS = 295, - kw_INCLUDES = 296, - kw_INSTANCE = 297, - kw_INTEGER = 298, - kw_INTERSECTION = 299, - kw_ISO646String = 300, - kw_MAX = 301, - kw_MIN = 302, - kw_MINUS_INFINITY = 303, - kw_NULL = 304, - kw_NumericString = 305, - kw_OBJECT = 306, - kw_OCTET = 307, - kw_OF = 308, - kw_OPTIONAL = 309, - kw_ObjectDescriptor = 310, - kw_PATTERN = 311, - kw_PDV = 312, - kw_PLUS_INFINITY = 313, - kw_PRESENT = 314, - kw_PRIVATE = 315, - kw_PrintableString = 316, - kw_REAL = 317, - kw_RELATIVE_OID = 318, - kw_SEQUENCE = 319, - kw_SET = 320, - kw_SIZE = 321, - kw_STRING = 322, - kw_SYNTAX = 323, - kw_T61String = 324, - kw_TAGS = 325, - kw_TRUE = 326, - kw_TYPE_IDENTIFIER = 327, - kw_TeletexString = 328, - kw_UNION = 329, - kw_UNIQUE = 330, - kw_UNIVERSAL = 331, - kw_UTCTime = 332, - kw_UTF8String = 333, - kw_UniversalString = 334, - kw_VideotexString = 335, - kw_VisibleString = 336, - kw_WITH = 337, - RANGE = 338, - EEQUAL = 339, - ELLIPSIS = 340, - IDENTIFIER = 341, - referencename = 342, - STRING = 343, - NUMBER = 344 - }; + enum yytokentype + { + YYEMPTY = -2, + YYEOF = 0, /* "end of file" */ + YYerror = 256, /* error */ + YYUNDEF = 257, /* "invalid token" */ + kw_ABSENT = 258, /* kw_ABSENT */ + kw_ABSTRACT_SYNTAX = 259, /* kw_ABSTRACT_SYNTAX */ + kw_ALL = 260, /* kw_ALL */ + kw_APPLICATION = 261, /* kw_APPLICATION */ + kw_AUTOMATIC = 262, /* kw_AUTOMATIC */ + kw_BEGIN = 263, /* kw_BEGIN */ + kw_BIT = 264, /* kw_BIT */ + kw_BMPString = 265, /* kw_BMPString */ + kw_BOOLEAN = 266, /* kw_BOOLEAN */ + kw_BY = 267, /* kw_BY */ + kw_CHARACTER = 268, /* kw_CHARACTER */ + kw_CHOICE = 269, /* kw_CHOICE */ + kw_CLASS = 270, /* kw_CLASS */ + kw_COMPONENT = 271, /* kw_COMPONENT */ + kw_COMPONENTS = 272, /* kw_COMPONENTS */ + kw_CONSTRAINED = 273, /* kw_CONSTRAINED */ + kw_CONTAINING = 274, /* kw_CONTAINING */ + kw_DEFAULT = 275, /* kw_DEFAULT */ + kw_DEFINITIONS = 276, /* kw_DEFINITIONS */ + kw_EMBEDDED = 277, /* kw_EMBEDDED */ + kw_ENCODED = 278, /* kw_ENCODED */ + kw_END = 279, /* kw_END */ + kw_ENUMERATED = 280, /* kw_ENUMERATED */ + kw_EXCEPT = 281, /* kw_EXCEPT */ + kw_EXPLICIT = 282, /* kw_EXPLICIT */ + kw_EXPORTS = 283, /* kw_EXPORTS */ + kw_EXTENSIBILITY = 284, /* kw_EXTENSIBILITY */ + kw_EXTERNAL = 285, /* kw_EXTERNAL */ + kw_FALSE = 286, /* kw_FALSE */ + kw_FROM = 287, /* kw_FROM */ + kw_GeneralString = 288, /* kw_GeneralString */ + kw_GeneralizedTime = 289, /* kw_GeneralizedTime */ + kw_GraphicString = 290, /* kw_GraphicString */ + kw_IA5String = 291, /* kw_IA5String */ + kw_IDENTIFIER = 292, /* kw_IDENTIFIER */ + kw_IMPLICIT = 293, /* kw_IMPLICIT */ + kw_IMPLIED = 294, /* kw_IMPLIED */ + kw_IMPORTS = 295, /* kw_IMPORTS */ + kw_INCLUDES = 296, /* kw_INCLUDES */ + kw_INSTANCE = 297, /* kw_INSTANCE */ + kw_INTEGER = 298, /* kw_INTEGER */ + kw_INTERSECTION = 299, /* kw_INTERSECTION */ + kw_ISO646String = 300, /* kw_ISO646String */ + kw_MAX = 301, /* kw_MAX */ + kw_MIN = 302, /* kw_MIN */ + kw_MINUS_INFINITY = 303, /* kw_MINUS_INFINITY */ + kw_NULL = 304, /* kw_NULL */ + kw_NumericString = 305, /* kw_NumericString */ + kw_OBJECT = 306, /* kw_OBJECT */ + kw_OCTET = 307, /* kw_OCTET */ + kw_OF = 308, /* kw_OF */ + kw_OPTIONAL = 309, /* kw_OPTIONAL */ + kw_ObjectDescriptor = 310, /* kw_ObjectDescriptor */ + kw_PATTERN = 311, /* kw_PATTERN */ + kw_PDV = 312, /* kw_PDV */ + kw_PLUS_INFINITY = 313, /* kw_PLUS_INFINITY */ + kw_PRESENT = 314, /* kw_PRESENT */ + kw_PRIVATE = 315, /* kw_PRIVATE */ + kw_PrintableString = 316, /* kw_PrintableString */ + kw_REAL = 317, /* kw_REAL */ + kw_RELATIVE_OID = 318, /* kw_RELATIVE_OID */ + kw_SEQUENCE = 319, /* kw_SEQUENCE */ + kw_SET = 320, /* kw_SET */ + kw_SIZE = 321, /* kw_SIZE */ + kw_STRING = 322, /* kw_STRING */ + kw_SYNTAX = 323, /* kw_SYNTAX */ + kw_T61String = 324, /* kw_T61String */ + kw_TAGS = 325, /* kw_TAGS */ + kw_TRUE = 326, /* kw_TRUE */ + kw_TYPE_IDENTIFIER = 327, /* kw_TYPE_IDENTIFIER */ + kw_TeletexString = 328, /* kw_TeletexString */ + kw_UNION = 329, /* kw_UNION */ + kw_UNIQUE = 330, /* kw_UNIQUE */ + kw_UNIVERSAL = 331, /* kw_UNIVERSAL */ + kw_UTCTime = 332, /* kw_UTCTime */ + kw_UTF8String = 333, /* kw_UTF8String */ + kw_UniversalString = 334, /* kw_UniversalString */ + kw_VideotexString = 335, /* kw_VideotexString */ + kw_VisibleString = 336, /* kw_VisibleString */ + kw_WITH = 337, /* kw_WITH */ + RANGE = 338, /* RANGE */ + EEQUAL = 339, /* EEQUAL */ + ELLIPSIS = 340, /* ELLIPSIS */ + IDENTIFIER = 341, /* IDENTIFIER */ + referencename = 342, /* referencename */ + STRING = 343, /* STRING */ + NUMBER = 344 /* NUMBER */ + }; + typedef enum yytokentype yytoken_kind_t; #endif -/* Tokens. */ +/* Token kinds. */ +#define YYEMPTY -2 +#define YYEOF 0 +#define YYerror 256 +#define YYUNDEF 257 #define kw_ABSENT 258 #define kw_ABSTRACT_SYNTAX 259 #define kw_ALL 260 @@ -244,67 +328,12 @@ #define STRING 343 #define NUMBER 344 - - - -/* Copy the first part of user declarations. */ -#line 38 "asn1parse.y" - - -#include <config.h> - -#include <stdio.h> -#include <stdlib.h> -#include <stdint.h> -#include <string.h> -#include "symbol.h" -#include "lex.h" -#include "gen_locl.h" -#include "der.h" - -static Type *new_type (Typetype t); -static struct constraint_spec *new_constraint_spec(enum ctype); -static Type *new_tag(int tagclass, int tagvalue, int tagenv, Type *oldtype); -void yyerror (const char *); -static struct objid *new_objid(const char *label, int value); -static void add_oid_to_tail(struct objid *, struct objid *); -static void fix_labels(Symbol *s); - -struct string_list { - char *string; - struct string_list *next; -}; - -static int default_tag_env = TE_EXPLICIT; - -/* Declarations for Bison */ -#define YYMALLOC malloc -#define YYFREE free - - - -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 1 -#endif - -/* Enabling verbose error messages. */ -#ifdef YYERROR_VERBOSE -# undef YYERROR_VERBOSE -# define YYERROR_VERBOSE 1 -#else -# define YYERROR_VERBOSE 0 -#endif - -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 -#endif - +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -#line 72 "asn1parse.y" +union YYSTYPE { +#line 72 "asn1parse.y" + int64_t constant; struct value *value; struct range *range; @@ -317,52 +346,285 @@ typedef union YYSTYPE struct tagtype tag; struct memhead *members; struct constraint_spec *constraint_spec; -} -/* Line 193 of yacc.c. */ -#line 323 "asn1parse.c" - YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 + +#line 351 "asn1parse.c" + +}; +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 +# define YYSTYPE_IS_DECLARED 1 #endif +extern YYSTYPE yylval; + + +int yyparse (void); + + +#endif /* !YY_YY_ASN_PARSE_H_INCLUDED */ +/* Symbol kind. */ +enum yysymbol_kind_t +{ + YYSYMBOL_YYEMPTY = -2, + YYSYMBOL_YYEOF = 0, /* "end of file" */ + YYSYMBOL_YYerror = 1, /* error */ + YYSYMBOL_YYUNDEF = 2, /* "invalid token" */ + YYSYMBOL_kw_ABSENT = 3, /* kw_ABSENT */ + YYSYMBOL_kw_ABSTRACT_SYNTAX = 4, /* kw_ABSTRACT_SYNTAX */ + YYSYMBOL_kw_ALL = 5, /* kw_ALL */ + YYSYMBOL_kw_APPLICATION = 6, /* kw_APPLICATION */ + YYSYMBOL_kw_AUTOMATIC = 7, /* kw_AUTOMATIC */ + YYSYMBOL_kw_BEGIN = 8, /* kw_BEGIN */ + YYSYMBOL_kw_BIT = 9, /* kw_BIT */ + YYSYMBOL_kw_BMPString = 10, /* kw_BMPString */ + YYSYMBOL_kw_BOOLEAN = 11, /* kw_BOOLEAN */ + YYSYMBOL_kw_BY = 12, /* kw_BY */ + YYSYMBOL_kw_CHARACTER = 13, /* kw_CHARACTER */ + YYSYMBOL_kw_CHOICE = 14, /* kw_CHOICE */ + YYSYMBOL_kw_CLASS = 15, /* kw_CLASS */ + YYSYMBOL_kw_COMPONENT = 16, /* kw_COMPONENT */ + YYSYMBOL_kw_COMPONENTS = 17, /* kw_COMPONENTS */ + YYSYMBOL_kw_CONSTRAINED = 18, /* kw_CONSTRAINED */ + YYSYMBOL_kw_CONTAINING = 19, /* kw_CONTAINING */ + YYSYMBOL_kw_DEFAULT = 20, /* kw_DEFAULT */ + YYSYMBOL_kw_DEFINITIONS = 21, /* kw_DEFINITIONS */ + YYSYMBOL_kw_EMBEDDED = 22, /* kw_EMBEDDED */ + YYSYMBOL_kw_ENCODED = 23, /* kw_ENCODED */ + YYSYMBOL_kw_END = 24, /* kw_END */ + YYSYMBOL_kw_ENUMERATED = 25, /* kw_ENUMERATED */ + YYSYMBOL_kw_EXCEPT = 26, /* kw_EXCEPT */ + YYSYMBOL_kw_EXPLICIT = 27, /* kw_EXPLICIT */ + YYSYMBOL_kw_EXPORTS = 28, /* kw_EXPORTS */ + YYSYMBOL_kw_EXTENSIBILITY = 29, /* kw_EXTENSIBILITY */ + YYSYMBOL_kw_EXTERNAL = 30, /* kw_EXTERNAL */ + YYSYMBOL_kw_FALSE = 31, /* kw_FALSE */ + YYSYMBOL_kw_FROM = 32, /* kw_FROM */ + YYSYMBOL_kw_GeneralString = 33, /* kw_GeneralString */ + YYSYMBOL_kw_GeneralizedTime = 34, /* kw_GeneralizedTime */ + YYSYMBOL_kw_GraphicString = 35, /* kw_GraphicString */ + YYSYMBOL_kw_IA5String = 36, /* kw_IA5String */ + YYSYMBOL_kw_IDENTIFIER = 37, /* kw_IDENTIFIER */ + YYSYMBOL_kw_IMPLICIT = 38, /* kw_IMPLICIT */ + YYSYMBOL_kw_IMPLIED = 39, /* kw_IMPLIED */ + YYSYMBOL_kw_IMPORTS = 40, /* kw_IMPORTS */ + YYSYMBOL_kw_INCLUDES = 41, /* kw_INCLUDES */ + YYSYMBOL_kw_INSTANCE = 42, /* kw_INSTANCE */ + YYSYMBOL_kw_INTEGER = 43, /* kw_INTEGER */ + YYSYMBOL_kw_INTERSECTION = 44, /* kw_INTERSECTION */ + YYSYMBOL_kw_ISO646String = 45, /* kw_ISO646String */ + YYSYMBOL_kw_MAX = 46, /* kw_MAX */ + YYSYMBOL_kw_MIN = 47, /* kw_MIN */ + YYSYMBOL_kw_MINUS_INFINITY = 48, /* kw_MINUS_INFINITY */ + YYSYMBOL_kw_NULL = 49, /* kw_NULL */ + YYSYMBOL_kw_NumericString = 50, /* kw_NumericString */ + YYSYMBOL_kw_OBJECT = 51, /* kw_OBJECT */ + YYSYMBOL_kw_OCTET = 52, /* kw_OCTET */ + YYSYMBOL_kw_OF = 53, /* kw_OF */ + YYSYMBOL_kw_OPTIONAL = 54, /* kw_OPTIONAL */ + YYSYMBOL_kw_ObjectDescriptor = 55, /* kw_ObjectDescriptor */ + YYSYMBOL_kw_PATTERN = 56, /* kw_PATTERN */ + YYSYMBOL_kw_PDV = 57, /* kw_PDV */ + YYSYMBOL_kw_PLUS_INFINITY = 58, /* kw_PLUS_INFINITY */ + YYSYMBOL_kw_PRESENT = 59, /* kw_PRESENT */ + YYSYMBOL_kw_PRIVATE = 60, /* kw_PRIVATE */ + YYSYMBOL_kw_PrintableString = 61, /* kw_PrintableString */ + YYSYMBOL_kw_REAL = 62, /* kw_REAL */ + YYSYMBOL_kw_RELATIVE_OID = 63, /* kw_RELATIVE_OID */ + YYSYMBOL_kw_SEQUENCE = 64, /* kw_SEQUENCE */ + YYSYMBOL_kw_SET = 65, /* kw_SET */ + YYSYMBOL_kw_SIZE = 66, /* kw_SIZE */ + YYSYMBOL_kw_STRING = 67, /* kw_STRING */ + YYSYMBOL_kw_SYNTAX = 68, /* kw_SYNTAX */ + YYSYMBOL_kw_T61String = 69, /* kw_T61String */ + YYSYMBOL_kw_TAGS = 70, /* kw_TAGS */ + YYSYMBOL_kw_TRUE = 71, /* kw_TRUE */ + YYSYMBOL_kw_TYPE_IDENTIFIER = 72, /* kw_TYPE_IDENTIFIER */ + YYSYMBOL_kw_TeletexString = 73, /* kw_TeletexString */ + YYSYMBOL_kw_UNION = 74, /* kw_UNION */ + YYSYMBOL_kw_UNIQUE = 75, /* kw_UNIQUE */ + YYSYMBOL_kw_UNIVERSAL = 76, /* kw_UNIVERSAL */ + YYSYMBOL_kw_UTCTime = 77, /* kw_UTCTime */ + YYSYMBOL_kw_UTF8String = 78, /* kw_UTF8String */ + YYSYMBOL_kw_UniversalString = 79, /* kw_UniversalString */ + YYSYMBOL_kw_VideotexString = 80, /* kw_VideotexString */ + YYSYMBOL_kw_VisibleString = 81, /* kw_VisibleString */ + YYSYMBOL_kw_WITH = 82, /* kw_WITH */ + YYSYMBOL_RANGE = 83, /* RANGE */ + YYSYMBOL_EEQUAL = 84, /* EEQUAL */ + YYSYMBOL_ELLIPSIS = 85, /* ELLIPSIS */ + YYSYMBOL_IDENTIFIER = 86, /* IDENTIFIER */ + YYSYMBOL_referencename = 87, /* referencename */ + YYSYMBOL_STRING = 88, /* STRING */ + YYSYMBOL_NUMBER = 89, /* NUMBER */ + YYSYMBOL_90_ = 90, /* ';' */ + YYSYMBOL_91_ = 91, /* ',' */ + YYSYMBOL_92_ = 92, /* '(' */ + YYSYMBOL_93_ = 93, /* ')' */ + YYSYMBOL_94_ = 94, /* '{' */ + YYSYMBOL_95_ = 95, /* '}' */ + YYSYMBOL_96_ = 96, /* '[' */ + YYSYMBOL_97_ = 97, /* ']' */ + YYSYMBOL_YYACCEPT = 98, /* $accept */ + YYSYMBOL_ModuleDefinition = 99, /* ModuleDefinition */ + YYSYMBOL_TagDefault = 100, /* TagDefault */ + YYSYMBOL_ExtensionDefault = 101, /* ExtensionDefault */ + YYSYMBOL_ModuleBody = 102, /* ModuleBody */ + YYSYMBOL_Imports = 103, /* Imports */ + YYSYMBOL_SymbolsImported = 104, /* SymbolsImported */ + YYSYMBOL_SymbolsFromModuleList = 105, /* SymbolsFromModuleList */ + YYSYMBOL_SymbolsFromModule = 106, /* SymbolsFromModule */ + YYSYMBOL_Exports = 107, /* Exports */ + YYSYMBOL_AssignmentList = 108, /* AssignmentList */ + YYSYMBOL_Assignment = 109, /* Assignment */ + YYSYMBOL_referencenames = 110, /* referencenames */ + YYSYMBOL_TypeAssignment = 111, /* TypeAssignment */ + YYSYMBOL_Type = 112, /* Type */ + YYSYMBOL_BuiltinType = 113, /* BuiltinType */ + YYSYMBOL_BooleanType = 114, /* BooleanType */ + YYSYMBOL_range = 115, /* range */ + YYSYMBOL_IntegerType = 116, /* IntegerType */ + YYSYMBOL_NamedNumberList = 117, /* NamedNumberList */ + YYSYMBOL_NamedNumber = 118, /* NamedNumber */ + YYSYMBOL_EnumeratedType = 119, /* EnumeratedType */ + YYSYMBOL_Enumerations = 120, /* Enumerations */ + YYSYMBOL_BitStringType = 121, /* BitStringType */ + YYSYMBOL_ObjectIdentifierType = 122, /* ObjectIdentifierType */ + YYSYMBOL_OctetStringType = 123, /* OctetStringType */ + YYSYMBOL_NullType = 124, /* NullType */ + YYSYMBOL_size = 125, /* size */ + YYSYMBOL_SequenceType = 126, /* SequenceType */ + YYSYMBOL_SequenceOfType = 127, /* SequenceOfType */ + YYSYMBOL_SetType = 128, /* SetType */ + YYSYMBOL_SetOfType = 129, /* SetOfType */ + YYSYMBOL_ChoiceType = 130, /* ChoiceType */ + YYSYMBOL_ReferencedType = 131, /* ReferencedType */ + YYSYMBOL_DefinedType = 132, /* DefinedType */ + YYSYMBOL_UsefulType = 133, /* UsefulType */ + YYSYMBOL_ConstrainedType = 134, /* ConstrainedType */ + YYSYMBOL_Constraint = 135, /* Constraint */ + YYSYMBOL_ConstraintSpec = 136, /* ConstraintSpec */ + YYSYMBOL_GeneralConstraint = 137, /* GeneralConstraint */ + YYSYMBOL_ContentsConstraint = 138, /* ContentsConstraint */ + YYSYMBOL_UserDefinedConstraint = 139, /* UserDefinedConstraint */ + YYSYMBOL_TaggedType = 140, /* TaggedType */ + YYSYMBOL_Tag = 141, /* Tag */ + YYSYMBOL_Class = 142, /* Class */ + YYSYMBOL_tagenv = 143, /* tagenv */ + YYSYMBOL_ValueAssignment = 144, /* ValueAssignment */ + YYSYMBOL_CharacterStringType = 145, /* CharacterStringType */ + YYSYMBOL_RestrictedCharactedStringType = 146, /* RestrictedCharactedStringType */ + YYSYMBOL_ComponentTypeList = 147, /* ComponentTypeList */ + YYSYMBOL_NamedType = 148, /* NamedType */ + YYSYMBOL_ComponentType = 149, /* ComponentType */ + YYSYMBOL_NamedBitList = 150, /* NamedBitList */ + YYSYMBOL_NamedBit = 151, /* NamedBit */ + YYSYMBOL_objid_opt = 152, /* objid_opt */ + YYSYMBOL_objid = 153, /* objid */ + YYSYMBOL_objid_list = 154, /* objid_list */ + YYSYMBOL_objid_element = 155, /* objid_element */ + YYSYMBOL_Value = 156, /* Value */ + YYSYMBOL_BuiltinValue = 157, /* BuiltinValue */ + YYSYMBOL_ReferencedValue = 158, /* ReferencedValue */ + YYSYMBOL_DefinedValue = 159, /* DefinedValue */ + YYSYMBOL_Valuereference = 160, /* Valuereference */ + YYSYMBOL_CharacterStringValue = 161, /* CharacterStringValue */ + YYSYMBOL_BooleanValue = 162, /* BooleanValue */ + YYSYMBOL_IntegerValue = 163, /* IntegerValue */ + YYSYMBOL_SignedNumber = 164, /* SignedNumber */ + YYSYMBOL_NullValue = 165, /* NullValue */ + YYSYMBOL_ObjectIdentifierValue = 166 /* ObjectIdentifierValue */ +}; +typedef enum yysymbol_kind_t yysymbol_kind_t; -/* Copy the second part of user declarations. */ -/* Line 216 of yacc.c. */ -#line 336 "asn1parse.c" #ifdef short # undef short #endif -#ifdef YYTYPE_UINT8 -typedef YYTYPE_UINT8 yytype_uint8; -#else -typedef unsigned char yytype_uint8; +/* On compilers that do not define __PTRDIFF_MAX__ etc., make sure + <limits.h> and (if available) <stdint.h> are included + so that the code can choose integer types of a good width. */ + +#ifndef __PTRDIFF_MAX__ +# include <limits.h> /* INFRINGES ON USER NAME SPACE */ +# if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ +# include <stdint.h> /* INFRINGES ON USER NAME SPACE */ +# define YY_STDINT_H +# endif #endif -#ifdef YYTYPE_INT8 -typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +/* Narrow types that promote to a signed type and that can represent a + signed or unsigned integer of at least N bits. In tables they can + save space and decrease cache pressure. Promoting to a signed type + helps avoid bugs in integer arithmetic. */ + +#ifdef __INT_LEAST8_MAX__ +typedef __INT_LEAST8_TYPE__ yytype_int8; +#elif defined YY_STDINT_H +typedef int_least8_t yytype_int8; +#else typedef signed char yytype_int8; +#endif + +#ifdef __INT_LEAST16_MAX__ +typedef __INT_LEAST16_TYPE__ yytype_int16; +#elif defined YY_STDINT_H +typedef int_least16_t yytype_int16; #else -typedef short int yytype_int8; +typedef short yytype_int16; #endif -#ifdef YYTYPE_UINT16 -typedef YYTYPE_UINT16 yytype_uint16; +/* Work around bug in HP-UX 11.23, which defines these macros + incorrectly for preprocessor constants. This workaround can likely + be removed in 2023, as HPE has promised support for HP-UX 11.23 + (aka HP-UX 11i v2) only through the end of 2022; see Table 2 of + <https://h20195.www2.hpe.com/V2/getpdf.aspx/4AA4-7673ENW.pdf>. */ +#ifdef __hpux +# undef UINT_LEAST8_MAX +# undef UINT_LEAST16_MAX +# define UINT_LEAST8_MAX 255 +# define UINT_LEAST16_MAX 65535 +#endif + +#if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__ +typedef __UINT_LEAST8_TYPE__ yytype_uint8; +#elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \ + && UINT_LEAST8_MAX <= INT_MAX) +typedef uint_least8_t yytype_uint8; +#elif !defined __UINT_LEAST8_MAX__ && UCHAR_MAX <= INT_MAX +typedef unsigned char yytype_uint8; #else -typedef unsigned short int yytype_uint16; +typedef short yytype_uint8; #endif -#ifdef YYTYPE_INT16 -typedef YYTYPE_INT16 yytype_int16; +#if defined __UINT_LEAST16_MAX__ && __UINT_LEAST16_MAX__ <= __INT_MAX__ +typedef __UINT_LEAST16_TYPE__ yytype_uint16; +#elif (!defined __UINT_LEAST16_MAX__ && defined YY_STDINT_H \ + && UINT_LEAST16_MAX <= INT_MAX) +typedef uint_least16_t yytype_uint16; +#elif !defined __UINT_LEAST16_MAX__ && USHRT_MAX <= INT_MAX +typedef unsigned short yytype_uint16; #else -typedef short int yytype_int16; +typedef int yytype_uint16; +#endif + +#ifndef YYPTRDIFF_T +# if defined __PTRDIFF_TYPE__ && defined __PTRDIFF_MAX__ +# define YYPTRDIFF_T __PTRDIFF_TYPE__ +# define YYPTRDIFF_MAXIMUM __PTRDIFF_MAX__ +# elif defined PTRDIFF_MAX +# ifndef ptrdiff_t +# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ +# endif +# define YYPTRDIFF_T ptrdiff_t +# define YYPTRDIFF_MAXIMUM PTRDIFF_MAX +# else +# define YYPTRDIFF_T long +# define YYPTRDIFF_MAXIMUM LONG_MAX +# endif #endif #ifndef YYSIZE_T @@ -370,55 +632,106 @@ typedef short int yytype_int16; # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ # include <stddef.h> /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else -# define YYSIZE_T unsigned int +# define YYSIZE_T unsigned # endif #endif -#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) +#define YYSIZE_MAXIMUM \ + YY_CAST (YYPTRDIFF_T, \ + (YYPTRDIFF_MAXIMUM < YY_CAST (YYSIZE_T, -1) \ + ? YYPTRDIFF_MAXIMUM \ + : YY_CAST (YYSIZE_T, -1))) + +#define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X)) + + +/* Stored state numbers (used for stacks). */ +typedef yytype_uint8 yy_state_t; + +/* State numbers in computations. */ +typedef int yy_state_fast_t; #ifndef YY_ # if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include <libintl.h> /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ -# define YY_(msgid) msgid +# define YY_(Msgid) Msgid +# endif +#endif + + +#ifndef YY_ATTRIBUTE_PURE +# if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__) +# define YY_ATTRIBUTE_PURE __attribute__ ((__pure__)) +# else +# define YY_ATTRIBUTE_PURE +# endif +#endif + +#ifndef YY_ATTRIBUTE_UNUSED +# if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__) +# define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) +# else +# define YY_ATTRIBUTE_UNUSED # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YY_USE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YY_USE(E) /* empty */ #endif -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(n) (n) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int i) +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__ +# if __GNUC__ * 100 + __GNUC_MINOR__ < 407 +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") +# else +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") \ + _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# endif +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ + _Pragma ("GCC diagnostic pop") #else -static int -YYID (i) - int i; +# define YY_INITIAL_VALUE(Value) Value #endif -{ - return i; -} +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ #endif -#if ! defined yyoverflow || YYERROR_VERBOSE +#if defined __cplusplus && defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__ +# define YY_IGNORE_USELESS_CAST_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuseless-cast\"") +# define YY_IGNORE_USELESS_CAST_END \ + _Pragma ("GCC diagnostic pop") +#endif +#ifndef YY_IGNORE_USELESS_CAST_BEGIN +# define YY_IGNORE_USELESS_CAST_BEGIN +# define YY_IGNORE_USELESS_CAST_END +#endif + + +#define YY_ASSERT(E) ((void) (0 && (E))) + +#if !defined yyoverflow /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -435,11 +748,11 @@ YYID (i) # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 + /* Use EXIT_SUCCESS as a witness for stdlib.h. */ +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # endif @@ -447,8 +760,8 @@ YYID (i) # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) + /* Pacify GCC's 'empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, and a page size can be as small as 4096 bytes. So we cannot safely @@ -462,88 +775,89 @@ YYID (i) # ifndef YYSTACK_ALLOC_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif -# if (defined __cplusplus && ! defined _STDLIB_H \ +# if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) + && (defined YYFREE || defined free))) # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined malloc && ! defined EXIT_SUCCESS void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined free && ! defined EXIT_SUCCESS void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif # endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ - +#endif /* !defined yyoverflow */ #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss; - YYSTYPE yyvs; - }; + yy_state_t yyss_alloc; + YYSTYPE yyvs_alloc; +}; /* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) +# define YYSTACK_GAP_MAXIMUM (YYSIZEOF (union yyalloc) - 1) /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (YYID (0)) -# endif -# endif +# define YYCOPY_NEEDED 1 /* Relocate STACK from its old location to the new one. The local variables YYSIZE and YYSTACKSIZE give the old and new number of elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYPTRDIFF_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * YYSIZEOF (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / YYSIZEOF (*yyptr); \ + } \ + while (0) #endif +#if defined YYCOPY_NEEDED && YYCOPY_NEEDED +/* Copy COUNT objects from SRC to DST. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(Dst, Src, Count) \ + __builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src))) +# else +# define YYCOPY(Dst, Src, Count) \ + do \ + { \ + YYPTRDIFF_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (Dst)[yyi] = (Src)[yyi]; \ + } \ + while (0) +# endif +# endif +#endif /* !YYCOPY_NEEDED */ + /* YYFINAL -- State number of the termination state. */ #define YYFINAL 6 /* YYLAST -- Last index in YYTABLE. */ @@ -555,18 +869,23 @@ union yyalloc #define YYNNTS 69 /* YYNRULES -- Number of rules. */ #define YYNRULES 140 -/* YYNRULES -- Number of states. */ +/* YYNSTATES -- Number of states. */ #define YYNSTATES 220 -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ -#define YYUNDEFTOK 2 +/* YYMAXUTOK -- Last valid token kind. */ #define YYMAXUTOK 344 -#define YYTRANSLATE(YYX) \ - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ -static const yytype_uint8 yytranslate[] = +/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, with out-of-bounds checking. */ +#define YYTRANSLATE(YYX) \ + (0 <= (YYX) && (YYX) <= YYMAXUTOK \ + ? YY_CAST (yysymbol_kind_t, yytranslate[YYX]) \ + : YYSYMBOL_YYUNDEF) + +/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM + as returned by yylex. */ +static const yytype_int8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -606,74 +925,8 @@ static const yytype_uint8 yytranslate[] = }; #if YYDEBUG -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in - YYRHS. */ -static const yytype_uint16 yyprhs[] = -{ - 0, 0, 3, 13, 16, 19, 22, 23, 26, 27, - 31, 32, 36, 37, 39, 40, 42, 45, 50, 54, - 57, 58, 60, 63, 65, 67, 71, 73, 77, 79, - 81, 83, 85, 87, 89, 91, 93, 95, 97, 99, - 101, 103, 105, 107, 109, 111, 113, 119, 125, 131, - 135, 137, 140, 145, 147, 151, 155, 160, 165, 167, - 170, 176, 179, 183, 185, 186, 189, 194, 198, 203, - 208, 212, 216, 221, 223, 225, 227, 229, 231, 234, - 238, 240, 242, 244, 247, 251, 257, 262, 266, 271, - 272, 274, 276, 278, 279, 281, 283, 288, 290, 292, - 294, 296, 298, 300, 302, 304, 306, 308, 312, 316, - 319, 321, 324, 328, 330, 334, 339, 341, 342, 346, - 347, 350, 355, 357, 359, 361, 363, 365, 367, 369, - 371, 373, 375, 377, 379, 381, 383, 385, 387, 389, - 391 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int16 yyrhs[] = -{ - 99, 0, -1, 86, 152, 21, 100, 101, 84, 8, - 102, 24, -1, 27, 70, -1, 38, 70, -1, 7, - 70, -1, -1, 29, 39, -1, -1, 107, 103, 108, - -1, -1, 40, 104, 90, -1, -1, 105, -1, -1, - 106, -1, 105, 106, -1, 110, 32, 86, 152, -1, - 28, 110, 90, -1, 28, 5, -1, -1, 109, -1, - 109, 108, -1, 111, -1, 144, -1, 86, 91, 110, - -1, 86, -1, 86, 84, 112, -1, 113, -1, 131, - -1, 134, -1, 121, -1, 114, -1, 145, -1, 130, - -1, 119, -1, 116, -1, 124, -1, 122, -1, 123, - -1, 126, -1, 127, -1, 128, -1, 129, -1, 140, - -1, 11, -1, 92, 156, 83, 156, 93, -1, 92, - 156, 83, 46, 93, -1, 92, 47, 83, 156, 93, - -1, 92, 156, 93, -1, 43, -1, 43, 115, -1, - 43, 94, 117, 95, -1, 118, -1, 117, 91, 118, - -1, 117, 91, 85, -1, 86, 92, 164, 93, -1, - 25, 94, 120, 95, -1, 117, -1, 9, 67, -1, - 9, 67, 94, 150, 95, -1, 51, 37, -1, 52, - 67, 125, -1, 49, -1, -1, 66, 115, -1, 64, - 94, 147, 95, -1, 64, 94, 95, -1, 64, 125, - 53, 112, -1, 65, 94, 147, 95, -1, 65, 94, - 95, -1, 65, 53, 112, -1, 14, 94, 147, 95, - -1, 132, -1, 133, -1, 86, -1, 34, -1, 77, - -1, 112, 135, -1, 92, 136, 93, -1, 137, -1, - 138, -1, 139, -1, 19, 112, -1, 23, 12, 156, - -1, 19, 112, 23, 12, 156, -1, 18, 12, 94, - 95, -1, 141, 143, 112, -1, 96, 142, 89, 97, - -1, -1, 76, -1, 6, -1, 60, -1, -1, 27, - -1, 38, -1, 86, 112, 84, 156, -1, 146, -1, - 33, -1, 73, -1, 78, -1, 61, -1, 81, -1, - 36, -1, 10, -1, 79, -1, 149, -1, 147, 91, - 149, -1, 147, 91, 85, -1, 86, 112, -1, 148, - -1, 148, 54, -1, 148, 20, 156, -1, 151, -1, - 150, 91, 151, -1, 86, 92, 89, 93, -1, 153, - -1, -1, 94, 154, 95, -1, -1, 155, 154, -1, - 86, 92, 89, 93, -1, 86, -1, 89, -1, 157, - -1, 158, -1, 162, -1, 161, -1, 163, -1, 166, - -1, 165, -1, 159, -1, 160, -1, 86, -1, 88, - -1, 71, -1, 31, -1, 164, -1, 89, -1, 49, - -1, 153, -1 -}; - -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const yytype_uint16 yyrline[] = +/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ +static const yytype_int16 yyrline[] = { 0, 240, 240, 247, 249, 251, 253, 256, 258, 261, 262, 265, 266, 269, 270, 273, 274, 277, 289, 295, @@ -693,21 +946,28 @@ static const yytype_uint16 yyrline[] = }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +/** Accessing symbol of state STATE. */ +#define YY_ACCESSING_SYMBOL(State) YY_CAST (yysymbol_kind_t, yystos[State]) + +#if YYDEBUG || 0 +/* The user-facing name of the symbol whose (internal) number is + YYSYMBOL. No bounds checking. */ +static const char *yysymbol_name (yysymbol_kind_t yysymbol) YY_ATTRIBUTE_UNUSED; + /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "$end", "error", "$undefined", "kw_ABSENT", "kw_ABSTRACT_SYNTAX", - "kw_ALL", "kw_APPLICATION", "kw_AUTOMATIC", "kw_BEGIN", "kw_BIT", - "kw_BMPString", "kw_BOOLEAN", "kw_BY", "kw_CHARACTER", "kw_CHOICE", - "kw_CLASS", "kw_COMPONENT", "kw_COMPONENTS", "kw_CONSTRAINED", - "kw_CONTAINING", "kw_DEFAULT", "kw_DEFINITIONS", "kw_EMBEDDED", - "kw_ENCODED", "kw_END", "kw_ENUMERATED", "kw_EXCEPT", "kw_EXPLICIT", - "kw_EXPORTS", "kw_EXTENSIBILITY", "kw_EXTERNAL", "kw_FALSE", "kw_FROM", - "kw_GeneralString", "kw_GeneralizedTime", "kw_GraphicString", - "kw_IA5String", "kw_IDENTIFIER", "kw_IMPLICIT", "kw_IMPLIED", - "kw_IMPORTS", "kw_INCLUDES", "kw_INSTANCE", "kw_INTEGER", + "\"end of file\"", "error", "\"invalid token\"", "kw_ABSENT", + "kw_ABSTRACT_SYNTAX", "kw_ALL", "kw_APPLICATION", "kw_AUTOMATIC", + "kw_BEGIN", "kw_BIT", "kw_BMPString", "kw_BOOLEAN", "kw_BY", + "kw_CHARACTER", "kw_CHOICE", "kw_CLASS", "kw_COMPONENT", "kw_COMPONENTS", + "kw_CONSTRAINED", "kw_CONTAINING", "kw_DEFAULT", "kw_DEFINITIONS", + "kw_EMBEDDED", "kw_ENCODED", "kw_END", "kw_ENUMERATED", "kw_EXCEPT", + "kw_EXPLICIT", "kw_EXPORTS", "kw_EXTENSIBILITY", "kw_EXTERNAL", + "kw_FALSE", "kw_FROM", "kw_GeneralString", "kw_GeneralizedTime", + "kw_GraphicString", "kw_IA5String", "kw_IDENTIFIER", "kw_IMPLICIT", + "kw_IMPLIED", "kw_IMPORTS", "kw_INCLUDES", "kw_INSTANCE", "kw_INTEGER", "kw_INTERSECTION", "kw_ISO646String", "kw_MAX", "kw_MIN", "kw_MINUS_INFINITY", "kw_NULL", "kw_NumericString", "kw_OBJECT", "kw_OCTET", "kw_OF", "kw_OPTIONAL", "kw_ObjectDescriptor", "kw_PATTERN", @@ -736,112 +996,28 @@ static const char *const yytname[] = "objid_list", "objid_element", "Value", "BuiltinValue", "ReferencedValue", "DefinedValue", "Valuereference", "CharacterStringValue", "BooleanValue", "IntegerValue", "SignedNumber", - "NullValue", "ObjectIdentifierValue", 0 + "NullValue", "ObjectIdentifierValue", YY_NULLPTR }; -#endif -# ifdef YYPRINT -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ -static const yytype_uint16 yytoknum[] = +static const char * +yysymbol_name (yysymbol_kind_t yysymbol) { - 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, - 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, - 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, - 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, - 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, - 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, - 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, - 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, - 59, 44, 40, 41, 123, 125, 91, 93 -}; -# endif + return yytname[yysymbol]; +} +#endif -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = -{ - 0, 98, 99, 100, 100, 100, 100, 101, 101, 102, - 102, 103, 103, 104, 104, 105, 105, 106, 107, 107, - 107, 108, 108, 109, 109, 110, 110, 111, 112, 112, - 112, 113, 113, 113, 113, 113, 113, 113, 113, 113, - 113, 113, 113, 113, 113, 114, 115, 115, 115, 115, - 116, 116, 116, 117, 117, 117, 118, 119, 120, 121, - 121, 122, 123, 124, 125, 125, 126, 126, 127, 128, - 128, 129, 130, 131, 131, 132, 133, 133, 134, 135, - 136, 137, 137, 138, 138, 138, 139, 140, 141, 142, - 142, 142, 142, 143, 143, 143, 144, 145, 146, 146, - 146, 146, 146, 146, 146, 146, 147, 147, 147, 148, - 149, 149, 149, 150, 150, 151, 152, 152, 153, 154, - 154, 155, 155, 155, 156, 156, 157, 157, 157, 157, - 157, 158, 159, 160, 161, 162, 162, 163, 164, 165, - 166 -}; +#define YYPACT_NINF (-119) -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = -{ - 0, 2, 9, 2, 2, 2, 0, 2, 0, 3, - 0, 3, 0, 1, 0, 1, 2, 4, 3, 2, - 0, 1, 2, 1, 1, 3, 1, 3, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 5, 5, 5, 3, - 1, 2, 4, 1, 3, 3, 4, 4, 1, 2, - 5, 2, 3, 1, 0, 2, 4, 3, 4, 4, - 3, 3, 4, 1, 1, 1, 1, 1, 2, 3, - 1, 1, 1, 2, 3, 5, 4, 3, 4, 0, - 1, 1, 1, 0, 1, 1, 4, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 3, 3, 2, - 1, 2, 3, 1, 3, 4, 1, 0, 3, 0, - 2, 4, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1 -}; +#define yypact_value_is_default(Yyn) \ + ((Yyn) == YYPACT_NINF) -/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state - STATE-NUM when YYTABLE doesn't specify something else to do. Zero - means the default is an error. */ -static const yytype_uint8 yydefact[] = -{ - 0, 117, 0, 119, 0, 116, 1, 122, 123, 0, - 119, 6, 0, 118, 120, 0, 0, 0, 8, 0, - 5, 3, 4, 0, 0, 121, 7, 0, 20, 0, - 0, 12, 19, 26, 0, 2, 14, 0, 0, 18, - 0, 13, 15, 0, 0, 9, 21, 23, 24, 25, - 11, 16, 0, 0, 104, 45, 0, 0, 98, 76, - 103, 50, 63, 0, 0, 101, 64, 0, 99, 77, - 100, 105, 102, 0, 75, 89, 0, 28, 32, 36, - 35, 31, 38, 39, 37, 40, 41, 42, 43, 34, - 29, 73, 74, 30, 44, 93, 33, 97, 22, 117, - 59, 0, 0, 0, 0, 51, 61, 64, 0, 0, - 0, 0, 0, 27, 91, 92, 90, 0, 0, 0, - 78, 94, 95, 0, 17, 0, 0, 0, 110, 106, - 0, 58, 53, 0, 136, 0, 139, 135, 133, 134, - 138, 140, 0, 124, 125, 131, 132, 127, 126, 128, - 137, 130, 129, 0, 62, 65, 67, 0, 0, 71, - 70, 0, 0, 96, 0, 0, 0, 0, 80, 81, - 82, 87, 0, 0, 113, 109, 0, 72, 0, 111, - 0, 0, 57, 0, 0, 49, 52, 66, 68, 69, - 88, 0, 83, 0, 79, 0, 0, 60, 108, 107, - 112, 0, 55, 54, 0, 0, 0, 0, 0, 84, - 0, 114, 56, 48, 47, 46, 86, 0, 115, 85 -}; +#define YYTABLE_NINF (-11) -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int16 yydefgoto[] = -{ - -1, 2, 18, 24, 30, 37, 40, 41, 42, 31, - 45, 46, 43, 47, 76, 77, 78, 105, 79, 131, - 132, 80, 133, 81, 82, 83, 84, 110, 85, 86, - 87, 88, 89, 90, 91, 92, 93, 120, 167, 168, - 169, 170, 94, 95, 117, 123, 48, 96, 97, 127, - 128, 129, 173, 174, 4, 141, 9, 10, 142, 143, - 144, 145, 146, 147, 148, 149, 150, 151, 152 -}; +#define yytable_value_is_error(Yyn) \ + 0 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -119 static const yytype_int16 yypact[] = { -43, -56, 47, -65, 29, -119, -119, -31, -119, -25, @@ -868,6 +1044,35 @@ static const yytype_int16 yypact[] = 99, -119, -119, -119, -119, -119, -119, 40, -119, -119 }; +/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not specify something else to do. Zero + means the default is an error. */ +static const yytype_uint8 yydefact[] = +{ + 0, 117, 0, 119, 0, 116, 1, 122, 123, 0, + 119, 6, 0, 118, 120, 0, 0, 0, 8, 0, + 5, 3, 4, 0, 0, 121, 7, 0, 20, 0, + 0, 12, 19, 26, 0, 2, 14, 0, 0, 18, + 0, 13, 15, 0, 0, 9, 21, 23, 24, 25, + 11, 16, 0, 0, 104, 45, 0, 0, 98, 76, + 103, 50, 63, 0, 0, 101, 64, 0, 99, 77, + 100, 105, 102, 0, 75, 89, 0, 28, 32, 36, + 35, 31, 38, 39, 37, 40, 41, 42, 43, 34, + 29, 73, 74, 30, 44, 93, 33, 97, 22, 117, + 59, 0, 0, 0, 0, 51, 61, 64, 0, 0, + 0, 0, 0, 27, 91, 92, 90, 0, 0, 0, + 78, 94, 95, 0, 17, 0, 0, 0, 110, 106, + 0, 58, 53, 0, 136, 0, 139, 135, 133, 134, + 138, 140, 0, 124, 125, 131, 132, 127, 126, 128, + 137, 130, 129, 0, 62, 65, 67, 0, 0, 71, + 70, 0, 0, 96, 0, 0, 0, 0, 80, 81, + 82, 87, 0, 0, 113, 109, 0, 72, 0, 111, + 0, 0, 57, 0, 0, 49, 52, 66, 68, 69, + 88, 0, 83, 0, 79, 0, 0, 60, 108, 107, + 112, 0, 55, 54, 0, 0, 0, 0, 0, 84, + 0, 114, 56, 48, 47, 46, 86, 0, 115, 85 +}; + /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { @@ -880,11 +1085,21 @@ static const yytype_int16 yypgoto[] = -119, -119, -119, -119, -119, -119, 22, -119, -119 }; -/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero, do what YYDEFACT says. - If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -11 +/* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_uint8 yydefgoto[] = +{ + 0, 2, 18, 24, 30, 37, 40, 41, 42, 31, + 45, 46, 43, 47, 76, 77, 78, 105, 79, 131, + 132, 80, 133, 81, 82, 83, 84, 110, 85, 86, + 87, 88, 89, 90, 91, 92, 93, 120, 167, 168, + 169, 170, 94, 95, 117, 123, 48, 96, 97, 127, + 128, 129, 173, 174, 4, 141, 9, 10, 142, 143, + 144, 145, 146, 147, 148, 149, 150, 151, 152 +}; + +/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_int16 yytable[] = { 163, 113, 5, 32, 208, 111, 108, 178, 114, 121, @@ -935,8 +1150,8 @@ static const yytype_int16 yycheck[] = 99, 196, 180, 96 }; -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ +/* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of + state STATE-NUM. */ static const yytype_uint8 yystos[] = { 0, 86, 99, 94, 152, 153, 0, 86, 89, 154, @@ -963,95 +1178,81 @@ static const yytype_uint8 yystos[] = 89, 151, 93, 93, 93, 93, 95, 12, 93, 156 }; -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - - -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ +/* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM. */ +static const yytype_uint8 yyr1[] = +{ + 0, 98, 99, 100, 100, 100, 100, 101, 101, 102, + 102, 103, 103, 104, 104, 105, 105, 106, 107, 107, + 107, 108, 108, 109, 109, 110, 110, 111, 112, 112, + 112, 113, 113, 113, 113, 113, 113, 113, 113, 113, + 113, 113, 113, 113, 113, 114, 115, 115, 115, 115, + 116, 116, 116, 117, 117, 117, 118, 119, 120, 121, + 121, 122, 123, 124, 125, 125, 126, 126, 127, 128, + 128, 129, 130, 131, 131, 132, 133, 133, 134, 135, + 136, 137, 137, 138, 138, 138, 139, 140, 141, 142, + 142, 142, 142, 143, 143, 143, 144, 145, 146, 146, + 146, 146, 146, 146, 146, 146, 147, 147, 147, 148, + 149, 149, 149, 150, 150, 151, 152, 152, 153, 154, + 154, 155, 155, 155, 156, 156, 157, 157, 157, 157, + 157, 158, 159, 160, 161, 162, 162, 163, 164, 165, + 166 +}; -#define YYFAIL goto yyerrlab +/* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM. */ +static const yytype_int8 yyr2[] = +{ + 0, 2, 9, 2, 2, 2, 0, 2, 0, 3, + 0, 3, 0, 1, 0, 1, 2, 4, 3, 2, + 0, 1, 2, 1, 1, 3, 1, 3, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 5, 5, 5, 3, + 1, 2, 4, 1, 3, 3, 4, 4, 1, 2, + 5, 2, 3, 1, 0, 2, 4, 3, 4, 4, + 3, 3, 4, 1, 1, 1, 1, 1, 2, 3, + 1, 1, 1, 2, 3, 5, 4, 3, 4, 0, + 1, 1, 1, 0, 1, 1, 4, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 3, 3, 2, + 1, 2, 3, 1, 3, 4, 1, 0, 3, 0, + 2, 4, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1 +}; -#define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (YYID (0)) - - -#define YYTERROR 1 -#define YYERRCODE 256 - - -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) -#endif +enum { YYENOMEM = -2 }; +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab +#define YYNOMEM goto yyexhaustedlab -#ifndef YY_LOCATION_PRINT -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif -#endif +#define YYRECOVERING() (!!yyerrstatus) -/* YYLEX -- calling `yylex' with the right arguments. */ +#define YYBACKUP(Token, Value) \ + do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ + while (0) + +/* Backward compatibility with an undocumented macro. + Use YYerror or YYUNDEF. */ +#define YYERRCODE YYUNDEF -#ifdef YYLEX_PARAM -# define YYLEX yylex (YYLEX_PARAM) -#else -# define YYLEX yylex () -#endif /* Enable debugging if requested. */ #if YYDEBUG @@ -1061,80 +1262,58 @@ while (YYID (0)) # define YYFPRINTF fprintf # endif -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (YYID (0)) - -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (0) + + + + +# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Kind, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (0) + + +/*-----------------------------------. +| Print this symbol's value on YYO. | +`-----------------------------------*/ + static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif +yy_symbol_value_print (FILE *yyo, + yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep) { + FILE *yyoutput = yyo; + YY_USE (yyoutput); if (!yyvaluep) return; -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); -# endif - switch (yytype) - { - default: - break; - } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YY_USE (yykind); + YY_IGNORE_MAYBE_UNINITIALIZED_END } -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +/*---------------------------. +| Print this symbol on YYO. | +`---------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else static void -yy_symbol_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif +yy_symbol_print (FILE *yyo, + yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep) { - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + YYFPRINTF (yyo, "%s %s (", + yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind)); - yy_symbol_value_print (yyoutput, yytype, yyvaluep); - YYFPRINTF (yyoutput, ")"); + yy_symbol_value_print (yyo, yykind, yyvaluep); + YYFPRINTF (yyo, ")"); } /*------------------------------------------------------------------. @@ -1142,80 +1321,68 @@ yy_symbol_print (yyoutput, yytype, yyvaluep) | TOP (included). | `------------------------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void -yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) -#else -static void -yy_stack_print (bottom, top) - yytype_int16 *bottom; - yytype_int16 *top; -#endif +yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop) { YYFPRINTF (stderr, "Stack now"); - for (; bottom <= top; ++bottom) - YYFPRINTF (stderr, " %d", *bottom); + for (; yybottom <= yytop; yybottom++) + { + int yybot = *yybottom; + YYFPRINTF (stderr, " %d", yybot); + } YYFPRINTF (stderr, "\n"); } -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_reduce_print (YYSTYPE *yyvsp, int yyrule) -#else static void -yy_reduce_print (yyvsp, yyrule) - YYSTYPE *yyvsp; - int yyrule; -#endif +yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, + int yyrule) { + int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; - unsigned long int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); + YYFPRINTF (stderr, "Reducing stack by rule %d (line %d):\n", + yyrule - 1, yylno); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { - fprintf (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - ); - fprintf (stderr, "\n"); + YYFPRINTF (stderr, " $%d = ", yyi + 1); + yy_symbol_print (stderr, + YY_ACCESSING_SYMBOL (+yyssp[yyi + 1 - yynrhs]), + &yyvsp[(yyi + 1) - (yynrhs)]); + YYFPRINTF (stderr, "\n"); } } -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyvsp, Rule); \ -} while (YYID (0)) +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyssp, yyvsp, Rule); \ +} while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; #else /* !YYDEBUG */ -# define YYDPRINTF(Args) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YYDPRINTF(Args) ((void) 0) +# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ /* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH +#ifndef YYINITDEPTH # define YYINITDEPTH 200 #endif @@ -1230,478 +1397,219 @@ int yydebug; # define YYMAXDEPTH 10000 #endif - - -#if YYERROR_VERBOSE - -# ifndef yystrlen -# if defined __GLIBC__ && defined _STRING_H -# define yystrlen strlen -# else -/* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static YYSIZE_T -yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif -{ - YYSIZE_T yylen; - for (yylen = 0; yystr[yylen]; yylen++) - continue; - return yylen; -} -# endif -# endif - -# ifndef yystpcpy -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -# define yystpcpy stpcpy -# else -/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in - YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static char * -yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif -{ - char *yyd = yydest; - const char *yys = yysrc; - - while ((*yyd++ = *yys++) != '\0') - continue; - - return yyd - 1; -} -# endif -# endif -# ifndef yytnamerr -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary - quotes and backslashes, so that it's suitable for yyerror. The - heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than - backslash-backslash). YYSTR is taken from yytname. If YYRES is - null, do not copy; instead, return the length of what the result - would have been. */ -static YYSIZE_T -yytnamerr (char *yyres, const char *yystr) -{ - if (*yystr == '"') - { - YYSIZE_T yyn = 0; - char const *yyp = yystr; - - for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - do_not_strip_quotes: ; - } - if (! yyres) - return yystrlen (yystr); - return yystpcpy (yyres, yystr) - yyres; -} -# endif -/* Copy into YYRESULT an error message about the unexpected token - YYCHAR while in state YYSTATE. Return the number of bytes copied, - including the terminating null byte. If YYRESULT is null, do not - copy anything; just return the number of bytes that would be - copied. As a special case, return 0 if an ordinary "syntax error" - message will do. Return YYSIZE_MAXIMUM if overflow occurs during - size calculation. */ -static YYSIZE_T -yysyntax_error (char *yyresult, int yystate, int yychar) -{ - int yyn = yypact[yystate]; - - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; - else - { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -# if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -# endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } - - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - - if (yysize_overflow) - return YYSIZE_MAXIMUM; - - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yyresult; - int yyi = 0; - while ((*yyp = *yyf) != '\0') - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - } - return yysize; - } -} -#endif /* YYERROR_VERBOSE */ - /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) -#else -static void -yydestruct (yymsg, yytype, yyvaluep) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; -#endif +yydestruct (const char *yymsg, + yysymbol_kind_t yykind, YYSTYPE *yyvaluep) { - YYUSE (yyvaluep); - + YY_USE (yyvaluep); if (!yymsg) yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp); - switch (yytype) - { - - default: - break; - } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YY_USE (yykind); + YY_IGNORE_MAYBE_UNINITIALIZED_END } - -/* Prevent warnings from -Wmissing-prototypes. */ - -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ - - -/* The look-ahead symbol. */ +/* Lookahead token kind. */ int yychar; -/* The semantic value of the look-ahead symbol. */ +/* The semantic value of the lookahead symbol. */ YYSTYPE yylval; - /* Number of syntax errors so far. */ int yynerrs; + /*----------. | yyparse. | `----------*/ -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) int yyparse (void) -#else -int -yyparse () - -#endif -#endif { - - int yystate; - int yyn; - int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ - int yytoken = 0; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif - - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. + yy_state_fast_t yystate = 0; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus = 0; - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ + /* Refer to the stacks through separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; + /* Their size. */ + YYPTRDIFF_T yystacksize = YYINITDEPTH; - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; + /* The state stack: array, bottom, top. */ + yy_state_t yyssa[YYINITDEPTH]; + yy_state_t *yyss = yyssa; + yy_state_t *yyssp = yyss; + /* The semantic value stack: array, bottom, top. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs = yyvsa; + YYSTYPE *yyvsp = yyvs; - -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) - - YYSIZE_T yystacksize = YYINITDEPTH; - + int yyn; + /* The return value of yyparse. */ + int yyresult; + /* Lookahead symbol kind. */ + yysymbol_kind_t yytoken = YYSYMBOL_YYEMPTY; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) + /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ int yylen = 0; YYDPRINTF ((stderr, "Starting parse\n")); - yystate = 0; - yyerrstatus = 0; - yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - - yyssp = yyss; - yyvsp = yyvs; + yychar = YYEMPTY; /* Cause a token to be read. */ goto yysetstate; + /*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | +| yynewstate -- push a new state, which is found in yystate. | `------------------------------------------------------------*/ - yynewstate: +yynewstate: /* In all cases, when you get here, the value and location stacks have just been pushed. So pushing a state here evens the stacks. */ yyssp++; - yysetstate: - *yyssp = yystate; + +/*--------------------------------------------------------------------. +| yysetstate -- set current state (the top of the stack) to yystate. | +`--------------------------------------------------------------------*/ +yysetstate: + YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + YY_ASSERT (0 <= yystate && yystate < YYNSTATES); + YY_IGNORE_USELESS_CAST_BEGIN + *yyssp = YY_CAST (yy_state_t, yystate); + YY_IGNORE_USELESS_CAST_END + YY_STACK_PRINT (yyss, yyssp); if (yyss + yystacksize - 1 <= yyssp) +#if !defined yyoverflow && !defined YYSTACK_RELOCATE + YYNOMEM; +#else { /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; + YYPTRDIFF_T yysize = yyssp - yyss + 1; -#ifdef yyoverflow +# if defined yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - - &yystacksize); - - yyss = yyss1; - yyvs = yyvs1; + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + yy_state_t *yyss1 = yyss; + YYSTYPE *yyvs1 = yyvs; + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * YYSIZEOF (*yyssp), + &yyvs1, yysize * YYSIZEOF (*yyvsp), + &yystacksize); + yyss = yyss1; + yyvs = yyvs1; } -#else /* no yyoverflow */ -# ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; -# else +# else /* defined YYSTACK_RELOCATE */ /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + YYNOMEM; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; + yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); - + yy_state_t *yyss1 = yyss; + union yyalloc *yyptr = + YY_CAST (union yyalloc *, + YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize)))); + if (! yyptr) + YYNOMEM; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); # undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); } # endif -#endif /* no yyoverflow */ yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; - - YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + YY_IGNORE_USELESS_CAST_BEGIN + YYDPRINTF ((stderr, "Stack size increased to %ld\n", + YY_CAST (long, yystacksize))); + YY_IGNORE_USELESS_CAST_END if (yyss + yystacksize - 1 <= yyssp) - YYABORT; + YYABORT; } +#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */ - YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + + if (yystate == YYFINAL) + YYACCEPT; goto yybackup; + /*-----------. | yybackup. | `-----------*/ yybackup: - /* Do appropriate processing given the current state. Read a - look-ahead token if we need one and don't already have one. */ + lookahead token if we need one and don't already have one. */ - /* First try to decide what to do without reference to look-ahead token. */ + /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; - if (yyn == YYPACT_NINF) + if (yypact_value_is_default (yyn)) goto yydefault; - /* Not known => get a look-ahead token if don't already have one. */ + /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ + /* YYCHAR is either empty, or end-of-input, or a valid lookahead. */ if (yychar == YYEMPTY) { - YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; + YYDPRINTF ((stderr, "Reading a token\n")); + yychar = yylex (); } if (yychar <= YYEOF) { - yychar = yytoken = YYEOF; + yychar = YYEOF; + yytoken = YYSYMBOL_YYEOF; YYDPRINTF ((stderr, "Now at end of input.\n")); } + else if (yychar == YYerror) + { + /* The scanner already issued an error message, process directly + to error recovery. But do not keep the error token as + lookahead, it is too special and may lead us to an endless + loop in error recovery. */ + yychar = YYUNDEF; + yytoken = YYSYMBOL_YYerror; + goto yyerrlab1; + } else { yytoken = YYTRANSLATE (yychar); @@ -1716,30 +1624,26 @@ yybackup: yyn = yytable[yyn]; if (yyn <= 0) { - if (yyn == 0 || yyn == YYTABLE_NINF) - goto yyerrlab; + if (yytable_value_is_error (yyn)) + goto yyerrlab; yyn = -yyn; goto yyreduce; } - if (yyn == YYFINAL) - YYACCEPT; - /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; - /* Shift the look-ahead token. */ + /* Shift the lookahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - - /* Discard the shifted token unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; - yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END + /* Discard the shifted token. */ + yychar = YYEMPTY; goto yynewstate; @@ -1754,14 +1658,14 @@ yydefault: /*-----------------------------. -| yyreduce -- Do a reduction. | +| yyreduce -- do a reduction. | `-----------------------------*/ yyreduce: /* yyn is the number of a rule to reduce with. */ yylen = yyr2[yyn]; /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. + '$$ = $1'. Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison @@ -1774,241 +1678,267 @@ yyreduce: YY_REDUCE_PRINT (yyn); switch (yyn) { - case 2: + case 2: /* ModuleDefinition: IDENTIFIER objid_opt kw_DEFINITIONS TagDefault ExtensionDefault EEQUAL kw_BEGIN ModuleBody kw_END */ #line 242 "asn1parse.y" - { + { checkundefined(); } +#line 1687 "asn1parse.c" break; - case 3: + case 3: /* TagDefault: kw_EXPLICIT kw_TAGS */ #line 248 "asn1parse.y" - { default_tag_env = TE_EXPLICIT; } + { default_tag_env = TE_EXPLICIT; } +#line 1693 "asn1parse.c" break; - case 4: + case 4: /* TagDefault: kw_IMPLICIT kw_TAGS */ #line 250 "asn1parse.y" - { default_tag_env = TE_IMPLICIT; } + { default_tag_env = TE_IMPLICIT; } +#line 1699 "asn1parse.c" break; - case 5: + case 5: /* TagDefault: kw_AUTOMATIC kw_TAGS */ #line 252 "asn1parse.y" - { lex_error_message("automatic tagging is not supported"); } + { lex_error_message("automatic tagging is not supported"); } +#line 1705 "asn1parse.c" break; - case 7: + case 7: /* ExtensionDefault: kw_EXTENSIBILITY kw_IMPLIED */ #line 257 "asn1parse.y" - { lex_error_message("no extensibility options supported"); } + { lex_error_message("no extensibility options supported"); } +#line 1711 "asn1parse.c" break; - case 17: + case 17: /* SymbolsFromModule: referencenames kw_FROM IDENTIFIER objid_opt */ #line 278 "asn1parse.y" - { + { struct string_list *sl; - for(sl = (yyvsp[(1) - (4)].sl); sl != NULL; sl = sl->next) { + for(sl = (yyvsp[-3].sl); sl != NULL; sl = sl->next) { Symbol *s = addsym(sl->string); s->stype = Stype; gen_template_import(s); } - add_import((yyvsp[(3) - (4)].name)); + add_import((yyvsp[-1].name)); } +#line 1725 "asn1parse.c" break; - case 18: + case 18: /* Exports: kw_EXPORTS referencenames ';' */ #line 290 "asn1parse.y" - { + { struct string_list *sl; - for(sl = (yyvsp[(2) - (3)].sl); sl != NULL; sl = sl->next) + for(sl = (yyvsp[-1].sl); sl != NULL; sl = sl->next) add_export(sl->string); } +#line 1735 "asn1parse.c" break; - case 25: + case 25: /* referencenames: IDENTIFIER ',' referencenames */ #line 308 "asn1parse.y" - { + { (yyval.sl) = emalloc(sizeof(*(yyval.sl))); - (yyval.sl)->string = (yyvsp[(1) - (3)].name); - (yyval.sl)->next = (yyvsp[(3) - (3)].sl); + (yyval.sl)->string = (yyvsp[-2].name); + (yyval.sl)->next = (yyvsp[0].sl); } +#line 1745 "asn1parse.c" break; - case 26: + case 26: /* referencenames: IDENTIFIER */ #line 314 "asn1parse.y" - { + { (yyval.sl) = emalloc(sizeof(*(yyval.sl))); - (yyval.sl)->string = (yyvsp[(1) - (1)].name); + (yyval.sl)->string = (yyvsp[0].name); (yyval.sl)->next = NULL; } +#line 1755 "asn1parse.c" break; - case 27: + case 27: /* TypeAssignment: IDENTIFIER EEQUAL Type */ #line 322 "asn1parse.y" - { - Symbol *s = addsym ((yyvsp[(1) - (3)].name)); + { + Symbol *s = addsym ((yyvsp[-2].name)); s->stype = Stype; - s->type = (yyvsp[(3) - (3)].type); + s->type = (yyvsp[0].type); fix_labels(s); generate_type (s); } +#line 1767 "asn1parse.c" break; - case 45: + case 45: /* BooleanType: kw_BOOLEAN */ #line 353 "asn1parse.y" - { + { (yyval.type) = new_tag(ASN1_C_UNIV, UT_Boolean, TE_EXPLICIT, new_type(TBoolean)); } +#line 1776 "asn1parse.c" break; - case 46: + case 46: /* range: '(' Value RANGE Value ')' */ #line 360 "asn1parse.y" - { - if((yyvsp[(2) - (5)].value)->type != integervalue) + { + if((yyvsp[-3].value)->type != integervalue) lex_error_message("Non-integer used in first part of range"); - if((yyvsp[(2) - (5)].value)->type != integervalue) + if((yyvsp[-3].value)->type != integervalue) lex_error_message("Non-integer in second part of range"); (yyval.range) = ecalloc(1, sizeof(*(yyval.range))); - (yyval.range)->min = (yyvsp[(2) - (5)].value)->u.integervalue; - (yyval.range)->max = (yyvsp[(4) - (5)].value)->u.integervalue; + (yyval.range)->min = (yyvsp[-3].value)->u.integervalue; + (yyval.range)->max = (yyvsp[-1].value)->u.integervalue; } +#line 1790 "asn1parse.c" break; - case 47: + case 47: /* range: '(' Value RANGE kw_MAX ')' */ #line 370 "asn1parse.y" - { - if((yyvsp[(2) - (5)].value)->type != integervalue) + { + if((yyvsp[-3].value)->type != integervalue) lex_error_message("Non-integer in first part of range"); (yyval.range) = ecalloc(1, sizeof(*(yyval.range))); - (yyval.range)->min = (yyvsp[(2) - (5)].value)->u.integervalue; + (yyval.range)->min = (yyvsp[-3].value)->u.integervalue; (yyval.range)->max = INT_MAX; } +#line 1802 "asn1parse.c" break; - case 48: + case 48: /* range: '(' kw_MIN RANGE Value ')' */ #line 378 "asn1parse.y" - { - if((yyvsp[(4) - (5)].value)->type != integervalue) + { + if((yyvsp[-1].value)->type != integervalue) lex_error_message("Non-integer in second part of range"); (yyval.range) = ecalloc(1, sizeof(*(yyval.range))); (yyval.range)->min = INT_MIN; - (yyval.range)->max = (yyvsp[(4) - (5)].value)->u.integervalue; + (yyval.range)->max = (yyvsp[-1].value)->u.integervalue; } +#line 1814 "asn1parse.c" break; - case 49: + case 49: /* range: '(' Value ')' */ #line 386 "asn1parse.y" - { - if((yyvsp[(2) - (3)].value)->type != integervalue) + { + if((yyvsp[-1].value)->type != integervalue) lex_error_message("Non-integer used in limit"); (yyval.range) = ecalloc(1, sizeof(*(yyval.range))); - (yyval.range)->min = (yyvsp[(2) - (3)].value)->u.integervalue; - (yyval.range)->max = (yyvsp[(2) - (3)].value)->u.integervalue; + (yyval.range)->min = (yyvsp[-1].value)->u.integervalue; + (yyval.range)->max = (yyvsp[-1].value)->u.integervalue; } +#line 1826 "asn1parse.c" break; - case 50: + case 50: /* IntegerType: kw_INTEGER */ #line 397 "asn1parse.y" - { + { (yyval.type) = new_tag(ASN1_C_UNIV, UT_Integer, TE_EXPLICIT, new_type(TInteger)); } +#line 1835 "asn1parse.c" break; - case 51: + case 51: /* IntegerType: kw_INTEGER range */ #line 402 "asn1parse.y" - { + { (yyval.type) = new_type(TInteger); - (yyval.type)->range = (yyvsp[(2) - (2)].range); + (yyval.type)->range = (yyvsp[0].range); (yyval.type) = new_tag(ASN1_C_UNIV, UT_Integer, TE_EXPLICIT, (yyval.type)); } +#line 1845 "asn1parse.c" break; - case 52: + case 52: /* IntegerType: kw_INTEGER '{' NamedNumberList '}' */ #line 408 "asn1parse.y" - { + { (yyval.type) = new_type(TInteger); - (yyval.type)->members = (yyvsp[(3) - (4)].members); + (yyval.type)->members = (yyvsp[-1].members); (yyval.type) = new_tag(ASN1_C_UNIV, UT_Integer, TE_EXPLICIT, (yyval.type)); } +#line 1855 "asn1parse.c" break; - case 53: + case 53: /* NamedNumberList: NamedNumber */ #line 416 "asn1parse.y" - { + { (yyval.members) = emalloc(sizeof(*(yyval.members))); ASN1_TAILQ_INIT((yyval.members)); - ASN1_TAILQ_INSERT_HEAD((yyval.members), (yyvsp[(1) - (1)].member), members); + ASN1_TAILQ_INSERT_HEAD((yyval.members), (yyvsp[0].member), members); } +#line 1865 "asn1parse.c" break; - case 54: + case 54: /* NamedNumberList: NamedNumberList ',' NamedNumber */ #line 422 "asn1parse.y" - { - ASN1_TAILQ_INSERT_TAIL((yyvsp[(1) - (3)].members), (yyvsp[(3) - (3)].member), members); - (yyval.members) = (yyvsp[(1) - (3)].members); + { + ASN1_TAILQ_INSERT_TAIL((yyvsp[-2].members), (yyvsp[0].member), members); + (yyval.members) = (yyvsp[-2].members); } +#line 1874 "asn1parse.c" break; - case 55: + case 55: /* NamedNumberList: NamedNumberList ',' ELLIPSIS */ #line 427 "asn1parse.y" - { (yyval.members) = (yyvsp[(1) - (3)].members); } + { (yyval.members) = (yyvsp[-2].members); } +#line 1880 "asn1parse.c" break; - case 56: + case 56: /* NamedNumber: IDENTIFIER '(' SignedNumber ')' */ #line 431 "asn1parse.y" - { + { (yyval.member) = emalloc(sizeof(*(yyval.member))); - (yyval.member)->name = (yyvsp[(1) - (4)].name); - (yyval.member)->gen_name = estrdup((yyvsp[(1) - (4)].name)); + (yyval.member)->name = (yyvsp[-3].name); + (yyval.member)->gen_name = estrdup((yyvsp[-3].name)); output_name ((yyval.member)->gen_name); - (yyval.member)->val = (yyvsp[(3) - (4)].constant); + (yyval.member)->val = (yyvsp[-1].constant); (yyval.member)->optional = 0; (yyval.member)->ellipsis = 0; (yyval.member)->type = NULL; } +#line 1895 "asn1parse.c" break; - case 57: + case 57: /* EnumeratedType: kw_ENUMERATED '{' Enumerations '}' */ #line 444 "asn1parse.y" - { + { (yyval.type) = new_type(TInteger); - (yyval.type)->members = (yyvsp[(3) - (4)].members); + (yyval.type)->members = (yyvsp[-1].members); (yyval.type) = new_tag(ASN1_C_UNIV, UT_Enumerated, TE_EXPLICIT, (yyval.type)); } +#line 1905 "asn1parse.c" break; - case 59: + case 59: /* BitStringType: kw_BIT kw_STRING */ #line 455 "asn1parse.y" - { + { (yyval.type) = new_type(TBitString); (yyval.type)->members = emalloc(sizeof(*(yyval.type)->members)); ASN1_TAILQ_INIT((yyval.type)->members); (yyval.type) = new_tag(ASN1_C_UNIV, UT_BitString, TE_EXPLICIT, (yyval.type)); } +#line 1916 "asn1parse.c" break; - case 60: + case 60: /* BitStringType: kw_BIT kw_STRING '{' NamedBitList '}' */ #line 462 "asn1parse.y" - { + { (yyval.type) = new_type(TBitString); - (yyval.type)->members = (yyvsp[(4) - (5)].members); + (yyval.type)->members = (yyvsp[-1].members); (yyval.type) = new_tag(ASN1_C_UNIV, UT_BitString, TE_EXPLICIT, (yyval.type)); } +#line 1926 "asn1parse.c" break; - case 61: + case 61: /* ObjectIdentifierType: kw_OBJECT kw_IDENTIFIER */ #line 470 "asn1parse.y" - { + { (yyval.type) = new_tag(ASN1_C_UNIV, UT_OID, TE_EXPLICIT, new_type(TOID)); } +#line 1935 "asn1parse.c" break; - case 62: + case 62: /* OctetStringType: kw_OCTET kw_STRING size */ #line 476 "asn1parse.y" - { + { Type *t = new_type(TOctetString); - t->range = (yyvsp[(3) - (3)].range); + t->range = (yyvsp[0].range); if (t->range) { if (t->range->min < 0) lex_error_message("can't use a negative SIZE range " @@ -2017,126 +1947,140 @@ yyreduce: (yyval.type) = new_tag(ASN1_C_UNIV, UT_OctetString, TE_EXPLICIT, t); } +#line 1951 "asn1parse.c" break; - case 63: + case 63: /* NullType: kw_NULL */ #line 490 "asn1parse.y" - { + { (yyval.type) = new_tag(ASN1_C_UNIV, UT_Null, TE_EXPLICIT, new_type(TNull)); } +#line 1960 "asn1parse.c" break; - case 64: + case 64: /* size: %empty */ #line 497 "asn1parse.y" - { (yyval.range) = NULL; } + { (yyval.range) = NULL; } +#line 1966 "asn1parse.c" break; - case 65: + case 65: /* size: kw_SIZE range */ #line 499 "asn1parse.y" - { (yyval.range) = (yyvsp[(2) - (2)].range); } + { (yyval.range) = (yyvsp[0].range); } +#line 1972 "asn1parse.c" break; - case 66: + case 66: /* SequenceType: kw_SEQUENCE '{' ComponentTypeList '}' */ #line 504 "asn1parse.y" - { + { (yyval.type) = new_type(TSequence); - (yyval.type)->members = (yyvsp[(3) - (4)].members); + (yyval.type)->members = (yyvsp[-1].members); (yyval.type) = new_tag(ASN1_C_UNIV, UT_Sequence, default_tag_env, (yyval.type)); } +#line 1982 "asn1parse.c" break; - case 67: + case 67: /* SequenceType: kw_SEQUENCE '{' '}' */ #line 510 "asn1parse.y" - { + { (yyval.type) = new_type(TSequence); (yyval.type)->members = NULL; (yyval.type) = new_tag(ASN1_C_UNIV, UT_Sequence, default_tag_env, (yyval.type)); } +#line 1992 "asn1parse.c" break; - case 68: + case 68: /* SequenceOfType: kw_SEQUENCE size kw_OF Type */ #line 518 "asn1parse.y" - { + { (yyval.type) = new_type(TSequenceOf); - (yyval.type)->range = (yyvsp[(2) - (4)].range); + (yyval.type)->range = (yyvsp[-2].range); if ((yyval.type)->range) { if ((yyval.type)->range->min < 0) lex_error_message("can't use a negative SIZE range " "length for SEQUENCE OF"); } - (yyval.type)->subtype = (yyvsp[(4) - (4)].type); + (yyval.type)->subtype = (yyvsp[0].type); (yyval.type) = new_tag(ASN1_C_UNIV, UT_Sequence, default_tag_env, (yyval.type)); } +#line 2009 "asn1parse.c" break; - case 69: + case 69: /* SetType: kw_SET '{' ComponentTypeList '}' */ #line 533 "asn1parse.y" - { + { (yyval.type) = new_type(TSet); - (yyval.type)->members = (yyvsp[(3) - (4)].members); + (yyval.type)->members = (yyvsp[-1].members); (yyval.type) = new_tag(ASN1_C_UNIV, UT_Set, default_tag_env, (yyval.type)); } +#line 2019 "asn1parse.c" break; - case 70: + case 70: /* SetType: kw_SET '{' '}' */ #line 539 "asn1parse.y" - { + { (yyval.type) = new_type(TSet); (yyval.type)->members = NULL; (yyval.type) = new_tag(ASN1_C_UNIV, UT_Set, default_tag_env, (yyval.type)); } +#line 2029 "asn1parse.c" break; - case 71: + case 71: /* SetOfType: kw_SET kw_OF Type */ #line 547 "asn1parse.y" - { + { (yyval.type) = new_type(TSetOf); - (yyval.type)->subtype = (yyvsp[(3) - (3)].type); + (yyval.type)->subtype = (yyvsp[0].type); (yyval.type) = new_tag(ASN1_C_UNIV, UT_Set, default_tag_env, (yyval.type)); } +#line 2039 "asn1parse.c" break; - case 72: + case 72: /* ChoiceType: kw_CHOICE '{' ComponentTypeList '}' */ #line 555 "asn1parse.y" - { + { (yyval.type) = new_type(TChoice); - (yyval.type)->members = (yyvsp[(3) - (4)].members); + (yyval.type)->members = (yyvsp[-1].members); } +#line 2048 "asn1parse.c" break; - case 75: + case 75: /* DefinedType: IDENTIFIER */ #line 566 "asn1parse.y" - { - Symbol *s = addsym((yyvsp[(1) - (1)].name)); + { + Symbol *s = addsym((yyvsp[0].name)); (yyval.type) = new_type(TType); if(s->stype != Stype && s->stype != SUndefined) - lex_error_message ("%s is not a type\n", (yyvsp[(1) - (1)].name)); + lex_error_message ("%s is not a type\n", (yyvsp[0].name)); else (yyval.type)->symbol = s; } +#line 2061 "asn1parse.c" break; - case 76: + case 76: /* UsefulType: kw_GeneralizedTime */ #line 577 "asn1parse.y" - { + { (yyval.type) = new_tag(ASN1_C_UNIV, UT_GeneralizedTime, TE_EXPLICIT, new_type(TGeneralizedTime)); } +#line 2070 "asn1parse.c" break; - case 77: + case 77: /* UsefulType: kw_UTCTime */ #line 582 "asn1parse.y" - { + { (yyval.type) = new_tag(ASN1_C_UNIV, UT_UTCTime, TE_EXPLICIT, new_type(TUTCTime)); } +#line 2079 "asn1parse.c" break; - case 78: + case 78: /* ConstrainedType: Type Constraint */ #line 589 "asn1parse.y" - { + { /* if (Constraint.type == contentConstrant) { assert(Constraint.u.constraint.type == octetstring|bitstring-w/o-NamedBitList); // remember to check type reference too if (Constraint.u.constraint.type) { @@ -2148,347 +2092,386 @@ yyreduce: } */ } +#line 2096 "asn1parse.c" break; - case 79: + case 79: /* Constraint: '(' ConstraintSpec ')' */ #line 605 "asn1parse.y" - { - (yyval.constraint_spec) = (yyvsp[(2) - (3)].constraint_spec); + { + (yyval.constraint_spec) = (yyvsp[-1].constraint_spec); } +#line 2104 "asn1parse.c" break; - case 83: + case 83: /* ContentsConstraint: kw_CONTAINING Type */ #line 618 "asn1parse.y" - { + { (yyval.constraint_spec) = new_constraint_spec(CT_CONTENTS); - (yyval.constraint_spec)->u.content.type = (yyvsp[(2) - (2)].type); + (yyval.constraint_spec)->u.content.type = (yyvsp[0].type); (yyval.constraint_spec)->u.content.encoding = NULL; } +#line 2114 "asn1parse.c" break; - case 84: + case 84: /* ContentsConstraint: kw_ENCODED kw_BY Value */ #line 624 "asn1parse.y" - { - if ((yyvsp[(3) - (3)].value)->type != objectidentifiervalue) + { + if ((yyvsp[0].value)->type != objectidentifiervalue) lex_error_message("Non-OID used in ENCODED BY constraint"); (yyval.constraint_spec) = new_constraint_spec(CT_CONTENTS); (yyval.constraint_spec)->u.content.type = NULL; - (yyval.constraint_spec)->u.content.encoding = (yyvsp[(3) - (3)].value); + (yyval.constraint_spec)->u.content.encoding = (yyvsp[0].value); } +#line 2126 "asn1parse.c" break; - case 85: + case 85: /* ContentsConstraint: kw_CONTAINING Type kw_ENCODED kw_BY Value */ #line 632 "asn1parse.y" - { - if ((yyvsp[(5) - (5)].value)->type != objectidentifiervalue) + { + if ((yyvsp[0].value)->type != objectidentifiervalue) lex_error_message("Non-OID used in ENCODED BY constraint"); (yyval.constraint_spec) = new_constraint_spec(CT_CONTENTS); - (yyval.constraint_spec)->u.content.type = (yyvsp[(2) - (5)].type); - (yyval.constraint_spec)->u.content.encoding = (yyvsp[(5) - (5)].value); + (yyval.constraint_spec)->u.content.type = (yyvsp[-3].type); + (yyval.constraint_spec)->u.content.encoding = (yyvsp[0].value); } +#line 2138 "asn1parse.c" break; - case 86: + case 86: /* UserDefinedConstraint: kw_CONSTRAINED kw_BY '{' '}' */ #line 642 "asn1parse.y" - { + { (yyval.constraint_spec) = new_constraint_spec(CT_USER); } +#line 2146 "asn1parse.c" break; - case 87: + case 87: /* TaggedType: Tag tagenv Type */ #line 648 "asn1parse.y" - { + { (yyval.type) = new_type(TTag); - (yyval.type)->tag = (yyvsp[(1) - (3)].tag); - (yyval.type)->tag.tagenv = (yyvsp[(2) - (3)].constant); + (yyval.type)->tag = (yyvsp[-2].tag); + (yyval.type)->tag.tagenv = (yyvsp[-1].constant); if (template_flag) { - (yyval.type)->subtype = (yyvsp[(3) - (3)].type); + (yyval.type)->subtype = (yyvsp[0].type); } else { - if((yyvsp[(3) - (3)].type)->type == TTag && (yyvsp[(2) - (3)].constant) == TE_IMPLICIT) { - (yyval.type)->subtype = (yyvsp[(3) - (3)].type)->subtype; - free((yyvsp[(3) - (3)].type)); + if((yyvsp[0].type)->type == TTag && (yyvsp[-1].constant) == TE_IMPLICIT) { + (yyval.type)->subtype = (yyvsp[0].type)->subtype; + free((yyvsp[0].type)); } else { - (yyval.type)->subtype = (yyvsp[(3) - (3)].type); + (yyval.type)->subtype = (yyvsp[0].type); } } } +#line 2166 "asn1parse.c" break; - case 88: + case 88: /* Tag: '[' Class NUMBER ']' */ #line 666 "asn1parse.y" - { - (yyval.tag).tagclass = (yyvsp[(2) - (4)].constant); - (yyval.tag).tagvalue = (yyvsp[(3) - (4)].constant); + { + (yyval.tag).tagclass = (yyvsp[-2].constant); + (yyval.tag).tagvalue = (yyvsp[-1].constant); (yyval.tag).tagenv = default_tag_env; } +#line 2176 "asn1parse.c" break; - case 89: + case 89: /* Class: %empty */ #line 674 "asn1parse.y" - { + { (yyval.constant) = ASN1_C_CONTEXT; } +#line 2184 "asn1parse.c" break; - case 90: + case 90: /* Class: kw_UNIVERSAL */ #line 678 "asn1parse.y" - { + { (yyval.constant) = ASN1_C_UNIV; } +#line 2192 "asn1parse.c" break; - case 91: + case 91: /* Class: kw_APPLICATION */ #line 682 "asn1parse.y" - { + { (yyval.constant) = ASN1_C_APPL; } +#line 2200 "asn1parse.c" break; - case 92: + case 92: /* Class: kw_PRIVATE */ #line 686 "asn1parse.y" - { + { (yyval.constant) = ASN1_C_PRIVATE; } +#line 2208 "asn1parse.c" break; - case 93: + case 93: /* tagenv: %empty */ #line 692 "asn1parse.y" - { + { (yyval.constant) = default_tag_env; } +#line 2216 "asn1parse.c" break; - case 94: + case 94: /* tagenv: kw_EXPLICIT */ #line 696 "asn1parse.y" - { + { (yyval.constant) = default_tag_env; } +#line 2224 "asn1parse.c" break; - case 95: + case 95: /* tagenv: kw_IMPLICIT */ #line 700 "asn1parse.y" - { + { (yyval.constant) = TE_IMPLICIT; } +#line 2232 "asn1parse.c" break; - case 96: + case 96: /* ValueAssignment: IDENTIFIER Type EEQUAL Value */ #line 707 "asn1parse.y" - { + { Symbol *s; - s = addsym ((yyvsp[(1) - (4)].name)); + s = addsym ((yyvsp[-3].name)); s->stype = SValue; - s->value = (yyvsp[(4) - (4)].value); + s->value = (yyvsp[0].value); generate_constant (s); } +#line 2245 "asn1parse.c" break; - case 98: + case 98: /* RestrictedCharactedStringType: kw_GeneralString */ #line 721 "asn1parse.y" - { + { (yyval.type) = new_tag(ASN1_C_UNIV, UT_GeneralString, TE_EXPLICIT, new_type(TGeneralString)); } +#line 2254 "asn1parse.c" break; - case 99: + case 99: /* RestrictedCharactedStringType: kw_TeletexString */ #line 726 "asn1parse.y" - { + { (yyval.type) = new_tag(ASN1_C_UNIV, UT_TeletexString, TE_EXPLICIT, new_type(TTeletexString)); } +#line 2263 "asn1parse.c" break; - case 100: + case 100: /* RestrictedCharactedStringType: kw_UTF8String */ #line 731 "asn1parse.y" - { + { (yyval.type) = new_tag(ASN1_C_UNIV, UT_UTF8String, TE_EXPLICIT, new_type(TUTF8String)); } +#line 2272 "asn1parse.c" break; - case 101: + case 101: /* RestrictedCharactedStringType: kw_PrintableString */ #line 736 "asn1parse.y" - { + { (yyval.type) = new_tag(ASN1_C_UNIV, UT_PrintableString, TE_EXPLICIT, new_type(TPrintableString)); } +#line 2281 "asn1parse.c" break; - case 102: + case 102: /* RestrictedCharactedStringType: kw_VisibleString */ #line 741 "asn1parse.y" - { + { (yyval.type) = new_tag(ASN1_C_UNIV, UT_VisibleString, TE_EXPLICIT, new_type(TVisibleString)); } +#line 2290 "asn1parse.c" break; - case 103: + case 103: /* RestrictedCharactedStringType: kw_IA5String */ #line 746 "asn1parse.y" - { + { (yyval.type) = new_tag(ASN1_C_UNIV, UT_IA5String, TE_EXPLICIT, new_type(TIA5String)); } +#line 2299 "asn1parse.c" break; - case 104: + case 104: /* RestrictedCharactedStringType: kw_BMPString */ #line 751 "asn1parse.y" - { + { (yyval.type) = new_tag(ASN1_C_UNIV, UT_BMPString, TE_EXPLICIT, new_type(TBMPString)); } +#line 2308 "asn1parse.c" break; - case 105: + case 105: /* RestrictedCharactedStringType: kw_UniversalString */ #line 756 "asn1parse.y" - { + { (yyval.type) = new_tag(ASN1_C_UNIV, UT_UniversalString, TE_EXPLICIT, new_type(TUniversalString)); } +#line 2317 "asn1parse.c" break; - case 106: + case 106: /* ComponentTypeList: ComponentType */ #line 764 "asn1parse.y" - { + { (yyval.members) = emalloc(sizeof(*(yyval.members))); ASN1_TAILQ_INIT((yyval.members)); - ASN1_TAILQ_INSERT_HEAD((yyval.members), (yyvsp[(1) - (1)].member), members); + ASN1_TAILQ_INSERT_HEAD((yyval.members), (yyvsp[0].member), members); } +#line 2327 "asn1parse.c" break; - case 107: + case 107: /* ComponentTypeList: ComponentTypeList ',' ComponentType */ #line 770 "asn1parse.y" - { - ASN1_TAILQ_INSERT_TAIL((yyvsp[(1) - (3)].members), (yyvsp[(3) - (3)].member), members); - (yyval.members) = (yyvsp[(1) - (3)].members); + { + ASN1_TAILQ_INSERT_TAIL((yyvsp[-2].members), (yyvsp[0].member), members); + (yyval.members) = (yyvsp[-2].members); } +#line 2336 "asn1parse.c" break; - case 108: + case 108: /* ComponentTypeList: ComponentTypeList ',' ELLIPSIS */ #line 775 "asn1parse.y" - { + { struct member *m = ecalloc(1, sizeof(*m)); m->name = estrdup("..."); m->gen_name = estrdup("asn1_ellipsis"); m->ellipsis = 1; - ASN1_TAILQ_INSERT_TAIL((yyvsp[(1) - (3)].members), m, members); - (yyval.members) = (yyvsp[(1) - (3)].members); + ASN1_TAILQ_INSERT_TAIL((yyvsp[-2].members), m, members); + (yyval.members) = (yyvsp[-2].members); } +#line 2349 "asn1parse.c" break; - case 109: + case 109: /* NamedType: IDENTIFIER Type */ #line 786 "asn1parse.y" - { + { (yyval.member) = emalloc(sizeof(*(yyval.member))); - (yyval.member)->name = (yyvsp[(1) - (2)].name); - (yyval.member)->gen_name = estrdup((yyvsp[(1) - (2)].name)); + (yyval.member)->name = (yyvsp[-1].name); + (yyval.member)->gen_name = estrdup((yyvsp[-1].name)); output_name ((yyval.member)->gen_name); - (yyval.member)->type = (yyvsp[(2) - (2)].type); + (yyval.member)->type = (yyvsp[0].type); (yyval.member)->ellipsis = 0; } +#line 2362 "asn1parse.c" break; - case 110: + case 110: /* ComponentType: NamedType */ #line 797 "asn1parse.y" - { - (yyval.member) = (yyvsp[(1) - (1)].member); + { + (yyval.member) = (yyvsp[0].member); (yyval.member)->optional = 0; (yyval.member)->defval = NULL; } +#line 2372 "asn1parse.c" break; - case 111: + case 111: /* ComponentType: NamedType kw_OPTIONAL */ #line 803 "asn1parse.y" - { - (yyval.member) = (yyvsp[(1) - (2)].member); + { + (yyval.member) = (yyvsp[-1].member); (yyval.member)->optional = 1; (yyval.member)->defval = NULL; } +#line 2382 "asn1parse.c" break; - case 112: + case 112: /* ComponentType: NamedType kw_DEFAULT Value */ #line 809 "asn1parse.y" - { - (yyval.member) = (yyvsp[(1) - (3)].member); + { + (yyval.member) = (yyvsp[-2].member); (yyval.member)->optional = 0; - (yyval.member)->defval = (yyvsp[(3) - (3)].value); + (yyval.member)->defval = (yyvsp[0].value); } +#line 2392 "asn1parse.c" break; - case 113: + case 113: /* NamedBitList: NamedBit */ #line 817 "asn1parse.y" - { + { (yyval.members) = emalloc(sizeof(*(yyval.members))); ASN1_TAILQ_INIT((yyval.members)); - ASN1_TAILQ_INSERT_HEAD((yyval.members), (yyvsp[(1) - (1)].member), members); + ASN1_TAILQ_INSERT_HEAD((yyval.members), (yyvsp[0].member), members); } +#line 2402 "asn1parse.c" break; - case 114: + case 114: /* NamedBitList: NamedBitList ',' NamedBit */ #line 823 "asn1parse.y" - { - ASN1_TAILQ_INSERT_TAIL((yyvsp[(1) - (3)].members), (yyvsp[(3) - (3)].member), members); - (yyval.members) = (yyvsp[(1) - (3)].members); + { + ASN1_TAILQ_INSERT_TAIL((yyvsp[-2].members), (yyvsp[0].member), members); + (yyval.members) = (yyvsp[-2].members); } +#line 2411 "asn1parse.c" break; - case 115: + case 115: /* NamedBit: IDENTIFIER '(' NUMBER ')' */ #line 830 "asn1parse.y" - { + { (yyval.member) = emalloc(sizeof(*(yyval.member))); - (yyval.member)->name = (yyvsp[(1) - (4)].name); - (yyval.member)->gen_name = estrdup((yyvsp[(1) - (4)].name)); + (yyval.member)->name = (yyvsp[-3].name); + (yyval.member)->gen_name = estrdup((yyvsp[-3].name)); output_name ((yyval.member)->gen_name); - (yyval.member)->val = (yyvsp[(3) - (4)].constant); + (yyval.member)->val = (yyvsp[-1].constant); (yyval.member)->optional = 0; (yyval.member)->ellipsis = 0; (yyval.member)->type = NULL; } +#line 2426 "asn1parse.c" break; - case 117: + case 117: /* objid_opt: %empty */ #line 843 "asn1parse.y" - { (yyval.objid) = NULL; } + { (yyval.objid) = NULL; } +#line 2432 "asn1parse.c" break; - case 118: + case 118: /* objid: '{' objid_list '}' */ #line 847 "asn1parse.y" - { - (yyval.objid) = (yyvsp[(2) - (3)].objid); + { + (yyval.objid) = (yyvsp[-1].objid); } +#line 2440 "asn1parse.c" break; - case 119: + case 119: /* objid_list: %empty */ #line 853 "asn1parse.y" - { + { (yyval.objid) = NULL; } +#line 2448 "asn1parse.c" break; - case 120: + case 120: /* objid_list: objid_element objid_list */ #line 857 "asn1parse.y" - { - if ((yyvsp[(2) - (2)].objid)) { - (yyval.objid) = (yyvsp[(2) - (2)].objid); - add_oid_to_tail((yyvsp[(2) - (2)].objid), (yyvsp[(1) - (2)].objid)); + { + if ((yyvsp[0].objid)) { + (yyval.objid) = (yyvsp[0].objid); + add_oid_to_tail((yyvsp[0].objid), (yyvsp[-1].objid)); } else { - (yyval.objid) = (yyvsp[(1) - (2)].objid); + (yyval.objid) = (yyvsp[-1].objid); } } +#line 2461 "asn1parse.c" break; - case 121: + case 121: /* objid_element: IDENTIFIER '(' NUMBER ')' */ #line 868 "asn1parse.y" - { - (yyval.objid) = new_objid((yyvsp[(1) - (4)].name), (yyvsp[(3) - (4)].constant)); + { + (yyval.objid) = new_objid((yyvsp[-3].name), (yyvsp[-1].constant)); } +#line 2469 "asn1parse.c" break; - case 122: + case 122: /* objid_element: IDENTIFIER */ #line 872 "asn1parse.y" - { - Symbol *s = addsym((yyvsp[(1) - (1)].name)); + { + Symbol *s = addsym((yyvsp[0].name)); if(s->stype != SValue || s->value->type != objectidentifiervalue) { lex_error_message("%s is not an object identifier\n", @@ -2497,174 +2480,158 @@ yyreduce: } (yyval.objid) = s->value->u.objectidentifiervalue; } +#line 2484 "asn1parse.c" break; - case 123: + case 123: /* objid_element: NUMBER */ #line 883 "asn1parse.y" - { - (yyval.objid) = new_objid(NULL, (yyvsp[(1) - (1)].constant)); + { + (yyval.objid) = new_objid(NULL, (yyvsp[0].constant)); } +#line 2492 "asn1parse.c" break; - case 133: + case 133: /* Valuereference: IDENTIFIER */ #line 906 "asn1parse.y" - { - Symbol *s = addsym((yyvsp[(1) - (1)].name)); + { + Symbol *s = addsym((yyvsp[0].name)); if(s->stype != SValue) lex_error_message ("%s is not a value\n", s->name); else (yyval.value) = s->value; } +#line 2505 "asn1parse.c" break; - case 134: + case 134: /* CharacterStringValue: STRING */ #line 917 "asn1parse.y" - { + { (yyval.value) = emalloc(sizeof(*(yyval.value))); (yyval.value)->type = stringvalue; - (yyval.value)->u.stringvalue = (yyvsp[(1) - (1)].name); + (yyval.value)->u.stringvalue = (yyvsp[0].name); } +#line 2515 "asn1parse.c" break; - case 135: + case 135: /* BooleanValue: kw_TRUE */ #line 925 "asn1parse.y" - { + { (yyval.value) = emalloc(sizeof(*(yyval.value))); (yyval.value)->type = booleanvalue; (yyval.value)->u.booleanvalue = 0; } +#line 2525 "asn1parse.c" break; - case 136: + case 136: /* BooleanValue: kw_FALSE */ #line 931 "asn1parse.y" - { + { (yyval.value) = emalloc(sizeof(*(yyval.value))); (yyval.value)->type = booleanvalue; (yyval.value)->u.booleanvalue = 0; } +#line 2535 "asn1parse.c" break; - case 137: + case 137: /* IntegerValue: SignedNumber */ #line 939 "asn1parse.y" - { + { (yyval.value) = emalloc(sizeof(*(yyval.value))); (yyval.value)->type = integervalue; - (yyval.value)->u.integervalue = (yyvsp[(1) - (1)].constant); + (yyval.value)->u.integervalue = (yyvsp[0].constant); } +#line 2545 "asn1parse.c" break; - case 139: + case 139: /* NullValue: kw_NULL */ #line 950 "asn1parse.y" - { + { } +#line 2552 "asn1parse.c" break; - case 140: + case 140: /* ObjectIdentifierValue: objid */ #line 955 "asn1parse.y" - { + { (yyval.value) = emalloc(sizeof(*(yyval.value))); (yyval.value)->type = objectidentifiervalue; - (yyval.value)->u.objectidentifiervalue = (yyvsp[(1) - (1)].objid); + (yyval.value)->u.objectidentifiervalue = (yyvsp[0].objid); } +#line 2562 "asn1parse.c" break; -/* Line 1267 of yacc.c. */ -#line 2575 "asn1parse.c" +#line 2566 "asn1parse.c" + default: break; } - YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); + /* User semantic actions sometimes alter yychar, and that requires + that yytoken be updated with the new translation. We take the + approach of translating immediately before every use of yytoken. + One alternative is translating here after every semantic action, + but that translation would be missed if the semantic action invokes + YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or + if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an + incorrect destructor might then be invoked immediately. In the + case of YYERROR or YYBACKUP, subsequent parser actions might lead + to an incorrect destructor call or verbose syntax error message + before the lookahead is translated. */ + YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, &yyloc); YYPOPSTACK (yylen); yylen = 0; - YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; - - /* Now `shift' the result of the reduction. Determine what state + /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTOKENS]; + { + const int yylhs = yyr1[yyn] - YYNTOKENS; + const int yyi = yypgoto[yylhs] + *yyssp; + yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp + ? yytable[yyi] + : yydefgoto[yylhs]); + } goto yynewstate; -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ +/*--------------------------------------. +| yyerrlab -- here on detecting error. | +`--------------------------------------*/ yyerrlab: + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = yychar == YYEMPTY ? YYSYMBOL_YYEMPTY : YYTRANSLATE (yychar); /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { ++yynerrs; -#if ! YYERROR_VERBOSE yyerror (YY_("syntax error")); -#else - { - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (yymsg); - } - else - { - yyerror (YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } - } -#endif } - - if (yyerrstatus == 3) { - /* If just tried and failed to reuse look-ahead token after an - error, discard it. */ + /* If just tried and failed to reuse lookahead token after an + error, discard it. */ if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } else - { - yydestruct ("Error: discarding", - yytoken, &yylval); - yychar = YYEMPTY; - } + { + yydestruct ("Error: discarding", + yytoken, &yylval); + yychar = YYEMPTY; + } } - /* Else will try to reuse look-ahead token after shifting the error + /* Else will try to reuse lookahead token after shifting the error token. */ goto yyerrlab1; @@ -2673,14 +2640,13 @@ yyerrlab: | yyerrorlab -- error raised explicitly by YYERROR. | `---------------------------------------------------*/ yyerrorlab: + /* Pacify compilers when the user code never invokes YYERROR and the + label yyerrorlab therefore never appears in user code. */ + if (0) + YYERROR; + ++yynerrs; - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) - goto yyerrorlab; - - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ YYPOPSTACK (yylen); yylen = 0; @@ -2693,42 +2659,42 @@ yyerrorlab: | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ + yyerrstatus = 3; /* Each real token shifted decrements this. */ + /* Pop stack until we find a state that shifts the error token. */ for (;;) { yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } + if (!yypact_value_is_default (yyn)) + { + yyn += YYSYMBOL_YYerror; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYSYMBOL_YYerror) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } /* Pop the current state because it cannot handle the error token. */ if (yyssp == yyss) - YYABORT; + YYABORT; yydestruct ("Error: popping", - yystos[yystate], yyvsp); + YY_ACCESSING_SYMBOL (yystate), yyvsp); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } - if (yyn == YYFINAL) - YYACCEPT; - + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); + YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp); yystate = yyn; goto yynewstate; @@ -2739,51 +2705,55 @@ yyerrlab1: `-------------------------------------*/ yyacceptlab: yyresult = 0; - goto yyreturn; + goto yyreturnlab; + /*-----------------------------------. | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ yyabortlab: yyresult = 1; - goto yyreturn; + goto yyreturnlab; -#ifndef yyoverflow -/*-------------------------------------------------. -| yyexhaustedlab -- memory exhaustion comes here. | -`-------------------------------------------------*/ + +/*-----------------------------------------------------------. +| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here. | +`-----------------------------------------------------------*/ yyexhaustedlab: yyerror (YY_("memory exhausted")); yyresult = 2; - /* Fall through. */ -#endif + goto yyreturnlab; -yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval); - /* Do not reclaim the symbols of the rule which action triggered + +/*----------------------------------------------------------. +| yyreturnlab -- parsing is finished, clean up and return. | +`----------------------------------------------------------*/ +yyreturnlab: + if (yychar != YYEMPTY) + { + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = YYTRANSLATE (yychar); + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval); + } + /* Do not reclaim the symbols of the rule whose action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); YY_STACK_PRINT (yyss, yyssp); while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); + YY_ACCESSING_SYMBOL (+*yyssp), yyvsp); YYPOPSTACK (1); } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif -#if YYERROR_VERBOSE - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); -#endif - /* Make sure YYID is used. */ - return YYID (yyresult); -} + return yyresult; +} #line 962 "asn1parse.y" @@ -2883,4 +2853,3 @@ fix_labels(Symbol *s) fix_labels2(s->type, p); free(p); } - diff --git a/lib/asn1/asn1parse.h b/lib/asn1/asn1parse.h index 3b59959ffbd2..2eb113c5904b 100644 --- a/lib/asn1/asn1parse.h +++ b/lib/asn1/asn1parse.h @@ -1,14 +1,14 @@ -/* A Bison parser, made by GNU Bison 2.3. */ +/* A Bison parser, made by GNU Bison 3.8.2. */ -/* Skeleton interface for Bison's Yacc-like parsers in C +/* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, + Inc. - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,9 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -33,102 +31,124 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ -/* Tokens. */ +/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, + especially those whose name start with YY_ or yy_. They are + private implementation details that can be changed or removed. */ + +#ifndef YY_YY_ASN_PARSE_H_INCLUDED +# define YY_YY_ASN_PARSE_H_INCLUDED +/* Debug traces. */ +#ifndef YYDEBUG +# define YYDEBUG 1 +#endif +#if YYDEBUG +extern int yydebug; +#endif + +/* Token kinds. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - kw_ABSENT = 258, - kw_ABSTRACT_SYNTAX = 259, - kw_ALL = 260, - kw_APPLICATION = 261, - kw_AUTOMATIC = 262, - kw_BEGIN = 263, - kw_BIT = 264, - kw_BMPString = 265, - kw_BOOLEAN = 266, - kw_BY = 267, - kw_CHARACTER = 268, - kw_CHOICE = 269, - kw_CLASS = 270, - kw_COMPONENT = 271, - kw_COMPONENTS = 272, - kw_CONSTRAINED = 273, - kw_CONTAINING = 274, - kw_DEFAULT = 275, - kw_DEFINITIONS = 276, - kw_EMBEDDED = 277, - kw_ENCODED = 278, - kw_END = 279, - kw_ENUMERATED = 280, - kw_EXCEPT = 281, - kw_EXPLICIT = 282, - kw_EXPORTS = 283, - kw_EXTENSIBILITY = 284, - kw_EXTERNAL = 285, - kw_FALSE = 286, - kw_FROM = 287, - kw_GeneralString = 288, - kw_GeneralizedTime = 289, - kw_GraphicString = 290, - kw_IA5String = 291, - kw_IDENTIFIER = 292, - kw_IMPLICIT = 293, - kw_IMPLIED = 294, - kw_IMPORTS = 295, - kw_INCLUDES = 296, - kw_INSTANCE = 297, - kw_INTEGER = 298, - kw_INTERSECTION = 299, - kw_ISO646String = 300, - kw_MAX = 301, - kw_MIN = 302, - kw_MINUS_INFINITY = 303, - kw_NULL = 304, - kw_NumericString = 305, - kw_OBJECT = 306, - kw_OCTET = 307, - kw_OF = 308, - kw_OPTIONAL = 309, - kw_ObjectDescriptor = 310, - kw_PATTERN = 311, - kw_PDV = 312, - kw_PLUS_INFINITY = 313, - kw_PRESENT = 314, - kw_PRIVATE = 315, - kw_PrintableString = 316, - kw_REAL = 317, - kw_RELATIVE_OID = 318, - kw_SEQUENCE = 319, - kw_SET = 320, - kw_SIZE = 321, - kw_STRING = 322, - kw_SYNTAX = 323, - kw_T61String = 324, - kw_TAGS = 325, - kw_TRUE = 326, - kw_TYPE_IDENTIFIER = 327, - kw_TeletexString = 328, - kw_UNION = 329, - kw_UNIQUE = 330, - kw_UNIVERSAL = 331, - kw_UTCTime = 332, - kw_UTF8String = 333, - kw_UniversalString = 334, - kw_VideotexString = 335, - kw_VisibleString = 336, - kw_WITH = 337, - RANGE = 338, - EEQUAL = 339, - ELLIPSIS = 340, - IDENTIFIER = 341, - referencename = 342, - STRING = 343, - NUMBER = 344 - }; + enum yytokentype + { + YYEMPTY = -2, + YYEOF = 0, /* "end of file" */ + YYerror = 256, /* error */ + YYUNDEF = 257, /* "invalid token" */ + kw_ABSENT = 258, /* kw_ABSENT */ + kw_ABSTRACT_SYNTAX = 259, /* kw_ABSTRACT_SYNTAX */ + kw_ALL = 260, /* kw_ALL */ + kw_APPLICATION = 261, /* kw_APPLICATION */ + kw_AUTOMATIC = 262, /* kw_AUTOMATIC */ + kw_BEGIN = 263, /* kw_BEGIN */ + kw_BIT = 264, /* kw_BIT */ + kw_BMPString = 265, /* kw_BMPString */ + kw_BOOLEAN = 266, /* kw_BOOLEAN */ + kw_BY = 267, /* kw_BY */ + kw_CHARACTER = 268, /* kw_CHARACTER */ + kw_CHOICE = 269, /* kw_CHOICE */ + kw_CLASS = 270, /* kw_CLASS */ + kw_COMPONENT = 271, /* kw_COMPONENT */ + kw_COMPONENTS = 272, /* kw_COMPONENTS */ + kw_CONSTRAINED = 273, /* kw_CONSTRAINED */ + kw_CONTAINING = 274, /* kw_CONTAINING */ + kw_DEFAULT = 275, /* kw_DEFAULT */ + kw_DEFINITIONS = 276, /* kw_DEFINITIONS */ + kw_EMBEDDED = 277, /* kw_EMBEDDED */ + kw_ENCODED = 278, /* kw_ENCODED */ + kw_END = 279, /* kw_END */ + kw_ENUMERATED = 280, /* kw_ENUMERATED */ + kw_EXCEPT = 281, /* kw_EXCEPT */ + kw_EXPLICIT = 282, /* kw_EXPLICIT */ + kw_EXPORTS = 283, /* kw_EXPORTS */ + kw_EXTENSIBILITY = 284, /* kw_EXTENSIBILITY */ + kw_EXTERNAL = 285, /* kw_EXTERNAL */ + kw_FALSE = 286, /* kw_FALSE */ + kw_FROM = 287, /* kw_FROM */ + kw_GeneralString = 288, /* kw_GeneralString */ + kw_GeneralizedTime = 289, /* kw_GeneralizedTime */ + kw_GraphicString = 290, /* kw_GraphicString */ + kw_IA5String = 291, /* kw_IA5String */ + kw_IDENTIFIER = 292, /* kw_IDENTIFIER */ + kw_IMPLICIT = 293, /* kw_IMPLICIT */ + kw_IMPLIED = 294, /* kw_IMPLIED */ + kw_IMPORTS = 295, /* kw_IMPORTS */ + kw_INCLUDES = 296, /* kw_INCLUDES */ + kw_INSTANCE = 297, /* kw_INSTANCE */ + kw_INTEGER = 298, /* kw_INTEGER */ + kw_INTERSECTION = 299, /* kw_INTERSECTION */ + kw_ISO646String = 300, /* kw_ISO646String */ + kw_MAX = 301, /* kw_MAX */ + kw_MIN = 302, /* kw_MIN */ + kw_MINUS_INFINITY = 303, /* kw_MINUS_INFINITY */ + kw_NULL = 304, /* kw_NULL */ + kw_NumericString = 305, /* kw_NumericString */ + kw_OBJECT = 306, /* kw_OBJECT */ + kw_OCTET = 307, /* kw_OCTET */ + kw_OF = 308, /* kw_OF */ + kw_OPTIONAL = 309, /* kw_OPTIONAL */ + kw_ObjectDescriptor = 310, /* kw_ObjectDescriptor */ + kw_PATTERN = 311, /* kw_PATTERN */ + kw_PDV = 312, /* kw_PDV */ + kw_PLUS_INFINITY = 313, /* kw_PLUS_INFINITY */ + kw_PRESENT = 314, /* kw_PRESENT */ + kw_PRIVATE = 315, /* kw_PRIVATE */ + kw_PrintableString = 316, /* kw_PrintableString */ + kw_REAL = 317, /* kw_REAL */ + kw_RELATIVE_OID = 318, /* kw_RELATIVE_OID */ + kw_SEQUENCE = 319, /* kw_SEQUENCE */ + kw_SET = 320, /* kw_SET */ + kw_SIZE = 321, /* kw_SIZE */ + kw_STRING = 322, /* kw_STRING */ + kw_SYNTAX = 323, /* kw_SYNTAX */ + kw_T61String = 324, /* kw_T61String */ + kw_TAGS = 325, /* kw_TAGS */ + kw_TRUE = 326, /* kw_TRUE */ + kw_TYPE_IDENTIFIER = 327, /* kw_TYPE_IDENTIFIER */ + kw_TeletexString = 328, /* kw_TeletexString */ + kw_UNION = 329, /* kw_UNION */ + kw_UNIQUE = 330, /* kw_UNIQUE */ + kw_UNIVERSAL = 331, /* kw_UNIVERSAL */ + kw_UTCTime = 332, /* kw_UTCTime */ + kw_UTF8String = 333, /* kw_UTF8String */ + kw_UniversalString = 334, /* kw_UniversalString */ + kw_VideotexString = 335, /* kw_VideotexString */ + kw_VisibleString = 336, /* kw_VisibleString */ + kw_WITH = 337, /* kw_WITH */ + RANGE = 338, /* RANGE */ + EEQUAL = 339, /* EEQUAL */ + ELLIPSIS = 340, /* ELLIPSIS */ + IDENTIFIER = 341, /* IDENTIFIER */ + referencename = 342, /* referencename */ + STRING = 343, /* STRING */ + NUMBER = 344 /* NUMBER */ + }; + typedef enum yytokentype yytoken_kind_t; #endif -/* Tokens. */ +/* Token kinds. */ +#define YYEMPTY -2 +#define YYEOF 0 +#define YYerror 256 +#define YYUNDEF 257 #define kw_ABSENT 258 #define kw_ABSTRACT_SYNTAX 259 #define kw_ALL 260 @@ -217,13 +237,12 @@ #define STRING 343 #define NUMBER 344 - - - +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -#line 72 "asn1parse.y" +union YYSTYPE { +#line 72 "asn1parse.y" + int64_t constant; struct value *value; struct range *range; @@ -236,14 +255,20 @@ typedef union YYSTYPE struct tagtype tag; struct memhead *members; struct constraint_spec *constraint_spec; -} -/* Line 1529 of yacc.c. */ -#line 242 "asn1parse.h" - YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 + +#line 260 "asn1parse.h" + +}; +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 +# define YYSTYPE_IS_DECLARED 1 #endif + extern YYSTYPE yylval; + +int yyparse (void); + + +#endif /* !YY_YY_ASN_PARSE_H_INCLUDED */ diff --git a/lib/asn1/check-common.c b/lib/asn1/check-common.c index 7eadc0109f52..c7836ef34327 100644 --- a/lib/asn1/check-common.c +++ b/lib/asn1/check-common.c @@ -192,12 +192,12 @@ int generic_test (const struct test_case *tests, unsigned ntests, size_t data_size, - int (ASN1CALL *encode)(unsigned char *, size_t, void *, size_t *), - int (ASN1CALL *length)(void *), - int (ASN1CALL *decode)(unsigned char *, size_t, void *, size_t *), - int (ASN1CALL *free_data)(void *), + generic_encode encode, + generic_length length, + generic_decode decode, + generic_free free_data, int (*cmp)(void *a, void *b), - int (ASN1CALL *copy)(const void *from, void *to)) + generic_copy copy) { unsigned char *buf, *buf2; int i; diff --git a/lib/asn1/check-common.h b/lib/asn1/check-common.h index c10fec28ca13..b68d1415692b 100644 --- a/lib/asn1/check-common.h +++ b/lib/asn1/check-common.h @@ -34,7 +34,8 @@ */ #define IF_OPT_COMPARE(ac,bc,e) \ - if (((ac)->e == NULL && (bc)->e != NULL) || (((ac)->e != NULL && (bc)->e == NULL))) return 1; if ((ac)->e) + if (((ac)->e == NULL && (bc)->e != NULL) || (((ac)->e != NULL && (bc)->e == NULL))) return 1; \ + if ((ac)->e) #define COMPARE_OPT_STRING(ac,bc,e) \ do { if (strcmp(*(ac)->e, *(bc)->e) != 0) return 1; } while(0) #define COMPARE_OPT_OCTET_STRING(ac,bc,e) \ @@ -58,21 +59,21 @@ struct test_case { }; typedef int (ASN1CALL *generic_encode)(unsigned char *, size_t, void *, size_t *); -typedef int (ASN1CALL *generic_length)(void *); +typedef size_t (ASN1CALL *generic_length)(void *); typedef int (ASN1CALL *generic_decode)(unsigned char *, size_t, void *, size_t *); -typedef int (ASN1CALL *generic_free)(void *); +typedef void (ASN1CALL *generic_free)(void *); typedef int (ASN1CALL *generic_copy)(const void *, void *); int -generic_test (const struct test_case *tests, - unsigned ntests, - size_t data_size, - int (ASN1CALL *encode)(unsigned char *, size_t, void *, size_t *), - int (ASN1CALL *length)(void *), - int (ASN1CALL *decode)(unsigned char *, size_t, void *, size_t *), - int (ASN1CALL *free_data)(void *), - int (*cmp)(void *a, void *b), - int (ASN1CALL *copy)(const void *a, void *b)); +generic_test (const struct test_case *, + unsigned, + size_t, + generic_encode, + generic_length, + generic_decode, + generic_free, + int (*)(void *a, void *b), + generic_copy); int generic_decode_fail(const struct test_case *tests, diff --git a/lib/asn1/check-der.c b/lib/asn1/check-der.c index 007197eb1fdc..3e57099e8e3a 100644 --- a/lib/asn1/check-der.c +++ b/lib/asn1/check-der.c @@ -67,11 +67,12 @@ test_integer (void) {NULL, 1, "\xff", NULL }, {NULL, 2, "\xff\x01", NULL }, {NULL, 2, "\x00\xff", NULL }, + {NULL, 2, "\xfe\x01", NULL }, {NULL, 4, "\x7f\xff\xff\xff", NULL } }; int values[] = {0, 127, 128, 256, -128, -129, -1, -255, 255, - 0x7fffffff}; + -511, 0x7fffffff}; int i, ret; int ntests = sizeof(tests) / sizeof(*tests); @@ -153,16 +154,16 @@ test_one_int(int val) static int test_integer_more (void) { - int i, n1, n2, n3, n4, n5, n6; + int64_t i, n1, n2, n3, n4, n5, n6; n2 = 0; for (i = 0; i < (sizeof(int) * 8); i++) { - n1 = 0x01 << i; + n1 = 0x01LL << i; n2 = n2 | n1; n3 = ~n1; n4 = ~n2; - n5 = (-1) & ~(0x3f << i); - n6 = (-1) & ~(0x7f << i); + n5 = (-1LL) & ~(0x3fLL << i); + n6 = (-1LL) & ~(0x7fLL << i); test_one_int(n1); test_one_int(n2); @@ -522,23 +523,27 @@ static int test_heim_integer (void) { struct test_case tests[] = { + {NULL, 1, "\xff", NULL }, + {NULL, 2, "\xff\x01", NULL }, {NULL, 2, "\xfe\x01", NULL }, {NULL, 2, "\xef\x01", NULL }, {NULL, 3, "\xff\x00\xff", NULL }, {NULL, 3, "\xff\x01\x00", NULL }, {NULL, 1, "\x00", NULL }, {NULL, 1, "\x01", NULL }, - {NULL, 2, "\x00\x80", NULL } + {NULL, 2, "\x00\x80", NULL }, }; heim_integer values[] = { + { 1, "\x01", 1 }, + { 1, "\xff", 1 }, { 2, "\x01\xff", 1 }, { 2, "\x10\xff", 1 }, { 2, "\xff\x01", 1 }, { 2, "\xff\x00", 1 }, { 0, "", 0 }, { 1, "\x01", 0 }, - { 1, "\x80", 0 } + { 1, "\x80", 0 }, }; int i, ret; int ntests = sizeof(tests) / sizeof(tests[0]); diff --git a/lib/asn1/check-gen.c b/lib/asn1/check-gen.c index bf2da8e7519a..c372862282f4 100644 --- a/lib/asn1/check-gen.c +++ b/lib/asn1/check-gen.c @@ -1356,7 +1356,7 @@ static int check_seq(void) { TESTSeqOf seq; - TESTInteger i; + TESTInteger i = 0; int ret; seq.val = NULL; diff --git a/lib/asn1/check-template.c b/lib/asn1/check-template.c index 72e42274b3f7..223a70750765 100644 --- a/lib/asn1/check-template.c +++ b/lib/asn1/check-template.c @@ -372,7 +372,7 @@ test_seqof4(void) b2val[3].u2 = -1LL; b2val[3].s3.data = "\x00\x01\x02\x03"; b2val[3].s3.length = 4; - b2val[3].u3 = 1LL<<63; + b2val[3].u3 = 1ULL<<63; b3val[3].s1.data = ""; b3val[3].s1.length = 0; @@ -382,7 +382,7 @@ test_seqof4(void) b3val[3].u2 = -1LL; b3val[3].s3.data = "\x00\x01\x02\x03"; b3val[3].s3.length = 4; - b3val[3].u3 = 1LL<<63; + b3val[3].u3 = 1ULL<<63; b3val[3].s4.data = "\x00"; b3val[3].s4.length = 1; b3val[3].u4 = 1LL<<32; diff --git a/lib/asn1/der_cmp.c b/lib/asn1/der_cmp.c index f4612c469f60..81efbd45465f 100644 --- a/lib/asn1/der_cmp.c +++ b/lib/asn1/der_cmp.c @@ -74,8 +74,11 @@ der_heim_bit_string_cmp(const heim_bit_string *p, size_t i; if (p->length != q->length) return (int)(p->length - q->length); - i = memcmp(p->data, q->data, p->length / 8); - if (i) + if (q->length) + i = memcmp(p->data, q->data, p->length / 8); + else + i = 0; + if (i != 0) return (int)i; if ((p->length % 8) == 0) return 0; diff --git a/lib/asn1/der_copy.c b/lib/asn1/der_copy.c index 87f1a0d5ac81..4faf87014280 100644 --- a/lib/asn1/der_copy.c +++ b/lib/asn1/der_copy.c @@ -149,8 +149,12 @@ int der_copy_octet_string (const heim_octet_string *from, heim_octet_string *to) { to->length = from->length; - to->data = malloc(to->length); - if(to->length != 0 && to->data == NULL) + if (from->data == NULL) { + to->data = NULL; + return 0; + } + to->data = malloc(to->length); + if (to->length != 0 && to->data == NULL) return ENOMEM; memcpy(to->data, from->data, to->length); return 0; diff --git a/lib/asn1/der_get.c b/lib/asn1/der_get.c index f0495f33e498..b1126abf4404 100644 --- a/lib/asn1/der_get.c +++ b/lib/asn1/der_get.c @@ -86,9 +86,12 @@ der_get_integer (const unsigned char *p, size_t len, int val = 0; size_t oldlen = len; - if (len > sizeof(val)) + if (len == sizeof(val) + 1 && (p[0] == 0 || p[0] == 0xff)) + ; + else if (len > sizeof(val)) return ASN1_OVERRUN; + /* We assume we're on a twos-complement platform */ if (len > 0) { val = (signed char)*p++; while (--len) @@ -109,6 +112,7 @@ der_get_integer64 (const unsigned char *p, size_t len, if (len > sizeof(val)) return ASN1_OVERRUN; + /* We assume we're on a twos-complement platform */ if (len > 0) { val = (signed char)*p++; while (--len) @@ -416,13 +420,45 @@ der_get_heim_integer (const unsigned char *p, size_t len, if (p[0] & 0x80) { unsigned char *q; int carry = 1; - data->negative = 1; + + /* + * A negative number. It's going to be a twos complement byte array. + * We're going to leave the positive value in `data->data', but set the + * `data->negative' flag. That means we need to negate the + * twos-complement integer received. + */ + data->negative = 1; data->length = len; if (p[0] == 0xff) { + if (data->length == 1) { + /* One byte of all ones == -1 */ + q = data->data = malloc(1); + *q = 1; + data->length = 1; + if (size) + *size = 1; + return 0; + } + p++; data->length--; + + /* + * We could check if the next byte's high bit is set, which would + * be an error ("illegal padding" in OpenSSL). However, this would + * mean failing to accept certificates made by certain CAs that + * would read 8 bytes of RNG into a buffer, slap on length 8, then + * slap on the tag [UNIVERSAL INTEGER], and make that the + * serialNumber field's encoding, which then fails to parse in + * around 1 in 256 certificates. + * + * So let's not. + * + * if (p[0] & 0x80) + * return ASN1_PARSE_ERROR; // or a new error code + */ } data->data = malloc(data->length); if (data->data == NULL) { @@ -431,9 +467,17 @@ der_get_heim_integer (const unsigned char *p, size_t len, *size = 0; return ENOMEM; } + + /* + * Note that if `data->length' were zero, this would be UB because we + * underflow if data->length is zero even though we wouldn't actually + * dereference the byte before data->data. Thus we check above for + * that. + */ q = &((unsigned char*)data->data)[data->length - 1]; p += data->length - 1; while (q >= (unsigned char*)data->data) { + /* *p XOR 0xff -> ~*p; we're dealing with twos complement */ *q = *p ^ 0xff; if (carry) carry = !++*q; diff --git a/lib/asn1/der_length.c b/lib/asn1/der_length.c index 684ba9bc6f32..ec4008283fbd 100644 --- a/lib/asn1/der_length.c +++ b/lib/asn1/der_length.c @@ -256,7 +256,9 @@ der_length_heim_integer (const heim_integer *k) { if (k->length == 0) return 1; - if (k->negative) + if (k->negative && k->length == 1 && ((unsigned char *)k->data)[0] == 1) + return 1; + else if (k->negative) return k->length + (((~(((unsigned char *)k->data)[0])) & 0x80) ? 0 : 1); else return k->length + ((((unsigned char *)k->data)[0] & 0x80) ? 1 : 0); diff --git a/lib/asn1/der_put.c b/lib/asn1/der_put.c index 843d09f5cdc1..98c2c8a2cebb 100644 --- a/lib/asn1/der_put.c +++ b/lib/asn1/der_put.c @@ -313,7 +313,8 @@ der_put_octet_string (unsigned char *p, size_t len, if (len < data->length) return ASN1_OVERFLOW; p -= data->length; - memcpy (p+1, data->data, data->length); + if (data->length) + memcpy(p+1, data->data, data->length); *size = data->length; return 0; } @@ -341,19 +342,30 @@ der_put_heim_integer (unsigned char *p, size_t len, if (data->negative) { ssize_t i; int carry; - for (i = data->length - 1, carry = 1; i >= 0; i--) { - *p = buf[i] ^ 0xff; - if (carry) - carry = !++*p; - p--; - } - if (p[1] < 128) { - if (len < 1) - return ASN1_OVERFLOW; - *p-- = 0xff; - len--; - hibitset = 1; - } + + /* + * We represent the parsed integer as a positive value with a + * negativity flag. But we need to put it on the wire as the shortest + * twos-complement byte sequence possible. So we're going to negate + * the number as go. + */ + if (data->length == 1 && *(unsigned char *)data->data == 1) { + *(p--) = 0xff; + } else { + for (i = data->length - 1, carry = 1; i >= 0; i--) { + *p = buf[i] ^ 0xff; + if (carry) + carry = !++*p; + p--; + } + if (p[1] < 128) { + if (len < 1) + return ASN1_OVERFLOW; + *p-- = 0xff; + len--; + hibitset = 1; + } + } } else { p -= data->length; memcpy(p + 1, buf, data->length); diff --git a/lib/asn1/gen_copy.c b/lib/asn1/gen_copy.c index 36f68ee5d99c..b494c5d85292 100644 --- a/lib/asn1/gen_copy.c +++ b/lib/asn1/gen_copy.c @@ -62,6 +62,7 @@ copy_type (const char *from, const char *to, const Type *t, int preserve) copy_primitive ("heim_integer", from, to); break; } + /* fallthrough */ case TBoolean: case TEnumerated : fprintf(codefile, "*(%s) = *(%s);\n", to, from); diff --git a/lib/asn1/gen_decode.c b/lib/asn1/gen_decode.c index 650017fa6b90..fd193208b444 100644 --- a/lib/asn1/gen_decode.c +++ b/lib/asn1/gen_decode.c @@ -594,14 +594,14 @@ decode_type (const char *name, const Type *t, int optional, classname(cl), ty ? "CONS" : "PRIM", valuename(cl, tag)); + fprintf(codefile, + "(%s)->element = %s;\n", + name, m->label); if (asprintf (&s, "%s(%s)->u.%s", m->optional ? "" : "&", name, m->gen_name) < 0 || s == NULL) errx(1, "malloc"); decode_type (s, m->type, m->optional, forwstr, m->gen_name, NULL, depth + 1); - fprintf(codefile, - "(%s)->element = %s;\n", - name, m->label); free(s); fprintf(codefile, "}\n"); @@ -610,23 +610,23 @@ decode_type (const char *name, const Type *t, int optional, if (have_ellipsis) { fprintf(codefile, "else {\n" + "(%s)->element = %s;\n" "(%s)->u.%s.data = calloc(1, len);\n" "if ((%s)->u.%s.data == NULL) {\n" "e = ENOMEM; %s;\n" "}\n" "(%s)->u.%s.length = len;\n" "memcpy((%s)->u.%s.data, p, len);\n" - "(%s)->element = %s;\n" "p += len;\n" "ret += len;\n" "len = 0;\n" "}\n", + name, have_ellipsis->label, name, have_ellipsis->gen_name, name, have_ellipsis->gen_name, forwstr, name, have_ellipsis->gen_name, - name, have_ellipsis->gen_name, - name, have_ellipsis->label); + name, have_ellipsis->gen_name); } else { fprintf(codefile, "else {\n" diff --git a/lib/asn1/gen_free.c b/lib/asn1/gen_free.c index b9cae7533b17..aa862c6f3afa 100644 --- a/lib/asn1/gen_free.c +++ b/lib/asn1/gen_free.c @@ -56,11 +56,19 @@ free_type (const char *name, const Type *t, int preserve) free_primitive ("heim_integer", name); break; } + /* fallthrough */ case TBoolean: case TEnumerated : case TNull: case TGeneralizedTime: case TUTCTime: + /* + * This doesn't do much, but it leaves zeros where garbage might + * otherwise have been found. Gets us closer to having the equivalent + * of a memset()-to-zero data structure after calling the free + * functions. + */ + fprintf(codefile, "*%s = 0;\n", name); break; case TBitString: if (ASN1_TAILQ_EMPTY(t->members)) diff --git a/lib/asn1/krb5.asn1 b/lib/asn1/krb5.asn1 index 9183fc19a48c..4e8b6db7a31e 100644 --- a/lib/asn1/krb5.asn1 +++ b/lib/asn1/krb5.asn1 @@ -79,6 +79,7 @@ EXPORTS KrbFastFinished, KrbFastReq, KrbFastArmor, + KrbFastArmoredReq, KDCFastState, KDCFastCookie, KDC-PROXY-MESSAGE, diff --git a/lib/asn1/lex.c b/lib/asn1/lex.c index 810c00c30935..4832940bf001 100644 --- a/lib/asn1/lex.c +++ b/lib/asn1/lex.c @@ -1,5 +1,5 @@ -#line 3 "lex.c" +#line 2 "lex.c" #define YY_INT_ALIGNED short int @@ -7,8 +7,8 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 35 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -46,7 +46,6 @@ typedef int16_t flex_int16_t; typedef uint16_t flex_uint16_t; typedef int32_t flex_int32_t; typedef uint32_t flex_uint32_t; -typedef uint64_t flex_uint64_t; #else typedef signed char flex_int8_t; typedef short int flex_int16_t; @@ -54,7 +53,6 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -85,63 +83,61 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! FLEXINT_H */ - -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) +#endif /* ! C99 */ -#define YY_USE_CONST +#endif /* ! FLEXINT_H */ -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ +/* begin standard C++ headers. */ -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* Returned upon end-of-file. */ #define YY_NULL 0 -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. +/* Promotes a possibly negative, possibly signed char to an + * integer in range [0..255] for use as an array index. */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) /* Enter a start condition. This macro really ought to take a parameter, * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ #define BEGIN (yy_start) = 1 + 2 * - /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ #define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START - /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ) - +#define YY_NEW_FILE yyrestart( yyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -158,15 +154,16 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; typedef size_t yy_size_t; #endif -extern yy_size_t yyleng; +extern int yyleng; extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + #define YY_LESS_LINENO(n) + #define YY_LINENO_REWIND_TO(ptr) /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ @@ -181,7 +178,6 @@ extern FILE *yyin, *yyout; YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) - #define unput(c) yyunput( c, (yytext_ptr) ) #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -196,12 +192,12 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -224,7 +220,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -252,7 +248,7 @@ struct yy_buffer_state /* Stack of input buffers. */ static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ -static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ +static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */ /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general @@ -263,7 +259,6 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ : NULL) - /* Same as previous macro, but useful when we know that the buffer stack is not * NULL or when we need an lvalue. For internal use only. */ @@ -271,11 +266,11 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ -yy_size_t yyleng; +static int yy_n_chars; /* number of characters read into yy_ch_buf */ +int yyleng; /* Points to current character in buffer. */ -static char *yy_c_buf_p = (char *) 0; +static char *yy_c_buf_p = NULL; static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ @@ -284,82 +279,78 @@ static int yy_start = 0; /* start state number */ */ static int yy_did_buffer_switch_on_eof; -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); - -static void yyensure_buffer_stack (void ); -static void yy_load_buffer_state (void ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); +void yyrestart ( FILE *input_file ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); +void yy_delete_buffer ( YY_BUFFER_STATE b ); +void yy_flush_buffer ( YY_BUFFER_STATE b ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state ( void ); -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) +static void yyensure_buffer_stack ( void ); +static void yy_load_buffer_state ( void ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len ); -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); +void *yyalloc ( yy_size_t ); +void *yyrealloc ( void *, yy_size_t ); +void yyfree ( void * ); #define yy_new_buffer yy_create_buffer - #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } - #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } - #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) /* Begin user sect3 */ +typedef flex_uint8_t YY_CHAR; -typedef unsigned char YY_CHAR; - -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; +FILE *yyin = NULL, *yyout = NULL; typedef int yy_state_type; extern int yylineno; - int yylineno = 1; extern char *yytext; +#ifdef yytext_ptr +#undef yytext_ptr +#endif #define yytext_ptr yytext -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -static void yy_fatal_error (yyconst char msg[] ); +static yy_state_type yy_get_previous_state ( void ); +static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); +static int yy_get_next_buffer ( void ); +static void yynoreturn yy_fatal_error ( const char* msg ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ (yytext_ptr) = yy_bp; \ - yyleng = (yy_size_t) (yy_cp - yy_bp); \ + yyleng = (int) (yy_cp - yy_bp); \ (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; - #define YY_NUM_RULES 95 #define YY_END_OF_BUFFER 96 /* This struct is not used in this scanner, @@ -369,7 +360,7 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[568] = +static const flex_int16_t yy_accept[568] = { 0, 0, 0, 96, 94, 90, 91, 87, 81, 81, 94, 94, 88, 88, 94, 89, 89, 89, 89, 89, 89, @@ -435,7 +426,7 @@ static yyconst flex_int16_t yy_accept[568] = 32, 89, 59, 70, 77, 53, 0 } ; -static yyconst flex_int32_t yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -467,7 +458,7 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[70] = +static const YY_CHAR yy_meta[70] = { 0, 1, 1, 1, 1, 1, 1, 2, 1, 1, 3, 3, 3, 3, 3, 3, 3, 1, 1, 3, 3, @@ -478,7 +469,7 @@ static yyconst flex_int32_t yy_meta[70] = 2, 2, 2, 2, 2, 2, 2, 2, 2 } ; -static yyconst flex_int16_t yy_base[570] = +static const flex_int16_t yy_base[570] = { 0, 0, 0, 636, 637, 637, 637, 637, 637, 63, 627, 628, 70, 77, 616, 74, 72, 76, 609, 65, 81, @@ -544,7 +535,7 @@ static yyconst flex_int16_t yy_base[570] = 0, 101, 0, 0, 0, 0, 637, 223, 69 } ; -static yyconst flex_int16_t yy_def[570] = +static const flex_int16_t yy_def[570] = { 0, 567, 1, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 567, 568, 568, 568, 568, 568, 568, @@ -610,7 +601,7 @@ static yyconst flex_int16_t yy_def[570] = 568, 568, 568, 568, 568, 568, 0, 567, 567 } ; -static yyconst flex_int16_t yy_nxt[707] = +static const flex_int16_t yy_nxt[707] = { 0, 4, 5, 6, 7, 8, 4, 9, 10, 11, 12, 13, 13, 13, 13, 13, 13, 14, 4, 15, 16, @@ -692,7 +683,7 @@ static yyconst flex_int16_t yy_nxt[707] = 567, 567, 567, 567, 567, 567 } ; -static yyconst flex_int16_t yy_chk[707] = +static const flex_int16_t yy_chk[707] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -848,8 +839,9 @@ static unsigned lineno = 1; static void unterminated(const char *, unsigned); +#line 842 "lex.c" /* This is for broken old lexes (solaris 10 and hpux) */ -#line 853 "lex.c" +#line 844 "lex.c" #define INITIAL 0 @@ -865,36 +857,36 @@ static void unterminated(const char *, unsigned); #define YY_EXTRA_TYPE void * #endif -static int yy_init_globals (void ); +static int yy_init_globals ( void ); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy (void ); +int yylex_destroy ( void ); -int yyget_debug (void ); +int yyget_debug ( void ); -void yyset_debug (int debug_flag ); +void yyset_debug ( int debug_flag ); -YY_EXTRA_TYPE yyget_extra (void ); +YY_EXTRA_TYPE yyget_extra ( void ); -void yyset_extra (YY_EXTRA_TYPE user_defined ); +void yyset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *yyget_in (void ); +FILE *yyget_in ( void ); -void yyset_in (FILE * in_str ); +void yyset_in ( FILE * _in_str ); -FILE *yyget_out (void ); +FILE *yyget_out ( void ); -void yyset_out (FILE * out_str ); +void yyset_out ( FILE * _out_str ); -yy_size_t yyget_leng (void ); + int yyget_leng ( void ); -char *yyget_text (void ); +char *yyget_text ( void ); -int yyget_lineno (void ); +int yyget_lineno ( void ); -void yyset_lineno (int line_number ); +void yyset_lineno ( int _line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -902,35 +894,43 @@ void yyset_lineno (int line_number ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap (void ); +extern "C" int yywrap ( void ); #else -extern int yywrap (void ); +extern int yywrap ( void ); #endif #endif - static void yyunput (int c,char *buf_ptr ); +#ifndef YY_NO_UNPUT + static void yyunput ( int c, char *buf_ptr ); + +#endif + #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy ( char *, const char *, int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen ( const char * ); #endif #ifndef YY_NO_INPUT - #ifdef __cplusplus -static int yyinput (void ); +static int yyinput ( void ); #else -static int input (void ); +static int input ( void ); #endif #endif /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -938,7 +938,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO fwrite( yytext, yyleng, 1, yyout ) +#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -949,7 +949,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - yy_size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -962,7 +962,7 @@ static int input (void ); else \ { \ errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -1017,7 +1017,7 @@ extern int yylex (void); /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK break; +#define YY_BREAK /*LINTED*/break; #endif #define YY_RULE_SETUP \ @@ -1027,14 +1027,10 @@ extern int yylex (void); */ YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; -#line 69 "lex.l" - -#line 1037 "lex.c" - if ( !(yy_init) ) { (yy_init) = 1; @@ -1055,13 +1051,18 @@ YY_DECL if ( ! YY_CURRENT_BUFFER ) { yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_load_buffer_state( ); + yy_load_buffer_state( ); } - while ( 1 ) /* loops until end-of-file is reached */ + { +#line 69 "lex.l" + +#line 1063 "lex.c" + + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { yy_cp = (yy_c_buf_p); @@ -1077,7 +1078,7 @@ YY_DECL yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1087,9 +1088,9 @@ yy_match: { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 568 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } while ( yy_base[yy_current_state] != 637 ); @@ -1780,7 +1781,7 @@ case YY_STATE_EOF(INITIAL): { (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap( ) ) + if ( yywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -1833,6 +1834,7 @@ case YY_STATE_EOF(INITIAL): "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ + } /* end of user's declarations */ } /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer @@ -1844,9 +1846,9 @@ case YY_STATE_EOF(INITIAL): */ static int yy_get_next_buffer (void) { - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); - register int number_to_move, i; + char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + char *source = (yytext_ptr); + int number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -1875,7 +1877,7 @@ static int yy_get_next_buffer (void) /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1); for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -1888,21 +1890,21 @@ static int yy_get_next_buffer (void) else { - yy_size_t num_to_read = + int num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; int yy_c_buf_p_offset = (int) ((yy_c_buf_p) - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { - yy_size_t new_size = b->yy_buf_size * 2; + int new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -1911,11 +1913,12 @@ static int yy_get_next_buffer (void) b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); + yyrealloc( (void *) b->yy_ch_buf, + (yy_size_t) (b->yy_buf_size + 2) ); } else /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; + b->yy_ch_buf = NULL; if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( @@ -1943,7 +1946,7 @@ static int yy_get_next_buffer (void) if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ); + yyrestart( yyin ); } else @@ -1957,12 +1960,15 @@ static int yy_get_next_buffer (void) else ret_val = EOB_ACT_CONTINUE_SCAN; - if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ - yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } (yy_n_chars) += number_to_move; @@ -1978,14 +1984,14 @@ static int yy_get_next_buffer (void) static yy_state_type yy_get_previous_state (void) { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; yy_current_state = (yy_start); for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1995,9 +2001,9 @@ static int yy_get_next_buffer (void) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 568 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; } return yy_current_state; @@ -2010,10 +2016,10 @@ static int yy_get_next_buffer (void) */ static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) { - register int yy_is_jam; - register char *yy_cp = (yy_c_buf_p); + int yy_is_jam; + char *yy_cp = (yy_c_buf_p); - register YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -2023,17 +2029,19 @@ static int yy_get_next_buffer (void) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 568 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; yy_is_jam = (yy_current_state == 567); - return yy_is_jam ? 0 : yy_current_state; + return yy_is_jam ? 0 : yy_current_state; } - static void yyunput (int c, register char * yy_bp ) +#ifndef YY_NO_UNPUT + + static void yyunput (int c, char * yy_bp ) { - register char *yy_cp; + char *yy_cp; yy_cp = (yy_c_buf_p); @@ -2043,10 +2051,10 @@ static int yy_get_next_buffer (void) if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register yy_size_t number_to_move = (yy_n_chars) + 2; - register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + int number_to_move = (yy_n_chars) + 2; + char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; - register char *source = + char *source = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) @@ -2055,7 +2063,7 @@ static int yy_get_next_buffer (void) yy_cp += (int) (dest - source); yy_bp += (int) (dest - source); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; + (yy_n_chars) = (int) YY_CURRENT_BUFFER_LVALUE->yy_buf_size; if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) YY_FATAL_ERROR( "flex scanner push-back overflow" ); @@ -2068,6 +2076,8 @@ static int yy_get_next_buffer (void) (yy_c_buf_p) = yy_cp; } +#endif + #ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput (void) @@ -2092,7 +2102,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (int) ((yy_c_buf_p) - (yytext_ptr)); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -2109,13 +2119,13 @@ static int yy_get_next_buffer (void) */ /* Reset buffer status. */ - yyrestart(yyin ); + yyrestart( yyin ); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap( ) ) + if ( yywrap( ) ) return 0; if ( ! (yy_did_buffer_switch_on_eof) ) @@ -2153,11 +2163,11 @@ static int yy_get_next_buffer (void) if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - yy_load_buffer_state( ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file ); + yy_load_buffer_state( ); } /** Switch to a different input buffer. @@ -2185,7 +2195,7 @@ static int yy_get_next_buffer (void) } YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); + yy_load_buffer_state( ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag @@ -2213,7 +2223,7 @@ static void yy_load_buffer_state (void) { YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -2222,13 +2232,13 @@ static void yy_load_buffer_state (void) /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer(b,file ); + yy_init_buffer( b, file ); return b; } @@ -2247,15 +2257,11 @@ static void yy_load_buffer_state (void) YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ); + yyfree( (void *) b->yy_ch_buf ); - yyfree((void *) b ); + yyfree( (void *) b ); } -#ifndef __cplusplus -extern int isatty (int ); -#endif /* __cplusplus */ - /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a yyrestart() or at EOF. @@ -2265,7 +2271,7 @@ extern int isatty (int ); { int oerrno = errno; - yy_flush_buffer(b ); + yy_flush_buffer( b ); b->yy_input_file = file; b->yy_fill_buffer = 1; @@ -2308,7 +2314,7 @@ extern int isatty (int ); b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); + yy_load_buffer_state( ); } /** Pushes the new state onto the stack. The new state becomes @@ -2339,7 +2345,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) YY_CURRENT_BUFFER_LVALUE = new_buffer; /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } @@ -2358,7 +2364,7 @@ void yypop_buffer_state (void) --(yy_buffer_stack_top); if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } } @@ -2376,15 +2382,15 @@ static void yyensure_buffer_stack (void) * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. */ - num_to_alloc = 1; + num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + (yy_buffer_stack_max) = num_to_alloc; (yy_buffer_stack_top) = 0; return; @@ -2393,7 +2399,7 @@ static void yyensure_buffer_stack (void) if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; + yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = (yy_buffer_stack_max) + grow_size; (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc @@ -2413,7 +2419,7 @@ static void yyensure_buffer_stack (void) * @param base the character buffer * @param size the size in bytes of the character buffer * - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) { @@ -2423,23 +2429,23 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ - return 0; + return NULL; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; - b->yy_input_file = 0; + b->yy_input_file = NULL; b->yy_n_chars = b->yy_buf_size; b->yy_is_interactive = 0; b->yy_at_bol = 1; b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer(b ); + yy_switch_to_buffer( b ); return b; } @@ -2452,28 +2458,29 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) * @note If you want to scan bytes that may contain NUL values, then use * yy_scan_bytes() instead. */ -YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) +YY_BUFFER_STATE yy_scan_string (const char * yystr ) { - return yy_scan_bytes(yystr,strlen(yystr) ); + return yy_scan_bytes( yystr, (int) strlen(yystr) ); } /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. + * @param yybytes the byte buffer to scan + * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; - yy_size_t n, i; + yy_size_t n; + int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) yyalloc(n ); + n = (yy_size_t) (_yybytes_len + 2); + buf = (char *) yyalloc( n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -2482,7 +2489,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer(buf,n ); + b = yy_scan_buffer( buf, n ); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -2498,9 +2505,9 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg ) +static void yynoreturn yy_fatal_error (const char* msg ) { - (void) fprintf( stderr, "%s\n", msg ); + fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -2528,7 +2535,7 @@ static void yy_fatal_error (yyconst char* msg ) */ int yyget_lineno (void) { - + return yylineno; } @@ -2551,7 +2558,7 @@ FILE *yyget_out (void) /** Get the length of the current token. * */ -yy_size_t yyget_leng (void) +int yyget_leng (void) { return yyleng; } @@ -2566,29 +2573,29 @@ char *yyget_text (void) } /** Set the current line number. - * @param line_number + * @param _line_number line number * */ -void yyset_lineno (int line_number ) +void yyset_lineno (int _line_number ) { - yylineno = line_number; + yylineno = _line_number; } /** Set the input stream. This does not discard the current * input buffer. - * @param in_str A readable stream. + * @param _in_str A readable stream. * * @see yy_switch_to_buffer */ -void yyset_in (FILE * in_str ) +void yyset_in (FILE * _in_str ) { - yyin = in_str ; + yyin = _in_str ; } -void yyset_out (FILE * out_str ) +void yyset_out (FILE * _out_str ) { - yyout = out_str ; + yyout = _out_str ; } int yyget_debug (void) @@ -2596,9 +2603,9 @@ int yyget_debug (void) return yy_flex_debug; } -void yyset_debug (int bdebug ) +void yyset_debug (int _bdebug ) { - yy_flex_debug = bdebug ; + yy_flex_debug = _bdebug ; } static int yy_init_globals (void) @@ -2607,10 +2614,10 @@ static int yy_init_globals (void) * This function is called from yylex_destroy(), so don't allocate here. */ - (yy_buffer_stack) = 0; + (yy_buffer_stack) = NULL; (yy_buffer_stack_top) = 0; (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = (char *) 0; + (yy_c_buf_p) = NULL; (yy_init) = 0; (yy_start) = 0; @@ -2619,8 +2626,8 @@ static int yy_init_globals (void) yyin = stdin; yyout = stdout; #else - yyin = (FILE *) 0; - yyout = (FILE *) 0; + yyin = NULL; + yyout = NULL; #endif /* For future reference: Set errno on error, since we are called by @@ -2635,7 +2642,7 @@ int yylex_destroy (void) /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); + yy_delete_buffer( YY_CURRENT_BUFFER ); YY_CURRENT_BUFFER_LVALUE = NULL; yypop_buffer_state(); } @@ -2656,18 +2663,19 @@ int yylex_destroy (void) */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +static void yy_flex_strncpy (char* s1, const char * s2, int n ) { - register int i; + + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) +static int yy_flex_strlen (const char * s ) { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; @@ -2677,11 +2685,12 @@ static int yy_flex_strlen (yyconst char * s ) void *yyalloc (yy_size_t size ) { - return (void *) malloc( size ); + return malloc(size); } void *yyrealloc (void * ptr, yy_size_t size ) { + /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -2689,12 +2698,12 @@ void *yyrealloc (void * ptr, yy_size_t size ) * any pointer type to void*, and deal with argument conversions * as though doing an assignment. */ - return (void *) realloc( (char *) ptr, size ); + return realloc(ptr, size); } void yyfree (void * ptr ) { - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" @@ -2702,7 +2711,6 @@ void yyfree (void * ptr ) #line 275 "lex.l" - int yywrap () { diff --git a/lib/base/Makefile.am b/lib/base/Makefile.am index ee5f120d3f5d..c5f857f4daeb 100644 --- a/lib/base/Makefile.am +++ b/lib/base/Makefile.am @@ -16,6 +16,8 @@ AM_CPPFLAGS += $(ROKEN_RENAME) lib_LTLIBRARIES = libheimbase.la check_PROGRAMS = test_base +test_base_CFLAGS = -Wno-string-concatenation + libheimbase_la_LDFLAGS = -version-info 1:0:0 TESTS = test_base diff --git a/lib/base/Makefile.in b/lib/base/Makefile.in index 9c147666e795..b46043ee2c56 100644 --- a/lib/base/Makefile.in +++ b/lib/base/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -102,7 +102,6 @@ subdir = lib/base ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ $(top_srcdir)/cf/auth-modules.m4 \ - $(top_srcdir)/cf/broken-getaddrinfo.m4 \ $(top_srcdir)/cf/broken-glob.m4 \ $(top_srcdir)/cf/broken-realloc.m4 \ $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ @@ -204,8 +203,11 @@ libheimbase_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(libheimbase_la_LDFLAGS) $(LDFLAGS) -o \ $@ test_base_SOURCES = test_base.c -test_base_OBJECTS = test_base.$(OBJEXT) +test_base_OBJECTS = test_base-test_base.$(OBJEXT) test_base_DEPENDENCIES = libheimbase.la $(am__DEPENDENCIES_1) +test_base_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_base_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -219,7 +221,14 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/array.Plo ./$(DEPDIR)/base64.Plo \ + ./$(DEPDIR)/bool.Plo ./$(DEPDIR)/bsearch.Plo \ + ./$(DEPDIR)/data.Plo ./$(DEPDIR)/db.Plo ./$(DEPDIR)/dict.Plo \ + ./$(DEPDIR)/dll.Plo ./$(DEPDIR)/error.Plo \ + ./$(DEPDIR)/heimbase.Plo ./$(DEPDIR)/json.Plo \ + ./$(DEPDIR)/null.Plo ./$(DEPDIR)/number.Plo \ + ./$(DEPDIR)/string.Plo ./$(DEPDIR)/test_base-test_base.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -265,8 +274,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no @@ -422,6 +429,7 @@ am__set_TESTS_bases = \ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck TEST_SUITE_LOG = test-suite.log @@ -469,9 +477,12 @@ CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLANG_FORMAT = @CLANG_FORMAT@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DB1LIB = @DB1LIB@ DB3LIB = @DB3LIB@ @@ -489,8 +500,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GCD_MIG = @GCD_MIG@ GREP = @GREP@ GROFF = @GROFF@ @@ -599,6 +612,11 @@ PKG_CONFIG = @PKG_CONFIG@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LDADD = @PTHREAD_LDADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -658,9 +676,14 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -704,6 +727,7 @@ heim_verbose_0 = @echo " GEN "$@; @do_roken_rename_TRUE@ES = base64.c IMPLEMENT_TLS = $(am__append_1) lib_LTLIBRARIES = libheimbase.la +test_base_CFLAGS = -Wno-string-concatenation libheimbase_la_LDFLAGS = -version-info 1:0:0 $(am__append_3) libheimbase_la_LIBADD = $(PTHREAD_LIBADD) include_HEADERS = heimbase.h @@ -754,8 +778,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty): @@ -768,6 +792,15 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -806,18 +839,9 @@ clean-libLTLIBRARIES: libheimbase.la: $(libheimbase_la_OBJECTS) $(libheimbase_la_DEPENDENCIES) $(EXTRA_libheimbase_la_DEPENDENCIES) $(AM_V_CCLD)$(libheimbase_la_LINK) -rpath $(libdir) $(libheimbase_la_OBJECTS) $(libheimbase_la_LIBADD) $(LIBS) -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - test_base$(EXEEXT): $(test_base_OBJECTS) $(test_base_DEPENDENCIES) $(EXTRA_test_base_DEPENDENCIES) @rm -f test_base$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_base_OBJECTS) $(test_base_LDADD) $(LIBS) + $(AM_V_CCLD)$(test_base_LINK) $(test_base_OBJECTS) $(test_base_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -825,21 +849,27 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bool.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsearch.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dict.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dll.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heimbase.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/null.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/number.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_base.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base64.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bool.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsearch.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dict.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dll.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heimbase.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/json.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/null.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/number.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_base-test_base.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -862,6 +892,20 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +test_base-test_base.o: test_base.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_base_CFLAGS) $(CFLAGS) -MT test_base-test_base.o -MD -MP -MF $(DEPDIR)/test_base-test_base.Tpo -c -o test_base-test_base.o `test -f 'test_base.c' || echo '$(srcdir)/'`test_base.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_base-test_base.Tpo $(DEPDIR)/test_base-test_base.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_base.c' object='test_base-test_base.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_base_CFLAGS) $(CFLAGS) -c -o test_base-test_base.o `test -f 'test_base.c' || echo '$(srcdir)/'`test_base.c + +test_base-test_base.obj: test_base.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_base_CFLAGS) $(CFLAGS) -MT test_base-test_base.obj -MD -MP -MF $(DEPDIR)/test_base-test_base.Tpo -c -o test_base-test_base.obj `if test -f 'test_base.c'; then $(CYGPATH_W) 'test_base.c'; else $(CYGPATH_W) '$(srcdir)/test_base.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_base-test_base.Tpo $(DEPDIR)/test_base-test_base.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_base.c' object='test_base-test_base.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_base_CFLAGS) $(CFLAGS) -c -o test_base-test_base.obj `if test -f 'test_base.c'; then $(CYGPATH_W) 'test_base.c'; else $(CYGPATH_W) '$(srcdir)/test_base.c'; fi` + mostlyclean-libtool: -rm -f *.lo @@ -1048,7 +1092,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ @@ -1061,7 +1105,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: $(check_PROGRAMS) @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -1103,8 +1147,10 @@ test_base.log: test_base$(EXEEXT) @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1142,6 +1188,8 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) all-local +install-checkPROGRAMS: install-libLTLIBRARIES + installdirs: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -1186,7 +1234,21 @@ clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-libtool mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/array.Plo + -rm -f ./$(DEPDIR)/base64.Plo + -rm -f ./$(DEPDIR)/bool.Plo + -rm -f ./$(DEPDIR)/bsearch.Plo + -rm -f ./$(DEPDIR)/data.Plo + -rm -f ./$(DEPDIR)/db.Plo + -rm -f ./$(DEPDIR)/dict.Plo + -rm -f ./$(DEPDIR)/dll.Plo + -rm -f ./$(DEPDIR)/error.Plo + -rm -f ./$(DEPDIR)/heimbase.Plo + -rm -f ./$(DEPDIR)/json.Plo + -rm -f ./$(DEPDIR)/null.Plo + -rm -f ./$(DEPDIR)/number.Plo + -rm -f ./$(DEPDIR)/string.Plo + -rm -f ./$(DEPDIR)/test_base-test_base.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1233,7 +1295,21 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/array.Plo + -rm -f ./$(DEPDIR)/base64.Plo + -rm -f ./$(DEPDIR)/bool.Plo + -rm -f ./$(DEPDIR)/bsearch.Plo + -rm -f ./$(DEPDIR)/data.Plo + -rm -f ./$(DEPDIR)/db.Plo + -rm -f ./$(DEPDIR)/dict.Plo + -rm -f ./$(DEPDIR)/dll.Plo + -rm -f ./$(DEPDIR)/error.Plo + -rm -f ./$(DEPDIR)/heimbase.Plo + -rm -f ./$(DEPDIR)/json.Plo + -rm -f ./$(DEPDIR)/null.Plo + -rm -f ./$(DEPDIR)/number.Plo + -rm -f ./$(DEPDIR)/string.Plo + -rm -f ./$(DEPDIR)/test_base-test_base.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1255,10 +1331,10 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: check-am install-am install-data-am install-strip uninstall-am -.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \ - check-am check-local clean clean-checkPROGRAMS clean-generic \ - clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ - ctags-am dist-hook distclean distclean-compile \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \ + check-TESTS check-am check-local clean clean-checkPROGRAMS \ + clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \ + ctags ctags-am dist-hook distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags distdir dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-data-hook install-dvi \ @@ -1354,11 +1430,20 @@ check-local:: test "$$failed" -eq 0 || exit 1; \ fi +# It's useful for debugging to format generated sources. The default for all +# clang-format styles is to sort includes, but in many cases in-tree we really +# don't want to do that. .x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @if [ -z "$(CLANG_FORMAT)" ]; then \ + cmp -s $< $@ 2> /dev/null || cp $< $@; \ + else \ + cp $< $@.tmp.c; \ + $(CLANG_FORMAT) -style='{BasedOnStyle: Chromium, SortIncludes: false}' -i $@.tmp.c; \ + cmp -s $@.tmp.c $@ 2> /dev/null || mv $@.tmp.c $@; \ + fi .hx.h: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @cmp -s $< $@ 2> /dev/null || cp $< $@; #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ diff --git a/lib/base/bsearch.c b/lib/base/bsearch.c index 278962172683..268cc018df6f 100644 --- a/lib/base/bsearch.c +++ b/lib/base/bsearch.c @@ -275,11 +275,12 @@ bsearch_common(const char *buf, size_t sz, const char *key, ret = 0; if (val_len && value) { /* Avoid strndup() so we don't need libroken here yet */ - *value = malloc(val_len + 1); - if (!*value) - ret = errno; - (void) memcpy(*value, &buf[val_start], val_len); - (*value)[val_len] = '\0'; + if ((*value = malloc(val_len + 1))) { + (void) memcpy(*value, &buf[val_start], val_len); + (*value)[val_len] = '\0'; + } else { + ret = errno; + } } break; } @@ -708,6 +709,10 @@ _bsearch_file(bsearch_file_handle bfh, const char *key, if (reads) *reads = 0; + if (value) + *value = NULL; + if (loops) + *loops = 0; /* If whole file is in memory then search that and we're done */ if (bfh->file_sz == bfh->cache_sz) @@ -715,11 +720,6 @@ _bsearch_file(bsearch_file_handle bfh, const char *key, /* Else block-wise binary search */ - if (value) - *value = NULL; - if (loops) - *loops = 0; - l = 0; r = (bfh->file_sz / bfh->page_sz) + 1; for (level = 0, page = r >> 1; page >= l && page < r ; level++) { @@ -851,7 +851,7 @@ stdb_copy_value(void *db, heim_string_t table, heim_data_t key, { bsearch_file_handle bfh = db; const char *k; - char *v; + char *v = NULL; heim_data_t value; int ret; @@ -869,6 +869,8 @@ stdb_copy_value(void *db, heim_string_t table, heim_data_t key, else k = (const char *)heim_data_get_ptr(key); ret = _bsearch_file(bfh, k, &v, NULL, NULL, NULL); + if (ret == 0 && v == NULL) + ret = -1; /* Quiet lint */ if (ret != 0) { if (ret > 0 && error) *error = heim_error_create(ret, "%s", strerror(ret)); diff --git a/lib/base/dll.c b/lib/base/dll.c index 31017a01191b..53f1f63bcdd5 100644 --- a/lib/base/dll.c +++ b/lib/base/dll.c @@ -83,7 +83,8 @@ struct tls_values { static HEIMDAL_THREAD_LOCAL struct tls_values values; -#define DEAD_KEY ((void *)8) +static char dead_key[1]; +static void no_dtor(void *d) { (void)d; } void heim_w32_service_thread_detach(void *unused) @@ -111,7 +112,7 @@ heim_w32_service_thread_detach(void *unused) assert(i < key_defs->keys_start_idx + key_defs->keys_num); } dtor = key_defs->keys_dtors[i - key_defs->keys_start_idx]; - if (values.values[i] != NULL && dtor != NULL && dtor != DEAD_KEY) + if (values.values[i] != NULL && dtor != NULL && dtor != no_dtor) dtor(values.values[i]); values.values[i] = NULL; } @@ -150,7 +151,7 @@ heim_w32_key_create(HEIM_PRIV_thread_key *key, void (*dtor)(void *)) #if !defined(WIN32) (void) pthread_once(&pt_once, create_pt_key); - (void) pthread_setspecific(pt_key, DEAD_KEY); + (void) pthread_setspecific(pt_key, dead_key); #endif HEIMDAL_MUTEX_lock(&tls_key_defs_lock); @@ -266,7 +267,7 @@ heim_w32_delete_key(HEIM_PRIV_thread_key key) key_lookup(key, &key_defs, &dtor_idx, NULL); if (key_defs == NULL) return EINVAL; - key_defs->keys_dtors[dtor_idx] = DEAD_KEY; + key_defs->keys_dtors[dtor_idx] = no_dtor; return 0; } @@ -279,7 +280,7 @@ heim_w32_setspecific(HEIM_PRIV_thread_key key, void *value) size_t i; #if !defined(WIN32) - (void) pthread_setspecific(pt_key, DEAD_KEY); + (void) pthread_setspecific(pt_key, dead_key); #endif key_lookup(key, NULL, NULL, &dtor); @@ -304,7 +305,7 @@ heim_w32_setspecific(HEIM_PRIV_thread_key key, void *value) assert(key < values.values_num); - if (values.values[key] != NULL && dtor != NULL && dtor != DEAD_KEY) + if (values.values[key] != NULL && dtor != NULL && dtor != no_dtor) dtor(values.values[key]); values.values[key] = value; diff --git a/lib/base/error.c b/lib/base/error.c index a1bbfa8a133f..8ae65de4981e 100644 --- a/lib/base/error.c +++ b/lib/base/error.c @@ -53,8 +53,8 @@ static int error_cmp(void *a, void *b) { struct heim_error *ap = a, *bp = b; - if (ap->error_code == ap->error_code) - return ap->error_code - ap->error_code; + if (ap->error_code == bp->error_code) + return 0; return heim_cmp(ap->msg, bp->msg); } diff --git a/lib/base/heimbase.c b/lib/base/heimbase.c index 6ad6ab258f09..9a1120b68368 100644 --- a/lib/base/heimbase.c +++ b/lib/base/heimbase.c @@ -86,11 +86,12 @@ struct heim_auto_release { void * heim_retain(void *ptr) { - struct heim_base *p = PTR2BASE(ptr); + struct heim_base *p; if (ptr == NULL || heim_base_is_tagged(ptr)) return ptr; + p = PTR2BASE(ptr); if (p->ref_cnt == heim_base_atomic_max) return ptr; @@ -109,11 +110,12 @@ void heim_release(void *ptr) { heim_base_atomic_type old; - struct heim_base *p = PTR2BASE(ptr); + struct heim_base *p; if (ptr == NULL || heim_base_is_tagged(ptr)) return; + p = PTR2BASE(ptr); if (p->ref_cnt == heim_base_atomic_max) return; @@ -256,9 +258,12 @@ heim_cmp(heim_object_t a, heim_object_t b) static void memory_dealloc(void *ptr) { - struct heim_base_mem *p = (struct heim_base_mem *)PTR2BASE(ptr); - if (p->dealloc) - p->dealloc(ptr); + if (ptr) { + struct heim_base_mem *p = (struct heim_base_mem *)PTR2BASE(ptr); + + if (p->dealloc) + p->dealloc(ptr); + } } struct heim_type_data memory_object = { @@ -666,13 +671,16 @@ heim_auto_release_create(void) heim_object_t heim_auto_release(heim_object_t ptr) { - struct heim_base *p = PTR2BASE(ptr); - struct ar_tls *tls = autorel_tls(); + struct heim_base *p; + struct ar_tls *tls; heim_auto_release_t ar; if (ptr == NULL || heim_base_is_tagged(ptr)) return ptr; + p = PTR2BASE(ptr); + tls = autorel_tls(); + /* drop from old pool */ if ((ar = p->autorelpool) != NULL) { HEIMDAL_MUTEX_lock(&ar->pool_mutex); diff --git a/lib/com_err/Makefile.in b/lib/com_err/Makefile.in index 71c992d1e39c..4b8fefdad10e 100644 --- a/lib/com_err/Makefile.in +++ b/lib/com_err/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -102,7 +102,6 @@ subdir = lib/com_err ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ $(top_srcdir)/cf/auth-modules.m4 \ - $(top_srcdir)/cf/broken-getaddrinfo.m4 \ $(top_srcdir)/cf/broken-glob.m4 \ $(top_srcdir)/cf/broken-realloc.m4 \ $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ @@ -152,6 +151,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +PROGRAMS = $(noinst_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -196,7 +196,6 @@ am__v_lt_1 = libcom_err_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libcom_err_la_LDFLAGS) $(LDFLAGS) -o $@ -PROGRAMS = $(noinst_PROGRAMS) am_compile_et_OBJECTS = compile_et.$(OBJEXT) parse.$(OBJEXT) \ lex.$(OBJEXT) compile_et_OBJECTS = $(am_compile_et_OBJECTS) @@ -215,7 +214,12 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/compile_et.Po ./$(DEPDIR)/lex.Po \ + ./$(DEPDIR)/libcom_err_la-com_err.Plo \ + ./$(DEPDIR)/libcom_err_la-error.Plo \ + ./$(DEPDIR)/libcom_err_la-snprintf.Plo \ + ./$(DEPDIR)/libcom_err_la-strlcpy.Plo ./$(DEPDIR)/parse.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -280,8 +284,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/Makefile.am.common \ $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/depcomp \ @@ -307,9 +309,12 @@ CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLANG_FORMAT = @CLANG_FORMAT@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DB1LIB = @DB1LIB@ DB3LIB = @DB3LIB@ @@ -327,8 +332,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GCD_MIG = @GCD_MIG@ GREP = @GREP@ GROFF = @GROFF@ @@ -437,6 +444,11 @@ PKG_CONFIG = @PKG_CONFIG@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LDADD = @PTHREAD_LDADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -496,9 +508,14 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -582,8 +599,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty): @@ -596,6 +613,15 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -633,15 +659,6 @@ clean-libLTLIBRARIES: libcom_err.la: $(libcom_err_la_OBJECTS) $(libcom_err_la_DEPENDENCIES) $(EXTRA_libcom_err_la_DEPENDENCIES) $(AM_V_CCLD)$(libcom_err_la_LINK) -rpath $(libdir) $(libcom_err_la_OBJECTS) $(libcom_err_la_LIBADD) $(LIBS) - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list parse.h: parse.c @if test ! -f $@; then rm -f parse.c; else :; fi @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) parse.c; else :; fi @@ -656,13 +673,19 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compile_et.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lex.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcom_err_la-com_err.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcom_err_la-error.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcom_err_la-snprintf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcom_err_la-strlcpy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compile_et.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lex.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcom_err_la-com_err.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcom_err_la-error.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcom_err_la-snprintf.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcom_err_la-strlcpy.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -797,8 +820,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -834,7 +859,7 @@ distdir: $(DISTFILES) check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-local +all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(HEADERS) all-local installdirs: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -878,7 +903,13 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/compile_et.Po + -rm -f ./$(DEPDIR)/lex.Po + -rm -f ./$(DEPDIR)/libcom_err_la-com_err.Plo + -rm -f ./$(DEPDIR)/libcom_err_la-error.Plo + -rm -f ./$(DEPDIR)/libcom_err_la-snprintf.Plo + -rm -f ./$(DEPDIR)/libcom_err_la-strlcpy.Plo + -rm -f ./$(DEPDIR)/parse.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -925,7 +956,13 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/compile_et.Po + -rm -f ./$(DEPDIR)/lex.Po + -rm -f ./$(DEPDIR)/libcom_err_la-com_err.Plo + -rm -f ./$(DEPDIR)/libcom_err_la-error.Plo + -rm -f ./$(DEPDIR)/libcom_err_la-snprintf.Plo + -rm -f ./$(DEPDIR)/libcom_err_la-strlcpy.Plo + -rm -f ./$(DEPDIR)/parse.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -947,8 +984,8 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: check-am install-am install-data-am install-strip uninstall-am -.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am \ - check-local clean clean-generic clean-libLTLIBRARIES \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \ + check-am check-local clean clean-generic clean-libLTLIBRARIES \ clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ ctags-am dist-hook distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags distdir dvi \ @@ -1046,11 +1083,20 @@ check-local:: test "$$failed" -eq 0 || exit 1; \ fi +# It's useful for debugging to format generated sources. The default for all +# clang-format styles is to sort includes, but in many cases in-tree we really +# don't want to do that. .x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @if [ -z "$(CLANG_FORMAT)" ]; then \ + cmp -s $< $@ 2> /dev/null || cp $< $@; \ + else \ + cp $< $@.tmp.c; \ + $(CLANG_FORMAT) -style='{BasedOnStyle: Chromium, SortIncludes: false}' -i $@.tmp.c; \ + cmp -s $@.tmp.c $@ 2> /dev/null || mv $@.tmp.c $@; \ + fi .hx.h: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @cmp -s $< $@ 2> /dev/null || cp $< $@; #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ diff --git a/lib/com_err/lex.c b/lib/com_err/lex.c index 2ebfad758d34..d35a45abba43 100644 --- a/lib/com_err/lex.c +++ b/lib/com_err/lex.c @@ -1,5 +1,5 @@ -#line 3 "lex.c" +#line 2 "lex.c" #define YY_INT_ALIGNED short int @@ -7,8 +7,8 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 35 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -46,7 +46,6 @@ typedef int16_t flex_int16_t; typedef uint16_t flex_uint16_t; typedef int32_t flex_int32_t; typedef uint32_t flex_uint32_t; -typedef uint64_t flex_uint64_t; #else typedef signed char flex_int8_t; typedef short int flex_int16_t; @@ -54,7 +53,6 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -85,63 +83,61 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! FLEXINT_H */ - -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) +#endif /* ! C99 */ -#define YY_USE_CONST +#endif /* ! FLEXINT_H */ -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ +/* begin standard C++ headers. */ -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* Returned upon end-of-file. */ #define YY_NULL 0 -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. +/* Promotes a possibly negative, possibly signed char to an + * integer in range [0..255] for use as an array index. */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) /* Enter a start condition. This macro really ought to take a parameter, * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ #define BEGIN (yy_start) = 1 + 2 * - /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ #define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START - /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ) - +#define YY_NEW_FILE yyrestart( yyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -158,15 +154,16 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; typedef size_t yy_size_t; #endif -extern yy_size_t yyleng; +extern int yyleng; extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + #define YY_LESS_LINENO(n) + #define YY_LINENO_REWIND_TO(ptr) /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ @@ -181,7 +178,6 @@ extern FILE *yyin, *yyout; YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) - #define unput(c) yyunput( c, (yytext_ptr) ) #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -196,12 +192,12 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -224,7 +220,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -252,7 +248,7 @@ struct yy_buffer_state /* Stack of input buffers. */ static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ -static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ +static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */ /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general @@ -263,7 +259,6 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ : NULL) - /* Same as previous macro, but useful when we know that the buffer stack is not * NULL or when we need an lvalue. For internal use only. */ @@ -271,11 +266,11 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ -yy_size_t yyleng; +static int yy_n_chars; /* number of characters read into yy_ch_buf */ +int yyleng; /* Points to current character in buffer. */ -static char *yy_c_buf_p = (char *) 0; +static char *yy_c_buf_p = NULL; static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ @@ -284,82 +279,78 @@ static int yy_start = 0; /* start state number */ */ static int yy_did_buffer_switch_on_eof; -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); - -static void yyensure_buffer_stack (void ); -static void yy_load_buffer_state (void ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); +void yyrestart ( FILE *input_file ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); +void yy_delete_buffer ( YY_BUFFER_STATE b ); +void yy_flush_buffer ( YY_BUFFER_STATE b ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state ( void ); -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) +static void yyensure_buffer_stack ( void ); +static void yy_load_buffer_state ( void ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len ); -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); +void *yyalloc ( yy_size_t ); +void *yyrealloc ( void *, yy_size_t ); +void yyfree ( void * ); #define yy_new_buffer yy_create_buffer - #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } - #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } - #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) /* Begin user sect3 */ +typedef flex_uint8_t YY_CHAR; -typedef unsigned char YY_CHAR; - -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; +FILE *yyin = NULL, *yyout = NULL; typedef int yy_state_type; extern int yylineno; - int yylineno = 1; extern char *yytext; +#ifdef yytext_ptr +#undef yytext_ptr +#endif #define yytext_ptr yytext -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -static void yy_fatal_error (yyconst char msg[] ); +static yy_state_type yy_get_previous_state ( void ); +static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); +static int yy_get_next_buffer ( void ); +static void yynoreturn yy_fatal_error ( const char* msg ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ (yytext_ptr) = yy_bp; \ - yyleng = (yy_size_t) (yy_cp - yy_bp); \ + yyleng = (int) (yy_cp - yy_bp); \ (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; - #define YY_NUM_RULES 16 #define YY_END_OF_BUFFER 17 /* This struct is not used in this scanner, @@ -369,7 +360,7 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[46] = +static const flex_int16_t yy_accept[46] = { 0, 0, 0, 17, 15, 11, 12, 13, 10, 9, 14, 14, 14, 14, 10, 9, 14, 3, 14, 14, 1, @@ -378,7 +369,7 @@ static yyconst flex_int16_t yy_accept[46] = 14, 4, 14, 2, 0 } ; -static yyconst flex_int32_t yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -410,14 +401,14 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[23] = +static const YY_CHAR yy_meta[23] = { 0, 1, 1, 2, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 } ; -static yyconst flex_int16_t yy_base[48] = +static const flex_int16_t yy_base[48] = { 0, 0, 0, 56, 57, 57, 57, 57, 0, 49, 0, 12, 13, 34, 0, 47, 0, 0, 40, 31, 0, @@ -426,7 +417,7 @@ static yyconst flex_int16_t yy_base[48] = 12, 0, 14, 0, 57, 34, 23 } ; -static yyconst flex_int16_t yy_def[48] = +static const flex_int16_t yy_def[48] = { 0, 45, 1, 45, 45, 45, 45, 45, 46, 47, 47, 47, 47, 47, 46, 47, 47, 47, 47, 47, 47, @@ -435,7 +426,7 @@ static yyconst flex_int16_t yy_def[48] = 47, 47, 47, 47, 0, 45, 45 } ; -static yyconst flex_int16_t yy_nxt[80] = +static const flex_int16_t yy_nxt[80] = { 0, 4, 5, 6, 7, 8, 9, 10, 10, 10, 10, 10, 10, 11, 10, 12, 10, 10, 10, 13, 10, @@ -447,7 +438,7 @@ static yyconst flex_int16_t yy_nxt[80] = 45, 45, 45, 45, 45, 45, 45, 45, 45 } ; -static yyconst flex_int16_t yy_chk[80] = +static const flex_int16_t yy_chk[80] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -527,7 +518,8 @@ static int getstring(void); #undef ECHO -#line 531 "lex.c" +#line 521 "lex.c" +#line 522 "lex.c" #define INITIAL 0 @@ -543,36 +535,36 @@ static int getstring(void); #define YY_EXTRA_TYPE void * #endif -static int yy_init_globals (void ); +static int yy_init_globals ( void ); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy (void ); +int yylex_destroy ( void ); -int yyget_debug (void ); +int yyget_debug ( void ); -void yyset_debug (int debug_flag ); +void yyset_debug ( int debug_flag ); -YY_EXTRA_TYPE yyget_extra (void ); +YY_EXTRA_TYPE yyget_extra ( void ); -void yyset_extra (YY_EXTRA_TYPE user_defined ); +void yyset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *yyget_in (void ); +FILE *yyget_in ( void ); -void yyset_in (FILE * in_str ); +void yyset_in ( FILE * _in_str ); -FILE *yyget_out (void ); +FILE *yyget_out ( void ); -void yyset_out (FILE * out_str ); +void yyset_out ( FILE * _out_str ); -yy_size_t yyget_leng (void ); + int yyget_leng ( void ); -char *yyget_text (void ); +char *yyget_text ( void ); -int yyget_lineno (void ); +int yyget_lineno ( void ); -void yyset_lineno (int line_number ); +void yyset_lineno ( int _line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -580,33 +572,41 @@ void yyset_lineno (int line_number ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap (void ); +extern "C" int yywrap ( void ); #else -extern int yywrap (void ); +extern int yywrap ( void ); #endif #endif +#ifndef YY_NO_UNPUT + +#endif + #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy ( char *, const char *, int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen ( const char * ); #endif #ifndef YY_NO_INPUT - #ifdef __cplusplus -static int yyinput (void ); +static int yyinput ( void ); #else -static int input (void ); +static int input ( void ); #endif #endif /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -614,7 +614,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO fwrite( yytext, yyleng, 1, yyout ) +#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -625,7 +625,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - yy_size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -638,7 +638,7 @@ static int input (void ); else \ { \ errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -693,7 +693,7 @@ extern int yylex (void); /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK break; +#define YY_BREAK /*LINTED*/break; #endif #define YY_RULE_SETUP \ @@ -703,14 +703,10 @@ extern int yylex (void); */ YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; -#line 58 "lex.l" - -#line 713 "lex.c" - if ( !(yy_init) ) { (yy_init) = 1; @@ -731,13 +727,18 @@ YY_DECL if ( ! YY_CURRENT_BUFFER ) { yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_load_buffer_state( ); + yy_load_buffer_state( ); } - while ( 1 ) /* loops until end-of-file is reached */ + { +#line 58 "lex.l" + +#line 739 "lex.c" + + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { yy_cp = (yy_c_buf_p); @@ -753,7 +754,7 @@ YY_DECL yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -763,9 +764,9 @@ yy_match: { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 46 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } while ( yy_base[yy_current_state] != 57 ); @@ -951,7 +952,7 @@ case YY_STATE_EOF(INITIAL): { (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap( ) ) + if ( yywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -1004,6 +1005,7 @@ case YY_STATE_EOF(INITIAL): "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ + } /* end of user's declarations */ } /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer @@ -1015,9 +1017,9 @@ case YY_STATE_EOF(INITIAL): */ static int yy_get_next_buffer (void) { - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); - register int number_to_move, i; + char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + char *source = (yytext_ptr); + int number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -1046,7 +1048,7 @@ static int yy_get_next_buffer (void) /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1); for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -1059,21 +1061,21 @@ static int yy_get_next_buffer (void) else { - yy_size_t num_to_read = + int num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; int yy_c_buf_p_offset = (int) ((yy_c_buf_p) - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { - yy_size_t new_size = b->yy_buf_size * 2; + int new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -1082,11 +1084,12 @@ static int yy_get_next_buffer (void) b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); + yyrealloc( (void *) b->yy_ch_buf, + (yy_size_t) (b->yy_buf_size + 2) ); } else /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; + b->yy_ch_buf = NULL; if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( @@ -1114,7 +1117,7 @@ static int yy_get_next_buffer (void) if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ); + yyrestart( yyin ); } else @@ -1128,12 +1131,15 @@ static int yy_get_next_buffer (void) else ret_val = EOB_ACT_CONTINUE_SCAN; - if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ - yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } (yy_n_chars) += number_to_move; @@ -1149,14 +1155,14 @@ static int yy_get_next_buffer (void) static yy_state_type yy_get_previous_state (void) { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; yy_current_state = (yy_start); for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1166,9 +1172,9 @@ static int yy_get_next_buffer (void) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 46 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; } return yy_current_state; @@ -1181,10 +1187,10 @@ static int yy_get_next_buffer (void) */ static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) { - register int yy_is_jam; - register char *yy_cp = (yy_c_buf_p); + int yy_is_jam; + char *yy_cp = (yy_c_buf_p); - register YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1194,14 +1200,18 @@ static int yy_get_next_buffer (void) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 46 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; yy_is_jam = (yy_current_state == 45); - return yy_is_jam ? 0 : yy_current_state; + return yy_is_jam ? 0 : yy_current_state; } +#ifndef YY_NO_UNPUT + +#endif + #ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput (void) @@ -1226,7 +1236,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (int) ((yy_c_buf_p) - (yytext_ptr)); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -1243,13 +1253,13 @@ static int yy_get_next_buffer (void) */ /* Reset buffer status. */ - yyrestart(yyin ); + yyrestart( yyin ); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap( ) ) + if ( yywrap( ) ) return 0; if ( ! (yy_did_buffer_switch_on_eof) ) @@ -1287,11 +1297,11 @@ static int yy_get_next_buffer (void) if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - yy_load_buffer_state( ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file ); + yy_load_buffer_state( ); } /** Switch to a different input buffer. @@ -1319,7 +1329,7 @@ static int yy_get_next_buffer (void) } YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); + yy_load_buffer_state( ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag @@ -1347,7 +1357,7 @@ static void yy_load_buffer_state (void) { YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -1356,13 +1366,13 @@ static void yy_load_buffer_state (void) /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer(b,file ); + yy_init_buffer( b, file ); return b; } @@ -1381,15 +1391,11 @@ static void yy_load_buffer_state (void) YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ); + yyfree( (void *) b->yy_ch_buf ); - yyfree((void *) b ); + yyfree( (void *) b ); } -#ifndef __cplusplus -extern int isatty (int ); -#endif /* __cplusplus */ - /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a yyrestart() or at EOF. @@ -1399,7 +1405,7 @@ extern int isatty (int ); { int oerrno = errno; - yy_flush_buffer(b ); + yy_flush_buffer( b ); b->yy_input_file = file; b->yy_fill_buffer = 1; @@ -1442,7 +1448,7 @@ extern int isatty (int ); b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); + yy_load_buffer_state( ); } /** Pushes the new state onto the stack. The new state becomes @@ -1473,7 +1479,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) YY_CURRENT_BUFFER_LVALUE = new_buffer; /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } @@ -1492,7 +1498,7 @@ void yypop_buffer_state (void) --(yy_buffer_stack_top); if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } } @@ -1510,15 +1516,15 @@ static void yyensure_buffer_stack (void) * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. */ - num_to_alloc = 1; + num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + (yy_buffer_stack_max) = num_to_alloc; (yy_buffer_stack_top) = 0; return; @@ -1527,7 +1533,7 @@ static void yyensure_buffer_stack (void) if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; + yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = (yy_buffer_stack_max) + grow_size; (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc @@ -1547,7 +1553,7 @@ static void yyensure_buffer_stack (void) * @param base the character buffer * @param size the size in bytes of the character buffer * - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) { @@ -1557,23 +1563,23 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ - return 0; + return NULL; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; - b->yy_input_file = 0; + b->yy_input_file = NULL; b->yy_n_chars = b->yy_buf_size; b->yy_is_interactive = 0; b->yy_at_bol = 1; b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer(b ); + yy_switch_to_buffer( b ); return b; } @@ -1586,28 +1592,29 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) * @note If you want to scan bytes that may contain NUL values, then use * yy_scan_bytes() instead. */ -YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) +YY_BUFFER_STATE yy_scan_string (const char * yystr ) { - return yy_scan_bytes(yystr,strlen(yystr) ); + return yy_scan_bytes( yystr, (int) strlen(yystr) ); } /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. + * @param yybytes the byte buffer to scan + * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; - yy_size_t n, i; + yy_size_t n; + int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) yyalloc(n ); + n = (yy_size_t) (_yybytes_len + 2); + buf = (char *) yyalloc( n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -1616,7 +1623,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer(buf,n ); + b = yy_scan_buffer( buf, n ); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -1632,9 +1639,9 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg ) +static void yynoreturn yy_fatal_error (const char* msg ) { - (void) fprintf( stderr, "%s\n", msg ); + fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -1662,7 +1669,7 @@ static void yy_fatal_error (yyconst char* msg ) */ int yyget_lineno (void) { - + return yylineno; } @@ -1685,7 +1692,7 @@ FILE *yyget_out (void) /** Get the length of the current token. * */ -yy_size_t yyget_leng (void) +int yyget_leng (void) { return yyleng; } @@ -1700,29 +1707,29 @@ char *yyget_text (void) } /** Set the current line number. - * @param line_number + * @param _line_number line number * */ -void yyset_lineno (int line_number ) +void yyset_lineno (int _line_number ) { - yylineno = line_number; + yylineno = _line_number; } /** Set the input stream. This does not discard the current * input buffer. - * @param in_str A readable stream. + * @param _in_str A readable stream. * * @see yy_switch_to_buffer */ -void yyset_in (FILE * in_str ) +void yyset_in (FILE * _in_str ) { - yyin = in_str ; + yyin = _in_str ; } -void yyset_out (FILE * out_str ) +void yyset_out (FILE * _out_str ) { - yyout = out_str ; + yyout = _out_str ; } int yyget_debug (void) @@ -1730,9 +1737,9 @@ int yyget_debug (void) return yy_flex_debug; } -void yyset_debug (int bdebug ) +void yyset_debug (int _bdebug ) { - yy_flex_debug = bdebug ; + yy_flex_debug = _bdebug ; } static int yy_init_globals (void) @@ -1741,10 +1748,10 @@ static int yy_init_globals (void) * This function is called from yylex_destroy(), so don't allocate here. */ - (yy_buffer_stack) = 0; + (yy_buffer_stack) = NULL; (yy_buffer_stack_top) = 0; (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = (char *) 0; + (yy_c_buf_p) = NULL; (yy_init) = 0; (yy_start) = 0; @@ -1753,8 +1760,8 @@ static int yy_init_globals (void) yyin = stdin; yyout = stdout; #else - yyin = (FILE *) 0; - yyout = (FILE *) 0; + yyin = NULL; + yyout = NULL; #endif /* For future reference: Set errno on error, since we are called by @@ -1769,7 +1776,7 @@ int yylex_destroy (void) /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); + yy_delete_buffer( YY_CURRENT_BUFFER ); YY_CURRENT_BUFFER_LVALUE = NULL; yypop_buffer_state(); } @@ -1790,18 +1797,19 @@ int yylex_destroy (void) */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +static void yy_flex_strncpy (char* s1, const char * s2, int n ) { - register int i; + + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) +static int yy_flex_strlen (const char * s ) { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; @@ -1811,11 +1819,12 @@ static int yy_flex_strlen (yyconst char * s ) void *yyalloc (yy_size_t size ) { - return (void *) malloc( size ); + return malloc(size); } void *yyrealloc (void * ptr, yy_size_t size ) { + /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -1823,12 +1832,12 @@ void *yyrealloc (void * ptr, yy_size_t size ) * any pointer type to void*, and deal with argument conversions * as though doing an assignment. */ - return (void *) realloc( (char *) ptr, size ); + return realloc(ptr, size); } void yyfree (void * ptr ) { - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" @@ -1836,7 +1845,6 @@ void yyfree (void * ptr ) #line 74 "lex.l" - int yywrap () { diff --git a/lib/com_err/parse.c b/lib/com_err/parse.c index ca1ef60b0f84..65e4aecb8513 100644 --- a/lib/com_err/parse.c +++ b/lib/com_err/parse.c @@ -1,14 +1,14 @@ -/* A Bison parser, made by GNU Bison 2.3. */ +/* A Bison parser, made by GNU Bison 3.8.2. */ -/* Skeleton implementation for Bison's Yacc-like parsers in C +/* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, + Inc. - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,9 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -36,6 +34,10 @@ /* C LALR(1) parser skeleton written by Richard Stallman, by simplifying the original so-called "semantic" parser. */ +/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, + especially those whose name start with YY_ or yy_. They are + private implementation details that can be changed or removed. */ + /* All symbols defined below should begin with yy or YY, to avoid infringing on user name space. This should be done even for local variables, as they might otherwise be expanded by user macros. @@ -43,11 +45,11 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ -/* Identify Bison output. */ -#define YYBISON 1 +/* Identify Bison output, and Bison version. */ +#define YYBISON 30802 -/* Bison version. */ -#define YYBISON_VERSION "2.3" +/* Bison version string. */ +#define YYBISON_VERSION "3.8.2" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -55,41 +57,16 @@ /* Pure parsers. */ #define YYPURE 0 -/* Using locations. */ -#define YYLSP_NEEDED 0 - - +/* Push parsers. */ +#define YYPUSH 0 -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - ET = 258, - INDEX = 259, - PREFIX = 260, - EC = 261, - ID = 262, - END = 263, - STRING = 264, - NUMBER = 265 - }; -#endif -/* Tokens. */ -#define ET 258 -#define INDEX 259 -#define PREFIX 260 -#define EC 261 -#define ID 262 -#define END 263 -#define STRING 264 -#define NUMBER 265 +/* Pull parsers. */ +#define YYPULL 1 -/* Copy the first part of user declarations. */ +/* First part of user prologue. */ #line 1 "parse.y" /* @@ -143,77 +120,214 @@ extern char *yytext; #define YYFREE free +#line 124 "parse.c" -/* Enabling traces. */ +# ifndef YY_CAST +# ifdef __cplusplus +# define YY_CAST(Type, Val) static_cast<Type> (Val) +# define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast<Type> (Val) +# else +# define YY_CAST(Type, Val) ((Type) (Val)) +# define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val)) +# endif +# endif +# ifndef YY_NULLPTR +# if defined __cplusplus +# if 201103L <= __cplusplus +# define YY_NULLPTR nullptr +# else +# define YY_NULLPTR 0 +# endif +# else +# define YY_NULLPTR ((void*)0) +# endif +# endif + +/* Use api.header.include to #include this header + instead of duplicating it here. */ +#ifndef YY_YY_PARSE_H_INCLUDED +# define YY_YY_PARSE_H_INCLUDED +/* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 0 #endif - -/* Enabling verbose error messages. */ -#ifdef YYERROR_VERBOSE -# undef YYERROR_VERBOSE -# define YYERROR_VERBOSE 1 -#else -# define YYERROR_VERBOSE 0 +#if YYDEBUG +extern int yydebug; #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 +/* Token kinds. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + enum yytokentype + { + YYEMPTY = -2, + YYEOF = 0, /* "end of file" */ + YYerror = 256, /* error */ + YYUNDEF = 257, /* "invalid token" */ + ET = 258, /* ET */ + INDEX = 259, /* INDEX */ + PREFIX = 260, /* PREFIX */ + EC = 261, /* EC */ + ID = 262, /* ID */ + END = 263, /* END */ + STRING = 264, /* STRING */ + NUMBER = 265 /* NUMBER */ + }; + typedef enum yytokentype yytoken_kind_t; #endif +/* Token kinds. */ +#define YYEMPTY -2 +#define YYEOF 0 +#define YYerror 256 +#define YYUNDEF 257 +#define ET 258 +#define INDEX 259 +#define PREFIX 260 +#define EC 261 +#define ID 262 +#define END 263 +#define STRING 264 +#define NUMBER 265 +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -#line 54 "parse.y" +union YYSTYPE { +#line 54 "parse.y" + char *string; int number; -} -/* Line 193 of yacc.c. */ -#line 174 "parse.c" - YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 + +#line 202 "parse.c" + +}; +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 +# define YYSTYPE_IS_DECLARED 1 #endif +extern YYSTYPE yylval; + + +int yyparse (void); + + +#endif /* !YY_YY_PARSE_H_INCLUDED */ +/* Symbol kind. */ +enum yysymbol_kind_t +{ + YYSYMBOL_YYEMPTY = -2, + YYSYMBOL_YYEOF = 0, /* "end of file" */ + YYSYMBOL_YYerror = 1, /* error */ + YYSYMBOL_YYUNDEF = 2, /* "invalid token" */ + YYSYMBOL_ET = 3, /* ET */ + YYSYMBOL_INDEX = 4, /* INDEX */ + YYSYMBOL_PREFIX = 5, /* PREFIX */ + YYSYMBOL_EC = 6, /* EC */ + YYSYMBOL_ID = 7, /* ID */ + YYSYMBOL_END = 8, /* END */ + YYSYMBOL_STRING = 9, /* STRING */ + YYSYMBOL_NUMBER = 10, /* NUMBER */ + YYSYMBOL_11_ = 11, /* ',' */ + YYSYMBOL_YYACCEPT = 12, /* $accept */ + YYSYMBOL_file = 13, /* file */ + YYSYMBOL_header = 14, /* header */ + YYSYMBOL_id = 15, /* id */ + YYSYMBOL_et = 16, /* et */ + YYSYMBOL_statements = 17, /* statements */ + YYSYMBOL_statement = 18 /* statement */ +}; +typedef enum yysymbol_kind_t yysymbol_kind_t; -/* Copy the second part of user declarations. */ -/* Line 216 of yacc.c. */ -#line 187 "parse.c" #ifdef short # undef short #endif -#ifdef YYTYPE_UINT8 -typedef YYTYPE_UINT8 yytype_uint8; -#else -typedef unsigned char yytype_uint8; +/* On compilers that do not define __PTRDIFF_MAX__ etc., make sure + <limits.h> and (if available) <stdint.h> are included + so that the code can choose integer types of a good width. */ + +#ifndef __PTRDIFF_MAX__ +# include <limits.h> /* INFRINGES ON USER NAME SPACE */ +# if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ +# include <stdint.h> /* INFRINGES ON USER NAME SPACE */ +# define YY_STDINT_H +# endif #endif -#ifdef YYTYPE_INT8 -typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +/* Narrow types that promote to a signed type and that can represent a + signed or unsigned integer of at least N bits. In tables they can + save space and decrease cache pressure. Promoting to a signed type + helps avoid bugs in integer arithmetic. */ + +#ifdef __INT_LEAST8_MAX__ +typedef __INT_LEAST8_TYPE__ yytype_int8; +#elif defined YY_STDINT_H +typedef int_least8_t yytype_int8; +#else typedef signed char yytype_int8; +#endif + +#ifdef __INT_LEAST16_MAX__ +typedef __INT_LEAST16_TYPE__ yytype_int16; +#elif defined YY_STDINT_H +typedef int_least16_t yytype_int16; #else -typedef short int yytype_int8; +typedef short yytype_int16; #endif -#ifdef YYTYPE_UINT16 -typedef YYTYPE_UINT16 yytype_uint16; +/* Work around bug in HP-UX 11.23, which defines these macros + incorrectly for preprocessor constants. This workaround can likely + be removed in 2023, as HPE has promised support for HP-UX 11.23 + (aka HP-UX 11i v2) only through the end of 2022; see Table 2 of + <https://h20195.www2.hpe.com/V2/getpdf.aspx/4AA4-7673ENW.pdf>. */ +#ifdef __hpux +# undef UINT_LEAST8_MAX +# undef UINT_LEAST16_MAX +# define UINT_LEAST8_MAX 255 +# define UINT_LEAST16_MAX 65535 +#endif + +#if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__ +typedef __UINT_LEAST8_TYPE__ yytype_uint8; +#elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \ + && UINT_LEAST8_MAX <= INT_MAX) +typedef uint_least8_t yytype_uint8; +#elif !defined __UINT_LEAST8_MAX__ && UCHAR_MAX <= INT_MAX +typedef unsigned char yytype_uint8; #else -typedef unsigned short int yytype_uint16; +typedef short yytype_uint8; #endif -#ifdef YYTYPE_INT16 -typedef YYTYPE_INT16 yytype_int16; +#if defined __UINT_LEAST16_MAX__ && __UINT_LEAST16_MAX__ <= __INT_MAX__ +typedef __UINT_LEAST16_TYPE__ yytype_uint16; +#elif (!defined __UINT_LEAST16_MAX__ && defined YY_STDINT_H \ + && UINT_LEAST16_MAX <= INT_MAX) +typedef uint_least16_t yytype_uint16; +#elif !defined __UINT_LEAST16_MAX__ && USHRT_MAX <= INT_MAX +typedef unsigned short yytype_uint16; #else -typedef short int yytype_int16; +typedef int yytype_uint16; +#endif + +#ifndef YYPTRDIFF_T +# if defined __PTRDIFF_TYPE__ && defined __PTRDIFF_MAX__ +# define YYPTRDIFF_T __PTRDIFF_TYPE__ +# define YYPTRDIFF_MAXIMUM __PTRDIFF_MAX__ +# elif defined PTRDIFF_MAX +# ifndef ptrdiff_t +# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ +# endif +# define YYPTRDIFF_T ptrdiff_t +# define YYPTRDIFF_MAXIMUM PTRDIFF_MAX +# else +# define YYPTRDIFF_T long +# define YYPTRDIFF_MAXIMUM LONG_MAX +# endif #endif #ifndef YYSIZE_T @@ -221,55 +335,106 @@ typedef short int yytype_int16; # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ # include <stddef.h> /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else -# define YYSIZE_T unsigned int +# define YYSIZE_T unsigned # endif #endif -#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) +#define YYSIZE_MAXIMUM \ + YY_CAST (YYPTRDIFF_T, \ + (YYPTRDIFF_MAXIMUM < YY_CAST (YYSIZE_T, -1) \ + ? YYPTRDIFF_MAXIMUM \ + : YY_CAST (YYSIZE_T, -1))) + +#define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X)) + + +/* Stored state numbers (used for stacks). */ +typedef yytype_int8 yy_state_t; + +/* State numbers in computations. */ +typedef int yy_state_fast_t; #ifndef YY_ # if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include <libintl.h> /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ -# define YY_(msgid) msgid +# define YY_(Msgid) Msgid +# endif +#endif + + +#ifndef YY_ATTRIBUTE_PURE +# if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__) +# define YY_ATTRIBUTE_PURE __attribute__ ((__pure__)) +# else +# define YY_ATTRIBUTE_PURE +# endif +#endif + +#ifndef YY_ATTRIBUTE_UNUSED +# if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__) +# define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) +# else +# define YY_ATTRIBUTE_UNUSED # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YY_USE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YY_USE(E) /* empty */ #endif -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(n) (n) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int i) +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__ +# if __GNUC__ * 100 + __GNUC_MINOR__ < 407 +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") +# else +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") \ + _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# endif +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ + _Pragma ("GCC diagnostic pop") #else -static int -YYID (i) - int i; +# define YY_INITIAL_VALUE(Value) Value #endif -{ - return i; -} +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ +#endif + +#if defined __cplusplus && defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__ +# define YY_IGNORE_USELESS_CAST_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuseless-cast\"") +# define YY_IGNORE_USELESS_CAST_END \ + _Pragma ("GCC diagnostic pop") +#endif +#ifndef YY_IGNORE_USELESS_CAST_BEGIN +# define YY_IGNORE_USELESS_CAST_BEGIN +# define YY_IGNORE_USELESS_CAST_END #endif -#if ! defined yyoverflow || YYERROR_VERBOSE + +#define YY_ASSERT(E) ((void) (0 && (E))) + +#if !defined yyoverflow /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -286,11 +451,11 @@ YYID (i) # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 + /* Use EXIT_SUCCESS as a witness for stdlib.h. */ +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # endif @@ -298,8 +463,8 @@ YYID (i) # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) + /* Pacify GCC's 'empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, and a page size can be as small as 4096 bytes. So we cannot safely @@ -313,88 +478,89 @@ YYID (i) # ifndef YYSTACK_ALLOC_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif -# if (defined __cplusplus && ! defined _STDLIB_H \ +# if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) + && (defined YYFREE || defined free))) # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined malloc && ! defined EXIT_SUCCESS void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined free && ! defined EXIT_SUCCESS void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif # endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ - +#endif /* !defined yyoverflow */ #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss; - YYSTYPE yyvs; - }; + yy_state_t yyss_alloc; + YYSTYPE yyvs_alloc; +}; /* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) +# define YYSTACK_GAP_MAXIMUM (YYSIZEOF (union yyalloc) - 1) /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (YYID (0)) -# endif -# endif +# define YYCOPY_NEEDED 1 /* Relocate STACK from its old location to the new one. The local variables YYSIZE and YYSTACKSIZE give the old and new number of elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYPTRDIFF_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * YYSIZEOF (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / YYSIZEOF (*yyptr); \ + } \ + while (0) #endif +#if defined YYCOPY_NEEDED && YYCOPY_NEEDED +/* Copy COUNT objects from SRC to DST. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(Dst, Src, Count) \ + __builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src))) +# else +# define YYCOPY(Dst, Src, Count) \ + do \ + { \ + YYPTRDIFF_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (Dst)[yyi] = (Src)[yyi]; \ + } \ + while (0) +# endif +# endif +#endif /* !YYCOPY_NEEDED */ + /* YYFINAL -- State number of the termination state. */ #define YYFINAL 9 /* YYLAST -- Last index in YYTABLE. */ @@ -406,18 +572,23 @@ union yyalloc #define YYNNTS 7 /* YYNRULES -- Number of rules. */ #define YYNRULES 15 -/* YYNRULES -- Number of states. */ +/* YYNSTATES -- Number of states. */ #define YYNSTATES 24 -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ -#define YYUNDEFTOK 2 +/* YYMAXUTOK -- Last valid token kind. */ #define YYMAXUTOK 265 -#define YYTRANSLATE(YYX) \ - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ -static const yytype_uint8 yytranslate[] = +/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, with out-of-bounds checking. */ +#define YYTRANSLATE(YYX) \ + (0 <= (YYX) && (YYX) <= YYMAXUTOK \ + ? YY_CAST (yysymbol_kind_t, yytranslate[YYX]) \ + : YYSYMBOL_YYUNDEF) + +/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM + as returned by yylex. */ +static const yytype_int8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -449,25 +620,7 @@ static const yytype_uint8 yytranslate[] = }; #if YYDEBUG -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in - YYRHS. */ -static const yytype_uint8 yyprhs[] = -{ - 0, 0, 3, 4, 7, 10, 12, 15, 18, 22, - 24, 27, 30, 33, 35, 40 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int8 yyrhs[] = -{ - 13, 0, -1, -1, 14, 17, -1, 15, 16, -1, - 16, -1, 7, 9, -1, 3, 9, -1, 3, 9, - 9, -1, 18, -1, 17, 18, -1, 4, 10, -1, - 5, 9, -1, 5, -1, 6, 9, 11, 9, -1, - 8, -1 -}; - -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ +/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint8 yyrline[] = { 0, 65, 65, 66, 69, 70, 73, 79, 85, 94, @@ -475,60 +628,42 @@ static const yytype_uint8 yyrline[] = }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +/** Accessing symbol of state STATE. */ +#define YY_ACCESSING_SYMBOL(State) YY_CAST (yysymbol_kind_t, yystos[State]) + +#if YYDEBUG || 0 +/* The user-facing name of the symbol whose (internal) number is + YYSYMBOL. No bounds checking. */ +static const char *yysymbol_name (yysymbol_kind_t yysymbol) YY_ATTRIBUTE_UNUSED; + /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "$end", "error", "$undefined", "ET", "INDEX", "PREFIX", "EC", "ID", - "END", "STRING", "NUMBER", "','", "$accept", "file", "header", "id", - "et", "statements", "statement", 0 + "\"end of file\"", "error", "\"invalid token\"", "ET", "INDEX", + "PREFIX", "EC", "ID", "END", "STRING", "NUMBER", "','", "$accept", + "file", "header", "id", "et", "statements", "statement", YY_NULLPTR }; -#endif -# ifdef YYPRINT -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ -static const yytype_uint16 yytoknum[] = +static const char * +yysymbol_name (yysymbol_kind_t yysymbol) { - 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 44 -}; -# endif + return yytname[yysymbol]; +} +#endif -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = -{ - 0, 12, 13, 13, 14, 14, 15, 16, 16, 17, - 17, 18, 18, 18, 18, 18 -}; +#define YYPACT_NINF (-5) -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = -{ - 0, 2, 0, 2, 2, 1, 2, 2, 3, 1, - 2, 2, 2, 1, 4, 1 -}; +#define yypact_value_is_default(Yyn) \ + ((Yyn) == YYPACT_NINF) -/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state - STATE-NUM when YYTABLE doesn't specify something else to do. Zero - means the default is an error. */ -static const yytype_uint8 yydefact[] = -{ - 2, 0, 0, 0, 0, 0, 5, 7, 6, 1, - 0, 13, 0, 15, 3, 9, 4, 8, 11, 12, - 0, 10, 0, 14 -}; +#define YYTABLE_NINF (-1) -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int8 yydefgoto[] = -{ - -1, 3, 4, 5, 6, 14, 15 -}; +#define yytable_value_is_error(Yyn) \ + 0 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -5 static const yytype_int8 yypact[] = { 0, -3, -1, 5, -4, 6, -5, 1, -5, -5, @@ -536,18 +671,32 @@ static const yytype_int8 yypact[] = 3, -5, 8, -5 }; +/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not specify something else to do. Zero + means the default is an error. */ +static const yytype_int8 yydefact[] = +{ + 2, 0, 0, 0, 0, 0, 5, 7, 6, 1, + 0, 13, 0, 15, 3, 9, 4, 8, 11, 12, + 0, 10, 0, 14 +}; + /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { -5, -5, -5, -5, 10, -5, 9 }; -/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero, do what YYDEFACT says. - If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -1 -static const yytype_uint8 yytable[] = +/* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int8 yydefgoto[] = +{ + 0, 3, 4, 5, 6, 14, 15 +}; + +/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ +static const yytype_int8 yytable[] = { 10, 11, 12, 1, 13, 9, 7, 2, 8, 1, 17, 0, 18, 19, 22, 16, 20, 23, 0, 0, @@ -561,104 +710,64 @@ static const yytype_int8 yycheck[] = -1, -1, -1, 14 }; -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ -static const yytype_uint8 yystos[] = +/* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of + state STATE-NUM. */ +static const yytype_int8 yystos[] = { 0, 3, 7, 13, 14, 15, 16, 9, 9, 0, 4, 5, 6, 8, 17, 18, 16, 9, 10, 9, 9, 18, 11, 9 }; -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - - -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ +/* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM. */ +static const yytype_int8 yyr1[] = +{ + 0, 12, 13, 13, 14, 14, 15, 16, 16, 17, + 17, 18, 18, 18, 18, 18 +}; -#define YYFAIL goto yyerrlab +/* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM. */ +static const yytype_int8 yyr2[] = +{ + 0, 2, 0, 2, 2, 1, 2, 2, 3, 1, + 2, 2, 2, 1, 4, 1 +}; -#define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (YYID (0)) - - -#define YYTERROR 1 -#define YYERRCODE 256 - - -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) -#endif +enum { YYENOMEM = -2 }; +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab +#define YYNOMEM goto yyexhaustedlab -#ifndef YY_LOCATION_PRINT -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif -#endif +#define YYRECOVERING() (!!yyerrstatus) -/* YYLEX -- calling `yylex' with the right arguments. */ +#define YYBACKUP(Token, Value) \ + do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ + while (0) + +/* Backward compatibility with an undocumented macro. + Use YYerror or YYUNDEF. */ +#define YYERRCODE YYUNDEF -#ifdef YYLEX_PARAM -# define YYLEX yylex (YYLEX_PARAM) -#else -# define YYLEX yylex () -#endif /* Enable debugging if requested. */ #if YYDEBUG @@ -668,80 +777,58 @@ while (YYID (0)) # define YYFPRINTF fprintf # endif -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (YYID (0)) - -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (0) + + + + +# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Kind, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (0) + + +/*-----------------------------------. +| Print this symbol's value on YYO. | +`-----------------------------------*/ + static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif +yy_symbol_value_print (FILE *yyo, + yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep) { + FILE *yyoutput = yyo; + YY_USE (yyoutput); if (!yyvaluep) return; -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); -# endif - switch (yytype) - { - default: - break; - } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YY_USE (yykind); + YY_IGNORE_MAYBE_UNINITIALIZED_END } -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +/*---------------------------. +| Print this symbol on YYO. | +`---------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif +yy_symbol_print (FILE *yyo, + yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep) { - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + YYFPRINTF (yyo, "%s %s (", + yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind)); - yy_symbol_value_print (yyoutput, yytype, yyvaluep); - YYFPRINTF (yyoutput, ")"); + yy_symbol_value_print (yyo, yykind, yyvaluep); + YYFPRINTF (yyo, ")"); } /*------------------------------------------------------------------. @@ -749,80 +836,68 @@ yy_symbol_print (yyoutput, yytype, yyvaluep) | TOP (included). | `------------------------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) -#else static void -yy_stack_print (bottom, top) - yytype_int16 *bottom; - yytype_int16 *top; -#endif +yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop) { YYFPRINTF (stderr, "Stack now"); - for (; bottom <= top; ++bottom) - YYFPRINTF (stderr, " %d", *bottom); + for (; yybottom <= yytop; yybottom++) + { + int yybot = *yybottom; + YYFPRINTF (stderr, " %d", yybot); + } YYFPRINTF (stderr, "\n"); } -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void -yy_reduce_print (YYSTYPE *yyvsp, int yyrule) -#else -static void -yy_reduce_print (yyvsp, yyrule) - YYSTYPE *yyvsp; - int yyrule; -#endif +yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, + int yyrule) { + int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; - unsigned long int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); + YYFPRINTF (stderr, "Reducing stack by rule %d (line %d):\n", + yyrule - 1, yylno); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { - fprintf (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - ); - fprintf (stderr, "\n"); + YYFPRINTF (stderr, " $%d = ", yyi + 1); + yy_symbol_print (stderr, + YY_ACCESSING_SYMBOL (+yyssp[yyi + 1 - yynrhs]), + &yyvsp[(yyi + 1) - (yynrhs)]); + YYFPRINTF (stderr, "\n"); } } -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyvsp, Rule); \ -} while (YYID (0)) +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyssp, yyvsp, Rule); \ +} while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; #else /* !YYDEBUG */ -# define YYDPRINTF(Args) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YYDPRINTF(Args) ((void) 0) +# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ /* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH +#ifndef YYINITDEPTH # define YYINITDEPTH 200 #endif @@ -837,478 +912,219 @@ int yydebug; # define YYMAXDEPTH 10000 #endif - -#if YYERROR_VERBOSE -# ifndef yystrlen -# if defined __GLIBC__ && defined _STRING_H -# define yystrlen strlen -# else -/* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static YYSIZE_T -yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif -{ - YYSIZE_T yylen; - for (yylen = 0; yystr[yylen]; yylen++) - continue; - return yylen; -} -# endif -# endif -# ifndef yystpcpy -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -# define yystpcpy stpcpy -# else -/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in - YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static char * -yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif -{ - char *yyd = yydest; - const char *yys = yysrc; - while ((*yyd++ = *yys++) != '\0') - continue; - - return yyd - 1; -} -# endif -# endif - -# ifndef yytnamerr -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary - quotes and backslashes, so that it's suitable for yyerror. The - heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than - backslash-backslash). YYSTR is taken from yytname. If YYRES is - null, do not copy; instead, return the length of what the result - would have been. */ -static YYSIZE_T -yytnamerr (char *yyres, const char *yystr) -{ - if (*yystr == '"') - { - YYSIZE_T yyn = 0; - char const *yyp = yystr; - - for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - do_not_strip_quotes: ; - } - - if (! yyres) - return yystrlen (yystr); - - return yystpcpy (yyres, yystr) - yyres; -} -# endif - -/* Copy into YYRESULT an error message about the unexpected token - YYCHAR while in state YYSTATE. Return the number of bytes copied, - including the terminating null byte. If YYRESULT is null, do not - copy anything; just return the number of bytes that would be - copied. As a special case, return 0 if an ordinary "syntax error" - message will do. Return YYSIZE_MAXIMUM if overflow occurs during - size calculation. */ -static YYSIZE_T -yysyntax_error (char *yyresult, int yystate, int yychar) -{ - int yyn = yypact[yystate]; - - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; - else - { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -# if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -# endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } - - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - - if (yysize_overflow) - return YYSIZE_MAXIMUM; - - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yyresult; - int yyi = 0; - while ((*yyp = *yyf) != '\0') - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - } - return yysize; - } -} -#endif /* YYERROR_VERBOSE */ - /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) -#else static void -yydestruct (yymsg, yytype, yyvaluep) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; -#endif +yydestruct (const char *yymsg, + yysymbol_kind_t yykind, YYSTYPE *yyvaluep) { - YYUSE (yyvaluep); - + YY_USE (yyvaluep); if (!yymsg) yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp); - switch (yytype) - { - - default: - break; - } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YY_USE (yykind); + YY_IGNORE_MAYBE_UNINITIALIZED_END } - -/* Prevent warnings from -Wmissing-prototypes. */ -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ - - - -/* The look-ahead symbol. */ +/* Lookahead token kind. */ int yychar; -/* The semantic value of the look-ahead symbol. */ +/* The semantic value of the lookahead symbol. */ YYSTYPE yylval; - /* Number of syntax errors so far. */ int yynerrs; + /*----------. | yyparse. | `----------*/ -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) int yyparse (void) -#else -int -yyparse () - -#endif -#endif { - - int yystate; - int yyn; - int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ - int yytoken = 0; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif - - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. - - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ + yy_state_fast_t yystate = 0; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus = 0; - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; + /* Refer to the stacks through separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; + /* Their size. */ + YYPTRDIFF_T yystacksize = YYINITDEPTH; + /* The state stack: array, bottom, top. */ + yy_state_t yyssa[YYINITDEPTH]; + yy_state_t *yyss = yyssa; + yy_state_t *yyssp = yyss; + /* The semantic value stack: array, bottom, top. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs = yyvsa; + YYSTYPE *yyvsp = yyvs; -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) - - YYSIZE_T yystacksize = YYINITDEPTH; - + int yyn; + /* The return value of yyparse. */ + int yyresult; + /* Lookahead symbol kind. */ + yysymbol_kind_t yytoken = YYSYMBOL_YYEMPTY; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) + /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ int yylen = 0; YYDPRINTF ((stderr, "Starting parse\n")); - yystate = 0; - yyerrstatus = 0; - yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - - yyssp = yyss; - yyvsp = yyvs; + yychar = YYEMPTY; /* Cause a token to be read. */ goto yysetstate; + /*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | +| yynewstate -- push a new state, which is found in yystate. | `------------------------------------------------------------*/ - yynewstate: +yynewstate: /* In all cases, when you get here, the value and location stacks have just been pushed. So pushing a state here evens the stacks. */ yyssp++; - yysetstate: - *yyssp = yystate; + +/*--------------------------------------------------------------------. +| yysetstate -- set current state (the top of the stack) to yystate. | +`--------------------------------------------------------------------*/ +yysetstate: + YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + YY_ASSERT (0 <= yystate && yystate < YYNSTATES); + YY_IGNORE_USELESS_CAST_BEGIN + *yyssp = YY_CAST (yy_state_t, yystate); + YY_IGNORE_USELESS_CAST_END + YY_STACK_PRINT (yyss, yyssp); if (yyss + yystacksize - 1 <= yyssp) +#if !defined yyoverflow && !defined YYSTACK_RELOCATE + YYNOMEM; +#else { /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; + YYPTRDIFF_T yysize = yyssp - yyss + 1; -#ifdef yyoverflow +# if defined yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - - &yystacksize); - - yyss = yyss1; - yyvs = yyvs1; + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + yy_state_t *yyss1 = yyss; + YYSTYPE *yyvs1 = yyvs; + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * YYSIZEOF (*yyssp), + &yyvs1, yysize * YYSIZEOF (*yyvsp), + &yystacksize); + yyss = yyss1; + yyvs = yyvs1; } -#else /* no yyoverflow */ -# ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; -# else +# else /* defined YYSTACK_RELOCATE */ /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + YYNOMEM; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; + yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); - + yy_state_t *yyss1 = yyss; + union yyalloc *yyptr = + YY_CAST (union yyalloc *, + YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize)))); + if (! yyptr) + YYNOMEM; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); # undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); } # endif -#endif /* no yyoverflow */ yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; - - YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + YY_IGNORE_USELESS_CAST_BEGIN + YYDPRINTF ((stderr, "Stack size increased to %ld\n", + YY_CAST (long, yystacksize))); + YY_IGNORE_USELESS_CAST_END if (yyss + yystacksize - 1 <= yyssp) - YYABORT; + YYABORT; } +#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */ - YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + + if (yystate == YYFINAL) + YYACCEPT; goto yybackup; + /*-----------. | yybackup. | `-----------*/ yybackup: - /* Do appropriate processing given the current state. Read a - look-ahead token if we need one and don't already have one. */ + lookahead token if we need one and don't already have one. */ - /* First try to decide what to do without reference to look-ahead token. */ + /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; - if (yyn == YYPACT_NINF) + if (yypact_value_is_default (yyn)) goto yydefault; - /* Not known => get a look-ahead token if don't already have one. */ + /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ + /* YYCHAR is either empty, or end-of-input, or a valid lookahead. */ if (yychar == YYEMPTY) { - YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; + YYDPRINTF ((stderr, "Reading a token\n")); + yychar = yylex (); } if (yychar <= YYEOF) { - yychar = yytoken = YYEOF; + yychar = YYEOF; + yytoken = YYSYMBOL_YYEOF; YYDPRINTF ((stderr, "Now at end of input.\n")); } + else if (yychar == YYerror) + { + /* The scanner already issued an error message, process directly + to error recovery. But do not keep the error token as + lookahead, it is too special and may lead us to an endless + loop in error recovery. */ + yychar = YYUNDEF; + yytoken = YYSYMBOL_YYerror; + goto yyerrlab1; + } else { yytoken = YYTRANSLATE (yychar); @@ -1323,30 +1139,26 @@ yybackup: yyn = yytable[yyn]; if (yyn <= 0) { - if (yyn == 0 || yyn == YYTABLE_NINF) - goto yyerrlab; + if (yytable_value_is_error (yyn)) + goto yyerrlab; yyn = -yyn; goto yyreduce; } - if (yyn == YYFINAL) - YYACCEPT; - /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; - /* Shift the look-ahead token. */ + /* Shift the lookahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - - /* Discard the shifted token unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; - yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END + /* Discard the shifted token. */ + yychar = YYEMPTY; goto yynewstate; @@ -1361,14 +1173,14 @@ yydefault: /*-----------------------------. -| yyreduce -- Do a reduction. | +| yyreduce -- do a reduction. | `-----------------------------*/ yyreduce: /* yyn is the number of a rule to reduce with. */ yylen = yyr2[yyn]; /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. + '$$ = $1'. Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison @@ -1381,63 +1193,69 @@ yyreduce: YY_REDUCE_PRINT (yyn); switch (yyn) { - case 6: + case 6: /* id: ID STRING */ #line 74 "parse.y" - { - id_str = (yyvsp[(2) - (2)].string); + { + id_str = (yyvsp[0].string); } +#line 1202 "parse.c" break; - case 7: + case 7: /* et: ET STRING */ #line 80 "parse.y" - { - base_id = name2number((yyvsp[(2) - (2)].string)); - strlcpy(name, (yyvsp[(2) - (2)].string), sizeof(name)); - free((yyvsp[(2) - (2)].string)); + { + base_id = name2number((yyvsp[0].string)); + strlcpy(name, (yyvsp[0].string), sizeof(name)); + free((yyvsp[0].string)); } +#line 1212 "parse.c" break; - case 8: + case 8: /* et: ET STRING STRING */ #line 86 "parse.y" - { - base_id = name2number((yyvsp[(2) - (3)].string)); - strlcpy(name, (yyvsp[(3) - (3)].string), sizeof(name)); - free((yyvsp[(2) - (3)].string)); - free((yyvsp[(3) - (3)].string)); + { + base_id = name2number((yyvsp[-1].string)); + strlcpy(name, (yyvsp[0].string), sizeof(name)); + free((yyvsp[-1].string)); + free((yyvsp[0].string)); } +#line 1223 "parse.c" break; - case 11: + case 11: /* statement: INDEX NUMBER */ #line 99 "parse.y" - { - number = (yyvsp[(2) - (2)].number); + { + number = (yyvsp[0].number); } +#line 1231 "parse.c" break; - case 12: + case 12: /* statement: PREFIX STRING */ #line 103 "parse.y" - { + { free(prefix); - asprintf (&prefix, "%s_", (yyvsp[(2) - (2)].string)); + asprintf (&prefix, "%s_", (yyvsp[0].string)); if (prefix == NULL) errx(1, "malloc"); - free((yyvsp[(2) - (2)].string)); + free((yyvsp[0].string)); } +#line 1243 "parse.c" break; - case 13: + case 13: /* statement: PREFIX */ #line 111 "parse.y" - { + { prefix = realloc(prefix, 1); if (prefix == NULL) errx(1, "malloc"); *prefix = '\0'; } +#line 1254 "parse.c" break; - case 14: + case 14: /* statement: EC STRING ',' STRING */ #line 118 "parse.y" - { + { struct error_code *ec = malloc(sizeof(*ec)); if (ec == NULL) @@ -1446,121 +1264,98 @@ yyreduce: ec->next = NULL; ec->number = number; if(prefix && *prefix != '\0') { - asprintf (&ec->name, "%s%s", prefix, (yyvsp[(2) - (4)].string)); + asprintf (&ec->name, "%s%s", prefix, (yyvsp[-2].string)); if (ec->name == NULL) errx(1, "malloc"); - free((yyvsp[(2) - (4)].string)); + free((yyvsp[-2].string)); } else - ec->name = (yyvsp[(2) - (4)].string); - ec->string = (yyvsp[(4) - (4)].string); + ec->name = (yyvsp[-2].string); + ec->string = (yyvsp[0].string); APPEND(codes, ec); number++; } +#line 1278 "parse.c" break; - case 15: + case 15: /* statement: END */ #line 138 "parse.y" - { + { YYACCEPT; } +#line 1286 "parse.c" break; -/* Line 1267 of yacc.c. */ -#line 1471 "parse.c" +#line 1290 "parse.c" + default: break; } - YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); + /* User semantic actions sometimes alter yychar, and that requires + that yytoken be updated with the new translation. We take the + approach of translating immediately before every use of yytoken. + One alternative is translating here after every semantic action, + but that translation would be missed if the semantic action invokes + YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or + if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an + incorrect destructor might then be invoked immediately. In the + case of YYERROR or YYBACKUP, subsequent parser actions might lead + to an incorrect destructor call or verbose syntax error message + before the lookahead is translated. */ + YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, &yyloc); YYPOPSTACK (yylen); yylen = 0; - YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; - - /* Now `shift' the result of the reduction. Determine what state + /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTOKENS]; + { + const int yylhs = yyr1[yyn] - YYNTOKENS; + const int yyi = yypgoto[yylhs] + *yyssp; + yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp + ? yytable[yyi] + : yydefgoto[yylhs]); + } goto yynewstate; -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ +/*--------------------------------------. +| yyerrlab -- here on detecting error. | +`--------------------------------------*/ yyerrlab: + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = yychar == YYEMPTY ? YYSYMBOL_YYEMPTY : YYTRANSLATE (yychar); /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { ++yynerrs; -#if ! YYERROR_VERBOSE yyerror (YY_("syntax error")); -#else - { - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (yymsg); - } - else - { - yyerror (YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } - } -#endif } - - if (yyerrstatus == 3) { - /* If just tried and failed to reuse look-ahead token after an - error, discard it. */ + /* If just tried and failed to reuse lookahead token after an + error, discard it. */ if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } else - { - yydestruct ("Error: discarding", - yytoken, &yylval); - yychar = YYEMPTY; - } + { + yydestruct ("Error: discarding", + yytoken, &yylval); + yychar = YYEMPTY; + } } - /* Else will try to reuse look-ahead token after shifting the error + /* Else will try to reuse lookahead token after shifting the error token. */ goto yyerrlab1; @@ -1569,14 +1364,13 @@ yyerrlab: | yyerrorlab -- error raised explicitly by YYERROR. | `---------------------------------------------------*/ yyerrorlab: + /* Pacify compilers when the user code never invokes YYERROR and the + label yyerrorlab therefore never appears in user code. */ + if (0) + YYERROR; + ++yynerrs; - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) - goto yyerrorlab; - - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ YYPOPSTACK (yylen); yylen = 0; @@ -1589,42 +1383,42 @@ yyerrorlab: | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ + yyerrstatus = 3; /* Each real token shifted decrements this. */ + /* Pop stack until we find a state that shifts the error token. */ for (;;) { yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } + if (!yypact_value_is_default (yyn)) + { + yyn += YYSYMBOL_YYerror; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYSYMBOL_YYerror) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } /* Pop the current state because it cannot handle the error token. */ if (yyssp == yyss) - YYABORT; + YYABORT; yydestruct ("Error: popping", - yystos[yystate], yyvsp); + YY_ACCESSING_SYMBOL (yystate), yyvsp); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } - if (yyn == YYFINAL) - YYACCEPT; - + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); + YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp); yystate = yyn; goto yynewstate; @@ -1635,51 +1429,55 @@ yyerrlab1: `-------------------------------------*/ yyacceptlab: yyresult = 0; - goto yyreturn; + goto yyreturnlab; + /*-----------------------------------. | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ yyabortlab: yyresult = 1; - goto yyreturn; + goto yyreturnlab; -#ifndef yyoverflow -/*-------------------------------------------------. -| yyexhaustedlab -- memory exhaustion comes here. | -`-------------------------------------------------*/ + +/*-----------------------------------------------------------. +| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here. | +`-----------------------------------------------------------*/ yyexhaustedlab: yyerror (YY_("memory exhausted")); yyresult = 2; - /* Fall through. */ -#endif + goto yyreturnlab; + -yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval); - /* Do not reclaim the symbols of the rule which action triggered +/*----------------------------------------------------------. +| yyreturnlab -- parsing is finished, clean up and return. | +`----------------------------------------------------------*/ +yyreturnlab: + if (yychar != YYEMPTY) + { + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = YYTRANSLATE (yychar); + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval); + } + /* Do not reclaim the symbols of the rule whose action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); YY_STACK_PRINT (yyss, yyssp); while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); + YY_ACCESSING_SYMBOL (+*yyssp), yyvsp); YYPOPSTACK (1); } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif -#if YYERROR_VERBOSE - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); -#endif - /* Make sure YYID is used. */ - return YYID (yyresult); -} + return yyresult; +} #line 143 "parse.y" @@ -1714,4 +1512,3 @@ yyerror (char *s) { _lex_error_message ("%s\n", s); } - diff --git a/lib/com_err/parse.h b/lib/com_err/parse.h index 763a331f1621..578d24447643 100644 --- a/lib/com_err/parse.h +++ b/lib/com_err/parse.h @@ -1,14 +1,14 @@ -/* A Bison parser, made by GNU Bison 2.3. */ +/* A Bison parser, made by GNU Bison 3.8.2. */ -/* Skeleton interface for Bison's Yacc-like parsers in C +/* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, + Inc. - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,9 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -33,23 +31,45 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ -/* Tokens. */ +/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, + especially those whose name start with YY_ or yy_. They are + private implementation details that can be changed or removed. */ + +#ifndef YY_YY_PARSE_H_INCLUDED +# define YY_YY_PARSE_H_INCLUDED +/* Debug traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif +#if YYDEBUG +extern int yydebug; +#endif + +/* Token kinds. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - ET = 258, - INDEX = 259, - PREFIX = 260, - EC = 261, - ID = 262, - END = 263, - STRING = 264, - NUMBER = 265 - }; + enum yytokentype + { + YYEMPTY = -2, + YYEOF = 0, /* "end of file" */ + YYerror = 256, /* error */ + YYUNDEF = 257, /* "invalid token" */ + ET = 258, /* ET */ + INDEX = 259, /* INDEX */ + PREFIX = 260, /* PREFIX */ + EC = 261, /* EC */ + ID = 262, /* ID */ + END = 263, /* END */ + STRING = 264, /* STRING */ + NUMBER = 265 /* NUMBER */ + }; + typedef enum yytokentype yytoken_kind_t; #endif -/* Tokens. */ +/* Token kinds. */ +#define YYEMPTY -2 +#define YYEOF 0 +#define YYerror 256 +#define YYUNDEF 257 #define ET 258 #define INDEX 259 #define PREFIX 260 @@ -59,23 +79,28 @@ #define STRING 264 #define NUMBER 265 - - - +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -#line 54 "parse.y" +union YYSTYPE { +#line 54 "parse.y" + char *string; int number; -} -/* Line 1529 of yacc.c. */ -#line 74 "parse.h" - YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 + +#line 92 "parse.h" + +}; +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 +# define YYSTYPE_IS_DECLARED 1 #endif + extern YYSTYPE yylval; + +int yyparse (void); + + +#endif /* !YY_YY_PARSE_H_INCLUDED */ diff --git a/lib/gssapi/Makefile.in b/lib/gssapi/Makefile.in index 5778556cc70c..1a4b3d9c8470 100644 --- a/lib/gssapi/Makefile.in +++ b/lib/gssapi/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -107,7 +107,6 @@ subdir = lib/gssapi ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ $(top_srcdir)/cf/auth-modules.m4 \ - $(top_srcdir)/cf/broken-getaddrinfo.m4 \ $(top_srcdir)/cf/broken-glob.m4 \ $(top_srcdir)/cf/broken-realloc.m4 \ $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ @@ -157,6 +156,12 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \ + "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" \ + "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" \ + "$(DESTDIR)$(gssapidir)" +am__EXEEXT_1 = test_oid$(EXEEXT) test_names$(EXEEXT) test_cfx$(EXEEXT) +PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -184,10 +189,6 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" \ - "$(DESTDIR)$(gssapidir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = am__dirstamp = $(am__leading_dot)dirstamp @@ -288,8 +289,6 @@ am__v_lt_1 = libgssapi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libgssapi_la_LDFLAGS) $(LDFLAGS) -o $@ -am__EXEEXT_1 = test_oid$(EXEEXT) test_names$(EXEEXT) test_cfx$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) dist_gsstool_OBJECTS = gsstool.$(OBJEXT) nodist_gsstool_OBJECTS = gss-commands.$(OBJEXT) gsstool_OBJECTS = $(dist_gsstool_OBJECTS) $(nodist_gsstool_OBJECTS) @@ -356,7 +355,154 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/asn1_ContextFlags.Plo \ + ./$(DEPDIR)/asn1_GSSAPIContextToken.Plo \ + ./$(DEPDIR)/asn1_MechType.Plo \ + ./$(DEPDIR)/asn1_MechTypeList.Plo \ + ./$(DEPDIR)/asn1_NegHints.Plo \ + ./$(DEPDIR)/asn1_NegTokenInit.Plo \ + ./$(DEPDIR)/asn1_NegTokenInitWin.Plo \ + ./$(DEPDIR)/asn1_NegTokenResp.Plo \ + ./$(DEPDIR)/asn1_NegotiationToken.Plo \ + ./$(DEPDIR)/asn1_NegotiationTokenWin.Plo \ + ./$(DEPDIR)/gkrb5_err.Plo ./$(DEPDIR)/gss-commands.Po \ + ./$(DEPDIR)/gsstool.Po ./$(DEPDIR)/test_acquire_cred.Po \ + ./$(DEPDIR)/test_add_store_cred.Po ./$(DEPDIR)/test_common.Po \ + ./$(DEPDIR)/test_context.Po ./$(DEPDIR)/test_cred.Po \ + ./$(DEPDIR)/test_kcred.Po ./$(DEPDIR)/test_names.Po \ + ./$(DEPDIR)/test_ntlm.Po ./$(DEPDIR)/test_oid.Po \ + krb5/$(DEPDIR)/8003.Plo krb5/$(DEPDIR)/accept_sec_context.Plo \ + krb5/$(DEPDIR)/acquire_cred.Plo krb5/$(DEPDIR)/add_cred.Plo \ + krb5/$(DEPDIR)/address_to_krb5addr.Plo krb5/$(DEPDIR)/aeap.Plo \ + krb5/$(DEPDIR)/arcfour.Plo \ + krb5/$(DEPDIR)/authorize_localname.Plo \ + krb5/$(DEPDIR)/canonicalize_name.Plo \ + krb5/$(DEPDIR)/ccache_name.Plo krb5/$(DEPDIR)/cfx.Plo \ + krb5/$(DEPDIR)/compare_name.Plo krb5/$(DEPDIR)/compat.Plo \ + krb5/$(DEPDIR)/context_time.Plo krb5/$(DEPDIR)/copy_ccache.Plo \ + krb5/$(DEPDIR)/creds.Plo krb5/$(DEPDIR)/decapsulate.Plo \ + krb5/$(DEPDIR)/delete_sec_context.Plo \ + krb5/$(DEPDIR)/display_name.Plo \ + krb5/$(DEPDIR)/display_status.Plo \ + krb5/$(DEPDIR)/duplicate_name.Plo \ + krb5/$(DEPDIR)/encapsulate.Plo krb5/$(DEPDIR)/export_name.Plo \ + krb5/$(DEPDIR)/export_sec_context.Plo \ + krb5/$(DEPDIR)/external.Plo krb5/$(DEPDIR)/get_mic.Plo \ + krb5/$(DEPDIR)/import_name.Plo \ + krb5/$(DEPDIR)/import_sec_context.Plo \ + krb5/$(DEPDIR)/indicate_mechs.Plo krb5/$(DEPDIR)/init.Plo \ + krb5/$(DEPDIR)/init_sec_context.Plo \ + krb5/$(DEPDIR)/inquire_context.Plo \ + krb5/$(DEPDIR)/inquire_cred.Plo \ + krb5/$(DEPDIR)/inquire_cred_by_mech.Plo \ + krb5/$(DEPDIR)/inquire_cred_by_oid.Plo \ + krb5/$(DEPDIR)/inquire_mechs_for_name.Plo \ + krb5/$(DEPDIR)/inquire_names_for_mech.Plo \ + krb5/$(DEPDIR)/inquire_sec_context_by_oid.Plo \ + krb5/$(DEPDIR)/pname_to_uid.Plo krb5/$(DEPDIR)/prf.Plo \ + krb5/$(DEPDIR)/process_context_token.Plo \ + krb5/$(DEPDIR)/release_buffer.Plo \ + krb5/$(DEPDIR)/release_cred.Plo \ + krb5/$(DEPDIR)/release_name.Plo krb5/$(DEPDIR)/sequence.Plo \ + krb5/$(DEPDIR)/set_cred_option.Plo \ + krb5/$(DEPDIR)/set_sec_context_option.Plo \ + krb5/$(DEPDIR)/store_cred.Plo krb5/$(DEPDIR)/test_cfx.Po \ + krb5/$(DEPDIR)/ticket_flags.Plo krb5/$(DEPDIR)/unwrap.Plo \ + krb5/$(DEPDIR)/verify_mic.Plo krb5/$(DEPDIR)/wrap.Plo \ + mech/$(DEPDIR)/context.Plo mech/$(DEPDIR)/doxygen.Plo \ + mech/$(DEPDIR)/gss_accept_sec_context.Plo \ + mech/$(DEPDIR)/gss_acquire_cred.Plo \ + mech/$(DEPDIR)/gss_acquire_cred_ext.Plo \ + mech/$(DEPDIR)/gss_acquire_cred_with_password.Plo \ + mech/$(DEPDIR)/gss_add_cred.Plo \ + mech/$(DEPDIR)/gss_add_cred_with_password.Plo \ + mech/$(DEPDIR)/gss_add_oid_set_member.Plo \ + mech/$(DEPDIR)/gss_aeap.Plo \ + mech/$(DEPDIR)/gss_authorize_localname.Plo \ + mech/$(DEPDIR)/gss_buffer_set.Plo \ + mech/$(DEPDIR)/gss_canonicalize_name.Plo \ + mech/$(DEPDIR)/gss_compare_name.Plo \ + mech/$(DEPDIR)/gss_context_time.Plo \ + mech/$(DEPDIR)/gss_create_empty_oid_set.Plo \ + mech/$(DEPDIR)/gss_cred.Plo \ + mech/$(DEPDIR)/gss_decapsulate_token.Plo \ + mech/$(DEPDIR)/gss_delete_name_attribute.Plo \ + mech/$(DEPDIR)/gss_delete_sec_context.Plo \ + mech/$(DEPDIR)/gss_display_name.Plo \ + mech/$(DEPDIR)/gss_display_name_ext.Plo \ + mech/$(DEPDIR)/gss_display_status.Plo \ + mech/$(DEPDIR)/gss_duplicate_name.Plo \ + mech/$(DEPDIR)/gss_duplicate_oid.Plo \ + mech/$(DEPDIR)/gss_encapsulate_token.Plo \ + mech/$(DEPDIR)/gss_export_name.Plo \ + mech/$(DEPDIR)/gss_export_name_composite.Plo \ + mech/$(DEPDIR)/gss_export_sec_context.Plo \ + mech/$(DEPDIR)/gss_get_mic.Plo \ + mech/$(DEPDIR)/gss_get_name_attribute.Plo \ + mech/$(DEPDIR)/gss_import_name.Plo \ + mech/$(DEPDIR)/gss_import_sec_context.Plo \ + mech/$(DEPDIR)/gss_indicate_mechs.Plo \ + mech/$(DEPDIR)/gss_init_sec_context.Plo \ + mech/$(DEPDIR)/gss_inquire_context.Plo \ + mech/$(DEPDIR)/gss_inquire_cred.Plo \ + mech/$(DEPDIR)/gss_inquire_cred_by_mech.Plo \ + mech/$(DEPDIR)/gss_inquire_cred_by_oid.Plo \ + mech/$(DEPDIR)/gss_inquire_mechs_for_name.Plo \ + mech/$(DEPDIR)/gss_inquire_name.Plo \ + mech/$(DEPDIR)/gss_inquire_names_for_mech.Plo \ + mech/$(DEPDIR)/gss_inquire_sec_context_by_oid.Plo \ + mech/$(DEPDIR)/gss_krb5.Plo mech/$(DEPDIR)/gss_mech_switch.Plo \ + mech/$(DEPDIR)/gss_mo.Plo mech/$(DEPDIR)/gss_names.Plo \ + mech/$(DEPDIR)/gss_oid.Plo mech/$(DEPDIR)/gss_oid_equal.Plo \ + mech/$(DEPDIR)/gss_oid_to_str.Plo \ + mech/$(DEPDIR)/gss_pname_to_uid.Plo \ + mech/$(DEPDIR)/gss_process_context_token.Plo \ + mech/$(DEPDIR)/gss_pseudo_random.Plo \ + mech/$(DEPDIR)/gss_release_buffer.Plo \ + mech/$(DEPDIR)/gss_release_cred.Plo \ + mech/$(DEPDIR)/gss_release_name.Plo \ + mech/$(DEPDIR)/gss_release_oid.Plo \ + mech/$(DEPDIR)/gss_release_oid_set.Plo \ + mech/$(DEPDIR)/gss_seal.Plo \ + mech/$(DEPDIR)/gss_set_cred_option.Plo \ + mech/$(DEPDIR)/gss_set_name_attribute.Plo \ + mech/$(DEPDIR)/gss_set_sec_context_option.Plo \ + mech/$(DEPDIR)/gss_sign.Plo mech/$(DEPDIR)/gss_store_cred.Plo \ + mech/$(DEPDIR)/gss_test_oid_set_member.Plo \ + mech/$(DEPDIR)/gss_unseal.Plo mech/$(DEPDIR)/gss_unwrap.Plo \ + mech/$(DEPDIR)/gss_utils.Plo mech/$(DEPDIR)/gss_verify.Plo \ + mech/$(DEPDIR)/gss_verify_mic.Plo mech/$(DEPDIR)/gss_wrap.Plo \ + mech/$(DEPDIR)/gss_wrap_size_limit.Plo \ + ntlm/$(DEPDIR)/accept_sec_context.Plo \ + ntlm/$(DEPDIR)/acquire_cred.Plo ntlm/$(DEPDIR)/add_cred.Plo \ + ntlm/$(DEPDIR)/canonicalize_name.Plo \ + ntlm/$(DEPDIR)/compare_name.Plo \ + ntlm/$(DEPDIR)/context_time.Plo ntlm/$(DEPDIR)/creds.Plo \ + ntlm/$(DEPDIR)/crypto.Plo \ + ntlm/$(DEPDIR)/delete_sec_context.Plo \ + ntlm/$(DEPDIR)/display_name.Plo \ + ntlm/$(DEPDIR)/display_status.Plo \ + ntlm/$(DEPDIR)/duplicate_name.Plo \ + ntlm/$(DEPDIR)/export_name.Plo \ + ntlm/$(DEPDIR)/export_sec_context.Plo \ + ntlm/$(DEPDIR)/external.Plo ntlm/$(DEPDIR)/import_name.Plo \ + ntlm/$(DEPDIR)/import_sec_context.Plo \ + ntlm/$(DEPDIR)/indicate_mechs.Plo \ + ntlm/$(DEPDIR)/init_sec_context.Plo \ + ntlm/$(DEPDIR)/inquire_context.Plo \ + ntlm/$(DEPDIR)/inquire_cred_by_mech.Plo \ + ntlm/$(DEPDIR)/inquire_mechs_for_name.Plo \ + ntlm/$(DEPDIR)/inquire_names_for_mech.Plo \ + ntlm/$(DEPDIR)/inquire_sec_context_by_oid.Plo \ + ntlm/$(DEPDIR)/iter_cred.Plo ntlm/$(DEPDIR)/kdc.Plo \ + ntlm/$(DEPDIR)/process_context_token.Plo \ + ntlm/$(DEPDIR)/release_cred.Plo \ + ntlm/$(DEPDIR)/release_name.Plo \ + spnego/$(DEPDIR)/accept_sec_context.Plo \ + spnego/$(DEPDIR)/compat.Plo spnego/$(DEPDIR)/context_stubs.Plo \ + spnego/$(DEPDIR)/cred_stubs.Plo spnego/$(DEPDIR)/external.Plo \ + spnego/$(DEPDIR)/init_sec_context.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -412,8 +558,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no @@ -569,6 +713,7 @@ am__set_TESTS_bases = \ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck TEST_SUITE_LOG = test-suite.log @@ -616,9 +761,12 @@ CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLANG_FORMAT = @CLANG_FORMAT@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DB1LIB = @DB1LIB@ DB3LIB = @DB3LIB@ @@ -636,8 +784,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GCD_MIG = @GCD_MIG@ GREP = @GREP@ GROFF = @GROFF@ @@ -746,6 +896,11 @@ PKG_CONFIG = @PKG_CONFIG@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LDADD = @PTHREAD_LDADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -805,9 +960,14 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1160,8 +1320,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty): @@ -1173,6 +1333,73 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -1521,73 +1748,6 @@ spnego/init_sec_context.lo: spnego/$(am__dirstamp) \ libgssapi.la: $(libgssapi_la_OBJECTS) $(libgssapi_la_DEPENDENCIES) $(EXTRA_libgssapi_la_DEPENDENCIES) $(AM_V_CCLD)$(libgssapi_la_LINK) -rpath $(libdir) $(libgssapi_la_OBJECTS) $(libgssapi_la_LIBADD) $(LIBS) -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - || test -f $$p1 \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list gsstool$(EXEEXT): $(gsstool_OBJECTS) $(gsstool_DEPENDENCIES) $(EXTRA_gsstool_DEPENDENCIES) @rm -f gsstool$(EXEEXT) @@ -1645,188 +1805,194 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_ContextFlags.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_GSSAPIContextToken.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_MechType.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_MechTypeList.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_NegHints.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_NegTokenInit.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_NegTokenInitWin.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_NegTokenResp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_NegotiationToken.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_NegotiationTokenWin.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gkrb5_err.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gss-commands.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsstool.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_acquire_cred.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_add_store_cred.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_common.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_context.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cred.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_kcred.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_names.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ntlm.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_oid.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/8003.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/accept_sec_context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/acquire_cred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/add_cred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/address_to_krb5addr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/aeap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/arcfour.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/authorize_localname.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/canonicalize_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/ccache_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/cfx.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/compare_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/compat.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/context_time.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/copy_ccache.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/creds.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/decapsulate.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/delete_sec_context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/display_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/display_status.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/duplicate_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/encapsulate.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/export_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/export_sec_context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/external.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/get_mic.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/import_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/import_sec_context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/indicate_mechs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/init.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/init_sec_context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/inquire_context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/inquire_cred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/inquire_cred_by_mech.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/inquire_cred_by_oid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/inquire_mechs_for_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/inquire_names_for_mech.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/inquire_sec_context_by_oid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/pname_to_uid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/prf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/process_context_token.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/release_buffer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/release_cred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/release_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/sequence.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/set_cred_option.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/set_sec_context_option.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/store_cred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/test_cfx.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/ticket_flags.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/unwrap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/verify_mic.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/wrap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/doxygen.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_accept_sec_context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_acquire_cred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_acquire_cred_ext.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_acquire_cred_with_password.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_add_cred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_add_cred_with_password.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_add_oid_set_member.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_aeap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_authorize_localname.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_buffer_set.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_canonicalize_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_compare_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_context_time.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_create_empty_oid_set.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_cred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_decapsulate_token.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_delete_name_attribute.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_delete_sec_context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_display_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_display_name_ext.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_display_status.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_duplicate_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_duplicate_oid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_encapsulate_token.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_export_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_export_name_composite.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_export_sec_context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_get_mic.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_get_name_attribute.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_import_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_import_sec_context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_indicate_mechs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_init_sec_context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_inquire_context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_inquire_cred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_inquire_cred_by_mech.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_inquire_cred_by_oid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_inquire_mechs_for_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_inquire_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_inquire_names_for_mech.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_inquire_sec_context_by_oid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_krb5.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_mech_switch.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_mo.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_names.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_oid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_oid_equal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_oid_to_str.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_pname_to_uid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_process_context_token.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_pseudo_random.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_release_buffer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_release_cred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_release_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_release_oid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_release_oid_set.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_seal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_set_cred_option.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_set_name_attribute.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_set_sec_context_option.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_sign.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_store_cred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_test_oid_set_member.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_unseal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_unwrap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_verify.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_verify_mic.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_wrap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_wrap_size_limit.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/accept_sec_context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/acquire_cred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/add_cred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/canonicalize_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/compare_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/context_time.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/creds.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/crypto.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/delete_sec_context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/display_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/display_status.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/duplicate_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/export_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/export_sec_context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/external.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/import_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/import_sec_context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/indicate_mechs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/init_sec_context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/inquire_context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/inquire_cred_by_mech.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/inquire_mechs_for_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/inquire_names_for_mech.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/inquire_sec_context_by_oid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/iter_cred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/kdc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/process_context_token.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/release_cred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/release_name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@spnego/$(DEPDIR)/accept_sec_context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@spnego/$(DEPDIR)/compat.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@spnego/$(DEPDIR)/context_stubs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@spnego/$(DEPDIR)/cred_stubs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@spnego/$(DEPDIR)/external.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@spnego/$(DEPDIR)/init_sec_context.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_ContextFlags.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_GSSAPIContextToken.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_MechType.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_MechTypeList.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_NegHints.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_NegTokenInit.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_NegTokenInitWin.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_NegTokenResp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_NegotiationToken.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_NegotiationTokenWin.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gkrb5_err.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gss-commands.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsstool.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_acquire_cred.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_add_store_cred.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_common.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_context.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cred.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_kcred.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_names.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ntlm.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_oid.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/8003.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/accept_sec_context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/acquire_cred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/add_cred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/address_to_krb5addr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/aeap.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/arcfour.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/authorize_localname.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/canonicalize_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/ccache_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/cfx.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/compare_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/compat.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/context_time.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/copy_ccache.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/creds.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/decapsulate.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/delete_sec_context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/display_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/display_status.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/duplicate_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/encapsulate.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/export_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/export_sec_context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/external.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/get_mic.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/import_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/import_sec_context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/indicate_mechs.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/init.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/init_sec_context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/inquire_context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/inquire_cred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/inquire_cred_by_mech.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/inquire_cred_by_oid.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/inquire_mechs_for_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/inquire_names_for_mech.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/inquire_sec_context_by_oid.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/pname_to_uid.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/prf.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/process_context_token.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/release_buffer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/release_cred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/release_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/sequence.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/set_cred_option.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/set_sec_context_option.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/store_cred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/test_cfx.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/ticket_flags.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/unwrap.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/verify_mic.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@krb5/$(DEPDIR)/wrap.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/doxygen.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_accept_sec_context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_acquire_cred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_acquire_cred_ext.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_acquire_cred_with_password.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_add_cred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_add_cred_with_password.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_add_oid_set_member.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_aeap.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_authorize_localname.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_buffer_set.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_canonicalize_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_compare_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_context_time.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_create_empty_oid_set.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_cred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_decapsulate_token.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_delete_name_attribute.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_delete_sec_context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_display_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_display_name_ext.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_display_status.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_duplicate_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_duplicate_oid.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_encapsulate_token.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_export_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_export_name_composite.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_export_sec_context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_get_mic.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_get_name_attribute.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_import_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_import_sec_context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_indicate_mechs.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_init_sec_context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_inquire_context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_inquire_cred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_inquire_cred_by_mech.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_inquire_cred_by_oid.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_inquire_mechs_for_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_inquire_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_inquire_names_for_mech.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_inquire_sec_context_by_oid.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_krb5.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_mech_switch.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_mo.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_names.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_oid.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_oid_equal.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_oid_to_str.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_pname_to_uid.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_process_context_token.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_pseudo_random.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_release_buffer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_release_cred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_release_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_release_oid.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_release_oid_set.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_seal.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_set_cred_option.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_set_name_attribute.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_set_sec_context_option.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_sign.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_store_cred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_test_oid_set_member.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_unseal.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_unwrap.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_utils.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_verify.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_verify_mic.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_wrap.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@mech/$(DEPDIR)/gss_wrap_size_limit.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/accept_sec_context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/acquire_cred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/add_cred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/canonicalize_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/compare_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/context_time.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/creds.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/crypto.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/delete_sec_context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/display_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/display_status.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/duplicate_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/export_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/export_sec_context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/external.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/import_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/import_sec_context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/indicate_mechs.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/init_sec_context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/inquire_context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/inquire_cred_by_mech.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/inquire_mechs_for_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/inquire_names_for_mech.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/inquire_sec_context_by_oid.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/iter_cred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/kdc.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/process_context_token.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/release_cred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@ntlm/$(DEPDIR)/release_name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@spnego/$(DEPDIR)/accept_sec_context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@spnego/$(DEPDIR)/compat.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@spnego/$(DEPDIR)/context_stubs.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@spnego/$(DEPDIR)/cred_stubs.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@spnego/$(DEPDIR)/external.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@spnego/$(DEPDIR)/init_sec_context.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -2173,7 +2339,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ @@ -2186,7 +2352,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: $(check_PROGRAMS) @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -2242,8 +2408,10 @@ test_cfx.log: test_cfx$(EXEEXT) @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -2281,17 +2449,20 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) \ +all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(MANS) $(HEADERS) \ all-local install-binPROGRAMS: install-libLTLIBRARIES +install-checkPROGRAMS: install-libLTLIBRARIES + installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(gssapidir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(gssapidir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -2340,7 +2511,188 @@ clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) krb5/$(DEPDIR) mech/$(DEPDIR) ntlm/$(DEPDIR) spnego/$(DEPDIR) + -rm -f ./$(DEPDIR)/asn1_ContextFlags.Plo + -rm -f ./$(DEPDIR)/asn1_GSSAPIContextToken.Plo + -rm -f ./$(DEPDIR)/asn1_MechType.Plo + -rm -f ./$(DEPDIR)/asn1_MechTypeList.Plo + -rm -f ./$(DEPDIR)/asn1_NegHints.Plo + -rm -f ./$(DEPDIR)/asn1_NegTokenInit.Plo + -rm -f ./$(DEPDIR)/asn1_NegTokenInitWin.Plo + -rm -f ./$(DEPDIR)/asn1_NegTokenResp.Plo + -rm -f ./$(DEPDIR)/asn1_NegotiationToken.Plo + -rm -f ./$(DEPDIR)/asn1_NegotiationTokenWin.Plo + -rm -f ./$(DEPDIR)/gkrb5_err.Plo + -rm -f ./$(DEPDIR)/gss-commands.Po + -rm -f ./$(DEPDIR)/gsstool.Po + -rm -f ./$(DEPDIR)/test_acquire_cred.Po + -rm -f ./$(DEPDIR)/test_add_store_cred.Po + -rm -f ./$(DEPDIR)/test_common.Po + -rm -f ./$(DEPDIR)/test_context.Po + -rm -f ./$(DEPDIR)/test_cred.Po + -rm -f ./$(DEPDIR)/test_kcred.Po + -rm -f ./$(DEPDIR)/test_names.Po + -rm -f ./$(DEPDIR)/test_ntlm.Po + -rm -f ./$(DEPDIR)/test_oid.Po + -rm -f krb5/$(DEPDIR)/8003.Plo + -rm -f krb5/$(DEPDIR)/accept_sec_context.Plo + -rm -f krb5/$(DEPDIR)/acquire_cred.Plo + -rm -f krb5/$(DEPDIR)/add_cred.Plo + -rm -f krb5/$(DEPDIR)/address_to_krb5addr.Plo + -rm -f krb5/$(DEPDIR)/aeap.Plo + -rm -f krb5/$(DEPDIR)/arcfour.Plo + -rm -f krb5/$(DEPDIR)/authorize_localname.Plo + -rm -f krb5/$(DEPDIR)/canonicalize_name.Plo + -rm -f krb5/$(DEPDIR)/ccache_name.Plo + -rm -f krb5/$(DEPDIR)/cfx.Plo + -rm -f krb5/$(DEPDIR)/compare_name.Plo + -rm -f krb5/$(DEPDIR)/compat.Plo + -rm -f krb5/$(DEPDIR)/context_time.Plo + -rm -f krb5/$(DEPDIR)/copy_ccache.Plo + -rm -f krb5/$(DEPDIR)/creds.Plo + -rm -f krb5/$(DEPDIR)/decapsulate.Plo + -rm -f krb5/$(DEPDIR)/delete_sec_context.Plo + -rm -f krb5/$(DEPDIR)/display_name.Plo + -rm -f krb5/$(DEPDIR)/display_status.Plo + -rm -f krb5/$(DEPDIR)/duplicate_name.Plo + -rm -f krb5/$(DEPDIR)/encapsulate.Plo + -rm -f krb5/$(DEPDIR)/export_name.Plo + -rm -f krb5/$(DEPDIR)/export_sec_context.Plo + -rm -f krb5/$(DEPDIR)/external.Plo + -rm -f krb5/$(DEPDIR)/get_mic.Plo + -rm -f krb5/$(DEPDIR)/import_name.Plo + -rm -f krb5/$(DEPDIR)/import_sec_context.Plo + -rm -f krb5/$(DEPDIR)/indicate_mechs.Plo + -rm -f krb5/$(DEPDIR)/init.Plo + -rm -f krb5/$(DEPDIR)/init_sec_context.Plo + -rm -f krb5/$(DEPDIR)/inquire_context.Plo + -rm -f krb5/$(DEPDIR)/inquire_cred.Plo + -rm -f krb5/$(DEPDIR)/inquire_cred_by_mech.Plo + -rm -f krb5/$(DEPDIR)/inquire_cred_by_oid.Plo + -rm -f krb5/$(DEPDIR)/inquire_mechs_for_name.Plo + -rm -f krb5/$(DEPDIR)/inquire_names_for_mech.Plo + -rm -f krb5/$(DEPDIR)/inquire_sec_context_by_oid.Plo + -rm -f krb5/$(DEPDIR)/pname_to_uid.Plo + -rm -f krb5/$(DEPDIR)/prf.Plo + -rm -f krb5/$(DEPDIR)/process_context_token.Plo + -rm -f krb5/$(DEPDIR)/release_buffer.Plo + -rm -f krb5/$(DEPDIR)/release_cred.Plo + -rm -f krb5/$(DEPDIR)/release_name.Plo + -rm -f krb5/$(DEPDIR)/sequence.Plo + -rm -f krb5/$(DEPDIR)/set_cred_option.Plo + -rm -f krb5/$(DEPDIR)/set_sec_context_option.Plo + -rm -f krb5/$(DEPDIR)/store_cred.Plo + -rm -f krb5/$(DEPDIR)/test_cfx.Po + -rm -f krb5/$(DEPDIR)/ticket_flags.Plo + -rm -f krb5/$(DEPDIR)/unwrap.Plo + -rm -f krb5/$(DEPDIR)/verify_mic.Plo + -rm -f krb5/$(DEPDIR)/wrap.Plo + -rm -f mech/$(DEPDIR)/context.Plo + -rm -f mech/$(DEPDIR)/doxygen.Plo + -rm -f mech/$(DEPDIR)/gss_accept_sec_context.Plo + -rm -f mech/$(DEPDIR)/gss_acquire_cred.Plo + -rm -f mech/$(DEPDIR)/gss_acquire_cred_ext.Plo + -rm -f mech/$(DEPDIR)/gss_acquire_cred_with_password.Plo + -rm -f mech/$(DEPDIR)/gss_add_cred.Plo + -rm -f mech/$(DEPDIR)/gss_add_cred_with_password.Plo + -rm -f mech/$(DEPDIR)/gss_add_oid_set_member.Plo + -rm -f mech/$(DEPDIR)/gss_aeap.Plo + -rm -f mech/$(DEPDIR)/gss_authorize_localname.Plo + -rm -f mech/$(DEPDIR)/gss_buffer_set.Plo + -rm -f mech/$(DEPDIR)/gss_canonicalize_name.Plo + -rm -f mech/$(DEPDIR)/gss_compare_name.Plo + -rm -f mech/$(DEPDIR)/gss_context_time.Plo + -rm -f mech/$(DEPDIR)/gss_create_empty_oid_set.Plo + -rm -f mech/$(DEPDIR)/gss_cred.Plo + -rm -f mech/$(DEPDIR)/gss_decapsulate_token.Plo + -rm -f mech/$(DEPDIR)/gss_delete_name_attribute.Plo + -rm -f mech/$(DEPDIR)/gss_delete_sec_context.Plo + -rm -f mech/$(DEPDIR)/gss_display_name.Plo + -rm -f mech/$(DEPDIR)/gss_display_name_ext.Plo + -rm -f mech/$(DEPDIR)/gss_display_status.Plo + -rm -f mech/$(DEPDIR)/gss_duplicate_name.Plo + -rm -f mech/$(DEPDIR)/gss_duplicate_oid.Plo + -rm -f mech/$(DEPDIR)/gss_encapsulate_token.Plo + -rm -f mech/$(DEPDIR)/gss_export_name.Plo + -rm -f mech/$(DEPDIR)/gss_export_name_composite.Plo + -rm -f mech/$(DEPDIR)/gss_export_sec_context.Plo + -rm -f mech/$(DEPDIR)/gss_get_mic.Plo + -rm -f mech/$(DEPDIR)/gss_get_name_attribute.Plo + -rm -f mech/$(DEPDIR)/gss_import_name.Plo + -rm -f mech/$(DEPDIR)/gss_import_sec_context.Plo + -rm -f mech/$(DEPDIR)/gss_indicate_mechs.Plo + -rm -f mech/$(DEPDIR)/gss_init_sec_context.Plo + -rm -f mech/$(DEPDIR)/gss_inquire_context.Plo + -rm -f mech/$(DEPDIR)/gss_inquire_cred.Plo + -rm -f mech/$(DEPDIR)/gss_inquire_cred_by_mech.Plo + -rm -f mech/$(DEPDIR)/gss_inquire_cred_by_oid.Plo + -rm -f mech/$(DEPDIR)/gss_inquire_mechs_for_name.Plo + -rm -f mech/$(DEPDIR)/gss_inquire_name.Plo + -rm -f mech/$(DEPDIR)/gss_inquire_names_for_mech.Plo + -rm -f mech/$(DEPDIR)/gss_inquire_sec_context_by_oid.Plo + -rm -f mech/$(DEPDIR)/gss_krb5.Plo + -rm -f mech/$(DEPDIR)/gss_mech_switch.Plo + -rm -f mech/$(DEPDIR)/gss_mo.Plo + -rm -f mech/$(DEPDIR)/gss_names.Plo + -rm -f mech/$(DEPDIR)/gss_oid.Plo + -rm -f mech/$(DEPDIR)/gss_oid_equal.Plo + -rm -f mech/$(DEPDIR)/gss_oid_to_str.Plo + -rm -f mech/$(DEPDIR)/gss_pname_to_uid.Plo + -rm -f mech/$(DEPDIR)/gss_process_context_token.Plo + -rm -f mech/$(DEPDIR)/gss_pseudo_random.Plo + -rm -f mech/$(DEPDIR)/gss_release_buffer.Plo + -rm -f mech/$(DEPDIR)/gss_release_cred.Plo + -rm -f mech/$(DEPDIR)/gss_release_name.Plo + -rm -f mech/$(DEPDIR)/gss_release_oid.Plo + -rm -f mech/$(DEPDIR)/gss_release_oid_set.Plo + -rm -f mech/$(DEPDIR)/gss_seal.Plo + -rm -f mech/$(DEPDIR)/gss_set_cred_option.Plo + -rm -f mech/$(DEPDIR)/gss_set_name_attribute.Plo + -rm -f mech/$(DEPDIR)/gss_set_sec_context_option.Plo + -rm -f mech/$(DEPDIR)/gss_sign.Plo + -rm -f mech/$(DEPDIR)/gss_store_cred.Plo + -rm -f mech/$(DEPDIR)/gss_test_oid_set_member.Plo + -rm -f mech/$(DEPDIR)/gss_unseal.Plo + -rm -f mech/$(DEPDIR)/gss_unwrap.Plo + -rm -f mech/$(DEPDIR)/gss_utils.Plo + -rm -f mech/$(DEPDIR)/gss_verify.Plo + -rm -f mech/$(DEPDIR)/gss_verify_mic.Plo + -rm -f mech/$(DEPDIR)/gss_wrap.Plo + -rm -f mech/$(DEPDIR)/gss_wrap_size_limit.Plo + -rm -f ntlm/$(DEPDIR)/accept_sec_context.Plo + -rm -f ntlm/$(DEPDIR)/acquire_cred.Plo + -rm -f ntlm/$(DEPDIR)/add_cred.Plo + -rm -f ntlm/$(DEPDIR)/canonicalize_name.Plo + -rm -f ntlm/$(DEPDIR)/compare_name.Plo + -rm -f ntlm/$(DEPDIR)/context_time.Plo + -rm -f ntlm/$(DEPDIR)/creds.Plo + -rm -f ntlm/$(DEPDIR)/crypto.Plo + -rm -f ntlm/$(DEPDIR)/delete_sec_context.Plo + -rm -f ntlm/$(DEPDIR)/display_name.Plo + -rm -f ntlm/$(DEPDIR)/display_status.Plo + -rm -f ntlm/$(DEPDIR)/duplicate_name.Plo + -rm -f ntlm/$(DEPDIR)/export_name.Plo + -rm -f ntlm/$(DEPDIR)/export_sec_context.Plo + -rm -f ntlm/$(DEPDIR)/external.Plo + -rm -f ntlm/$(DEPDIR)/import_name.Plo + -rm -f ntlm/$(DEPDIR)/import_sec_context.Plo + -rm -f ntlm/$(DEPDIR)/indicate_mechs.Plo + -rm -f ntlm/$(DEPDIR)/init_sec_context.Plo + -rm -f ntlm/$(DEPDIR)/inquire_context.Plo + -rm -f ntlm/$(DEPDIR)/inquire_cred_by_mech.Plo + -rm -f ntlm/$(DEPDIR)/inquire_mechs_for_name.Plo + -rm -f ntlm/$(DEPDIR)/inquire_names_for_mech.Plo + -rm -f ntlm/$(DEPDIR)/inquire_sec_context_by_oid.Plo + -rm -f ntlm/$(DEPDIR)/iter_cred.Plo + -rm -f ntlm/$(DEPDIR)/kdc.Plo + -rm -f ntlm/$(DEPDIR)/process_context_token.Plo + -rm -f ntlm/$(DEPDIR)/release_cred.Plo + -rm -f ntlm/$(DEPDIR)/release_name.Plo + -rm -f spnego/$(DEPDIR)/accept_sec_context.Plo + -rm -f spnego/$(DEPDIR)/compat.Plo + -rm -f spnego/$(DEPDIR)/context_stubs.Plo + -rm -f spnego/$(DEPDIR)/cred_stubs.Plo + -rm -f spnego/$(DEPDIR)/external.Plo + -rm -f spnego/$(DEPDIR)/init_sec_context.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -2389,7 +2741,188 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) krb5/$(DEPDIR) mech/$(DEPDIR) ntlm/$(DEPDIR) spnego/$(DEPDIR) + -rm -f ./$(DEPDIR)/asn1_ContextFlags.Plo + -rm -f ./$(DEPDIR)/asn1_GSSAPIContextToken.Plo + -rm -f ./$(DEPDIR)/asn1_MechType.Plo + -rm -f ./$(DEPDIR)/asn1_MechTypeList.Plo + -rm -f ./$(DEPDIR)/asn1_NegHints.Plo + -rm -f ./$(DEPDIR)/asn1_NegTokenInit.Plo + -rm -f ./$(DEPDIR)/asn1_NegTokenInitWin.Plo + -rm -f ./$(DEPDIR)/asn1_NegTokenResp.Plo + -rm -f ./$(DEPDIR)/asn1_NegotiationToken.Plo + -rm -f ./$(DEPDIR)/asn1_NegotiationTokenWin.Plo + -rm -f ./$(DEPDIR)/gkrb5_err.Plo + -rm -f ./$(DEPDIR)/gss-commands.Po + -rm -f ./$(DEPDIR)/gsstool.Po + -rm -f ./$(DEPDIR)/test_acquire_cred.Po + -rm -f ./$(DEPDIR)/test_add_store_cred.Po + -rm -f ./$(DEPDIR)/test_common.Po + -rm -f ./$(DEPDIR)/test_context.Po + -rm -f ./$(DEPDIR)/test_cred.Po + -rm -f ./$(DEPDIR)/test_kcred.Po + -rm -f ./$(DEPDIR)/test_names.Po + -rm -f ./$(DEPDIR)/test_ntlm.Po + -rm -f ./$(DEPDIR)/test_oid.Po + -rm -f krb5/$(DEPDIR)/8003.Plo + -rm -f krb5/$(DEPDIR)/accept_sec_context.Plo + -rm -f krb5/$(DEPDIR)/acquire_cred.Plo + -rm -f krb5/$(DEPDIR)/add_cred.Plo + -rm -f krb5/$(DEPDIR)/address_to_krb5addr.Plo + -rm -f krb5/$(DEPDIR)/aeap.Plo + -rm -f krb5/$(DEPDIR)/arcfour.Plo + -rm -f krb5/$(DEPDIR)/authorize_localname.Plo + -rm -f krb5/$(DEPDIR)/canonicalize_name.Plo + -rm -f krb5/$(DEPDIR)/ccache_name.Plo + -rm -f krb5/$(DEPDIR)/cfx.Plo + -rm -f krb5/$(DEPDIR)/compare_name.Plo + -rm -f krb5/$(DEPDIR)/compat.Plo + -rm -f krb5/$(DEPDIR)/context_time.Plo + -rm -f krb5/$(DEPDIR)/copy_ccache.Plo + -rm -f krb5/$(DEPDIR)/creds.Plo + -rm -f krb5/$(DEPDIR)/decapsulate.Plo + -rm -f krb5/$(DEPDIR)/delete_sec_context.Plo + -rm -f krb5/$(DEPDIR)/display_name.Plo + -rm -f krb5/$(DEPDIR)/display_status.Plo + -rm -f krb5/$(DEPDIR)/duplicate_name.Plo + -rm -f krb5/$(DEPDIR)/encapsulate.Plo + -rm -f krb5/$(DEPDIR)/export_name.Plo + -rm -f krb5/$(DEPDIR)/export_sec_context.Plo + -rm -f krb5/$(DEPDIR)/external.Plo + -rm -f krb5/$(DEPDIR)/get_mic.Plo + -rm -f krb5/$(DEPDIR)/import_name.Plo + -rm -f krb5/$(DEPDIR)/import_sec_context.Plo + -rm -f krb5/$(DEPDIR)/indicate_mechs.Plo + -rm -f krb5/$(DEPDIR)/init.Plo + -rm -f krb5/$(DEPDIR)/init_sec_context.Plo + -rm -f krb5/$(DEPDIR)/inquire_context.Plo + -rm -f krb5/$(DEPDIR)/inquire_cred.Plo + -rm -f krb5/$(DEPDIR)/inquire_cred_by_mech.Plo + -rm -f krb5/$(DEPDIR)/inquire_cred_by_oid.Plo + -rm -f krb5/$(DEPDIR)/inquire_mechs_for_name.Plo + -rm -f krb5/$(DEPDIR)/inquire_names_for_mech.Plo + -rm -f krb5/$(DEPDIR)/inquire_sec_context_by_oid.Plo + -rm -f krb5/$(DEPDIR)/pname_to_uid.Plo + -rm -f krb5/$(DEPDIR)/prf.Plo + -rm -f krb5/$(DEPDIR)/process_context_token.Plo + -rm -f krb5/$(DEPDIR)/release_buffer.Plo + -rm -f krb5/$(DEPDIR)/release_cred.Plo + -rm -f krb5/$(DEPDIR)/release_name.Plo + -rm -f krb5/$(DEPDIR)/sequence.Plo + -rm -f krb5/$(DEPDIR)/set_cred_option.Plo + -rm -f krb5/$(DEPDIR)/set_sec_context_option.Plo + -rm -f krb5/$(DEPDIR)/store_cred.Plo + -rm -f krb5/$(DEPDIR)/test_cfx.Po + -rm -f krb5/$(DEPDIR)/ticket_flags.Plo + -rm -f krb5/$(DEPDIR)/unwrap.Plo + -rm -f krb5/$(DEPDIR)/verify_mic.Plo + -rm -f krb5/$(DEPDIR)/wrap.Plo + -rm -f mech/$(DEPDIR)/context.Plo + -rm -f mech/$(DEPDIR)/doxygen.Plo + -rm -f mech/$(DEPDIR)/gss_accept_sec_context.Plo + -rm -f mech/$(DEPDIR)/gss_acquire_cred.Plo + -rm -f mech/$(DEPDIR)/gss_acquire_cred_ext.Plo + -rm -f mech/$(DEPDIR)/gss_acquire_cred_with_password.Plo + -rm -f mech/$(DEPDIR)/gss_add_cred.Plo + -rm -f mech/$(DEPDIR)/gss_add_cred_with_password.Plo + -rm -f mech/$(DEPDIR)/gss_add_oid_set_member.Plo + -rm -f mech/$(DEPDIR)/gss_aeap.Plo + -rm -f mech/$(DEPDIR)/gss_authorize_localname.Plo + -rm -f mech/$(DEPDIR)/gss_buffer_set.Plo + -rm -f mech/$(DEPDIR)/gss_canonicalize_name.Plo + -rm -f mech/$(DEPDIR)/gss_compare_name.Plo + -rm -f mech/$(DEPDIR)/gss_context_time.Plo + -rm -f mech/$(DEPDIR)/gss_create_empty_oid_set.Plo + -rm -f mech/$(DEPDIR)/gss_cred.Plo + -rm -f mech/$(DEPDIR)/gss_decapsulate_token.Plo + -rm -f mech/$(DEPDIR)/gss_delete_name_attribute.Plo + -rm -f mech/$(DEPDIR)/gss_delete_sec_context.Plo + -rm -f mech/$(DEPDIR)/gss_display_name.Plo + -rm -f mech/$(DEPDIR)/gss_display_name_ext.Plo + -rm -f mech/$(DEPDIR)/gss_display_status.Plo + -rm -f mech/$(DEPDIR)/gss_duplicate_name.Plo + -rm -f mech/$(DEPDIR)/gss_duplicate_oid.Plo + -rm -f mech/$(DEPDIR)/gss_encapsulate_token.Plo + -rm -f mech/$(DEPDIR)/gss_export_name.Plo + -rm -f mech/$(DEPDIR)/gss_export_name_composite.Plo + -rm -f mech/$(DEPDIR)/gss_export_sec_context.Plo + -rm -f mech/$(DEPDIR)/gss_get_mic.Plo + -rm -f mech/$(DEPDIR)/gss_get_name_attribute.Plo + -rm -f mech/$(DEPDIR)/gss_import_name.Plo + -rm -f mech/$(DEPDIR)/gss_import_sec_context.Plo + -rm -f mech/$(DEPDIR)/gss_indicate_mechs.Plo + -rm -f mech/$(DEPDIR)/gss_init_sec_context.Plo + -rm -f mech/$(DEPDIR)/gss_inquire_context.Plo + -rm -f mech/$(DEPDIR)/gss_inquire_cred.Plo + -rm -f mech/$(DEPDIR)/gss_inquire_cred_by_mech.Plo + -rm -f mech/$(DEPDIR)/gss_inquire_cred_by_oid.Plo + -rm -f mech/$(DEPDIR)/gss_inquire_mechs_for_name.Plo + -rm -f mech/$(DEPDIR)/gss_inquire_name.Plo + -rm -f mech/$(DEPDIR)/gss_inquire_names_for_mech.Plo + -rm -f mech/$(DEPDIR)/gss_inquire_sec_context_by_oid.Plo + -rm -f mech/$(DEPDIR)/gss_krb5.Plo + -rm -f mech/$(DEPDIR)/gss_mech_switch.Plo + -rm -f mech/$(DEPDIR)/gss_mo.Plo + -rm -f mech/$(DEPDIR)/gss_names.Plo + -rm -f mech/$(DEPDIR)/gss_oid.Plo + -rm -f mech/$(DEPDIR)/gss_oid_equal.Plo + -rm -f mech/$(DEPDIR)/gss_oid_to_str.Plo + -rm -f mech/$(DEPDIR)/gss_pname_to_uid.Plo + -rm -f mech/$(DEPDIR)/gss_process_context_token.Plo + -rm -f mech/$(DEPDIR)/gss_pseudo_random.Plo + -rm -f mech/$(DEPDIR)/gss_release_buffer.Plo + -rm -f mech/$(DEPDIR)/gss_release_cred.Plo + -rm -f mech/$(DEPDIR)/gss_release_name.Plo + -rm -f mech/$(DEPDIR)/gss_release_oid.Plo + -rm -f mech/$(DEPDIR)/gss_release_oid_set.Plo + -rm -f mech/$(DEPDIR)/gss_seal.Plo + -rm -f mech/$(DEPDIR)/gss_set_cred_option.Plo + -rm -f mech/$(DEPDIR)/gss_set_name_attribute.Plo + -rm -f mech/$(DEPDIR)/gss_set_sec_context_option.Plo + -rm -f mech/$(DEPDIR)/gss_sign.Plo + -rm -f mech/$(DEPDIR)/gss_store_cred.Plo + -rm -f mech/$(DEPDIR)/gss_test_oid_set_member.Plo + -rm -f mech/$(DEPDIR)/gss_unseal.Plo + -rm -f mech/$(DEPDIR)/gss_unwrap.Plo + -rm -f mech/$(DEPDIR)/gss_utils.Plo + -rm -f mech/$(DEPDIR)/gss_verify.Plo + -rm -f mech/$(DEPDIR)/gss_verify_mic.Plo + -rm -f mech/$(DEPDIR)/gss_wrap.Plo + -rm -f mech/$(DEPDIR)/gss_wrap_size_limit.Plo + -rm -f ntlm/$(DEPDIR)/accept_sec_context.Plo + -rm -f ntlm/$(DEPDIR)/acquire_cred.Plo + -rm -f ntlm/$(DEPDIR)/add_cred.Plo + -rm -f ntlm/$(DEPDIR)/canonicalize_name.Plo + -rm -f ntlm/$(DEPDIR)/compare_name.Plo + -rm -f ntlm/$(DEPDIR)/context_time.Plo + -rm -f ntlm/$(DEPDIR)/creds.Plo + -rm -f ntlm/$(DEPDIR)/crypto.Plo + -rm -f ntlm/$(DEPDIR)/delete_sec_context.Plo + -rm -f ntlm/$(DEPDIR)/display_name.Plo + -rm -f ntlm/$(DEPDIR)/display_status.Plo + -rm -f ntlm/$(DEPDIR)/duplicate_name.Plo + -rm -f ntlm/$(DEPDIR)/export_name.Plo + -rm -f ntlm/$(DEPDIR)/export_sec_context.Plo + -rm -f ntlm/$(DEPDIR)/external.Plo + -rm -f ntlm/$(DEPDIR)/import_name.Plo + -rm -f ntlm/$(DEPDIR)/import_sec_context.Plo + -rm -f ntlm/$(DEPDIR)/indicate_mechs.Plo + -rm -f ntlm/$(DEPDIR)/init_sec_context.Plo + -rm -f ntlm/$(DEPDIR)/inquire_context.Plo + -rm -f ntlm/$(DEPDIR)/inquire_cred_by_mech.Plo + -rm -f ntlm/$(DEPDIR)/inquire_mechs_for_name.Plo + -rm -f ntlm/$(DEPDIR)/inquire_names_for_mech.Plo + -rm -f ntlm/$(DEPDIR)/inquire_sec_context_by_oid.Plo + -rm -f ntlm/$(DEPDIR)/iter_cred.Plo + -rm -f ntlm/$(DEPDIR)/kdc.Plo + -rm -f ntlm/$(DEPDIR)/process_context_token.Plo + -rm -f ntlm/$(DEPDIR)/release_cred.Plo + -rm -f ntlm/$(DEPDIR)/release_name.Plo + -rm -f spnego/$(DEPDIR)/accept_sec_context.Plo + -rm -f spnego/$(DEPDIR)/compat.Plo + -rm -f spnego/$(DEPDIR)/context_stubs.Plo + -rm -f spnego/$(DEPDIR)/cred_stubs.Plo + -rm -f spnego/$(DEPDIR)/external.Plo + -rm -f spnego/$(DEPDIR)/init_sec_context.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -2414,10 +2947,10 @@ uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \ uninstall-man: uninstall-man3 uninstall-man5 .MAKE: all check check-am install install-am install-data-am \ - install-strip uninstall-am + install-exec install-strip uninstall-am -.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \ - check-am check-local clean clean-binPROGRAMS \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \ + check-TESTS check-am check-local clean clean-binPROGRAMS \ clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ ctags-am dist-hook distclean distclean-compile \ @@ -2521,11 +3054,20 @@ check-local:: test "$$failed" -eq 0 || exit 1; \ fi +# It's useful for debugging to format generated sources. The default for all +# clang-format styles is to sort includes, but in many cases in-tree we really +# don't want to do that. .x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @if [ -z "$(CLANG_FORMAT)" ]; then \ + cmp -s $< $@ 2> /dev/null || cp $< $@; \ + else \ + cp $< $@.tmp.c; \ + $(CLANG_FORMAT) -style='{BasedOnStyle: Chromium, SortIncludes: false}' -i $@.tmp.c; \ + cmp -s $@.tmp.c $@ 2> /dev/null || mv $@.tmp.c $@; \ + fi .hx.h: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @cmp -s $< $@ 2> /dev/null || cp $< $@; #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ diff --git a/lib/gssapi/gss_acquire_cred.cat3 b/lib/gssapi/gss_acquire_cred.cat3 index bf95976ad1c3..256a904a3028 100644 --- a/lib/gssapi/gss_acquire_cred.cat3 +++ b/lib/gssapi/gss_acquire_cred.cat3 @@ -1,292 +1,291 @@ - GSS_ACQUIRE_CRED(3) BSD Library Functions Manual GSS_ACQUIRE_CRED(3) -NNAAMMEE - ggssss__aacccceepptt__sseecc__ccoonntteexxtt, ggssss__aaccqquuiirree__ccrreedd, ggssss__aadddd__ccrreedd, - ggssss__aadddd__ooiidd__sseett__mmeemmbbeerr, ggssss__ccaannoonniiccaalliizzee__nnaammee, ggssss__ccoommppaarree__nnaammee, - ggssss__ccoonntteexxtt__ttiimmee, ggssss__ccrreeaattee__eemmppttyy__ooiidd__sseett, ggssss__ddeelleettee__sseecc__ccoonntteexxtt, - ggssss__ddiissppllaayy__nnaammee, ggssss__ddiissppllaayy__ssttaattuuss, ggssss__dduupplliiccaattee__nnaammee, - ggssss__eexxppoorrtt__nnaammee, ggssss__eexxppoorrtt__sseecc__ccoonntteexxtt, ggssss__ggeett__mmiicc, ggssss__iimmppoorrtt__nnaammee, - ggssss__iimmppoorrtt__sseecc__ccoonntteexxtt, ggssss__iinnddiiccaattee__mmeecchhss, ggssss__iinniitt__sseecc__ccoonntteexxtt, - ggssss__iinnqquuiirree__ccoonntteexxtt, ggssss__iinnqquuiirree__ccrreedd, ggssss__iinnqquuiirree__ccrreedd__bbyy__mmeecchh, - ggssss__iinnqquuiirree__mmeecchhss__ffoorr__nnaammee, ggssss__iinnqquuiirree__nnaammeess__ffoorr__mmeecchh, - ggssss__kkrrbb55__ccccaacchhee__nnaammee, ggssss__kkrrbb55__ccoommppaatt__ddeess33__mmiicc, ggssss__kkrrbb55__ccooppyy__ccccaacchhee, - ggssss__kkrrbb55__iimmppoorrtt__ccrreedd ggsssskkrrbb55__eexxttrraacctt__aauutthhzz__ddaattaa__ffrroomm__sseecc__ccoonntteexxtt, - ggsssskkrrbb55__rreeggiisstteerr__aacccceeppttoorr__iiddeennttiittyy, ggssss__kkrrbb55__iimmppoorrtt__ccccaacchhee, - ggssss__kkrrbb55__ggeett__ttkktt__ffllaaggss, ggssss__pprroocceessss__ccoonntteexxtt__ttookkeenn, ggssss__rreelleeaassee__bbuuffffeerr, - ggssss__rreelleeaassee__ccrreedd, ggssss__rreelleeaassee__nnaammee, ggssss__rreelleeaassee__ooiidd__sseett, ggssss__sseeaall, - ggssss__ssiiggnn, ggssss__tteesstt__ooiidd__sseett__mmeemmbbeerr, ggssss__uunnsseeaall, ggssss__uunnwwrraapp, ggssss__vveerriiffyy, - ggssss__vveerriiffyy__mmiicc, ggssss__wwrraapp, ggssss__wwrraapp__ssiizzee__lliimmiitt -- Generic Security Service +[1mNAME[0m + [1mgss_accept_sec_context[22m, [1mgss_acquire_cred[22m, [1mgss_add_cred[22m, + [1mgss_add_oid_set_member[22m, [1mgss_canonicalize_name[22m, [1mgss_compare_name[22m, + [1mgss_context_time[22m, [1mgss_create_empty_oid_set[22m, [1mgss_delete_sec_context[22m, + [1mgss_display_name[22m, [1mgss_display_status[22m, [1mgss_duplicate_name[22m, + [1mgss_export_name[22m, [1mgss_export_sec_context[22m, [1mgss_get_mic[22m, [1mgss_import_name[22m, + [1mgss_import_sec_context[22m, [1mgss_indicate_mechs[22m, [1mgss_init_sec_context[22m, + [1mgss_inquire_context[22m, [1mgss_inquire_cred[22m, [1mgss_inquire_cred_by_mech[22m, + [1mgss_inquire_mechs_for_name[22m, [1mgss_inquire_names_for_mech[22m, + [1mgss_krb5_ccache_name[22m, [1mgss_krb5_compat_des3_mic[22m, [1mgss_krb5_copy_ccache[22m, + [1mgss_krb5_import_cred gsskrb5_extract_authz_data_from_sec_context[22m, + [1mgsskrb5_register_acceptor_identity[22m, [1mgss_krb5_import_ccache[22m, + [1mgss_krb5_get_tkt_flags[22m, [1mgss_process_context_token[22m, [1mgss_release_buffer[22m, + [1mgss_release_cred[22m, [1mgss_release_name[22m, [1mgss_release_oid_set[22m, [1mgss_seal[22m, + [1mgss_sign[22m, [1mgss_test_oid_set_member[22m, [1mgss_unseal[22m, [1mgss_unwrap[22m, [1mgss_verify[22m, + [1mgss_verify_mic[22m, [1mgss_wrap[22m, [1mgss_wrap_size_limit [22m-- Generic Security Service Application Program Interface library -LLIIBBRRAARRYY +[1mLIBRARY[0m GSS-API library (libgssapi, -lgssapi) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<ggssssaappii..hh>> - - _O_M___u_i_n_t_3_2 - ggssss__aacccceepptt__sseecc__ccoonntteexxtt(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, - _g_s_s___c_t_x___i_d___t _* _c_o_n_t_e_x_t___h_a_n_d_l_e, - _g_s_s___c_o_n_s_t___c_r_e_d___i_d___t _a_c_c_e_p_t_o_r___c_r_e_d___h_a_n_d_l_e, - _c_o_n_s_t _g_s_s___b_u_f_f_e_r___t _i_n_p_u_t___t_o_k_e_n___b_u_f_f_e_r, - _c_o_n_s_t _g_s_s___c_h_a_n_n_e_l___b_i_n_d_i_n_g_s___t _i_n_p_u_t___c_h_a_n___b_i_n_d_i_n_g_s, - _g_s_s___n_a_m_e___t _* _s_r_c___n_a_m_e, _g_s_s___O_I_D _* _m_e_c_h___t_y_p_e, - _g_s_s___b_u_f_f_e_r___t _o_u_t_p_u_t___t_o_k_e_n, _O_M___u_i_n_t_3_2 _* _r_e_t___f_l_a_g_s, - _O_M___u_i_n_t_3_2 _* _t_i_m_e___r_e_c, _g_s_s___c_r_e_d___i_d___t _* _d_e_l_e_g_a_t_e_d___c_r_e_d___h_a_n_d_l_e); - - _O_M___u_i_n_t_3_2 - ggssss__aaccqquuiirree__ccrreedd(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, _g_s_s___c_o_n_s_t___n_a_m_e___t _d_e_s_i_r_e_d___n_a_m_e, - _O_M___u_i_n_t_3_2 _t_i_m_e___r_e_q, _c_o_n_s_t _g_s_s___O_I_D___s_e_t _d_e_s_i_r_e_d___m_e_c_h_s, - _g_s_s___c_r_e_d___u_s_a_g_e___t _c_r_e_d___u_s_a_g_e, _g_s_s___c_r_e_d___i_d___t _* _o_u_t_p_u_t___c_r_e_d___h_a_n_d_l_e, - _g_s_s___O_I_D___s_e_t _* _a_c_t_u_a_l___m_e_c_h_s, _O_M___u_i_n_t_3_2 _* _t_i_m_e___r_e_c); - - _O_M___u_i_n_t_3_2 - ggssss__aadddd__ccrreedd(_O_M___u_i_n_t_3_2 _*_m_i_n_o_r___s_t_a_t_u_s, - _g_s_s___c_o_n_s_t___c_r_e_d___i_d___t _i_n_p_u_t___c_r_e_d___h_a_n_d_l_e, _g_s_s___c_o_n_s_t___n_a_m_e___t _d_e_s_i_r_e_d___n_a_m_e, - _c_o_n_s_t _g_s_s___O_I_D _d_e_s_i_r_e_d___m_e_c_h, _g_s_s___c_r_e_d___u_s_a_g_e___t _c_r_e_d___u_s_a_g_e, - _O_M___u_i_n_t_3_2 _i_n_i_t_i_a_t_o_r___t_i_m_e___r_e_q, _O_M___u_i_n_t_3_2 _a_c_c_e_p_t_o_r___t_i_m_e___r_e_q, - _g_s_s___c_r_e_d___i_d___t _*_o_u_t_p_u_t___c_r_e_d___h_a_n_d_l_e, _g_s_s___O_I_D___s_e_t _*_a_c_t_u_a_l___m_e_c_h_s, - _O_M___u_i_n_t_3_2 _*_i_n_i_t_i_a_t_o_r___t_i_m_e___r_e_c, _O_M___u_i_n_t_3_2 _*_a_c_c_e_p_t_o_r___t_i_m_e___r_e_c); - - _O_M___u_i_n_t_3_2 - ggssss__aadddd__ooiidd__sseett__mmeemmbbeerr(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, - _c_o_n_s_t _g_s_s___O_I_D _m_e_m_b_e_r___o_i_d, _g_s_s___O_I_D___s_e_t _* _o_i_d___s_e_t); - - _O_M___u_i_n_t_3_2 - ggssss__ccaannoonniiccaalliizzee__nnaammee(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, - _g_s_s___c_o_n_s_t___n_a_m_e___t _i_n_p_u_t___n_a_m_e, _c_o_n_s_t _g_s_s___O_I_D _m_e_c_h___t_y_p_e, - _g_s_s___n_a_m_e___t _* _o_u_t_p_u_t___n_a_m_e); - - _O_M___u_i_n_t_3_2 - ggssss__ccoommppaarree__nnaammee(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, _g_s_s___c_o_n_s_t___n_a_m_e___t _n_a_m_e_1, - _g_s_s___c_o_n_s_t___n_a_m_e___t _n_a_m_e_2, _i_n_t _* _n_a_m_e___e_q_u_a_l); - - _O_M___u_i_n_t_3_2 - ggssss__ccoonntteexxtt__ttiimmee(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, - _g_s_s___c_o_n_s_t___c_t_x___i_d___t _c_o_n_t_e_x_t___h_a_n_d_l_e, _O_M___u_i_n_t_3_2 _* _t_i_m_e___r_e_c); - - _O_M___u_i_n_t_3_2 - ggssss__ccrreeaattee__eemmppttyy__ooiidd__sseett(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, - _g_s_s___O_I_D___s_e_t _* _o_i_d___s_e_t); - - _O_M___u_i_n_t_3_2 - ggssss__ddeelleettee__sseecc__ccoonntteexxtt(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, - _g_s_s___c_t_x___i_d___t _* _c_o_n_t_e_x_t___h_a_n_d_l_e, _g_s_s___b_u_f_f_e_r___t _o_u_t_p_u_t___t_o_k_e_n); - - _O_M___u_i_n_t_3_2 - ggssss__ddiissppllaayy__nnaammee(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, _g_s_s___c_o_n_s_t___n_a_m_e___t _i_n_p_u_t___n_a_m_e, - _g_s_s___b_u_f_f_e_r___t _o_u_t_p_u_t___n_a_m_e___b_u_f_f_e_r, _g_s_s___O_I_D _* _o_u_t_p_u_t___n_a_m_e___t_y_p_e); - - _O_M___u_i_n_t_3_2 - ggssss__ddiissppllaayy__ssttaattuuss(_O_M___u_i_n_t_3_2 _*_m_i_n_o_r___s_t_a_t_u_s, _O_M___u_i_n_t_3_2 _s_t_a_t_u_s___v_a_l_u_e, - _i_n_t _s_t_a_t_u_s___t_y_p_e, _c_o_n_s_t _g_s_s___O_I_D _m_e_c_h___t_y_p_e, _O_M___u_i_n_t_3_2 _*_m_e_s_s_a_g_e___c_o_n_t_e_x_t, - _g_s_s___b_u_f_f_e_r___t _s_t_a_t_u_s___s_t_r_i_n_g); - - _O_M___u_i_n_t_3_2 - ggssss__dduupplliiccaattee__nnaammee(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, _g_s_s___c_o_n_s_t___n_a_m_e___t _s_r_c___n_a_m_e, - _g_s_s___n_a_m_e___t _* _d_e_s_t___n_a_m_e); - - _O_M___u_i_n_t_3_2 - ggssss__eexxppoorrtt__nnaammee(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, _g_s_s___c_o_n_s_t___n_a_m_e___t _i_n_p_u_t___n_a_m_e, - _g_s_s___b_u_f_f_e_r___t _e_x_p_o_r_t_e_d___n_a_m_e); - - _O_M___u_i_n_t_3_2 - ggssss__eexxppoorrtt__sseecc__ccoonntteexxtt(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, - _g_s_s___c_t_x___i_d___t _* _c_o_n_t_e_x_t___h_a_n_d_l_e, _g_s_s___b_u_f_f_e_r___t _i_n_t_e_r_p_r_o_c_e_s_s___t_o_k_e_n); - - _O_M___u_i_n_t_3_2 - ggssss__ggeett__mmiicc(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, _g_s_s___c_o_n_s_t___c_t_x___i_d___t _c_o_n_t_e_x_t___h_a_n_d_l_e, - _g_s_s___q_o_p___t _q_o_p___r_e_q, _c_o_n_s_t _g_s_s___b_u_f_f_e_r___t _m_e_s_s_a_g_e___b_u_f_f_e_r, - _g_s_s___b_u_f_f_e_r___t _m_e_s_s_a_g_e___t_o_k_e_n); - - _O_M___u_i_n_t_3_2 - ggssss__iimmppoorrtt__nnaammee(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, - _c_o_n_s_t _g_s_s___b_u_f_f_e_r___t _i_n_p_u_t___n_a_m_e___b_u_f_f_e_r, _c_o_n_s_t _g_s_s___O_I_D _i_n_p_u_t___n_a_m_e___t_y_p_e, - _g_s_s___n_a_m_e___t _* _o_u_t_p_u_t___n_a_m_e); - - _O_M___u_i_n_t_3_2 - ggssss__iimmppoorrtt__sseecc__ccoonntteexxtt(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, - _c_o_n_s_t _g_s_s___b_u_f_f_e_r___t _i_n_t_e_r_p_r_o_c_e_s_s___t_o_k_e_n, - _g_s_s___c_t_x___i_d___t _* _c_o_n_t_e_x_t___h_a_n_d_l_e); - - _O_M___u_i_n_t_3_2 - ggssss__iinnddiiccaattee__mmeecchhss(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, _g_s_s___O_I_D___s_e_t _* _m_e_c_h___s_e_t); - - _O_M___u_i_n_t_3_2 - ggssss__iinniitt__sseecc__ccoonntteexxtt(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, - _g_s_s___c_o_n_s_t___c_r_e_d___i_d___t _i_n_i_t_i_a_t_o_r___c_r_e_d___h_a_n_d_l_e, - _g_s_s___c_t_x___i_d___t _* _c_o_n_t_e_x_t___h_a_n_d_l_e, _g_s_s___c_o_n_s_t___n_a_m_e___t _t_a_r_g_e_t___n_a_m_e, - _c_o_n_s_t _g_s_s___O_I_D _m_e_c_h___t_y_p_e, _O_M___u_i_n_t_3_2 _r_e_q___f_l_a_g_s, _O_M___u_i_n_t_3_2 _t_i_m_e___r_e_q, - _c_o_n_s_t _g_s_s___c_h_a_n_n_e_l___b_i_n_d_i_n_g_s___t _i_n_p_u_t___c_h_a_n___b_i_n_d_i_n_g_s, - _c_o_n_s_t _g_s_s___b_u_f_f_e_r___t _i_n_p_u_t___t_o_k_e_n, _g_s_s___O_I_D _* _a_c_t_u_a_l___m_e_c_h___t_y_p_e, - _g_s_s___b_u_f_f_e_r___t _o_u_t_p_u_t___t_o_k_e_n, _O_M___u_i_n_t_3_2 _* _r_e_t___f_l_a_g_s, - _O_M___u_i_n_t_3_2 _* _t_i_m_e___r_e_c); - - _O_M___u_i_n_t_3_2 - ggssss__iinnqquuiirree__ccoonntteexxtt(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, - _g_s_s___c_o_n_s_t___c_t_x___i_d___t _c_o_n_t_e_x_t___h_a_n_d_l_e, _g_s_s___n_a_m_e___t _* _s_r_c___n_a_m_e, - _g_s_s___n_a_m_e___t _* _t_a_r_g___n_a_m_e, _O_M___u_i_n_t_3_2 _* _l_i_f_e_t_i_m_e___r_e_c, - _g_s_s___O_I_D _* _m_e_c_h___t_y_p_e, _O_M___u_i_n_t_3_2 _* _c_t_x___f_l_a_g_s, _i_n_t _* _l_o_c_a_l_l_y___i_n_i_t_i_a_t_e_d, - _i_n_t _* _o_p_e_n___c_o_n_t_e_x_t); - - _O_M___u_i_n_t_3_2 - ggssss__iinnqquuiirree__ccrreedd(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, - _g_s_s___c_o_n_s_t___c_r_e_d___i_d___t _c_r_e_d___h_a_n_d_l_e, _g_s_s___n_a_m_e___t _* _n_a_m_e, - _O_M___u_i_n_t_3_2 _* _l_i_f_e_t_i_m_e, _g_s_s___c_r_e_d___u_s_a_g_e___t _* _c_r_e_d___u_s_a_g_e, - _g_s_s___O_I_D___s_e_t _* _m_e_c_h_a_n_i_s_m_s); - - _O_M___u_i_n_t_3_2 - ggssss__iinnqquuiirree__ccrreedd__bbyy__mmeecchh(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, - _g_s_s___c_o_n_s_t___c_r_e_d___i_d___t _c_r_e_d___h_a_n_d_l_e, _c_o_n_s_t _g_s_s___O_I_D _m_e_c_h___t_y_p_e, - _g_s_s___n_a_m_e___t _* _n_a_m_e, _O_M___u_i_n_t_3_2 _* _i_n_i_t_i_a_t_o_r___l_i_f_e_t_i_m_e, - _O_M___u_i_n_t_3_2 _* _a_c_c_e_p_t_o_r___l_i_f_e_t_i_m_e, _g_s_s___c_r_e_d___u_s_a_g_e___t _* _c_r_e_d___u_s_a_g_e); - - _O_M___u_i_n_t_3_2 - ggssss__iinnqquuiirree__mmeecchhss__ffoorr__nnaammee(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, - _g_s_s___c_o_n_s_t___n_a_m_e___t _i_n_p_u_t___n_a_m_e, _g_s_s___O_I_D___s_e_t _* _m_e_c_h___t_y_p_e_s); - - _O_M___u_i_n_t_3_2 - ggssss__iinnqquuiirree__nnaammeess__ffoorr__mmeecchh(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, - _c_o_n_s_t _g_s_s___O_I_D _m_e_c_h_a_n_i_s_m, _g_s_s___O_I_D___s_e_t _* _n_a_m_e___t_y_p_e_s); - - _O_M___u_i_n_t_3_2 - ggssss__kkrrbb55__ccccaacchhee__nnaammee(_O_M___u_i_n_t_3_2 _*_m_i_n_o_r, _c_o_n_s_t _c_h_a_r _*_n_a_m_e, - _c_o_n_s_t _c_h_a_r _*_*_o_l_d___n_a_m_e); - - _O_M___u_i_n_t_3_2 - ggssss__kkrrbb55__ccooppyy__ccccaacchhee(_O_M___u_i_n_t_3_2 _*_m_i_n_o_r, _g_s_s___c_r_e_d___i_d___t _c_r_e_d, - _k_r_b_5___c_c_a_c_h_e _o_u_t); - - _O_M___u_i_n_t_3_2 - ggssss__kkrrbb55__iimmppoorrtt__ccrreedd(_O_M___u_i_n_t_3_2 _*_m_i_n_o_r___s_t_a_t_u_s, _k_r_b_5___c_c_a_c_h_e _i_d, - _k_r_b_5___p_r_i_n_c_i_p_a_l _k_e_y_t_a_b___p_r_i_n_c_i_p_a_l, _k_r_b_5___k_e_y_t_a_b _k_e_y_t_a_b, - _g_s_s___c_r_e_d___i_d___t _*_c_r_e_d); - - _O_M___u_i_n_t_3_2 - ggssss__kkrrbb55__ccoommppaatt__ddeess33__mmiicc(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, - _g_s_s___c_t_x___i_d___t _c_o_n_t_e_x_t___h_a_n_d_l_e, _i_n_t _o_n_o_f_f); - - _O_M___u_i_n_t_3_2 - ggsssskkrrbb55__eexxttrraacctt__aauutthhzz__ddaattaa__ffrroomm__sseecc__ccoonntteexxtt(_O_M___u_i_n_t_3_2 _*_m_i_n_o_r___s_t_a_t_u_s, - _g_s_s___c_t_x___i_d___t _c_o_n_t_e_x_t___h_a_n_d_l_e, _i_n_t _a_d___t_y_p_e, _g_s_s___b_u_f_f_e_r___t _a_d___d_a_t_a); - - _O_M___u_i_n_t_3_2 - ggsssskkrrbb55__rreeggiisstteerr__aacccceeppttoorr__iiddeennttiittyy(_c_o_n_s_t _c_h_a_r _*_i_d_e_n_t_i_t_y); - - _O_M___u_i_n_t_3_2 - ggssss__kkrrbb55__iimmppoorrtt__ccaacchhee(_O_M___u_i_n_t_3_2 _*_m_i_n_o_r, _k_r_b_5___c_c_a_c_h_e _i_d, - _k_r_b_5___k_e_y_t_a_b _k_e_y_t_a_b, _g_s_s___c_r_e_d___i_d___t _*_c_r_e_d); - - _O_M___u_i_n_t_3_2 - ggssss__kkrrbb55__ggeett__ttkktt__ffllaaggss(_O_M___u_i_n_t_3_2 _*_m_i_n_o_r___s_t_a_t_u_s, - _g_s_s___c_t_x___i_d___t _c_o_n_t_e_x_t___h_a_n_d_l_e, _O_M___u_i_n_t_3_2 _*_t_k_t___f_l_a_g_s); - - _O_M___u_i_n_t_3_2 - ggssss__pprroocceessss__ccoonntteexxtt__ttookkeenn(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, - _g_s_s___c_o_n_s_t___c_t_x___i_d___t _c_o_n_t_e_x_t___h_a_n_d_l_e, _c_o_n_s_t _g_s_s___b_u_f_f_e_r___t _t_o_k_e_n___b_u_f_f_e_r); - - _O_M___u_i_n_t_3_2 - ggssss__rreelleeaassee__bbuuffffeerr(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, _g_s_s___b_u_f_f_e_r___t _b_u_f_f_e_r); - - _O_M___u_i_n_t_3_2 - ggssss__rreelleeaassee__ccrreedd(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, _g_s_s___c_r_e_d___i_d___t _* _c_r_e_d___h_a_n_d_l_e); - - _O_M___u_i_n_t_3_2 - ggssss__rreelleeaassee__nnaammee(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, _g_s_s___n_a_m_e___t _* _i_n_p_u_t___n_a_m_e); - - _O_M___u_i_n_t_3_2 - ggssss__rreelleeaassee__ooiidd__sseett(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, _g_s_s___O_I_D___s_e_t _* _s_e_t); - - _O_M___u_i_n_t_3_2 - ggssss__sseeaall(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, _g_s_s___c_t_x___i_d___t _c_o_n_t_e_x_t___h_a_n_d_l_e, - _i_n_t _c_o_n_f___r_e_q___f_l_a_g, _i_n_t _q_o_p___r_e_q, _g_s_s___b_u_f_f_e_r___t _i_n_p_u_t___m_e_s_s_a_g_e___b_u_f_f_e_r, - _i_n_t _* _c_o_n_f___s_t_a_t_e, _g_s_s___b_u_f_f_e_r___t _o_u_t_p_u_t___m_e_s_s_a_g_e___b_u_f_f_e_r); - - _O_M___u_i_n_t_3_2 - ggssss__ssiiggnn(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, _g_s_s___c_t_x___i_d___t _c_o_n_t_e_x_t___h_a_n_d_l_e, - _i_n_t _q_o_p___r_e_q, _g_s_s___b_u_f_f_e_r___t _m_e_s_s_a_g_e___b_u_f_f_e_r, - _g_s_s___b_u_f_f_e_r___t _m_e_s_s_a_g_e___t_o_k_e_n); - - _O_M___u_i_n_t_3_2 - ggssss__tteesstt__ooiidd__sseett__mmeemmbbeerr(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, _c_o_n_s_t _g_s_s___O_I_D _m_e_m_b_e_r, - _c_o_n_s_t _g_s_s___O_I_D___s_e_t _s_e_t, _i_n_t _* _p_r_e_s_e_n_t); - - _O_M___u_i_n_t_3_2 - ggssss__uunnsseeaall(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, _g_s_s___c_t_x___i_d___t _c_o_n_t_e_x_t___h_a_n_d_l_e, - _g_s_s___b_u_f_f_e_r___t _i_n_p_u_t___m_e_s_s_a_g_e___b_u_f_f_e_r, - _g_s_s___b_u_f_f_e_r___t _o_u_t_p_u_t___m_e_s_s_a_g_e___b_u_f_f_e_r, _i_n_t _* _c_o_n_f___s_t_a_t_e, - _i_n_t _* _q_o_p___s_t_a_t_e); - - _O_M___u_i_n_t_3_2 - ggssss__uunnwwrraapp(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, _g_s_s___c_o_n_s_t___c_t_x___i_d___t _c_o_n_t_e_x_t___h_a_n_d_l_e, - _c_o_n_s_t _g_s_s___b_u_f_f_e_r___t _i_n_p_u_t___m_e_s_s_a_g_e___b_u_f_f_e_r, - _g_s_s___b_u_f_f_e_r___t _o_u_t_p_u_t___m_e_s_s_a_g_e___b_u_f_f_e_r, _i_n_t _* _c_o_n_f___s_t_a_t_e, - _g_s_s___q_o_p___t _* _q_o_p___s_t_a_t_e); - - _O_M___u_i_n_t_3_2 - ggssss__vveerriiffyy(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, _g_s_s___c_t_x___i_d___t _c_o_n_t_e_x_t___h_a_n_d_l_e, - _g_s_s___b_u_f_f_e_r___t _m_e_s_s_a_g_e___b_u_f_f_e_r, _g_s_s___b_u_f_f_e_r___t _t_o_k_e_n___b_u_f_f_e_r, - _i_n_t _* _q_o_p___s_t_a_t_e); - - _O_M___u_i_n_t_3_2 - ggssss__vveerriiffyy__mmiicc(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, - _g_s_s___c_o_n_s_t___c_t_x___i_d___t _c_o_n_t_e_x_t___h_a_n_d_l_e, _c_o_n_s_t _g_s_s___b_u_f_f_e_r___t _m_e_s_s_a_g_e___b_u_f_f_e_r, - _c_o_n_s_t _g_s_s___b_u_f_f_e_r___t _t_o_k_e_n___b_u_f_f_e_r, _g_s_s___q_o_p___t _* _q_o_p___s_t_a_t_e); - - _O_M___u_i_n_t_3_2 - ggssss__wwrraapp(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, _g_s_s___c_o_n_s_t___c_t_x___i_d___t _c_o_n_t_e_x_t___h_a_n_d_l_e, - _i_n_t _c_o_n_f___r_e_q___f_l_a_g, _g_s_s___q_o_p___t _q_o_p___r_e_q, - _c_o_n_s_t _g_s_s___b_u_f_f_e_r___t _i_n_p_u_t___m_e_s_s_a_g_e___b_u_f_f_e_r, _i_n_t _* _c_o_n_f___s_t_a_t_e, - _g_s_s___b_u_f_f_e_r___t _o_u_t_p_u_t___m_e_s_s_a_g_e___b_u_f_f_e_r); - - _O_M___u_i_n_t_3_2 - ggssss__wwrraapp__ssiizzee__lliimmiitt(_O_M___u_i_n_t_3_2 _* _m_i_n_o_r___s_t_a_t_u_s, - _g_s_s___c_o_n_s_t___c_t_x___i_d___t _c_o_n_t_e_x_t___h_a_n_d_l_e, _i_n_t _c_o_n_f___r_e_q___f_l_a_g, - _g_s_s___q_o_p___t _q_o_p___r_e_q, _O_M___u_i_n_t_3_2 _r_e_q___o_u_t_p_u_t___s_i_z_e, - _O_M___u_i_n_t_3_2 _* _m_a_x___i_n_p_u_t___s_i_z_e); - -DDEESSCCRRIIPPTTIIOONN +[1mSYNOPSIS[0m + [1m#include <gssapi.h>[0m + + [4mOM_uint32[0m + [1mgss_accept_sec_context[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, + [4mgss_ctx_id_t[24m [4m*[24m [4mcontext_handle[24m, + [4mgss_const_cred_id_t[24m [4macceptor_cred_handle[24m, + [4mconst[24m [4mgss_buffer_t[24m [4minput_token_buffer[24m, + [4mconst[24m [4mgss_channel_bindings_t[24m [4minput_chan_bindings[24m, + [4mgss_name_t[24m [4m*[24m [4msrc_name[24m, [4mgss_OID[24m [4m*[24m [4mmech_type[24m, + [4mgss_buffer_t[24m [4moutput_token[24m, [4mOM_uint32[24m [4m*[24m [4mret_flags[24m, + [4mOM_uint32[24m [4m*[24m [4mtime_rec[24m, [4mgss_cred_id_t[24m [4m*[24m [4mdelegated_cred_handle[24m); + + [4mOM_uint32[0m + [1mgss_acquire_cred[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, [4mgss_const_name_t[24m [4mdesired_name[24m, + [4mOM_uint32[24m [4mtime_req[24m, [4mconst[24m [4mgss_OID_set[24m [4mdesired_mechs[24m, + [4mgss_cred_usage_t[24m [4mcred_usage[24m, [4mgss_cred_id_t[24m [4m*[24m [4moutput_cred_handle[24m, + [4mgss_OID_set[24m [4m*[24m [4mactual_mechs[24m, [4mOM_uint32[24m [4m*[24m [4mtime_rec[24m); + + [4mOM_uint32[0m + [1mgss_add_cred[22m([4mOM_uint32[24m [4m*minor_status[24m, + [4mgss_const_cred_id_t[24m [4minput_cred_handle[24m, [4mgss_const_name_t[24m [4mdesired_name[24m, + [4mconst[24m [4mgss_OID[24m [4mdesired_mech[24m, [4mgss_cred_usage_t[24m [4mcred_usage[24m, + [4mOM_uint32[24m [4minitiator_time_req[24m, [4mOM_uint32[24m [4macceptor_time_req[24m, + [4mgss_cred_id_t[24m [4m*output_cred_handle[24m, [4mgss_OID_set[24m [4m*actual_mechs[24m, + [4mOM_uint32[24m [4m*initiator_time_rec[24m, [4mOM_uint32[24m [4m*acceptor_time_rec[24m); + + [4mOM_uint32[0m + [1mgss_add_oid_set_member[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, + [4mconst[24m [4mgss_OID[24m [4mmember_oid[24m, [4mgss_OID_set[24m [4m*[24m [4moid_set[24m); + + [4mOM_uint32[0m + [1mgss_canonicalize_name[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, + [4mgss_const_name_t[24m [4minput_name[24m, [4mconst[24m [4mgss_OID[24m [4mmech_type[24m, + [4mgss_name_t[24m [4m*[24m [4moutput_name[24m); + + [4mOM_uint32[0m + [1mgss_compare_name[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, [4mgss_const_name_t[24m [4mname1[24m, + [4mgss_const_name_t[24m [4mname2[24m, [4mint[24m [4m*[24m [4mname_equal[24m); + + [4mOM_uint32[0m + [1mgss_context_time[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, + [4mgss_const_ctx_id_t[24m [4mcontext_handle[24m, [4mOM_uint32[24m [4m*[24m [4mtime_rec[24m); + + [4mOM_uint32[0m + [1mgss_create_empty_oid_set[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, + [4mgss_OID_set[24m [4m*[24m [4moid_set[24m); + + [4mOM_uint32[0m + [1mgss_delete_sec_context[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, + [4mgss_ctx_id_t[24m [4m*[24m [4mcontext_handle[24m, [4mgss_buffer_t[24m [4moutput_token[24m); + + [4mOM_uint32[0m + [1mgss_display_name[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, [4mgss_const_name_t[24m [4minput_name[24m, + [4mgss_buffer_t[24m [4moutput_name_buffer[24m, [4mgss_OID[24m [4m*[24m [4moutput_name_type[24m); + + [4mOM_uint32[0m + [1mgss_display_status[22m([4mOM_uint32[24m [4m*minor_status[24m, [4mOM_uint32[24m [4mstatus_value[24m, + [4mint[24m [4mstatus_type[24m, [4mconst[24m [4mgss_OID[24m [4mmech_type[24m, [4mOM_uint32[24m [4m*message_context[24m, + [4mgss_buffer_t[24m [4mstatus_string[24m); + + [4mOM_uint32[0m + [1mgss_duplicate_name[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, [4mgss_const_name_t[24m [4msrc_name[24m, + [4mgss_name_t[24m [4m*[24m [4mdest_name[24m); + + [4mOM_uint32[0m + [1mgss_export_name[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, [4mgss_const_name_t[24m [4minput_name[24m, + [4mgss_buffer_t[24m [4mexported_name[24m); + + [4mOM_uint32[0m + [1mgss_export_sec_context[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, + [4mgss_ctx_id_t[24m [4m*[24m [4mcontext_handle[24m, [4mgss_buffer_t[24m [4minterprocess_token[24m); + + [4mOM_uint32[0m + [1mgss_get_mic[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, [4mgss_const_ctx_id_t[24m [4mcontext_handle[24m, + [4mgss_qop_t[24m [4mqop_req[24m, [4mconst[24m [4mgss_buffer_t[24m [4mmessage_buffer[24m, + [4mgss_buffer_t[24m [4mmessage_token[24m); + + [4mOM_uint32[0m + [1mgss_import_name[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, + [4mconst[24m [4mgss_buffer_t[24m [4minput_name_buffer[24m, [4mconst[24m [4mgss_OID[24m [4minput_name_type[24m, + [4mgss_name_t[24m [4m*[24m [4moutput_name[24m); + + [4mOM_uint32[0m + [1mgss_import_sec_context[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, + [4mconst[24m [4mgss_buffer_t[24m [4minterprocess_token[24m, + [4mgss_ctx_id_t[24m [4m*[24m [4mcontext_handle[24m); + + [4mOM_uint32[0m + [1mgss_indicate_mechs[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, [4mgss_OID_set[24m [4m*[24m [4mmech_set[24m); + + [4mOM_uint32[0m + [1mgss_init_sec_context[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, + [4mgss_const_cred_id_t[24m [4minitiator_cred_handle[24m, + [4mgss_ctx_id_t[24m [4m*[24m [4mcontext_handle[24m, [4mgss_const_name_t[24m [4mtarget_name[24m, + [4mconst[24m [4mgss_OID[24m [4mmech_type[24m, [4mOM_uint32[24m [4mreq_flags[24m, [4mOM_uint32[24m [4mtime_req[24m, + [4mconst[24m [4mgss_channel_bindings_t[24m [4minput_chan_bindings[24m, + [4mconst[24m [4mgss_buffer_t[24m [4minput_token[24m, [4mgss_OID[24m [4m*[24m [4mactual_mech_type[24m, + [4mgss_buffer_t[24m [4moutput_token[24m, [4mOM_uint32[24m [4m*[24m [4mret_flags[24m, + [4mOM_uint32[24m [4m*[24m [4mtime_rec[24m); + + [4mOM_uint32[0m + [1mgss_inquire_context[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, + [4mgss_const_ctx_id_t[24m [4mcontext_handle[24m, [4mgss_name_t[24m [4m*[24m [4msrc_name[24m, + [4mgss_name_t[24m [4m*[24m [4mtarg_name[24m, [4mOM_uint32[24m [4m*[24m [4mlifetime_rec[24m, + [4mgss_OID[24m [4m*[24m [4mmech_type[24m, [4mOM_uint32[24m [4m*[24m [4mctx_flags[24m, [4mint[24m [4m*[24m [4mlocally_initiated[24m, + [4mint[24m [4m*[24m [4mopen_context[24m); + + [4mOM_uint32[0m + [1mgss_inquire_cred[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, + [4mgss_const_cred_id_t[24m [4mcred_handle[24m, [4mgss_name_t[24m [4m*[24m [4mname[24m, + [4mOM_uint32[24m [4m*[24m [4mlifetime[24m, [4mgss_cred_usage_t[24m [4m*[24m [4mcred_usage[24m, + [4mgss_OID_set[24m [4m*[24m [4mmechanisms[24m); + + [4mOM_uint32[0m + [1mgss_inquire_cred_by_mech[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, + [4mgss_const_cred_id_t[24m [4mcred_handle[24m, [4mconst[24m [4mgss_OID[24m [4mmech_type[24m, + [4mgss_name_t[24m [4m*[24m [4mname[24m, [4mOM_uint32[24m [4m*[24m [4minitiator_lifetime[24m, + [4mOM_uint32[24m [4m*[24m [4macceptor_lifetime[24m, [4mgss_cred_usage_t[24m [4m*[24m [4mcred_usage[24m); + + [4mOM_uint32[0m + [1mgss_inquire_mechs_for_name[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, + [4mgss_const_name_t[24m [4minput_name[24m, [4mgss_OID_set[24m [4m*[24m [4mmech_types[24m); + + [4mOM_uint32[0m + [1mgss_inquire_names_for_mech[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, + [4mconst[24m [4mgss_OID[24m [4mmechanism[24m, [4mgss_OID_set[24m [4m*[24m [4mname_types[24m); + + [4mOM_uint32[0m + [1mgss_krb5_ccache_name[22m([4mOM_uint32[24m [4m*minor[24m, [4mconst[24m [4mchar[24m [4m*name[24m, + [4mconst[24m [4mchar[24m [4m**old_name[24m); + + [4mOM_uint32[0m + [1mgss_krb5_copy_ccache[22m([4mOM_uint32[24m [4m*minor[24m, [4mgss_cred_id_t[24m [4mcred[24m, + [4mkrb5_ccache[24m [4mout[24m); + + [4mOM_uint32[0m + [1mgss_krb5_import_cred[22m([4mOM_uint32[24m [4m*minor_status[24m, [4mkrb5_ccache[24m [4mid[24m, + [4mkrb5_principal[24m [4mkeytab_principal[24m, [4mkrb5_keytab[24m [4mkeytab[24m, + [4mgss_cred_id_t[24m [4m*cred[24m); + + [4mOM_uint32[0m + [1mgss_krb5_compat_des3_mic[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, + [4mgss_ctx_id_t[24m [4mcontext_handle[24m, [4mint[24m [4monoff[24m); + + [4mOM_uint32[0m + [1mgsskrb5_extract_authz_data_from_sec_context[22m([4mOM_uint32[24m [4m*minor_status[24m, + [4mgss_ctx_id_t[24m [4mcontext_handle[24m, [4mint[24m [4mad_type[24m, [4mgss_buffer_t[24m [4mad_data[24m); + + [4mOM_uint32[0m + [1mgsskrb5_register_acceptor_identity[22m([4mconst[24m [4mchar[24m [4m*identity[24m); + + [4mOM_uint32[0m + [1mgss_krb5_import_cache[22m([4mOM_uint32[24m [4m*minor[24m, [4mkrb5_ccache[24m [4mid[24m, + [4mkrb5_keytab[24m [4mkeytab[24m, [4mgss_cred_id_t[24m [4m*cred[24m); + + [4mOM_uint32[0m + [1mgss_krb5_get_tkt_flags[22m([4mOM_uint32[24m [4m*minor_status[24m, + [4mgss_ctx_id_t[24m [4mcontext_handle[24m, [4mOM_uint32[24m [4m*tkt_flags[24m); + + [4mOM_uint32[0m + [1mgss_process_context_token[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, + [4mgss_const_ctx_id_t[24m [4mcontext_handle[24m, [4mconst[24m [4mgss_buffer_t[24m [4mtoken_buffer[24m); + + [4mOM_uint32[0m + [1mgss_release_buffer[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, [4mgss_buffer_t[24m [4mbuffer[24m); + + [4mOM_uint32[0m + [1mgss_release_cred[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, [4mgss_cred_id_t[24m [4m*[24m [4mcred_handle[24m); + + [4mOM_uint32[0m + [1mgss_release_name[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, [4mgss_name_t[24m [4m*[24m [4minput_name[24m); + + [4mOM_uint32[0m + [1mgss_release_oid_set[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, [4mgss_OID_set[24m [4m*[24m [4mset[24m); + + [4mOM_uint32[0m + [1mgss_seal[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, [4mgss_ctx_id_t[24m [4mcontext_handle[24m, + [4mint[24m [4mconf_req_flag[24m, [4mint[24m [4mqop_req[24m, [4mgss_buffer_t[24m [4minput_message_buffer[24m, + [4mint[24m [4m*[24m [4mconf_state[24m, [4mgss_buffer_t[24m [4moutput_message_buffer[24m); + + [4mOM_uint32[0m + [1mgss_sign[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, [4mgss_ctx_id_t[24m [4mcontext_handle[24m, + [4mint[24m [4mqop_req[24m, [4mgss_buffer_t[24m [4mmessage_buffer[24m, + [4mgss_buffer_t[24m [4mmessage_token[24m); + + [4mOM_uint32[0m + [1mgss_test_oid_set_member[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, [4mconst[24m [4mgss_OID[24m [4mmember[24m, + [4mconst[24m [4mgss_OID_set[24m [4mset[24m, [4mint[24m [4m*[24m [4mpresent[24m); + + [4mOM_uint32[0m + [1mgss_unseal[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, [4mgss_ctx_id_t[24m [4mcontext_handle[24m, + [4mgss_buffer_t[24m [4minput_message_buffer[24m, + [4mgss_buffer_t[24m [4moutput_message_buffer[24m, [4mint[24m [4m*[24m [4mconf_state[24m, + [4mint[24m [4m*[24m [4mqop_state[24m); + + [4mOM_uint32[0m + [1mgss_unwrap[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, [4mgss_const_ctx_id_t[24m [4mcontext_handle[24m, + [4mconst[24m [4mgss_buffer_t[24m [4minput_message_buffer[24m, + [4mgss_buffer_t[24m [4moutput_message_buffer[24m, [4mint[24m [4m*[24m [4mconf_state[24m, + [4mgss_qop_t[24m [4m*[24m [4mqop_state[24m); + + [4mOM_uint32[0m + [1mgss_verify[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, [4mgss_ctx_id_t[24m [4mcontext_handle[24m, + [4mgss_buffer_t[24m [4mmessage_buffer[24m, [4mgss_buffer_t[24m [4mtoken_buffer[24m, + [4mint[24m [4m*[24m [4mqop_state[24m); + + [4mOM_uint32[0m + [1mgss_verify_mic[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, + [4mgss_const_ctx_id_t[24m [4mcontext_handle[24m, [4mconst[24m [4mgss_buffer_t[24m [4mmessage_buffer[24m, + [4mconst[24m [4mgss_buffer_t[24m [4mtoken_buffer[24m, [4mgss_qop_t[24m [4m*[24m [4mqop_state[24m); + + [4mOM_uint32[0m + [1mgss_wrap[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, [4mgss_const_ctx_id_t[24m [4mcontext_handle[24m, + [4mint[24m [4mconf_req_flag[24m, [4mgss_qop_t[24m [4mqop_req[24m, + [4mconst[24m [4mgss_buffer_t[24m [4minput_message_buffer[24m, [4mint[24m [4m*[24m [4mconf_state[24m, + [4mgss_buffer_t[24m [4moutput_message_buffer[24m); + + [4mOM_uint32[0m + [1mgss_wrap_size_limit[22m([4mOM_uint32[24m [4m*[24m [4mminor_status[24m, + [4mgss_const_ctx_id_t[24m [4mcontext_handle[24m, [4mint[24m [4mconf_req_flag[24m, + [4mgss_qop_t[24m [4mqop_req[24m, [4mOM_uint32[24m [4mreq_output_size[24m, + [4mOM_uint32[24m [4m*[24m [4mmax_input_size[24m); + +[1mDESCRIPTION[0m Generic Security Service API (GSS-API) version 2, and its C binding, is described in RFC2743 and RFC2744. Version 1 (deprecated) of the C bind- ing is described in RFC1509. Heimdals GSS-API implementation supports the following mechanisms - ++oo GSS_KRB5_MECHANISM + [1m+o [22mGSS_KRB5_MECHANISM - ++oo GSS_SPNEGO_MECHANISM + [1m+o [22mGSS_SPNEGO_MECHANISM GSS-API have generic name types that all mechanism are supposed to imple- ment (if possible): - ++oo GSS_C_NT_USER_NAME + [1m+o [22mGSS_C_NT_USER_NAME - ++oo GSS_C_NT_MACHINE_UID_NAME + [1m+o [22mGSS_C_NT_MACHINE_UID_NAME - ++oo GSS_C_NT_STRING_UID_NAME + [1m+o [22mGSS_C_NT_STRING_UID_NAME - ++oo GSS_C_NT_HOSTBASED_SERVICE + [1m+o [22mGSS_C_NT_HOSTBASED_SERVICE - ++oo GSS_C_NT_ANONYMOUS + [1m+o [22mGSS_C_NT_ANONYMOUS - ++oo GSS_C_NT_EXPORT_NAME + [1m+o [22mGSS_C_NT_EXPORT_NAME GSS-API implementations that supports Kerberos 5 have some additional name types: - ++oo GSS_KRB5_NT_PRINCIPAL_NAME + [1m+o [22mGSS_KRB5_NT_PRINCIPAL_NAME - ++oo GSS_KRB5_NT_USER_NAME + [1m+o [22mGSS_KRB5_NT_USER_NAME - ++oo GSS_KRB5_NT_MACHINE_UID_NAME + [1m+o [22mGSS_KRB5_NT_MACHINE_UID_NAME - ++oo GSS_KRB5_NT_STRING_UID_NAME + [1m+o [22mGSS_KRB5_NT_STRING_UID_NAME In GSS-API, names have two forms, internal names and contiguous string names. - ++oo Internal name and mechanism name + [1m+o [22mInternal name and mechanism name Internal names are implementation specific representation of a GSS- API name. Mechanism names special form of internal names corresponds @@ -294,13 +293,13 @@ DDEESSCCRRIIPPTTIIOONN In GSS-API an internal name is stored in a gss_name_t. - ++oo Contiguous string name and exported name + [1m+o [22mContiguous string name and exported name Contiguous string names are gssapi names stored in a OCTET STRING that together with a name type identifier (OID) uniquely specifies a - gss-name. A special form of the contiguous string name is the - exported name that have a OID embedded in the string to make it - unique. Exported name have the nametype GSS_C_NT_EXPORT_NAME. + gss-name. A special form of the contiguous string name is the ex- + ported name that have a OID embedded in the string to make it unique. + Exported name have the nametype GSS_C_NT_EXPORT_NAME. In GSS-API an contiguous string name is stored in a gss_buffer_t. @@ -308,99 +307,99 @@ DDEESSCCRRIIPPTTIIOONN mechanism itself and compatible between different GSS-API implementa- tions. -AACCCCEESSSS CCOONNTTRROOLL - There are two ways of comparing GSS-API names, either comparing two - internal names with each other or two contiguous string names with either +[1mACCESS CONTROL[0m + There are two ways of comparing GSS-API names, either comparing two in- + ternal names with each other or two contiguous string names with either other. To compare two internal names with each other, import (if needed) the - names with ggssss__iimmppoorrtt__nnaammee() into the GSS-API implementation and the com- - pare the imported name with ggssss__ccoommppaarree__nnaammee(). + names with [1mgss_import_name[22m() into the GSS-API implementation and the com- + pare the imported name with [1mgss_compare_name[22m(). Importing names can be slow, so when its possible to store exported names in the access control list, comparing contiguous string name might be better. when comparing contiguous string name, first export them into a - GSS_C_NT_EXPORT_NAME name with ggssss__eexxppoorrtt__nnaammee() and then compare with + GSS_C_NT_EXPORT_NAME name with [1mgss_export_name[22m() and then compare with memcmp(3). Note that there are might be a difference between the two methods of com- - paring names. The first (using ggssss__ccoommppaarree__nnaammee()) will compare to + paring names. The first (using [1mgss_compare_name[22m()) will compare to (unauthenticated) names are the same. The second will compare if a mech- anism will authenticate them as the same principal. - For example, if ggssss__iimmppoorrtt__nnaammee() name was used with GSS_C_NO_OID the - default syntax is used for all mechanism the GSS-API implementation sup- + For example, if [1mgss_import_name[22m() name was used with GSS_C_NO_OID the de- + fault syntax is used for all mechanism the GSS-API implementation sup- ports. When compare the imported name of GSS_C_NO_OID it may match sev- eral mechanism names (MN). - The resulting name from ggssss__ddiissppllaayy__nnaammee() must not be used for acccess + The resulting name from [1mgss_display_name[22m() must not be used for acccess control. -FFUUNNCCTTIIOONNSS - ggssss__ddiissppllaayy__nnaammee() takes the gss name in _i_n_p_u_t___n_a_m_e and puts a printable - form in _o_u_t_p_u_t___n_a_m_e___b_u_f_f_e_r. _o_u_t_p_u_t___n_a_m_e___b_u_f_f_e_r should be freed when done - using ggssss__rreelleeaassee__bbuuffffeerr(). _o_u_t_p_u_t___n_a_m_e___t_y_p_e can either be NULL or a +[1mFUNCTIONS[0m + [1mgss_display_name[22m() takes the gss name in [4minput_name[24m and puts a printable + form in [4moutput_name_buffer[24m. [4moutput_name_buffer[24m should be freed when done + using [1mgss_release_buffer[22m(). [4moutput_name_type[24m can either be NULL or a pointer to a gss_OID and will in the latter case contain the OID type of the name. The name must only be used for printing. If access control is - needed, see section _A_C_C_E_S_S _C_O_N_T_R_O_L. + needed, see section [4mACCESS[24m [4mCONTROL[24m. - ggssss__iinnqquuiirree__ccoonntteexxtt() returns information about the context. Information - is available even after the context have expired. _l_i_f_e_t_i_m_e___r_e_c argument + [1mgss_inquire_context[22m() returns information about the context. Information + is available even after the context have expired. [4mlifetime_rec[24m argument is set to GSS_C_INDEFINITE (don't expire) or the number of seconds that - the context is still valid. A value of 0 means that the context is - expired. _m_e_c_h___t_y_p_e argument should be considered readonly and must not - be released. _s_r_c___n_a_m_e and ddeesstt__nnaammee() are both mechanims names and must - be released with ggssss__rreelleeaassee__nnaammee() when no longer used. + the context is still valid. A value of 0 means that the context is ex- + pired. [4mmech_type[24m argument should be considered readonly and must not be + released. [4msrc_name[24m and [1mdest_name[22m() are both mechanims names and must be + released with [1mgss_release_name[22m() when no longer used. - ggssss__ccoonntteexxtt__ttiimmee will return the amount of time (in seconds) of the con- - text is still valid. If its expired _t_i_m_e___r_e_c will be set to 0 and + [1mgss_context_time [22mwill return the amount of time (in seconds) of the con- + text is still valid. If its expired [4mtime_rec[24m will be set to 0 and GSS_S_CONTEXT_EXPIRED returned. - ggssss__ssiiggnn(), ggssss__vveerriiffyy(), ggssss__sseeaall(), and ggssss__uunnsseeaall() are part of the + [1mgss_sign[22m(), [1mgss_verify[22m(), [1mgss_seal[22m(), and [1mgss_unseal[22m() are part of the GSS-API V1 interface and are obsolete. The functions should not be used for new applications. They are provided so that version 1 applications can link against the library. -EEXXTTEENNSSIIOONNSS - ggssss__kkrrbb55__ccccaacchhee__nnaammee() sets the internal kerberos 5 credential cache name - to _n_a_m_e. The old name is returned in _o_l_d___n_a_m_e, and must not be freed. - The data allocated for _o_l_d___n_a_m_e is free upon next call to - ggssss__kkrrbb55__ccccaacchhee__nnaammee(). This function is not threadsafe if _o_l_d___n_a_m_e - argument is used. +[1mEXTENSIONS[0m + [1mgss_krb5_ccache_name[22m() sets the internal kerberos 5 credential cache name + to [4mname[24m. The old name is returned in [4mold_name[24m, and must not be freed. + The data allocated for [4mold_name[24m is free upon next call to + [1mgss_krb5_ccache_name[22m(). This function is not threadsafe if [4mold_name[24m ar- + gument is used. - ggssss__kkrrbb55__ccooppyy__ccccaacchhee() will extract the krb5 credentials that are trans- + [1mgss_krb5_copy_ccache[22m() will extract the krb5 credentials that are trans- ferred from the initiator to the acceptor when using token delegation in the Kerberos mechanism. The acceptor receives the delegated token in the - last argument to ggssss__aacccceepptt__sseecc__ccoonntteexxtt(). + last argument to [1mgss_accept_sec_context[22m(). - ggssss__kkrrbb55__iimmppoorrtt__ccrreedd() will import the krb5 credentials (both keytab + [1mgss_krb5_import_cred[22m() will import the krb5 credentials (both keytab and/or credential cache) into gss credential so it can be used withing - GSS-API. The _c_c_a_c_h_e is copied by reference and thus shared, so if the - credential is destroyed with _k_r_b_5___c_c___d_e_s_t_r_o_y, all users of thep - _g_s_s___c_r_e_d___i_d___t returned by ggssss__kkrrbb55__iimmppoorrtt__ccccaacchhee() will fail. + GSS-API. The [4mccache[24m is copied by reference and thus shared, so if the + credential is destroyed with [4mkrb5_cc_destroy[24m, all users of thep + [4mgss_cred_id_t[24m returned by [1mgss_krb5_import_ccache[22m() will fail. - ggsssskkrrbb55__rreeggiisstteerr__aacccceeppttoorr__iiddeennttiittyy() sets the Kerberos 5 filebased keytab - that the acceptor will use. The _i_d_e_n_t_i_f_i_e_r is the file name. + [1mgsskrb5_register_acceptor_identity[22m() sets the Kerberos 5 filebased keytab + that the acceptor will use. The [4midentifier[24m is the file name. - ggsssskkrrbb55__eexxttrraacctt__aauutthhzz__ddaattaa__ffrroomm__sseecc__ccoonntteexxtt() extracts the Kerberos - authorizationdata that may be stored within the context. Tha caller must - free the returned buffer _a_d___d_a_t_a with ggssss__rreelleeaassee__bbuuffffeerr() upon success. + [1mgsskrb5_extract_authz_data_from_sec_context[22m() extracts the Kerberos au- + thorizationdata that may be stored within the context. Tha caller must + free the returned buffer [4mad_data[24m with [1mgss_release_buffer[22m() upon success. - ggssss__kkrrbb55__ggeett__ttkktt__ffllaaggss() return the ticket flags for the kerberos ticket + [1mgss_krb5_get_tkt_flags[22m() return the ticket flags for the kerberos ticket receive when authenticating the initiator. Only valid on the acceptor context. - ggssss__kkrrbb55__ccoommppaatt__ddeess33__mmiicc() turns on or off the compatibility with older + [1mgss_krb5_compat_des3_mic[22m() turns on or off the compatibility with older version of Heimdal using des3 get and verify mic, this is way to program- matically set the [gssapi]broken_des3_mic and [gssapi]correct_des3_mic flags (see COMPATIBILITY section in gssapi(3)). If the CPP symbol - GSS_C_KRB5_COMPAT_DES3_MIC is present, ggssss__kkrrbb55__ccoommppaatt__ddeess33__mmiicc() exists. - ggssss__kkrrbb55__ccoommppaatt__ddeess33__mmiicc() will be removed in a later version of the GSS- + GSS_C_KRB5_COMPAT_DES3_MIC is present, [1mgss_krb5_compat_des3_mic[22m() exists. + [1mgss_krb5_compat_des3_mic[22m() will be removed in a later version of the GSS- API library. -SSEEEE AALLSSOO +[1mSEE ALSO[0m gssapi(3), krb5(3), krb5_ccache(3), kerberos(8) HEIMDAL October 26, 2005 HEIMDAL diff --git a/lib/gssapi/gssapi.cat3 b/lib/gssapi/gssapi.cat3 index 82901ad0efbd..701dd4264c0a 100644 --- a/lib/gssapi/gssapi.cat3 +++ b/lib/gssapi/gssapi.cat3 @@ -1,13 +1,12 @@ - GSSAPI(3) BSD Library Functions Manual GSSAPI(3) -NNAAMMEE - ggssssaappii -- Generic Security Service Application Program Interface library +[1mNAME[0m + [1mgssapi [22m-- Generic Security Service Application Program Interface library -LLIIBBRRAARRYY +[1mLIBRARY[0m GSS-API Library (libgssapi, -lgssapi) -DDEESSCCRRIIPPTTIIOONN +[1mDESCRIPTION[0m The Generic Security Service Application Program Interface (GSS-API) pro- vides security services to callers in a generic fashion, supportable with a range of underlying mechanisms and technologies and hence allowing @@ -16,10 +15,10 @@ DDEESSCCRRIIPPTTIIOONN The GSS-API implementation in Heimdal implements the Kerberos 5 and the SPNEGO GSS-API security mechanisms. -LLIISSTT OOFF FFUUNNCCTTIIOONNSS - These functions constitute the gssapi library, _l_i_b_g_s_s_a_p_i. Declarations - for these functions may be obtained from the include file _g_s_s_a_p_i_._h. - NNaammee//PPaaggee +[1mLIST OF FUNCTIONS[0m + These functions constitute the gssapi library, [4mlibgssapi[24m. Declarations + for these functions may be obtained from the include file [4mgssapi.h[24m. + [1mName/Page[0m gss_accept_sec_context(3) gss_acquire_cred(3) gss_add_cred(3) @@ -64,52 +63,52 @@ LLIISSTT OOFF FFUUNNCCTTIIOONNSS gss_wrap(3) gss_wrap_size_limit(3) -CCOOMMPPAATTIIBBIILLIITTYY - The HHeeiimmddaall GSS-API implementation had a bug in releases before 0.6 that +[1mCOMPATIBILITY[0m + The [1mHeimdal [22mGSS-API implementation had a bug in releases before 0.6 that made it fail to inter-operate when using DES3 with other GSS-API imple- - mentations when using ggssss__ggeett__mmiicc() / ggssss__vveerriiffyy__mmiicc(). It is possible - to modify the behavior of the generator of the MIC with the _k_r_b_5_._c_o_n_f + mentations when using [1mgss_get_mic[22m() / [1mgss_verify_mic[22m(). It is possible + to modify the behavior of the generator of the MIC with the [4mkrb5.conf[0m configuration file so that old clients/servers will still work. New clients/servers will try both the old and new MIC in Heimdal 0.6. In - 0.7 it will check only if configured - the compatibility code will be - removed in 0.8. + 0.7 it will check only if configured - the compatibility code will be re- + moved in 0.8. Heimdal 0.6 still generates by default the broken GSS-API DES3 mic, this will change in 0.7 to generate correct des3 mic. To turn on compatibility with older clients and servers, change the - [[ggssssaappii]] _b_r_o_k_e_n___d_e_s_3___m_i_c in _k_r_b_5_._c_o_n_f that contains a list of globbing + [1m[gssapi] [4m[22mbroken_des3_mic[24m in [4mkrb5.conf[24m that contains a list of globbing expressions that will be matched against the server name. To turn off - generation of the old (incompatible) mic of the MIC use [[ggssssaappii]] - _c_o_r_r_e_c_t___d_e_s_3___m_i_c. + generation of the old (incompatible) mic of the MIC use [1m[gssapi][0m + [4mcorrect_des3_mic[24m. - If a match for a entry is in both [[ggssssaappii]] _c_o_r_r_e_c_t___d_e_s_3___m_i_c and [[ggssssaappii]] - _b_r_o_k_e_n___d_e_s_3___m_i_c, the later will override. + If a match for a entry is in both [1m[gssapi] [4m[22mcorrect_des3_mic[24m and [1m[gssapi][0m + [4mbroken_des3_mic[24m, the later will override. This config option modifies behaviour for both clients and servers. Microsoft implemented SPNEGO to Windows2000, however, they managed to get - it wrong, their implementation didn't fill in the MechListMIC in the - reply token with the right content. There is a work around for this - problem, but not all implementation support it. + it wrong, their implementation didn't fill in the MechListMIC in the re- + ply token with the right content. There is a work around for this prob- + lem, but not all implementation support it. Heimdal defaults to correct SPNEGO when the the kerberos implementation uses CFX, or when it is configured by the user. To turn on compatibility - with peers, use option [[ggssssaappii]] _r_e_q_u_i_r_e___m_e_c_h_l_i_s_t___m_i_c. + with peers, use option [1m[gssapi] [4m[22mrequire_mechlist_mic[24m. -EEXXAAMMPPLLEESS +[1mEXAMPLES[0m [gssapi] broken_des3_mic = cvs/*@SU.SE broken_des3_mic = host/*@E.KTH.SE correct_des3_mic = host/*@SU.SE require_mechlist_mic = host/*@SU.SE -BBUUGGSS - All of 0.5.x versions of hheeiimmddaall had broken token delegations in the +[1mBUGS[0m + All of 0.5.x versions of [1mheimdal [22mhad broken token delegations in the client side, the server side was correct. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3), krb5.conf(5), kerberos(8) BSD April 20, 2005 BSD diff --git a/lib/gssapi/krb5/accept_sec_context.c b/lib/gssapi/krb5/accept_sec_context.c index d4680e9e8fb6..e35cc10e560c 100644 --- a/lib/gssapi/krb5/accept_sec_context.c +++ b/lib/gssapi/krb5/accept_sec_context.c @@ -443,6 +443,7 @@ gsskrb5_acceptor_start(OM_uint32 * minor_status, * lets only send the error token on clock skew, that * limit when send error token for non-MUTUAL. */ + free_Authenticator(ctx->auth_context->authenticator); return send_error_token(minor_status, context, kret, server, &indata, output_token); } else if (kret) { diff --git a/lib/gssapi/krb5/acquire_cred.c b/lib/gssapi/krb5/acquire_cred.c index 9c880b334fd6..431700070e53 100644 --- a/lib/gssapi/krb5/acquire_cred.c +++ b/lib/gssapi/krb5/acquire_cred.c @@ -100,6 +100,7 @@ acquire_cred_with_password(OM_uint32 *minor_status, krb5_error_code kret; time_t now; OM_uint32 left; + const char *realm; if (cred_usage == GSS_C_ACCEPT) { /* @@ -126,6 +127,10 @@ acquire_cred_with_password(OM_uint32 *minor_status, if (kret) goto end; + realm = krb5_principal_get_realm(context, handle->principal); + + krb5_get_init_creds_opt_set_default_flags(context, "gss_krb5", realm, opt); + /* * Get the current time before the AS exchange so we don't * accidentally end up returning a value that puts advertised diff --git a/lib/gssapi/krb5/arcfour.c b/lib/gssapi/krb5/arcfour.c index d88ec4cddc53..aa03cbe41acb 100644 --- a/lib/gssapi/krb5/arcfour.c +++ b/lib/gssapi/krb5/arcfour.c @@ -177,7 +177,7 @@ arcfour_mic_cksum_iov(krb5_context context, memcpy(ptr + ofs, padding->buffer.value, padding->buffer.length); - ofs += padding->buffer.length; + /* ofs += padding->buffer.length; */ } ret = krb5_crypto_init(context, key, 0, &crypto); @@ -365,7 +365,7 @@ _gssapi_verify_mic_arcfour(OM_uint32 * minor_status, return GSS_S_FAILURE; } - cmp = ct_memcmp(cksum_data, p + 8, 8); + cmp = (ct_memcmp(cksum_data, p + 8, 8) == 0); if (cmp) { *minor_status = 0; return GSS_S_BAD_MIC; @@ -385,9 +385,9 @@ _gssapi_verify_mic_arcfour(OM_uint32 * minor_status, _gsskrb5_decode_be_om_uint32(SND_SEQ, &seq_number); if (context_handle->more_flags & LOCAL) - cmp = memcmp(&SND_SEQ[4], "\xff\xff\xff\xff", 4); + cmp = (ct_memcmp(&SND_SEQ[4], "\xff\xff\xff\xff", 4) != 0); else - cmp = memcmp(&SND_SEQ[4], "\x00\x00\x00\x00", 4); + cmp = (ct_memcmp(&SND_SEQ[4], "\x00\x00\x00\x00", 4) != 0); memset_s(SND_SEQ, sizeof(SND_SEQ), 0, sizeof(SND_SEQ)); if (cmp != 0) { @@ -656,9 +656,9 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status, _gsskrb5_decode_be_om_uint32(SND_SEQ, &seq_number); if (context_handle->more_flags & LOCAL) - cmp = memcmp(&SND_SEQ[4], "\xff\xff\xff\xff", 4); + cmp = (ct_memcmp(&SND_SEQ[4], "\xff\xff\xff\xff", 4) != 0); else - cmp = memcmp(&SND_SEQ[4], "\x00\x00\x00\x00", 4); + cmp = (ct_memcmp(&SND_SEQ[4], "\x00\x00\x00\x00", 4) != 0); if (cmp != 0) { *minor_status = 0; @@ -730,7 +730,7 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status, return GSS_S_FAILURE; } - cmp = ct_memcmp(cksum_data, p0 + 16, 8); /* SGN_CKSUM */ + cmp = (ct_memcmp(cksum_data, p0 + 16, 8) == 0); /* SGN_CKSUM */ if (cmp) { _gsskrb5_release_buffer(minor_status, output_message_buffer); *minor_status = 0; @@ -880,7 +880,13 @@ _gssapi_wrap_iov_length_arcfour(OM_uint32 *minor_status, } } - major_status = _gk_verify_buffers(minor_status, ctx, header, padding, trailer); + if (header == NULL) { + *minor_status = EINVAL; + return GSS_S_FAILURE; + } + + major_status = _gk_verify_buffers(minor_status, ctx, header, + padding, trailer, FALSE); if (major_status != GSS_S_COMPLETE) { return major_status; } @@ -937,7 +943,8 @@ _gssapi_wrap_iov_arcfour(OM_uint32 *minor_status, padding = _gk_find_buffer(iov, iov_count, GSS_IOV_BUFFER_TYPE_PADDING); trailer = _gk_find_buffer(iov, iov_count, GSS_IOV_BUFFER_TYPE_TRAILER); - major_status = _gk_verify_buffers(minor_status, ctx, header, padding, trailer); + major_status = _gk_verify_buffers(minor_status, ctx, header, + padding, trailer, FALSE); if (major_status != GSS_S_COMPLETE) { return major_status; } @@ -974,7 +981,7 @@ _gssapi_wrap_iov_arcfour(OM_uint32 *minor_status, header_len -= data_len; } - if (GSS_IOV_BUFFER_FLAGS(header->type) & GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATE) { + if (GSS_IOV_BUFFER_FLAGS(header->type) & GSS_IOV_BUFFER_FLAG_ALLOCATE) { major_status = _gk_allocate_buffer(minor_status, header, header_len); if (major_status != GSS_S_COMPLETE) @@ -988,7 +995,7 @@ _gssapi_wrap_iov_arcfour(OM_uint32 *minor_status, } if (padding) { - if (GSS_IOV_BUFFER_FLAGS(padding->type) & GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATE) { + if (GSS_IOV_BUFFER_FLAGS(padding->type) & GSS_IOV_BUFFER_FLAG_ALLOCATE) { major_status = _gk_allocate_buffer(minor_status, padding, 1); if (major_status != GSS_S_COMPLETE) goto failure; @@ -1181,10 +1188,11 @@ _gssapi_unwrap_iov_arcfour(OM_uint32 *minor_status, /* Check if the packet is correct */ major_status = _gk_verify_buffers(minor_status, - ctx, - header, - padding, - trailer); + ctx, + header, + padding, + trailer, + FALSE); /* behaves as stream cipher */ if (major_status != GSS_S_COMPLETE) { return major_status; } @@ -1194,15 +1202,19 @@ _gssapi_unwrap_iov_arcfour(OM_uint32 *minor_status, return GSS_S_FAILURE; } - if (IS_DCE_STYLE(context)) { - verify_len = GSS_ARCFOUR_WRAP_TOKEN_SIZE + - GSS_ARCFOUR_WRAP_TOKEN_DCE_DER_HEADER_SIZE; - if (header->buffer.length > verify_len) { - return GSS_S_BAD_MECH; + verify_len = header->buffer.length; + + if (!IS_DCE_STYLE(context)) { + for (i = 0; i < iov_count; i++) { + /* length in header also includes data and padding */ + if (GSS_IOV_BUFFER_TYPE(iov[i].type) == GSS_IOV_BUFFER_TYPE_DATA) + verify_len += iov[i].buffer.length; } - } else { - verify_len = header->buffer.length; + + if (padding) + verify_len += padding->buffer.length; } + _p = header->buffer.value; ret = _gssapi_verify_mech_header(&_p, @@ -1267,19 +1279,9 @@ _gssapi_unwrap_iov_arcfour(OM_uint32 *minor_status, _gsskrb5_decode_be_om_uint32(snd_seq, &seq_number); if (ctx->more_flags & LOCAL) { - cmp = memcmp(&snd_seq[4], "\xff\xff\xff\xff", 4); - } else { - cmp = memcmp(&snd_seq[4], "\x00\x00\x00\x00", 4); - } - if (cmp != 0) { - *minor_status = 0; - return GSS_S_BAD_MIC; - } - - if (ctx->more_flags & LOCAL) { - cmp = memcmp(&snd_seq[4], "\xff\xff\xff\xff", 4); + cmp = (ct_memcmp(&snd_seq[4], "\xff\xff\xff\xff", 4) != 0); } else { - cmp = memcmp(&snd_seq[4], "\x00\x00\x00\x00", 4); + cmp = (ct_memcmp(&snd_seq[4], "\x00\x00\x00\x00", 4) != 0); } if (cmp != 0) { *minor_status = 0; diff --git a/lib/gssapi/krb5/cfx.c b/lib/gssapi/krb5/cfx.c index 29fecca861ce..8d806f9fbf1c 100644 --- a/lib/gssapi/krb5/cfx.c +++ b/lib/gssapi/krb5/cfx.c @@ -206,11 +206,36 @@ gss_iov_buffer_desc * _gk_find_buffer(gss_iov_buffer_desc *iov, int iov_count, OM_uint32 type) { int i; + gss_iov_buffer_t iovp = GSS_C_NO_IOV_BUFFER; - for (i = 0; i < iov_count; i++) - if (type == GSS_IOV_BUFFER_TYPE(iov[i].type)) - return &iov[i]; - return NULL; + if (iov == GSS_C_NO_IOV_BUFFER) + return GSS_C_NO_IOV_BUFFER; + + /* + * This function is used to find header, padding or trailer buffers + * which are singletons; return NULL if multiple instances are found. + */ + for (i = 0; i < iov_count; i++) { + if (type == GSS_IOV_BUFFER_TYPE(iov[i].type)) { + if (iovp == GSS_C_NO_IOV_BUFFER) + iovp = &iov[i]; + else + return GSS_C_NO_IOV_BUFFER; + } + } + + /* + * For compatibility with SSPI, an empty padding buffer is treated + * equivalent to an absent padding buffer (unless the caller is + * requesting that a padding buffer be allocated). + */ + if (iovp && + iovp->buffer.length == 0 && + type == GSS_IOV_BUFFER_TYPE_PADDING && + (GSS_IOV_BUFFER_FLAGS(iovp->type) & GSS_IOV_BUFFER_FLAG_ALLOCATE) == 0) + iovp = NULL; + + return iovp; } OM_uint32 @@ -239,7 +264,8 @@ _gk_verify_buffers(OM_uint32 *minor_status, const gsskrb5_ctx ctx, const gss_iov_buffer_desc *header, const gss_iov_buffer_desc *padding, - const gss_iov_buffer_desc *trailer) + const gss_iov_buffer_desc *trailer, + int block_cipher) { if (header == NULL) { *minor_status = EINVAL; @@ -260,9 +286,12 @@ _gk_verify_buffers(OM_uint32 *minor_status, } } else { /* - * In non-DCE style mode we require having a padding buffer + * In non-DCE style mode we require having a padding buffer for + * encryption types that do not behave as stream ciphers. This + * check is superfluous for now, as only RC4 and RFC4121 enctypes + * are presently implemented for the IOV APIs; be defensive. */ - if (padding == NULL) { + if (block_cipher && padding == NULL) { *minor_status = EINVAL; return GSS_S_FAILURE; } @@ -306,7 +335,8 @@ _gssapi_wrap_cfx_iov(OM_uint32 *minor_status, trailer = _gk_find_buffer(iov, iov_count, GSS_IOV_BUFFER_TYPE_TRAILER); - major_status = _gk_verify_buffers(minor_status, ctx, header, padding, trailer); + major_status = _gk_verify_buffers(minor_status, ctx, header, + padding, trailer, FALSE); if (major_status != GSS_S_COMPLETE) { return major_status; } @@ -747,7 +777,8 @@ _gssapi_unwrap_cfx_iov(OM_uint32 *minor_status, trailer = _gk_find_buffer(iov, iov_count, GSS_IOV_BUFFER_TYPE_TRAILER); - major_status = _gk_verify_buffers(minor_status, ctx, header, padding, trailer); + major_status = _gk_verify_buffers(minor_status, ctx, header, + padding, trailer, FALSE); if (major_status != GSS_S_COMPLETE) { return major_status; } @@ -1069,7 +1100,8 @@ _gssapi_wrap_iov_length_cfx(OM_uint32 *minor_status, } } - major_status = _gk_verify_buffers(minor_status, ctx, header, padding, trailer); + major_status = _gk_verify_buffers(minor_status, ctx, header, + padding, trailer, FALSE); if (major_status != GSS_S_COMPLETE) { return major_status; } diff --git a/lib/gssapi/krb5/decapsulate.c b/lib/gssapi/krb5/decapsulate.c index 86085f569501..d7b75a642224 100644 --- a/lib/gssapi/krb5/decapsulate.c +++ b/lib/gssapi/krb5/decapsulate.c @@ -54,6 +54,8 @@ _gsskrb5_get_mech (const u_char *ptr, e = der_get_length (p, total_len - 1, &len, &len_len); if (e || 1 + len_len + len != total_len) return -1; + if (total_len < 1 + len_len + 1) + return -1; p += len_len; if (*p++ != 0x06) return -1; @@ -80,6 +82,10 @@ _gssapi_verify_mech_header(u_char **str, if (mech_len != mech->length) return GSS_S_BAD_MECH; + if (mech_len > total_len) + return GSS_S_BAD_MECH; + if (p - *str > total_len - mech_len) + return GSS_S_BAD_MECH; if (ct_memcmp(p, mech->elements, mech->length) != 0) @@ -193,13 +199,13 @@ _gssapi_verify_pad(gss_buffer_t wrapped_token, if (wrapped_token->length < 1) return GSS_S_BAD_MECH; - pad = (u_char *)wrapped_token->value + wrapped_token->length - 1; - padlength = *pad; + pad = (u_char *)wrapped_token->value + wrapped_token->length; + padlength = pad[-1]; if (padlength > datalen) return GSS_S_BAD_MECH; - for (i = padlength; i > 0 && *pad == padlength; i--, pad--) + for (i = padlength; i > 0 && *--pad == padlength; i--) ; if (i != 0) return GSS_S_BAD_MIC; diff --git a/lib/gssapi/krb5/delete_sec_context.c b/lib/gssapi/krb5/delete_sec_context.c index 83a66cc0ca01..a4800791ec4e 100644 --- a/lib/gssapi/krb5/delete_sec_context.c +++ b/lib/gssapi/krb5/delete_sec_context.c @@ -75,6 +75,8 @@ _gsskrb5_delete_sec_context(OM_uint32 * minor_status, krb5_data_free(&ctx->fwd_data); if (ctx->crypto) krb5_crypto_destroy(context, ctx->crypto); + if (ctx->ccache && (ctx->more_flags & CLOSE_CCACHE)) + krb5_cc_close(context, ctx->ccache); HEIMDAL_MUTEX_unlock(&ctx->ctx_id_mutex); HEIMDAL_MUTEX_destroy(&ctx->ctx_id_mutex); diff --git a/lib/gssapi/krb5/display_status.c b/lib/gssapi/krb5/display_status.c index c50200672aaf..2587b966cfb8 100644 --- a/lib/gssapi/krb5/display_status.c +++ b/lib/gssapi/krb5/display_status.c @@ -64,8 +64,7 @@ routine_error(OM_uint32 v) "Incorrect channel bindings were supplied", "An invalid status code was supplied", "A token had an invalid MIC", - "No credentials were supplied, " - "or the credentials were unavailable or inaccessible.", + "No credentials were supplied, or the credentials were unavailable or inaccessible.", "No context has been established", "A token was invalid", "A credential was invalid", diff --git a/lib/gssapi/krb5/gsskrb5-private.h b/lib/gssapi/krb5/gsskrb5-private.h index e05d4a6b6da6..29eea8adf0a8 100644 --- a/lib/gssapi/krb5/gsskrb5-private.h +++ b/lib/gssapi/krb5/gsskrb5-private.h @@ -42,7 +42,8 @@ _gk_verify_buffers ( const gsskrb5_ctx /*ctx*/, const gss_iov_buffer_desc */*header*/, const gss_iov_buffer_desc */*padding*/, - const gss_iov_buffer_desc */*trailer*/); + const gss_iov_buffer_desc */*trailer*/, + int /*block_cipher*/); OM_uint32 GSSAPI_CALLCONV _gk_wrap_iov ( diff --git a/lib/gssapi/krb5/init_sec_context.c b/lib/gssapi/krb5/init_sec_context.c index 4ef5c9c7123a..21ac554efd4f 100644 --- a/lib/gssapi/krb5/init_sec_context.c +++ b/lib/gssapi/krb5/init_sec_context.c @@ -600,7 +600,19 @@ init_auth_restart if (ret == 0) { if (timedata.length == 4) { const u_char *p = timedata.data; - offset = (p[0] <<24) | (p[1] << 16) | (p[2] << 8) | (p[3] << 0); + if (p[0] < 128) { + offset = (p[0] <<24) | (p[1] << 16) | (p[2] << 8) | (p[3] << 0); + } else { + /* + * (p[0] << 24), if p[0] > 127 -> offset is negative, but *p is + * positive, so this is overflow -- overflow we want, but UBSAN + * flags it. + * + * NOTE: We assume the platform is a twos-complement platform. + */ + offset = INT32_MIN; + offset |= ((p[0] & 0x7f) <<24) | (p[1] << 16) | (p[2] << 8) | (p[3] << 0); + } } krb5_data_free(&timedata); } @@ -921,7 +933,7 @@ OM_uint32 GSSAPI_CALLCONV _gsskrb5_init_sec_context time_rec); if (ret != GSS_S_COMPLETE) break; - /* FALL THOUGH */ + /* FALLTHROUGH */ case INITIATOR_RESTART: ret = init_auth_restart(minor_status, cred, diff --git a/lib/gssapi/krb5/unwrap.c b/lib/gssapi/krb5/unwrap.c index da939c052930..bab30f45016b 100644 --- a/lib/gssapi/krb5/unwrap.c +++ b/lib/gssapi/krb5/unwrap.c @@ -64,6 +64,8 @@ unwrap_des if (IS_DCE_STYLE(context_handle)) { token_len = 22 + 8 + 15; /* 45 */ + if (input_message_buffer->length < token_len) + return GSS_S_BAD_MECH; } else { token_len = input_message_buffer->length; } @@ -76,6 +78,11 @@ unwrap_des if (ret) return ret; + len = (p - (u_char *)input_message_buffer->value) + + 22 + 8; + if (input_message_buffer->length < len) + return GSS_S_BAD_MECH; + if (memcmp (p, "\x00\x00", 2) != 0) return GSS_S_BAD_SIG; p += 2; @@ -117,7 +124,7 @@ unwrap_des } else { /* check pad */ ret = _gssapi_verify_pad(input_message_buffer, - input_message_buffer->length - len, + input_message_buffer->length - len - 8, &padlength); if (ret) return ret; @@ -180,9 +187,10 @@ unwrap_des output_message_buffer->value = malloc(output_message_buffer->length); if(output_message_buffer->length != 0 && output_message_buffer->value == NULL) return GSS_S_FAILURE; - memcpy (output_message_buffer->value, - p + 24, - output_message_buffer->length); + if (output_message_buffer->value != NULL) + memcpy (output_message_buffer->value, + p + 24, + output_message_buffer->length); return GSS_S_COMPLETE; } #endif @@ -215,6 +223,8 @@ unwrap_des3 if (IS_DCE_STYLE(context_handle)) { token_len = 34 + 8 + 15; /* 57 */ + if (input_message_buffer->length < token_len) + return GSS_S_BAD_MECH; } else { token_len = input_message_buffer->length; } @@ -227,7 +237,12 @@ unwrap_des3 if (ret) return ret; - if (memcmp (p, "\x04\x00", 2) != 0) /* HMAC SHA1 DES3_KD */ + len = (p - (u_char *)input_message_buffer->value) + + 34 + 8; + if (input_message_buffer->length < len) + return GSS_S_BAD_MECH; + + if (ct_memcmp (p, "\x04\x00", 2) != 0) /* HMAC SHA1 DES3_KD */ return GSS_S_BAD_SIG; p += 2; if (ct_memcmp (p, "\x02\x00", 2) == 0) { @@ -274,7 +289,7 @@ unwrap_des3 } else { /* check pad */ ret = _gssapi_verify_pad(input_message_buffer, - input_message_buffer->length - len, + input_message_buffer->length - len - 8, &padlength); if (ret) return ret; @@ -374,9 +389,10 @@ unwrap_des3 output_message_buffer->value = malloc(output_message_buffer->length); if(output_message_buffer->length != 0 && output_message_buffer->value == NULL) return GSS_S_FAILURE; - memcpy (output_message_buffer->value, - p + 36, - output_message_buffer->length); + if (output_message_buffer->value != NULL) + memcpy (output_message_buffer->value, + p + 36, + output_message_buffer->length); return GSS_S_COMPLETE; } diff --git a/lib/gssapi/mech/gss_display_status.c b/lib/gssapi/mech/gss_display_status.c index a79ef350dc93..848e8a320b3d 100644 --- a/lib/gssapi/mech/gss_display_status.c +++ b/lib/gssapi/mech/gss_display_status.c @@ -91,8 +91,7 @@ routine_error(OM_uint32 v) "Incorrect channel bindings were supplied", "An invalid status code was supplied", "A token had an invalid MIC", - "No credentials were supplied, " - "or the credentials were unavailable or inaccessible.", + "No credentials were supplied, or the credentials were unavailable or inaccessible.", "No context has been established", "A token was invalid", "A credential was invalid", diff --git a/lib/gssapi/mech/gss_import_name.c b/lib/gssapi/mech/gss_import_name.c index 4c1d940d9af8..fab57597c90e 100644 --- a/lib/gssapi/mech/gss_import_name.c +++ b/lib/gssapi/mech/gss_import_name.c @@ -113,7 +113,7 @@ _gss_import_export_name(OM_uint32 *minor_status, len -= t; t = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]; - p += 4; + /* p += 4; */ len -= 4; if (!composite && len != t) diff --git a/lib/gssapi/mech/gss_mech_switch.c b/lib/gssapi/mech/gss_mech_switch.c index 58b187eda296..4d7f298d1961 100644 --- a/lib/gssapi/mech/gss_mech_switch.c +++ b/lib/gssapi/mech/gss_mech_switch.c @@ -137,6 +137,8 @@ _gss_string_to_oid(const char* s, gss_OID oid) } } } + if (byte_count == 0) + return EINVAL; if (!res) { res = malloc(byte_count); if (!res) diff --git a/lib/gssapi/mech/gss_pname_to_uid.c b/lib/gssapi/mech/gss_pname_to_uid.c index 315f0e0d8147..9223a918b858 100644 --- a/lib/gssapi/mech/gss_pname_to_uid.c +++ b/lib/gssapi/mech/gss_pname_to_uid.c @@ -158,6 +158,10 @@ gss_pname_to_uid(OM_uint32 *minor_status, major = gss_localname(minor_status, pname, mech_type, &localname); if (GSS_ERROR(major)) return major; + if (localname.length == 0) { + *minor_status = KRB5_NO_LOCALNAME; + return GSS_S_FAILURE; + } szLocalname = malloc(localname.length + 1); if (szLocalname == NULL) { diff --git a/lib/gssapi/mech/mech.cat5 b/lib/gssapi/mech/mech.cat5 index 998079f2959c..d4a38d579eb3 100644 --- a/lib/gssapi/mech/mech.cat5 +++ b/lib/gssapi/mech/mech.cat5 @@ -1,61 +1,61 @@ - MECH(5) BSD File Formats Manual MECH(5) -NNAAMMEE - mmeecchh, qqoopp -- GSS-API Mechanism and QOP files +[1mNAME[0m + [1mmech[22m, [1mqop [22m-- GSS-API Mechanism and QOP files -SSYYNNOOPPSSIISS - _/_e_t_c_/_g_s_s_/_m_e_c_h _/_e_t_c_/_g_s_s_/_q_o_p +[1mSYNOPSIS[0m + [4m/etc/gss/mech[24m [4m/etc/gss/qop[0m -DDEESSCCRRIIPPTTIIOONN - The _/_e_t_c_/_g_s_s_/_m_e_c_h file contains a list of installed GSS-API security +[1mDESCRIPTION[0m + The [4m/etc/gss/mech[24m file contains a list of installed GSS-API security mechanisms. Each line of the file either contains a comment if the first character is '#' or it contains five fields with the following meanings: - Name The name of this GSS-API mechanism. + Name The name of this GSS-API mechanism. Object identifier - The OID for this mechanism. + The OID for this mechanism. - Library A shared library containing the implementation of this - mechanism. + Library + A shared library containing the implementation of this mechanism. Kernel module (optional) - A kernel module containing the implementation of this mech- - anism (not yet supported in FreeBSD). + A kernel module containing the implementation of this mechanism + (not yet supported in FreeBSD). Library options (optional) - Optionsal parameters interpreted by the mechanism. Library - options must be enclosed in brackets ([ ]) to differentiate - them from the optional kernel module entry. + Optionsal parameters interpreted by the mechanism. Library op- + tions must be enclosed in brackets ([ ]) to differentiate them + from the optional kernel module entry. - The _/_e_t_c_/_g_s_s_/_q_o_p file contains a list of Quality of Protection values for + The [4m/etc/gss/qop[24m file contains a list of Quality of Protection values for use with GSS-API. Each line of the file either contains a comment if the first character is '#' or it contains three fields with the following meanings: - QOP string The name of this Quality of Protection algorithm. + QOP string + The name of this Quality of Protection algorithm. - QOP value The numeric value used to select this algorithm for use - with GSS-API functions such as gss_get_mic(3). + QOP value + The numeric value used to select this algorithm for use with GSS- + API functions such as gss_get_mic(3). Mechanism name - The GSS-API mechanism name that corresponds to this algo- - rithm. + The GSS-API mechanism name that corresponds to this algorithm. -EEXXAAMMPPLLEESS - This is a typical entry from _/_e_t_c_/_g_s_s_/_m_e_c_h: +[1mEXAMPLES[0m + This is a typical entry from [4m/etc/gss/mech[24m: kerberosv5 1.2.840.113554.1.2.2 /usr/lib/libgssapi_krb5.so.8 - - This is a typical entry from _/_e_t_c_/_g_s_s_/_q_o_p: + This is a typical entry from [4m/etc/gss/qop[24m: GSS_KRB5_CONF_C_QOP_DES 0x0100 kerberosv5 -HHIISSTTOORRYY - The mmeecchh manual page example first appeared in FreeBSD 7.0. +[1mHISTORY[0m + The [1mmech [22mmanual page example first appeared in FreeBSD 7.0. -AAUUTTHHOORRSS - This manual page was written by Doug Rabson <_d_f_r_@_F_r_e_e_B_S_D_._o_r_g>. +[1mAUTHORS[0m + This manual page was written by Doug Rabson <[4mdfr@FreeBSD.org[24m>. BSD November 14, 2005 BSD diff --git a/lib/gssapi/mech/mech_locl.h b/lib/gssapi/mech/mech_locl.h index 6c23ac5256b1..0f4d8e51b2c3 100644 --- a/lib/gssapi/mech/mech_locl.h +++ b/lib/gssapi/mech/mech_locl.h @@ -51,6 +51,7 @@ #include <roken.h> +#include <krb5.h> #include <gssapi.h> #include <gssapi_mech.h> #include <gssapi_krb5.h> diff --git a/lib/gssapi/ntlm/init_sec_context.c b/lib/gssapi/ntlm/init_sec_context.c index f3198d8a274d..cf72ae8f77d6 100644 --- a/lib/gssapi/ntlm/init_sec_context.c +++ b/lib/gssapi/ntlm/init_sec_context.c @@ -56,6 +56,8 @@ from_file(const char *fn, const char *target_domain, d = strtok_r(buf, ":", &str); free(*domainp); *domainp = NULL; + if (!d) + continue; if (d && target_domain != NULL && strcasecmp(target_domain, d) != 0) continue; *domainp = strdup(d); diff --git a/lib/gssapi/spnego/accept_sec_context.c b/lib/gssapi/spnego/accept_sec_context.c index 48b786c29ed1..5fe1a1a649a4 100644 --- a/lib/gssapi/spnego/accept_sec_context.c +++ b/lib/gssapi/spnego/accept_sec_context.c @@ -619,13 +619,15 @@ acceptor_start if (ret == 0) break; } - if (preferred_mech_type == GSS_C_NO_OID) { - HEIMDAL_MUTEX_unlock(&ctx->ctx_id_mutex); - free_NegotiationToken(&nt); - return ret; - } + } + + ctx->preferred_mech_type = preferred_mech_type; - ctx->preferred_mech_type = preferred_mech_type; + if (preferred_mech_type == GSS_C_NO_OID) { + send_reject(minor_status, output_token); + HEIMDAL_MUTEX_unlock(&ctx->ctx_id_mutex); + free_NegotiationToken(&nt); + return ret; } /* diff --git a/lib/gssapi/test_context.c b/lib/gssapi/test_context.c index 36a7389aba2f..f5aa27aaf19d 100644 --- a/lib/gssapi/test_context.c +++ b/lib/gssapi/test_context.c @@ -349,7 +349,7 @@ wrapunwrap_iov(gss_ctx_id_t cctx, gss_ctx_id_t sctx, int flags, gss_OID mechoid) memset(iov, 0, sizeof(iov)); - iov[0].type = GSS_IOV_BUFFER_TYPE_HEADER | GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATE; + iov[0].type = GSS_IOV_BUFFER_TYPE_HEADER | GSS_IOV_BUFFER_FLAG_ALLOCATE; if (header.length != 0) { iov[1].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY; @@ -375,7 +375,7 @@ wrapunwrap_iov(gss_ctx_id_t cctx, gss_ctx_id_t sctx, int flags, gss_OID mechoid) if (dce_style_flag) { iov[4].type = GSS_IOV_BUFFER_TYPE_EMPTY; } else { - iov[4].type = GSS_IOV_BUFFER_TYPE_PADDING | GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATE; + iov[4].type = GSS_IOV_BUFFER_TYPE_PADDING | GSS_IOV_BUFFER_FLAG_ALLOCATE; } iov[4].buffer.length = 0; iov[4].buffer.value = 0; @@ -384,7 +384,7 @@ wrapunwrap_iov(gss_ctx_id_t cctx, gss_ctx_id_t sctx, int flags, gss_OID mechoid) } else if (flags & USE_HEADER_ONLY) { iov[5].type = GSS_IOV_BUFFER_TYPE_EMPTY; } else { - iov[5].type = GSS_IOV_BUFFER_TYPE_TRAILER | GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATE; + iov[5].type = GSS_IOV_BUFFER_TYPE_TRAILER | GSS_IOV_BUFFER_FLAG_ALLOCATE; } iov[5].buffer.length = 0; iov[5].buffer.value = 0; @@ -404,17 +404,29 @@ wrapunwrap_iov(gss_ctx_id_t cctx, gss_ctx_id_t sctx, int flags, gss_OID mechoid) token.data = emalloc(token.length); p = token.data; - memcpy(p, iov[0].buffer.value, iov[0].buffer.length); + + if (iov[0].buffer.length) + memcpy(p, iov[0].buffer.value, iov[0].buffer.length); p += iov[0].buffer.length; - memcpy(p, iov[1].buffer.value, iov[1].buffer.length); + + if (iov[1].buffer.length) + memcpy(p, iov[1].buffer.value, iov[1].buffer.length); p += iov[1].buffer.length; - memcpy(p, iov[2].buffer.value, iov[2].buffer.length); + + if (iov[2].buffer.length) + memcpy(p, iov[2].buffer.value, iov[2].buffer.length); p += iov[2].buffer.length; - memcpy(p, iov[3].buffer.value, iov[3].buffer.length); + + if (iov[3].buffer.length) + memcpy(p, iov[3].buffer.value, iov[3].buffer.length); p += iov[3].buffer.length; - memcpy(p, iov[4].buffer.value, iov[4].buffer.length); + + if (iov[4].buffer.length) + memcpy(p, iov[4].buffer.value, iov[4].buffer.length); p += iov[4].buffer.length; - memcpy(p, iov[5].buffer.value, iov[5].buffer.length); + + if (iov[5].buffer.length) + memcpy(p, iov[5].buffer.value, iov[5].buffer.length); p += iov[5].buffer.length; assert(p - ((unsigned char *)token.data) == token.length); @@ -931,7 +943,7 @@ main(int argc, char **argv) if (out1.length != out2.length) errx(1, "prf len mismatch"); - if (memcmp(out1.value, out2.value, out1.length) != 0) + if (out1.length && memcmp(out1.value, out2.value, out1.length) != 0) errx(1, "prf data mismatch"); gss_release_buffer(&min_stat, &out1); @@ -941,7 +953,7 @@ main(int argc, char **argv) if (out1.length != out2.length) errx(1, "prf len mismatch"); - if (memcmp(out1.value, out2.value, out1.length) != 0) + if (out1.length && memcmp(out1.value, out2.value, out1.length) != 0) errx(1, "prf data mismatch"); gss_release_buffer(&min_stat, &out1); diff --git a/lib/hcrypto/Makefile.am b/lib/hcrypto/Makefile.am index 469176b6c604..a9c688d28f21 100644 --- a/lib/hcrypto/Makefile.am +++ b/lib/hcrypto/Makefile.am @@ -44,7 +44,6 @@ hcryptoinclude_HEADERS = \ evp-openssl.h \ evp-pkcs11.h \ hmac.h \ - md2.h \ md4.h \ md5.h \ pkcs12.h \ @@ -136,8 +135,6 @@ libhcrypto_la_SOURCES = \ hash.h \ hmac.c \ hmac.h \ - md2.c \ - md2.h \ md4.c \ md4.h \ md5.c \ @@ -297,7 +294,7 @@ ltmsources = \ libtommath/bn_mp_to_unsigned_bin_n.c -$(libhcrypto_la_OBJECTS): hcrypto-link +$(libhcrypto_la_OBJECTS) $(test_rand_OBJECTS): hcrypto-link libhcrypto_la_CPPFLAGS = -DBUILD_HCRYPTO_LIB $(AM_CPPFLAGS) diff --git a/lib/hcrypto/Makefile.in b/lib/hcrypto/Makefile.in index a9c54aa07e5d..85b5196df582 100644 --- a/lib/hcrypto/Makefile.in +++ b/lib/hcrypto/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -107,7 +107,6 @@ subdir = lib/hcrypto ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ $(top_srcdir)/cf/auth-modules.m4 \ - $(top_srcdir)/cf/broken-getaddrinfo.m4 \ $(top_srcdir)/cf/broken-glob.m4 \ $(top_srcdir)/cf/broken-realloc.m4 \ $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ @@ -157,6 +156,11 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +am__EXEEXT_1 = destest$(EXEEXT) mdtest$(EXEEXT) rc2test$(EXEEXT) \ + rctest$(EXEEXT) test_bn$(EXEEXT) test_bulk$(EXEEXT) \ + test_cipher$(EXEEXT) test_engine_dso$(EXEEXT) \ + test_hmac$(EXEEXT) test_pkcs12$(EXEEXT) test_pkcs5$(EXEEXT) +PROGRAMS = $(noinst_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -324,7 +328,7 @@ am_libhcrypto_la_OBJECTS = $(am__objects_1) libhcrypto_la-aes.lo \ libhcrypto_la-evp-hcrypto.lo libhcrypto_la-evp-cc.lo \ libhcrypto_la-evp-openssl.lo libhcrypto_la-evp-pkcs11.lo \ libhcrypto_la-engine.lo libhcrypto_la-hmac.lo \ - libhcrypto_la-md2.lo libhcrypto_la-md4.lo libhcrypto_la-md5.lo \ + libhcrypto_la-md4.lo libhcrypto_la-md5.lo \ libhcrypto_la-pkcs5.lo libhcrypto_la-pkcs12.lo \ libhcrypto_la-rand-fortuna.lo libhcrypto_la-rand-timer.lo \ libhcrypto_la-rand-unix.lo libhcrypto_la-rand.lo \ @@ -345,11 +349,6 @@ libhcrypto_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ libhctest_la_LIBADD = am_libhctest_la_OBJECTS = des.lo ui.lo libhctest_la_OBJECTS = $(am_libhctest_la_OBJECTS) -am__EXEEXT_1 = destest$(EXEEXT) mdtest$(EXEEXT) rc2test$(EXEEXT) \ - rctest$(EXEEXT) test_bn$(EXEEXT) test_bulk$(EXEEXT) \ - test_cipher$(EXEEXT) test_engine_dso$(EXEEXT) \ - test_hmac$(EXEEXT) test_pkcs12$(EXEEXT) test_pkcs5$(EXEEXT) -PROGRAMS = $(noinst_PROGRAMS) destest_SOURCES = destest.c destest_OBJECTS = destest.$(OBJEXT) destest_DEPENDENCIES = libhctest.la $(am__DEPENDENCIES_1) @@ -436,7 +435,174 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/des.Plo ./$(DEPDIR)/destest.Po \ + ./$(DEPDIR)/example_evp_cipher.Po \ + ./$(DEPDIR)/libhcrypto_la-aes.Plo \ + ./$(DEPDIR)/libhcrypto_la-bn.Plo \ + ./$(DEPDIR)/libhcrypto_la-camellia-ntt.Plo \ + ./$(DEPDIR)/libhcrypto_la-camellia.Plo \ + ./$(DEPDIR)/libhcrypto_la-common.Plo \ + ./$(DEPDIR)/libhcrypto_la-des.Plo \ + ./$(DEPDIR)/libhcrypto_la-dh-ltm.Plo \ + ./$(DEPDIR)/libhcrypto_la-dh.Plo \ + ./$(DEPDIR)/libhcrypto_la-doxygen.Plo \ + ./$(DEPDIR)/libhcrypto_la-dsa.Plo \ + ./$(DEPDIR)/libhcrypto_la-engine.Plo \ + ./$(DEPDIR)/libhcrypto_la-evp-cc.Plo \ + ./$(DEPDIR)/libhcrypto_la-evp-hcrypto.Plo \ + ./$(DEPDIR)/libhcrypto_la-evp-openssl.Plo \ + ./$(DEPDIR)/libhcrypto_la-evp-pkcs11.Plo \ + ./$(DEPDIR)/libhcrypto_la-evp.Plo \ + ./$(DEPDIR)/libhcrypto_la-hmac.Plo \ + ./$(DEPDIR)/libhcrypto_la-md4.Plo \ + ./$(DEPDIR)/libhcrypto_la-md5.Plo \ + ./$(DEPDIR)/libhcrypto_la-pkcs12.Plo \ + ./$(DEPDIR)/libhcrypto_la-pkcs5.Plo \ + ./$(DEPDIR)/libhcrypto_la-rand-fortuna.Plo \ + ./$(DEPDIR)/libhcrypto_la-rand-timer.Plo \ + ./$(DEPDIR)/libhcrypto_la-rand-unix.Plo \ + ./$(DEPDIR)/libhcrypto_la-rand.Plo \ + ./$(DEPDIR)/libhcrypto_la-rc2.Plo \ + ./$(DEPDIR)/libhcrypto_la-rc4.Plo \ + ./$(DEPDIR)/libhcrypto_la-rijndael-alg-fst.Plo \ + ./$(DEPDIR)/libhcrypto_la-rnd_keys.Plo \ + ./$(DEPDIR)/libhcrypto_la-rsa-gmp.Plo \ + ./$(DEPDIR)/libhcrypto_la-rsa-ltm.Plo \ + ./$(DEPDIR)/libhcrypto_la-rsa.Plo \ + ./$(DEPDIR)/libhcrypto_la-sha.Plo \ + ./$(DEPDIR)/libhcrypto_la-sha256.Plo \ + ./$(DEPDIR)/libhcrypto_la-sha512.Plo \ + ./$(DEPDIR)/libhcrypto_la-ui.Plo \ + ./$(DEPDIR)/libhcrypto_la-validate.Plo ./$(DEPDIR)/mdtest.Po \ + ./$(DEPDIR)/rc2test.Po ./$(DEPDIR)/rctest.Po \ + ./$(DEPDIR)/test_bn.Po ./$(DEPDIR)/test_bulk.Po \ + ./$(DEPDIR)/test_cipher.Po ./$(DEPDIR)/test_dh.Po \ + ./$(DEPDIR)/test_engine_dso.Po ./$(DEPDIR)/test_hmac.Po \ + ./$(DEPDIR)/test_pkcs12.Po ./$(DEPDIR)/test_pkcs5.Po \ + ./$(DEPDIR)/test_rand.Po ./$(DEPDIR)/test_rsa.Po \ + ./$(DEPDIR)/ui.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_error.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_mp_invmod.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_mp_montgomery_reduce.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_s_mp_mul_digs.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_s_mp_mul_high_digs.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_s_mp_sqr.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_2expt.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_abs.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_add.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_add_d.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_addmod.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_and.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_clamp.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_clear.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_clear_multi.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_cmp.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_cmp_d.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_cmp_mag.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_cnt_lsb.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_copy.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_count_bits.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div_2.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div_2d.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div_3.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div_d.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_dr_is_modulus.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_dr_reduce.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_dr_setup.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_exch.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_expt_d.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_exptmod.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_exptmod_fast.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_exteuclid.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_find_prime.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_fread.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_fwrite.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_gcd.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_get_int.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_grow.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_copy.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_multi.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_set.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_set_int.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_size.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_invmod.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_invmod_slow.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_is_square.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_jacobi.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_karatsuba_mul.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_karatsuba_sqr.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_lcm.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_lshd.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mod.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mod_2d.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mod_d.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_montgomery_calc_normalization.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_montgomery_reduce.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_montgomery_setup.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mul.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mul_2.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mul_2d.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mul_d.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mulmod.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_n_root.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_neg.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_or.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_fermat.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_is_divisible.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_is_prime.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_miller_rabin.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_next_prime.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_rabin_miller_trials.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_random_ex.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_radix_size.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_radix_smap.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_rand.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_read_radix.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_read_signed_bin.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_read_unsigned_bin.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_2k.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_2k_l.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_2k_setup.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_2k_setup_l.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_is_2k.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_is_2k_l.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_setup.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_rshd.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_set.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_set_int.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_shrink.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_signed_bin_size.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sqr.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sqrmod.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sqrt.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sub.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sub_d.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_submod.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_to_signed_bin.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_to_signed_bin_n.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_to_unsigned_bin.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_to_unsigned_bin_n.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_toom_mul.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_toom_sqr.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_toradix.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_toradix_n.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_unsigned_bin_size.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_xor.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_zero.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_zero_multi.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_prime_tab.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_reverse.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_add.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_exptmod.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_mul_digs.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_mul_high_digs.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_sqr.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_sub.Plo \ + libtommath/$(DEPDIR)/libhcrypto_la-bncore.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -488,8 +654,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no @@ -645,6 +809,7 @@ am__set_TESTS_bases = \ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck TEST_SUITE_LOG = test-suite.log @@ -692,9 +857,12 @@ CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLANG_FORMAT = @CLANG_FORMAT@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DB1LIB = @DB1LIB@ DB3LIB = @DB3LIB@ @@ -712,8 +880,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GCD_MIG = @GCD_MIG@ GREP = @GREP@ GROFF = @GROFF@ @@ -822,6 +992,11 @@ PKG_CONFIG = @PKG_CONFIG@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LDADD = @PTHREAD_LDADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -881,9 +1056,14 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -950,7 +1130,6 @@ hcryptoinclude_HEADERS = \ evp-openssl.h \ evp-pkcs11.h \ hmac.h \ - md2.h \ md4.h \ md5.h \ pkcs12.h \ @@ -1021,8 +1200,6 @@ libhcrypto_la_SOURCES = \ hash.h \ hmac.c \ hmac.h \ - md2.c \ - md2.h \ md4.c \ md4.h \ md5.c \ @@ -1247,8 +1424,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty): @@ -1261,6 +1438,24 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + clean-checkLTLIBRARIES: -test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES) @list='$(check_LTLIBRARIES)'; \ @@ -1618,24 +1813,6 @@ libhcrypto.la: $(libhcrypto_la_OBJECTS) $(libhcrypto_la_DEPENDENCIES) $(EXTRA_li libhctest.la: $(libhctest_la_OBJECTS) $(libhctest_la_DEPENDENCIES) $(EXTRA_libhctest_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libhctest_la_OBJECTS) $(libhctest_la_LIBADD) $(LIBS) -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - destest$(EXEEXT): $(destest_OBJECTS) $(destest_DEPENDENCIES) $(EXTRA_destest_DEPENDENCIES) @rm -f destest$(EXEEXT) $(AM_V_CCLD)$(LINK) $(destest_OBJECTS) $(destest_LDADD) $(LIBS) @@ -1704,182 +1881,187 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/des.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/destest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/example_evp_cipher.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-aes.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-bn.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-camellia-ntt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-camellia.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-common.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-des.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-dh-ltm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-dh.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-doxygen.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-dsa.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-engine.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-evp-cc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-evp-hcrypto.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-evp-openssl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-evp-pkcs11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-evp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-hmac.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-md2.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-md4.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-md5.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-pkcs12.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-pkcs5.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rand-fortuna.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rand-timer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rand-unix.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rand.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rc2.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rc4.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rijndael-alg-fst.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rnd_keys.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rsa-gmp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rsa-ltm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rsa.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-sha.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-sha256.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-sha512.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-ui.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-validate.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mdtest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rc2test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rctest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_bn.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_bulk.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cipher.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_dh.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_engine_dso.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_hmac.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_pkcs12.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_pkcs5.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_rand.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_rsa.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_error.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_mp_invmod.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_mp_montgomery_reduce.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_s_mp_mul_digs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_s_mp_mul_high_digs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_s_mp_sqr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_2expt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_abs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_add.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_add_d.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_addmod.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_and.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_clamp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_clear.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_clear_multi.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_cmp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_cmp_d.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_cmp_mag.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_cnt_lsb.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_copy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_count_bits.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div_2.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div_2d.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div_3.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div_d.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_dr_is_modulus.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_dr_reduce.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_dr_setup.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_exch.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_expt_d.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_exptmod.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_exptmod_fast.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_exteuclid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_find_prime.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_fread.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_fwrite.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_gcd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_get_int.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_grow.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_copy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_multi.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_set.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_set_int.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_size.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_invmod.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_invmod_slow.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_is_square.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_jacobi.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_karatsuba_mul.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_karatsuba_sqr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_lcm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_lshd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mod.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mod_2d.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mod_d.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_montgomery_calc_normalization.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_montgomery_reduce.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_montgomery_setup.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mul.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mul_2.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mul_2d.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mul_d.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mulmod.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_n_root.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_neg.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_or.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_fermat.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_is_divisible.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_is_prime.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_miller_rabin.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_next_prime.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_rabin_miller_trials.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_random_ex.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_radix_size.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_radix_smap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_rand.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_read_radix.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_read_signed_bin.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_read_unsigned_bin.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_2k.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_2k_l.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_2k_setup.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_2k_setup_l.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_is_2k.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_is_2k_l.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_setup.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_rshd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_set.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_set_int.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_shrink.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_signed_bin_size.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sqr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sqrmod.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sqrt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sub.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sub_d.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_submod.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_to_signed_bin.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_to_signed_bin_n.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_to_unsigned_bin.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_to_unsigned_bin_n.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_toom_mul.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_toom_sqr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_toradix.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_toradix_n.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_unsigned_bin_size.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_xor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_zero.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_zero_multi.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_prime_tab.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_reverse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_add.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_exptmod.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_mul_digs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_mul_high_digs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_sqr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_sub.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bncore.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/des.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/destest.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/example_evp_cipher.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-aes.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-bn.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-camellia-ntt.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-camellia.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-common.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-des.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-dh-ltm.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-dh.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-doxygen.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-dsa.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-engine.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-evp-cc.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-evp-hcrypto.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-evp-openssl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-evp-pkcs11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-evp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-hmac.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-md4.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-md5.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-pkcs12.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-pkcs5.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rand-fortuna.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rand-timer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rand-unix.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rand.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rc2.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rc4.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rijndael-alg-fst.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rnd_keys.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rsa-gmp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rsa-ltm.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-rsa.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-sha.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-sha256.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-sha512.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-ui.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libhcrypto_la-validate.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mdtest.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rc2test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rctest.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_bn.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_bulk.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cipher.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_dh.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_engine_dso.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_hmac.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_pkcs12.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_pkcs5.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_rand.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_rsa.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_error.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_mp_invmod.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_mp_montgomery_reduce.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_s_mp_mul_digs.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_s_mp_mul_high_digs.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_s_mp_sqr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_2expt.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_abs.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_add.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_add_d.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_addmod.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_and.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_clamp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_clear.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_clear_multi.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_cmp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_cmp_d.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_cmp_mag.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_cnt_lsb.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_copy.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_count_bits.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div_2.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div_2d.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div_3.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div_d.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_dr_is_modulus.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_dr_reduce.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_dr_setup.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_exch.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_expt_d.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_exptmod.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_exptmod_fast.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_exteuclid.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_find_prime.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_fread.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_fwrite.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_gcd.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_get_int.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_grow.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_copy.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_multi.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_set.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_set_int.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_size.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_invmod.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_invmod_slow.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_is_square.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_jacobi.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_karatsuba_mul.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_karatsuba_sqr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_lcm.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_lshd.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mod.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mod_2d.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mod_d.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_montgomery_calc_normalization.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_montgomery_reduce.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_montgomery_setup.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mul.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mul_2.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mul_2d.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mul_d.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mulmod.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_n_root.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_neg.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_or.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_fermat.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_is_divisible.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_is_prime.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_miller_rabin.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_next_prime.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_rabin_miller_trials.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_random_ex.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_radix_size.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_radix_smap.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_rand.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_read_radix.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_read_signed_bin.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_read_unsigned_bin.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_2k.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_2k_l.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_2k_setup.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_2k_setup_l.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_is_2k.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_is_2k_l.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_setup.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_rshd.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_set.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_set_int.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_shrink.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_signed_bin_size.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sqr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sqrmod.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sqrt.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sub.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sub_d.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_submod.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_to_signed_bin.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_to_signed_bin_n.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_to_unsigned_bin.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_to_unsigned_bin_n.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_toom_mul.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_toom_sqr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_toradix.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_toradix_n.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_unsigned_bin_size.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_xor.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_zero.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_zero_multi.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_prime_tab.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_reverse.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_add.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_exptmod.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_mul_digs.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_mul_high_digs.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_sqr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_sub.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@libtommath/$(DEPDIR)/libhcrypto_la-bncore.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -2871,13 +3053,6 @@ libhcrypto_la-hmac.lo: hmac.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhcrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libhcrypto_la-hmac.lo `test -f 'hmac.c' || echo '$(srcdir)/'`hmac.c -libhcrypto_la-md2.lo: md2.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhcrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libhcrypto_la-md2.lo -MD -MP -MF $(DEPDIR)/libhcrypto_la-md2.Tpo -c -o libhcrypto_la-md2.lo `test -f 'md2.c' || echo '$(srcdir)/'`md2.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhcrypto_la-md2.Tpo $(DEPDIR)/libhcrypto_la-md2.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='md2.c' object='libhcrypto_la-md2.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhcrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libhcrypto_la-md2.lo `test -f 'md2.c' || echo '$(srcdir)/'`md2.c - libhcrypto_la-md4.lo: md4.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libhcrypto_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libhcrypto_la-md4.lo -MD -MP -MF $(DEPDIR)/libhcrypto_la-md4.Tpo -c -o libhcrypto_la-md4.lo `test -f 'md4.c' || echo '$(srcdir)/'`md4.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libhcrypto_la-md4.Tpo $(DEPDIR)/libhcrypto_la-md4.Plo @@ -3205,7 +3380,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ @@ -3218,7 +3393,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: $(check_PROGRAMS) $(check_LTLIBRARIES) $(check_SCRIPTS) @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -3228,7 +3403,7 @@ check-TESTS: log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ exit $$?; -recheck: all $(check_LTLIBRARIES) $(check_PROGRAMS) $(check_SCRIPTS) +recheck: all $(check_PROGRAMS) $(check_LTLIBRARIES) $(check_SCRIPTS) @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @set +e; $(am__set_TESTS_bases); \ bases=`for i in $$bases; do echo $$i; done \ @@ -3337,8 +3512,10 @@ test_crypto.log: test_crypto @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -3372,11 +3549,15 @@ distdir: $(DISTFILES) top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS) \ + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_LTLIBRARIES) \ $(check_SCRIPTS) $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-local +all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(HEADERS) all-local +install-checkPROGRAMS: install-libLTLIBRARIES + +install-checkLTLIBRARIES: install-libLTLIBRARIES + installdirs: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(hcryptoincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -3424,7 +3605,181 @@ clean-am: clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) libtommath/$(DEPDIR) + -rm -f ./$(DEPDIR)/des.Plo + -rm -f ./$(DEPDIR)/destest.Po + -rm -f ./$(DEPDIR)/example_evp_cipher.Po + -rm -f ./$(DEPDIR)/libhcrypto_la-aes.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-bn.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-camellia-ntt.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-camellia.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-common.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-des.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-dh-ltm.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-dh.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-doxygen.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-dsa.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-engine.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-evp-cc.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-evp-hcrypto.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-evp-openssl.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-evp-pkcs11.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-evp.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-hmac.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-md4.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-md5.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-pkcs12.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-pkcs5.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rand-fortuna.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rand-timer.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rand-unix.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rand.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rc2.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rc4.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rijndael-alg-fst.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rnd_keys.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rsa-gmp.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rsa-ltm.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rsa.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-sha.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-sha256.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-sha512.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-ui.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-validate.Plo + -rm -f ./$(DEPDIR)/mdtest.Po + -rm -f ./$(DEPDIR)/rc2test.Po + -rm -f ./$(DEPDIR)/rctest.Po + -rm -f ./$(DEPDIR)/test_bn.Po + -rm -f ./$(DEPDIR)/test_bulk.Po + -rm -f ./$(DEPDIR)/test_cipher.Po + -rm -f ./$(DEPDIR)/test_dh.Po + -rm -f ./$(DEPDIR)/test_engine_dso.Po + -rm -f ./$(DEPDIR)/test_hmac.Po + -rm -f ./$(DEPDIR)/test_pkcs12.Po + -rm -f ./$(DEPDIR)/test_pkcs5.Po + -rm -f ./$(DEPDIR)/test_rand.Po + -rm -f ./$(DEPDIR)/test_rsa.Po + -rm -f ./$(DEPDIR)/ui.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_error.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_mp_invmod.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_mp_montgomery_reduce.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_s_mp_mul_digs.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_s_mp_mul_high_digs.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_s_mp_sqr.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_2expt.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_abs.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_add.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_add_d.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_addmod.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_and.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_clamp.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_clear.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_clear_multi.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_cmp.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_cmp_d.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_cmp_mag.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_cnt_lsb.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_copy.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_count_bits.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div_2.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div_2d.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div_3.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div_d.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_dr_is_modulus.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_dr_reduce.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_dr_setup.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_exch.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_expt_d.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_exptmod.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_exptmod_fast.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_exteuclid.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_find_prime.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_fread.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_fwrite.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_gcd.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_get_int.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_grow.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_copy.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_multi.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_set.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_set_int.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_size.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_invmod.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_invmod_slow.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_is_square.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_jacobi.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_karatsuba_mul.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_karatsuba_sqr.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_lcm.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_lshd.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mod.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mod_2d.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mod_d.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_montgomery_calc_normalization.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_montgomery_reduce.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_montgomery_setup.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mul.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mul_2.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mul_2d.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mul_d.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mulmod.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_n_root.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_neg.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_or.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_fermat.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_is_divisible.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_is_prime.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_miller_rabin.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_next_prime.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_rabin_miller_trials.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_random_ex.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_radix_size.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_radix_smap.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_rand.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_read_radix.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_read_signed_bin.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_read_unsigned_bin.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_2k.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_2k_l.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_2k_setup.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_2k_setup_l.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_is_2k.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_is_2k_l.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_setup.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_rshd.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_set.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_set_int.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_shrink.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_signed_bin_size.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sqr.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sqrmod.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sqrt.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sub.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sub_d.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_submod.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_to_signed_bin.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_to_signed_bin_n.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_to_unsigned_bin.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_to_unsigned_bin_n.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_toom_mul.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_toom_sqr.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_toradix.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_toradix_n.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_unsigned_bin_size.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_xor.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_zero.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_zero_multi.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_prime_tab.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_reverse.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_add.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_exptmod.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_mul_digs.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_mul_high_digs.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_sqr.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_sub.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bncore.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -3471,7 +3826,181 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) libtommath/$(DEPDIR) + -rm -f ./$(DEPDIR)/des.Plo + -rm -f ./$(DEPDIR)/destest.Po + -rm -f ./$(DEPDIR)/example_evp_cipher.Po + -rm -f ./$(DEPDIR)/libhcrypto_la-aes.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-bn.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-camellia-ntt.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-camellia.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-common.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-des.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-dh-ltm.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-dh.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-doxygen.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-dsa.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-engine.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-evp-cc.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-evp-hcrypto.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-evp-openssl.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-evp-pkcs11.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-evp.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-hmac.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-md4.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-md5.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-pkcs12.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-pkcs5.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rand-fortuna.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rand-timer.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rand-unix.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rand.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rc2.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rc4.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rijndael-alg-fst.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rnd_keys.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rsa-gmp.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rsa-ltm.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-rsa.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-sha.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-sha256.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-sha512.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-ui.Plo + -rm -f ./$(DEPDIR)/libhcrypto_la-validate.Plo + -rm -f ./$(DEPDIR)/mdtest.Po + -rm -f ./$(DEPDIR)/rc2test.Po + -rm -f ./$(DEPDIR)/rctest.Po + -rm -f ./$(DEPDIR)/test_bn.Po + -rm -f ./$(DEPDIR)/test_bulk.Po + -rm -f ./$(DEPDIR)/test_cipher.Po + -rm -f ./$(DEPDIR)/test_dh.Po + -rm -f ./$(DEPDIR)/test_engine_dso.Po + -rm -f ./$(DEPDIR)/test_hmac.Po + -rm -f ./$(DEPDIR)/test_pkcs12.Po + -rm -f ./$(DEPDIR)/test_pkcs5.Po + -rm -f ./$(DEPDIR)/test_rand.Po + -rm -f ./$(DEPDIR)/test_rsa.Po + -rm -f ./$(DEPDIR)/ui.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_error.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_mp_invmod.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_mp_montgomery_reduce.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_s_mp_mul_digs.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_s_mp_mul_high_digs.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_fast_s_mp_sqr.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_2expt.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_abs.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_add.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_add_d.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_addmod.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_and.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_clamp.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_clear.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_clear_multi.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_cmp.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_cmp_d.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_cmp_mag.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_cnt_lsb.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_copy.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_count_bits.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div_2.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div_2d.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div_3.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_div_d.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_dr_is_modulus.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_dr_reduce.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_dr_setup.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_exch.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_expt_d.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_exptmod.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_exptmod_fast.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_exteuclid.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_find_prime.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_fread.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_fwrite.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_gcd.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_get_int.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_grow.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_copy.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_multi.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_set.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_set_int.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_init_size.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_invmod.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_invmod_slow.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_is_square.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_jacobi.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_karatsuba_mul.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_karatsuba_sqr.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_lcm.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_lshd.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mod.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mod_2d.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mod_d.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_montgomery_calc_normalization.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_montgomery_reduce.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_montgomery_setup.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mul.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mul_2.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mul_2d.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mul_d.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_mulmod.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_n_root.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_neg.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_or.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_fermat.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_is_divisible.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_is_prime.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_miller_rabin.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_next_prime.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_rabin_miller_trials.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_prime_random_ex.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_radix_size.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_radix_smap.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_rand.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_read_radix.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_read_signed_bin.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_read_unsigned_bin.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_2k.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_2k_l.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_2k_setup.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_2k_setup_l.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_is_2k.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_is_2k_l.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_reduce_setup.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_rshd.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_set.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_set_int.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_shrink.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_signed_bin_size.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sqr.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sqrmod.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sqrt.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sub.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_sub_d.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_submod.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_to_signed_bin.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_to_signed_bin_n.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_to_unsigned_bin.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_to_unsigned_bin_n.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_toom_mul.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_toom_sqr.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_toradix.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_toradix_n.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_unsigned_bin_size.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_xor.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_zero.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_mp_zero_multi.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_prime_tab.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_reverse.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_add.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_exptmod.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_mul_digs.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_mul_high_digs.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_sqr.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bn_s_mp_sub.Plo + -rm -f libtommath/$(DEPDIR)/libhcrypto_la-bncore.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -3493,8 +4022,8 @@ uninstall-am: uninstall-hcryptoincludeHEADERS uninstall-libLTLIBRARIES $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: check-am install-am install-data-am install-strip uninstall-am -.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \ - check-am check-local clean clean-checkLTLIBRARIES \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \ + check-TESTS check-am check-local clean clean-checkLTLIBRARIES \ clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ ctags-am dist-hook distclean distclean-compile \ @@ -3593,11 +4122,20 @@ check-local:: test "$$failed" -eq 0 || exit 1; \ fi +# It's useful for debugging to format generated sources. The default for all +# clang-format styles is to sort includes, but in many cases in-tree we really +# don't want to do that. .x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @if [ -z "$(CLANG_FORMAT)" ]; then \ + cmp -s $< $@ 2> /dev/null || cp $< $@; \ + else \ + cp $< $@.tmp.c; \ + $(CLANG_FORMAT) -style='{BasedOnStyle: Chromium, SortIncludes: false}' -i $@.tmp.c; \ + cmp -s $@.tmp.c $@ 2> /dev/null || mv $@.tmp.c $@; \ + fi .hx.h: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @cmp -s $< $@ 2> /dev/null || cp $< $@; #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ @@ -3725,7 +4263,7 @@ install-build-headers:: $(hcryptoinclude_HEADERS) fi ; \ done -$(libhcrypto_la_OBJECTS): hcrypto-link +$(libhcrypto_la_OBJECTS) $(test_rand_OBJECTS): hcrypto-link $(libhcrypto_la_OBJECTS): $(srcdir)/version-script.map hcrypto-link: diff --git a/lib/hcrypto/NTMakefile b/lib/hcrypto/NTMakefile index 8063ca616e1c..6eea96655beb 100644 --- a/lib/hcrypto/NTMakefile +++ b/lib/hcrypto/NTMakefile @@ -76,7 +76,6 @@ INCFILES= \ $(HCRYPTOINCLUDEDIR)\evp-wincng.h \ $(HCRYPTOINCLUDEDIR)\evp-w32.h \ $(HCRYPTOINCLUDEDIR)\hmac.h \ - $(HCRYPTOINCLUDEDIR)\md2.h \ $(HCRYPTOINCLUDEDIR)\md4.h \ $(HCRYPTOINCLUDEDIR)\md5.h \ $(HCRYPTOINCLUDEDIR)\pkcs12.h \ @@ -123,7 +122,6 @@ libhcrypto_OBJs = \ $(OBJ)\evp-w32.obj \ $(OBJ)\engine.obj \ $(OBJ)\hmac.obj \ - $(OBJ)\md2.obj \ $(OBJ)\md4.obj \ $(OBJ)\md5.obj \ $(OBJ)\pkcs5.obj \ diff --git a/lib/hcrypto/bn.c b/lib/hcrypto/bn.c index e7d5b0473716..91933c0a2943 100644 --- a/lib/hcrypto/bn.c +++ b/lib/hcrypto/bn.c @@ -142,7 +142,8 @@ BN_bin2bn(const void *s, int len, BIGNUM *bn) return NULL; } hi->length = len; - memcpy(hi->data, s, len); + if (len) + memcpy(hi->data, s, len); return (BIGNUM *)hi; } @@ -237,7 +238,7 @@ BN_is_bit_set(const BIGNUM *bn, int bit) heim_integer *hi = (heim_integer *)bn; unsigned char *p = hi->data; - if ((bit / 8) > hi->length || hi->length == 0) + if ((bit / 8) >= hi->length || hi->length == 0) return 0; return p[hi->length - 1 - (bit / 8)] & is_set[bit % 8]; @@ -250,7 +251,7 @@ BN_set_bit(BIGNUM *bn, int bit) unsigned char *p; if ((bit / 8) > hi->length || hi->length == 0) { - size_t len = (bit + 7) / 8; + size_t len = bit == 0 ? 1 : (bit + 7) / 8; void *d = realloc(hi->data, len); if (d == NULL) return 0; diff --git a/lib/hcrypto/des.c b/lib/hcrypto/des.c index c16f33ba2685..ad15c67be8b4 100644 --- a/lib/hcrypto/des.c +++ b/lib/hcrypto/des.c @@ -225,8 +225,8 @@ DES_set_key_unchecked(DES_cblock *key, DES_key_schedule *ks) uint32_t *k = &ks->ks[0]; int i; - t1 = (*key)[0] << 24 | (*key)[1] << 16 | (*key)[2] << 8 | (*key)[3]; - t2 = (*key)[4] << 24 | (*key)[5] << 16 | (*key)[6] << 8 | (*key)[7]; + t1 = (uint32_t)(*key)[0] << 24 | (*key)[1] << 16 | (*key)[2] << 8 | (*key)[3]; + t2 = (uint32_t)(*key)[4] << 24 | (*key)[5] << 16 | (*key)[6] << 8 | (*key)[7]; c = (pc1_c_3[(t1 >> (5 )) & 0x7] << 3) | (pc1_c_3[(t1 >> (5 + 8 )) & 0x7] << 2) @@ -325,27 +325,27 @@ DES_key_sched(DES_cblock *key, DES_key_schedule *ks) static void load(const unsigned char *b, uint32_t v[2]) { - v[0] = b[0] << 24; - v[0] |= b[1] << 16; - v[0] |= b[2] << 8; - v[0] |= b[3] << 0; - v[1] = b[4] << 24; - v[1] |= b[5] << 16; - v[1] |= b[6] << 8; - v[1] |= b[7] << 0; + v[0] = (uint32_t)b[0] << 24U; + v[0] |= b[1] << 16U; + v[0] |= b[2] << 8U; + v[0] |= b[3] << 0U; + v[1] = (uint32_t)b[4] << 24U; + v[1] |= b[5] << 16U; + v[1] |= b[6] << 8U; + v[1] |= b[7] << 0U; } static void store(const uint32_t v[2], unsigned char *b) { - b[0] = (v[0] >> 24) & 0xff; - b[1] = (v[0] >> 16) & 0xff; - b[2] = (v[0] >> 8) & 0xff; - b[3] = (v[0] >> 0) & 0xff; - b[4] = (v[1] >> 24) & 0xff; - b[5] = (v[1] >> 16) & 0xff; - b[6] = (v[1] >> 8) & 0xff; - b[7] = (v[1] >> 0) & 0xff; + b[0] = (v[0] >> 24) & 0xffU; + b[1] = (v[0] >> 16) & 0xffU; + b[2] = (v[0] >> 8) & 0xffU; + b[3] = (v[0] >> 0) & 0xffU; + b[4] = (v[1] >> 24) & 0xffU; + b[5] = (v[1] >> 16) & 0xffU; + b[6] = (v[1] >> 8) & 0xffU; + b[7] = (v[1] >> 0) & 0xffU; } /** diff --git a/lib/hcrypto/dh.c b/lib/hcrypto/dh.c index ef717d50c0a6..0447c4f48384 100644 --- a/lib/hcrypto/dh.c +++ b/lib/hcrypto/dh.c @@ -305,7 +305,7 @@ DH_check_pubkey(const DH *dh, const BIGNUM *pub_key, int *codes) unsigned i, n = BN_num_bits(pub_key); unsigned bits = 0; - for (i = 0; i <= n; i++) + for (i = 0; i < n; i++) if (BN_is_bit_set(pub_key, i)) bits++; diff --git a/lib/hcrypto/engine.h b/lib/hcrypto/engine.h index e6fc5b92e415..27c6ab6affaf 100644 --- a/lib/hcrypto/engine.h +++ b/lib/hcrypto/engine.h @@ -70,7 +70,7 @@ typedef struct hc_engine ENGINE; -#define NID_md2 0 +/*#define NID_md2 0 */ #define NID_md4 1 #define NID_md5 2 #define NID_sha1 4 diff --git a/lib/hcrypto/evp-cc.c b/lib/hcrypto/evp-cc.c index 4a377f1c3bb1..7798519da182 100644 --- a/lib/hcrypto/evp-cc.c +++ b/lib/hcrypto/evp-cc.c @@ -605,32 +605,6 @@ EVP_cc_rc2_64_cbc(void) #endif } -/** - * The CommonCrypto md2 provider - * - * @ingroup hcrypto_evp - */ - -const EVP_MD * -EVP_cc_md2(void) -{ -#ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H - static const struct hc_evp_md md2 = { - CC_MD2_DIGEST_LENGTH, - CC_MD2_BLOCK_BYTES, - sizeof(CC_MD2_CTX), - (hc_evp_md_init)CC_MD2_Init, - (hc_evp_md_update)CC_MD2_Update, - (hc_evp_md_final)CC_MD2_Final, - (hc_evp_md_cleanup)NULL - }; - return &md2; -#elif HCRYPTO_FALLBACK - return EVP_hcrypto_md2(); -#else - return NULL; -#endif -} /** * The CommonCrypto md4 provider diff --git a/lib/hcrypto/evp-cc.h b/lib/hcrypto/evp-cc.h index 4d131de01eb9..f8576459a8fd 100644 --- a/lib/hcrypto/evp-cc.h +++ b/lib/hcrypto/evp-cc.h @@ -37,7 +37,6 @@ #define HEIM_EVP_CC_H 1 /* symbol renaming */ -#define EVP_cc_md2 hc_EVP_cc_md2 #define EVP_cc_md4 hc_EVP_cc_md4 #define EVP_cc_md5 hc_EVP_cc_md5 #define EVP_cc_sha1 hc_EVP_cc_sha1 @@ -67,7 +66,6 @@ HC_CPP_BEGIN -const EVP_MD * EVP_cc_md2(void); const EVP_MD * EVP_cc_md4(void); const EVP_MD * EVP_cc_md5(void); const EVP_MD * EVP_cc_sha1(void); diff --git a/lib/hcrypto/evp-hcrypto.c b/lib/hcrypto/evp-hcrypto.c index 321efb08c52a..ee43e105a324 100644 --- a/lib/hcrypto/evp-hcrypto.c +++ b/lib/hcrypto/evp-hcrypto.c @@ -51,7 +51,6 @@ #include <rc4.h> #include <sha.h> -#include <md2.h> #include <md4.h> #include <md5.h> @@ -401,28 +400,6 @@ EVP_hcrypto_md4(void) return &md4; } -/** - * The message digest MD2 - hcrypto - * - * @return the message digest type. - * - * @ingroup hcrypto_evp - */ - -const EVP_MD * -EVP_hcrypto_md2(void) -{ - static const struct hc_evp_md md2 = { - 16, - 16, - sizeof(MD2_CTX), - (hc_evp_md_init)MD2_Init, - (hc_evp_md_update)MD2_Update, - (hc_evp_md_final)MD2_Final, - NULL - }; - return &md2; -} /* * diff --git a/lib/hcrypto/evp-hcrypto.h b/lib/hcrypto/evp-hcrypto.h index b7876c67c8a3..6d4f1c872a29 100644 --- a/lib/hcrypto/evp-hcrypto.h +++ b/lib/hcrypto/evp-hcrypto.h @@ -37,7 +37,6 @@ #define HEIM_EVP_HCRYPTO_H 1 /* symbol renaming */ -#define EVP_hcrypto_md2 hc_EVP_hcrypto_md2 #define EVP_hcrypto_md4 hc_EVP_hcrypto_md4 #define EVP_hcrypto_md5 hc_EVP_hcrypto_md5 #define EVP_hcrypto_sha1 hc_EVP_hcrypto_sha1 @@ -67,7 +66,6 @@ HC_CPP_BEGIN -const EVP_MD * EVP_hcrypto_md2(void); const EVP_MD * EVP_hcrypto_md4(void); const EVP_MD * EVP_hcrypto_md5(void); const EVP_MD * EVP_hcrypto_sha1(void); diff --git a/lib/hcrypto/evp-openssl.c b/lib/hcrypto/evp-openssl.c index a651184c6ea0..ae38e27c0092 100644 --- a/lib/hcrypto/evp-openssl.c +++ b/lib/hcrypto/evp-openssl.c @@ -581,15 +581,6 @@ OSSL_CIPHER_ALGORITHM(rc4_40, hc_EVP_CIPH_VARIABLE_LENGTH) /** - * The MD2 hash algorithm (OpenSSL provider) - * - * @return the MD2 EVP_MD pointer. - * - * @ingroup hcrypto_evp - */ -OSSL_MD_ALGORITHM(md2) - -/** * The MD4 hash algorithm (OpenSSL provider) * * @return the MD4 EVP_MD pointer. diff --git a/lib/hcrypto/evp-openssl.h b/lib/hcrypto/evp-openssl.h index 225ff454a874..ff285adeee30 100644 --- a/lib/hcrypto/evp-openssl.h +++ b/lib/hcrypto/evp-openssl.h @@ -37,7 +37,6 @@ #define HEIM_EVP_OSSL_H 1 /* symbol renaming */ -#define EVP_ossl_md2 hc_EVP_ossl_md2 #define EVP_ossl_md4 hc_EVP_ossl_md4 #define EVP_ossl_md5 hc_EVP_ossl_md5 #define EVP_ossl_sha1 hc_EVP_ossl_sha1 @@ -67,7 +66,6 @@ HC_CPP_BEGIN -const hc_EVP_MD * hc_EVP_ossl_md2(void); const hc_EVP_MD * hc_EVP_ossl_md4(void); const hc_EVP_MD * hc_EVP_ossl_md5(void); const hc_EVP_MD * hc_EVP_ossl_sha1(void); diff --git a/lib/hcrypto/evp-pkcs11.c b/lib/hcrypto/evp-pkcs11.c index 325bb0afd104..522c036fb926 100644 --- a/lib/hcrypto/evp-pkcs11.c +++ b/lib/hcrypto/evp-pkcs11.c @@ -834,7 +834,6 @@ PKCS11_CIPHER_ALGORITHM(rc4_40, 0, EVP_CIPH_STREAM_CIPHER | EVP_CIPH_VARIABLE_LENGTH) -PKCS11_MD_ALGORITHM(md2, CKM_MD2, 16, 16) #ifdef CKM_MD4 /* non-standard extension */ PKCS11_MD_ALGORITHM(md4, CKM_MD4, 16, 64) #else diff --git a/lib/hcrypto/evp-pkcs11.h b/lib/hcrypto/evp-pkcs11.h index 6d8a21f528bb..49d020a2f2c4 100644 --- a/lib/hcrypto/evp-pkcs11.h +++ b/lib/hcrypto/evp-pkcs11.h @@ -35,7 +35,6 @@ /* symbol renaming */ -#define EVP_pkcs11_md2() hc_EVP_pkcs11_md2() #define EVP_pkcs11_md4() hc_EVP_pkcs11_md4() #define EVP_pkcs11_md5() hc_EVP_pkcs11_md5() #define EVP_pkcs11_sha1() hc_EVP_pkcs11_sha1() @@ -59,7 +58,6 @@ #define EVP_pkcs11_camellia_192_cbc() hc_EVP_pkcs11_camellia_192_cbc() #define EVP_pkcs11_camellia_256_cbc() hc_EVP_pkcs11_camellia_256_cbc() -#define EVP_pkcs11_hcrypto_md2() hc_EVP_pkcs11_hcrypto_md2() #define EVP_pkcs11_hcrypto_md4() hc_EVP_pkcs11_hcrypto_md4() #define EVP_pkcs11_hcrypto_md5() hc_EVP_pkcs11_hcrypto_md5() #define EVP_pkcs11_hcrypto_sha1() hc_EVP_pkcs11_hcrypto_sha1() @@ -89,7 +87,6 @@ HC_CPP_BEGIN * Strict PKCS#11 implementations (these will return NULL if the underlying * PKCS#11 implementation does not implement the cipher or hash). */ -const EVP_MD * hc_EVP_pkcs11_md2(void); const EVP_MD * hc_EVP_pkcs11_md4(void); const EVP_MD * hc_EVP_pkcs11_md5(void); const EVP_MD * hc_EVP_pkcs11_sha1(void); @@ -122,7 +119,6 @@ const EVP_CIPHER * hc_EVP_pkcs11_camellia_256_cbc(void); /* * PKCS#11 implementations with fallback to hcrypto. */ -const EVP_MD * hc_EVP_pkcs11_hcrypto_md2(void); const EVP_MD * hc_EVP_pkcs11_hcrypto_md4(void); const EVP_MD * hc_EVP_pkcs11_hcrypto_md5(void); const EVP_MD * hc_EVP_pkcs11_hcrypto_sha1(void); diff --git a/lib/hcrypto/evp-w32.c b/lib/hcrypto/evp-w32.c index 7d14d1f4f309..ac2c6a53e4b0 100644 --- a/lib/hcrypto/evp-w32.c +++ b/lib/hcrypto/evp-w32.c @@ -109,7 +109,6 @@ _hc_w32crypto_DllMain(HINSTANCE hinstDLL, return hc_EVP_hcrypto_ ##name (); \ } -EVP_W32CRYPTO_PROVIDER(EVP_MD, md2) EVP_W32CRYPTO_PROVIDER(EVP_MD, md4) EVP_W32CRYPTO_PROVIDER(EVP_MD, md5) EVP_W32CRYPTO_PROVIDER(EVP_MD, sha1) diff --git a/lib/hcrypto/evp-w32.h b/lib/hcrypto/evp-w32.h index 89bfa4d0af3d..6d3ba4596d3c 100644 --- a/lib/hcrypto/evp-w32.h +++ b/lib/hcrypto/evp-w32.h @@ -34,7 +34,6 @@ #define HEIM_EVP_W32_H 1 /* symbol renaming */ -#define EVP_w32crypto_md2() hc_EVP_w32crypto_md2() #define EVP_w32crypto_md4() hc_EVP_w32crypto_md4() #define EVP_w32crypto_md5() hc_EVP_w32crypto_md5() #define EVP_w32crypto_sha1() hc_EVP_w32crypto_sha1() @@ -65,7 +64,6 @@ HC_CPP_BEGIN -const EVP_MD * hc_EVP_w32crypto_md2(void); const EVP_MD * hc_EVP_w32crypto_md4(void); const EVP_MD * hc_EVP_w32crypto_md5(void); const EVP_MD * hc_EVP_w32crypto_sha1(void); diff --git a/lib/hcrypto/evp-wincng.c b/lib/hcrypto/evp-wincng.c index a9b14e3bbeea..bd498d58faa1 100644 --- a/lib/hcrypto/evp-wincng.c +++ b/lib/hcrypto/evp-wincng.c @@ -688,7 +688,6 @@ wincng_md_cleanup(EVP_MD_CTX *ctx) } \ } while (0) -WINCNG_MD_ALGORITHM(md2, BCRYPT_MD2_ALGORITHM); WINCNG_MD_ALGORITHM(md4, BCRYPT_MD4_ALGORITHM); WINCNG_MD_ALGORITHM(md5, BCRYPT_MD5_ALGORITHM); WINCNG_MD_ALGORITHM(sha1, BCRYPT_SHA1_ALGORITHM); @@ -699,7 +698,6 @@ WINCNG_MD_ALGORITHM(sha512, BCRYPT_SHA512_ALGORITHM); static void wincng_md_algorithm_cleanup(void) { - WINCNG_MD_ALGORITHM_CLEANUP(md2); WINCNG_MD_ALGORITHM_CLEANUP(md4); WINCNG_MD_ALGORITHM_CLEANUP(md5); WINCNG_MD_ALGORITHM_CLEANUP(sha1); diff --git a/lib/hcrypto/evp-wincng.h b/lib/hcrypto/evp-wincng.h index ed7037a11450..88d98303e84f 100644 --- a/lib/hcrypto/evp-wincng.h +++ b/lib/hcrypto/evp-wincng.h @@ -34,7 +34,6 @@ #define HEIM_EVP_WINCNG_H 1 /* symbol renaming */ -#define EVP_wincng_md2() EVP_wincng_md2() #define EVP_wincng_md4() EVP_wincng_md4() #define EVP_wincng_md5() EVP_wincng_md5() #define EVP_wincng_sha1() EVP_wincng_sha1() @@ -64,7 +63,6 @@ HC_CPP_BEGIN -const EVP_MD * hc_EVP_wincng_md2(void); const EVP_MD * hc_EVP_wincng_md4(void); const EVP_MD * hc_EVP_wincng_md5(void); const EVP_MD * hc_EVP_wincng_sha1(void); diff --git a/lib/hcrypto/evp.c b/lib/hcrypto/evp.c index 23838709c8e9..06935449e47b 100644 --- a/lib/hcrypto/evp.c +++ b/lib/hcrypto/evp.c @@ -466,36 +466,24 @@ EVP_md4(void) HC_DEPRECATED_CRYPTO return EVP_DEF_OP(HCRYPTO_DEF_PROVIDER, md4); } -/** - * The message digest MD2 - * - * @return the message digest type. - * - * @ingroup hcrypto_evp - */ - -const EVP_MD * -EVP_md2(void) HC_DEPRECATED_CRYPTO -{ - hcrypto_validate(); - return EVP_DEF_OP(HCRYPTO_DEF_PROVIDER, md2); -} - /* * */ -static void +static int null_Init (void *m) { + return -1; } -static void +static int null_Update (void *m, const void * data, size_t size) { + return -1; } -static void +static int null_Final(void *res, void *m) { + return -1; } /** diff --git a/lib/hcrypto/evp.h b/lib/hcrypto/evp.h index 8893362db23e..820c500f4275 100644 --- a/lib/hcrypto/evp.h +++ b/lib/hcrypto/evp.h @@ -81,7 +81,6 @@ #define EVP_des_cbc hc_EVP_des_cbc #define EVP_des_ede3_cbc hc_EVP_des_ede3_cbc #define EVP_enc_null hc_EVP_enc_null -#define EVP_md2 hc_EVP_md2 #define EVP_md4 hc_EVP_md4 #define EVP_md5 hc_EVP_md5 #define EVP_md_null hc_EVP_md_null @@ -250,7 +249,6 @@ HC_CPP_BEGIN */ const EVP_MD *EVP_md_null(void); -HC_DEPRECATED_CRYPTO const EVP_MD *EVP_md2(void); HC_DEPRECATED_CRYPTO const EVP_MD *EVP_md4(void); HC_DEPRECATED_CRYPTO const EVP_MD *EVP_md5(void); const EVP_MD *EVP_sha(void); diff --git a/lib/hcrypto/libhcrypto-exports.def b/lib/hcrypto/libhcrypto-exports.def index ab692b4e5e4d..6a620148349b 100644 --- a/lib/hcrypto/libhcrypto-exports.def +++ b/lib/hcrypto/libhcrypto-exports.def @@ -147,7 +147,6 @@ EXPORTS hc_EVP_camellia_256_cbc hc_EVP_enc_null hc_EVP_get_cipherbyname - hc_EVP_md2 hc_EVP_md4 hc_EVP_md5 hc_EVP_md_null @@ -162,7 +161,6 @@ EXPORTS hc_EVP_sha384 hc_EVP_sha512 -;! hc_EVP_cc_md2 ;! hc_EVP_cc_md4 ;! hc_EVP_cc_md5 ;! hc_EVP_cc_sha1 @@ -177,7 +175,6 @@ EXPORTS ;! hc_EVP_cc_aes_192_cfb8 ;! hc_EVP_cc_aes_256_cfb8 - hc_EVP_ossl_md2 hc_EVP_ossl_md4 hc_EVP_ossl_md5 hc_EVP_ossl_sha1 @@ -196,7 +193,6 @@ EXPORTS hc_EVP_ossl_rc4 hc_EVP_ossl_rc4_40 - hc_EVP_pkcs11_md2 hc_EVP_pkcs11_md4 hc_EVP_pkcs11_md5 hc_EVP_pkcs11_sha1 @@ -214,7 +210,6 @@ EXPORTS hc_EVP_pkcs11_rc4 hc_EVP_pkcs11_rc4_40 - hc_EVP_w32crypto_md2 ;! hc_EVP_w32crypto_md4 ;! hc_EVP_w32crypto_md5 ;! hc_EVP_w32crypto_sha1 ;! @@ -234,7 +229,6 @@ EXPORTS hc_EVP_w32crypto_aes_192_cfb8 ;! hc_EVP_w32crypto_aes_256_cfb8 ;! - hc_EVP_hcrypto_md2 hc_EVP_hcrypto_md4 hc_EVP_hcrypto_md5 hc_EVP_hcrypto_sha1 @@ -263,9 +257,6 @@ EXPORTS hc_HMAC_Init_ex hc_HMAC_Update hc_HMAC_size - hc_MD2_Final - hc_MD2_Init - hc_MD2_Update hc_MD4_Final hc_MD4_Init hc_MD4_Update diff --git a/lib/hcrypto/md2.c b/lib/hcrypto/md2.c deleted file mode 100644 index da41e6d83ee0..000000000000 --- a/lib/hcrypto/md2.c +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Copyright (c) 2006 Kungliga Tekniska Högskolan - * (Royal Institute of Technology, Stockholm, Sweden). - * All rights reserved. - * - * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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. - */ - -#include <config.h> -#include <roken.h> - -#include "hash.h" -#include "md2.h" - -static const unsigned char subst[256] = { - 41, 46, 67, 201, 162, 216, 124, 1, 61, 54, 84, 161, 236, 240, 6, - 19, 98, 167, 5, 243, 192, 199, 115, 140, 152, 147, 43, 217, 188, - 76, 130, 202, 30, 155, 87, 60, 253, 212, 224, 22, 103, 66, 111, 24, - 138, 23, 229, 18, 190, 78, 196, 214, 218, 158, 222, 73, 160, 251, - 245, 142, 187, 47, 238, 122, 169, 104, 121, 145, 21, 178, 7, 63, - 148, 194, 16, 137, 11, 34, 95, 33, 128, 127, 93, 154, 90, 144, 50, - 39, 53, 62, 204, 231, 191, 247, 151, 3, 255, 25, 48, 179, 72, 165, - 181, 209, 215, 94, 146, 42, 172, 86, 170, 198, 79, 184, 56, 210, - 150, 164, 125, 182, 118, 252, 107, 226, 156, 116, 4, 241, 69, 157, - 112, 89, 100, 113, 135, 32, 134, 91, 207, 101, 230, 45, 168, 2, 27, - 96, 37, 173, 174, 176, 185, 246, 28, 70, 97, 105, 52, 64, 126, 15, - 85, 71, 163, 35, 221, 81, 175, 58, 195, 92, 249, 206, 186, 197, - 234, 38, 44, 83, 13, 110, 133, 40, 132, 9, 211, 223, 205, 244, 65, - 129, 77, 82, 106, 220, 55, 200, 108, 193, 171, 250, 36, 225, 123, - 8, 12, 189, 177, 74, 120, 136, 149, 139, 227, 99, 232, 109, 233, - 203, 213, 254, 59, 0, 29, 57, 242, 239, 183, 14, 102, 88, 208, 228, - 166, 119, 114, 248, 235, 117, 75, 10, 49, 68, 80, 180, 143, 237, - 31, 26, 219, 153, 141, 51, 159, 17, 131, 20 -}; - -int -MD2_Init (struct md2 *m) -{ - memset(m, 0, sizeof(*m)); - return 1; -} - -static void -calc(struct md2 *m, const void *v) -{ - unsigned char x[48], L; - const unsigned char *p = v; - int i, j, t; - - L = m->checksum[15]; - for (i = 0; i < 16; i++) - L = m->checksum[i] ^= subst[p[i] ^ L]; - - for (i = 0; i < 16; i++) { - x[i] = m->state[i]; - x[i + 16] = p[i]; - x[i + 32] = x[i] ^ p[i]; - } - - t = 0; - for (i = 0; i < 18; i++) { - for (j = 0; j < 48; j++) - t = x[j] ^= subst[t]; - t = (t + i) & 0xff; - } - - memcpy(m->state, x, 16); - memset_s(x, sizeof(x), 0, sizeof(x)); -} - -int -MD2_Update (struct md2 *m, const void *v, size_t len) -{ - size_t idx = m->len & 0xf; - const unsigned char *p = v; - - m->len += len; - if (len + idx >= 16) { - if (idx) { - memcpy(m->data + idx, p, 16 - idx); - calc(m, m->data); - p += 16; - len -= 16 - idx; - } - while (len >= 16) { - calc(m, p); - p += 16; - len -= 16; - } - idx = 0; - } - - memcpy(m->data + idx, p, len); - return 1; -} - -int -MD2_Final (void *res, struct md2 *m) -{ - unsigned char pad[16]; - size_t padlen; - - padlen = 16 - (m->len % 16); - memset(pad, padlen, padlen); - - MD2_Update(m, pad, padlen); - memcpy(pad, m->checksum, 16); - MD2_Update(m, pad, 16); - - memcpy(res, m->state, MD2_DIGEST_LENGTH); - memset(m, 0, sizeof(*m)); - return 1; -} diff --git a/lib/hcrypto/md2.h b/lib/hcrypto/md2.h deleted file mode 100644 index d82334eac948..000000000000 --- a/lib/hcrypto/md2.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2006 Kungliga Tekniska Högskolan - * (Royal Institute of Technology, Stockholm, Sweden). - * All rights reserved. - * - * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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. - */ - -/* $Id$ */ - -#ifndef HEIM_MD2_H -#define HEIM_MD2_H 1 - -/* symbol renaming */ -#define MD2_Init hc_MD2_Init -#define MD2_Update hc_MD2_Update -#define MD2_Final hc_MD2_Final - -/* - * - */ - -#define MD2_DIGEST_LENGTH 16 - -struct md2 { - size_t len; - unsigned char data[16]; /* stored unalligned data between Update's */ - unsigned char checksum[16]; - unsigned char state[16]; /* lower 16 bytes of X */ -}; - -typedef struct md2 MD2_CTX; - -int MD2_Init (struct md2 *m); -int MD2_Update (struct md2 *m, const void *p, size_t len); -int MD2_Final (void *res, struct md2 *m); - -#endif /* HEIM_MD2_H */ diff --git a/lib/hcrypto/mdtest.c b/lib/hcrypto/mdtest.c index d301c5c4a422..7ad93e3560e1 100644 --- a/lib/hcrypto/mdtest.c +++ b/lib/hcrypto/mdtest.c @@ -39,7 +39,6 @@ #ifdef KRB5 #include <krb5-types.h> #endif -#include <md2.h> #include <md4.h> #include <md5.h> #include <sha.h> @@ -51,68 +50,60 @@ struct hash_foo { const char *name; size_t psize; size_t hsize; - void (*init)(void*); - void (*update)(void*, const void*, size_t); - void (*final)(void*, void*); + int (*init)(void*); + int (*update)(void*, const void*, size_t); + int (*final)(void*, void*); const EVP_MD * (*evp)(void); -} md2 = { - "MD2", - sizeof(MD2_CTX), - 16, - (void (*)(void*))MD2_Init, - (void (*)(void*,const void*, size_t))MD2_Update, - (void (*)(void*, void*))MD2_Final, - EVP_md2 -}, md4 = { +} md4 = { "MD4", sizeof(MD4_CTX), 16, - (void (*)(void*))MD4_Init, - (void (*)(void*,const void*, size_t))MD4_Update, - (void (*)(void*, void*))MD4_Final, + (int (*)(void*))MD4_Init, + (int (*)(void*,const void*, size_t))MD4_Update, + (int (*)(void*, void*))MD4_Final, EVP_md4 }, md5 = { "MD5", sizeof(MD5_CTX), 16, - (void (*)(void*))MD5_Init, - (void (*)(void*,const void*, size_t))MD5_Update, - (void (*)(void*, void*))MD5_Final, + (int (*)(void*))MD5_Init, + (int (*)(void*,const void*, size_t))MD5_Update, + (int (*)(void*, void*))MD5_Final, EVP_md5 }, sha1 = { "SHA-1", sizeof(struct sha), 20, - (void (*)(void*))SHA1_Init, - (void (*)(void*,const void*, size_t))SHA1_Update, - (void (*)(void*, void*))SHA1_Final, + (int (*)(void*))SHA1_Init, + (int (*)(void*,const void*, size_t))SHA1_Update, + (int (*)(void*, void*))SHA1_Final, EVP_sha1 }; struct hash_foo sha256 = { "SHA-256", sizeof(SHA256_CTX), 32, - (void (*)(void*))SHA256_Init, - (void (*)(void*,const void*, size_t))SHA256_Update, - (void (*)(void*, void*))SHA256_Final, + (int (*)(void*))SHA256_Init, + (int (*)(void*,const void*, size_t))SHA256_Update, + (int (*)(void*, void*))SHA256_Final, EVP_sha256 }; struct hash_foo sha384 = { "SHA-384", sizeof(SHA384_CTX), 48, - (void (*)(void*))SHA384_Init, - (void (*)(void*,const void*, size_t))SHA384_Update, - (void (*)(void*, void*))SHA384_Final, + (int (*)(void*))SHA384_Init, + (int (*)(void*,const void*, size_t))SHA384_Update, + (int (*)(void*, void*))SHA384_Final, EVP_sha384 }; struct hash_foo sha512 = { "SHA-512", sizeof(SHA512_CTX), 64, - (void (*)(void*))SHA512_Init, - (void (*)(void*,const void*, size_t))SHA512_Update, - (void (*)(void*, void*))SHA512_Final, + (int (*)(void*))SHA512_Init, + (int (*)(void*,const void*, size_t))SHA512_Update, + (int (*)(void*, void*))SHA512_Final, EVP_sha512 }; @@ -121,24 +112,6 @@ struct test { unsigned char hash[64]; }; -struct test md2_tests[] = { - {"", - "\x83\x50\xe5\xa3\xe2\x4c\x15\x3d\xf2\x27\x5c\x9f\x80\x69\x27\x73" }, - {"a", - "\x32\xec\x01\xec\x4a\x6d\xac\x72\xc0\xab\x96\xfb\x34\xc0\xb5\xd1" }, - {"abc", - "\xda\x85\x3b\x0d\x3f\x88\xd9\x9b\x30\x28\x3a\x69\xe6\xde\xd6\xbb" }, - {"message digest", - "\xab\x4f\x49\x6b\xfb\x2a\x53\x0b\x21\x9f\xf3\x30\x31\xfe\x06\xb0" }, - {"abcdefghijklmnopqrstuvwxyz", - "\x4e\x8d\xdf\xf3\x65\x02\x92\xab\x5a\x41\x08\xc3\xaa\x47\x94\x0b" }, - {"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", - "\xda\x33\xde\xf2\xa4\x2d\xf1\x39\x75\x35\x28\x46\xc3\x03\x38\xcd" }, - {"12345678901234567890123456789012345678901234567890123456789012345678901234567890", - "\xd5\x97\x6f\x79\xd8\x3d\x3a\x0d\xc9\x80\x6c\x3c\x66\xf3\xef\xd8" }, - {NULL, { 0 } } -}; - struct test md4_tests[] = { {"", {0x31, 0xd6, 0xcf, 0xe0, 0xd1, 0x6a, 0xe9, 0x31, 0xb7, 0x3c, 0x59, @@ -338,7 +311,6 @@ int main (void) { return - hash_test(&md2, md2_tests) + hash_test(&md4, md4_tests) + hash_test(&md5, md5_tests) + hash_test(&sha1, sha1_tests) + diff --git a/lib/hcrypto/pkcs5.c b/lib/hcrypto/pkcs5.c index dff3ccea3986..88e71c4dd539 100644 --- a/lib/hcrypto/pkcs5.c +++ b/lib/hcrypto/pkcs5.c @@ -85,7 +85,8 @@ PKCS5_PBKDF2_HMAC(const void * password, size_t password_len, data = &tmpcksum[checksumsize]; - memcpy(data, salt, salt_len); + if (salt_len) + memcpy(data, salt, salt_len); keypart = 1; leftofkey = keylen; diff --git a/lib/hcrypto/test_bulk.c b/lib/hcrypto/test_bulk.c index e3737fd1e953..db5aeae1ee13 100644 --- a/lib/hcrypto/test_bulk.c +++ b/lib/hcrypto/test_bulk.c @@ -201,7 +201,6 @@ test_bulk_provider_hcrypto(void) test_bulk_cipher("hcrypto_aes_256_cfb8", EVP_hcrypto_aes_256_cfb8()); #endif test_bulk_cipher("hcrypto_rc4", EVP_hcrypto_rc4()); - test_bulk_digest("hcrypto_md2", EVP_hcrypto_md2()); test_bulk_digest("hcrypto_md4", EVP_hcrypto_md4()); test_bulk_digest("hcrypto_md5", EVP_hcrypto_md5()); test_bulk_digest("hcrypto_sha1", EVP_hcrypto_sha1()); @@ -219,7 +218,6 @@ test_bulk_provider_cc(void) test_bulk_cipher("cc_aes_256_cfb8", EVP_cc_aes_256_cfb8()); #endif test_bulk_cipher("cc_rc4", EVP_cc_rc4()); - test_bulk_digest("cc_md2", EVP_cc_md2()); test_bulk_digest("cc_md4", EVP_cc_md4()); test_bulk_digest("cc_md5", EVP_cc_md5()); test_bulk_digest("cc_sha1", EVP_cc_sha1()); @@ -238,7 +236,6 @@ test_bulk_provider_w32crypto(void) test_bulk_cipher("w32crypto_aes_256_cfb8", EVP_w32crypto_aes_256_cfb8()); #endif test_bulk_cipher("w32crypto_rc4", EVP_w32crypto_rc4()); - test_bulk_digest("w32crypto_md2", EVP_w32crypto_md2()); test_bulk_digest("w32crypto_md4", EVP_w32crypto_md4()); test_bulk_digest("w32crypto_md5", EVP_w32crypto_md5()); test_bulk_digest("w32crypto_sha1", EVP_w32crypto_sha1()); diff --git a/lib/hcrypto/test_cipher.c b/lib/hcrypto/test_cipher.c index 0131e148b172..26bf42c1b09d 100644 --- a/lib/hcrypto/test_cipher.c +++ b/lib/hcrypto/test_cipher.c @@ -295,8 +295,10 @@ test_cipher(int i, const EVP_CIPHER *c, struct tests *t) hex_encode(d, t->datasize, &s); errx(1, "%s: %d decrypt not the same: %s", t->name, i, s); } - if (t->outiv) - /* XXXX check */; + if (t->outiv) { + /* XXXX check */ + ; + } EVP_CIPHER_CTX_cleanup(&ectx); EVP_CIPHER_CTX_cleanup(&dctx); diff --git a/lib/hcrypto/ui.c b/lib/hcrypto/ui.c index 40f47a21d0e7..0eb09e78066a 100644 --- a/lib/hcrypto/ui.c +++ b/lib/hcrypto/ui.c @@ -194,7 +194,7 @@ UI_UTIL_read_pw_string(char *buf, int length, const char *prompt, int verify) if (ret) return ret; - if (verify) { + if (verify & UI_UTIL_FLAG_VERIFY) { char *buf2; buf2 = malloc(length); if (buf2 == NULL) @@ -205,8 +205,13 @@ UI_UTIL_read_pw_string(char *buf, int length, const char *prompt, int verify) free(buf2); return ret; } - if (strcmp(buf2, buf) != 0) + if (strcmp(buf2, buf) != 0) { + if (!(verify & UI_UTIL_FLAG_VERIFY_SILENT)) { + fprintf(stderr, "Verify failure\n"); + fflush(stderr); + } ret = 1; + } free(buf2); } return ret; diff --git a/lib/hcrypto/ui.h b/lib/hcrypto/ui.h index 6b4d6d8c4d5e..4f56da7aae97 100644 --- a/lib/hcrypto/ui.h +++ b/lib/hcrypto/ui.h @@ -39,6 +39,10 @@ /* symbol renaming */ #define UI_UTIL_read_pw_string hc_UI_UTIL_read_pw_string +/* OpenSSL API extensions */ +#define UI_UTIL_FLAG_VERIFY 0x1 /* ask to verify password */ +#define UI_UTIL_FLAG_VERIFY_SILENT 0x2 /* silence on verify failure */ + int UI_UTIL_read_pw_string(char *, int, const char *, int); /* XXX */ #endif /* _HEIM_UI_H */ diff --git a/lib/hcrypto/undef.h b/lib/hcrypto/undef.h index 512b8c3f02e8..6de5734a28f3 100644 --- a/lib/hcrypto/undef.h +++ b/lib/hcrypto/undef.h @@ -116,7 +116,6 @@ #undef EVP_des_cbc #undef EVP_des_ede3_cbc #undef EVP_enc_null -#undef EVP_md2 #undef EVP_md4 #undef EVP_md5 #undef EVP_md_null @@ -158,7 +157,6 @@ #undef EVP_CIPH_ALWAYS_CALL_INIT #undef EVP_CIPH_RAND_KEY #undef EVP_CTRL_RAND_KEY -#undef NID_md2 #undef NID_md4 #undef NID_md5 #undef NID_sha1 diff --git a/lib/hcrypto/version-script.map b/lib/hcrypto/version-script.map index 5b9d34a459b3..03583c5be4d7 100644 --- a/lib/hcrypto/version-script.map +++ b/lib/hcrypto/version-script.map @@ -154,7 +154,6 @@ HEIMDAL_CRYPTO_1.0 { hc_EVP_camellia_256_cbc; hc_EVP_enc_null; hc_EVP_get_cipherbyname; - hc_EVP_md2; hc_EVP_md4; hc_EVP_md5; hc_EVP_md_null; @@ -169,7 +168,6 @@ HEIMDAL_CRYPTO_1.0 { hc_EVP_sha384; hc_EVP_sha512; - hc_EVP_cc_md2; hc_EVP_cc_md4; hc_EVP_cc_md5; hc_EVP_cc_sha1; @@ -184,7 +182,6 @@ HEIMDAL_CRYPTO_1.0 { hc_EVP_cc_aes_192_cfb8; hc_EVP_cc_aes_256_cfb8; - hc_EVP_hcrypto_md2; hc_EVP_hcrypto_md4; hc_EVP_hcrypto_md5; hc_EVP_hcrypto_sha1; @@ -201,7 +198,6 @@ HEIMDAL_CRYPTO_1.0 { hc_EVP_hcrypto_rc4; hc_EVP_hcrypto_rc4_40; - hc_EVP_ossl_md2; hc_EVP_ossl_md4; hc_EVP_ossl_md5; hc_EVP_ossl_sha1; @@ -220,7 +216,6 @@ HEIMDAL_CRYPTO_1.0 { hc_EVP_ossl_rc4; hc_EVP_ossl_rc4_40; - hc_EVP_pkcs11_md2; hc_EVP_pkcs11_md4; hc_EVP_pkcs11_md5; hc_EVP_pkcs11_sha1; @@ -248,9 +243,6 @@ HEIMDAL_CRYPTO_1.0 { hc_HMAC_Init_ex; hc_HMAC_Update; hc_HMAC_size; - hc_MD2_Final; - hc_MD2_Init; - hc_MD2_Update; hc_MD4_Final; hc_MD4_Init; hc_MD4_Update; diff --git a/lib/hdb/Makefile.in b/lib/hdb/Makefile.in index 065c4fc1ae5e..ab4074f09808 100644 --- a/lib/hdb/Makefile.in +++ b/lib/hdb/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -104,7 +104,6 @@ subdir = lib/hdb ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ $(top_srcdir)/cf/auth-modules.m4 \ - $(top_srcdir)/cf/broken-getaddrinfo.m4 \ $(top_srcdir)/cf/broken-glob.m4 \ $(top_srcdir)/cf/broken-realloc.m4 \ $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ @@ -154,6 +153,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +PROGRAMS = $(noinst_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -222,7 +222,6 @@ libhdb_la_OBJECTS = $(dist_libhdb_la_OBJECTS) \ libhdb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libhdb_la_LDFLAGS) $(LDFLAGS) -o $@ -PROGRAMS = $(noinst_PROGRAMS) test_dbinfo_SOURCES = test_dbinfo.c test_dbinfo_OBJECTS = test_dbinfo.$(OBJEXT) test_dbinfo_LDADD = $(LDADD) @@ -260,7 +259,33 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/asn1_Event.Plo \ + ./$(DEPDIR)/asn1_GENERATION.Plo ./$(DEPDIR)/asn1_HDBFlags.Plo \ + ./$(DEPDIR)/asn1_HDB_Ext_Aliases.Plo \ + ./$(DEPDIR)/asn1_HDB_Ext_Constrained_delegation_acl.Plo \ + ./$(DEPDIR)/asn1_HDB_Ext_KeySet.Plo \ + ./$(DEPDIR)/asn1_HDB_Ext_Lan_Manager_OWF.Plo \ + ./$(DEPDIR)/asn1_HDB_Ext_PKINIT_acl.Plo \ + ./$(DEPDIR)/asn1_HDB_Ext_PKINIT_cert.Plo \ + ./$(DEPDIR)/asn1_HDB_Ext_PKINIT_hash.Plo \ + ./$(DEPDIR)/asn1_HDB_Ext_Password.Plo \ + ./$(DEPDIR)/asn1_HDB_extension.Plo \ + ./$(DEPDIR)/asn1_HDB_extensions.Plo ./$(DEPDIR)/asn1_Key.Plo \ + ./$(DEPDIR)/asn1_Keys.Plo ./$(DEPDIR)/asn1_Salt.Plo \ + ./$(DEPDIR)/asn1_hdb_entry.Plo \ + ./$(DEPDIR)/asn1_hdb_entry_alias.Plo \ + ./$(DEPDIR)/asn1_hdb_keyset.Plo ./$(DEPDIR)/common.Plo \ + ./$(DEPDIR)/db.Plo ./$(DEPDIR)/db3.Plo ./$(DEPDIR)/dbinfo.Plo \ + ./$(DEPDIR)/ext.Plo ./$(DEPDIR)/hdb-keytab.Plo \ + ./$(DEPDIR)/hdb-ldap.Plo ./$(DEPDIR)/hdb-mdb.Plo \ + ./$(DEPDIR)/hdb-mitdb.Plo ./$(DEPDIR)/hdb-sqlite.Plo \ + ./$(DEPDIR)/hdb.Plo ./$(DEPDIR)/hdb_err.Plo \ + ./$(DEPDIR)/keys.Plo ./$(DEPDIR)/keytab.Plo \ + ./$(DEPDIR)/mkey.Plo ./$(DEPDIR)/ndbm.Plo \ + ./$(DEPDIR)/print.Plo ./$(DEPDIR)/test_dbinfo.Po \ + ./$(DEPDIR)/test_hdbkeys.Po ./$(DEPDIR)/test_hdbplugin.Po \ + ./$(DEPDIR)/test_mkey.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -310,8 +335,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/Makefile.am.common \ $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/depcomp @@ -336,9 +359,12 @@ CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLANG_FORMAT = @CLANG_FORMAT@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DB1LIB = @DB1LIB@ DB3LIB = @DB3LIB@ @@ -356,8 +382,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GCD_MIG = @GCD_MIG@ GREP = @GREP@ GROFF = @GROFF@ @@ -466,6 +494,11 @@ PKG_CONFIG = @PKG_CONFIG@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LDADD = @PTHREAD_LDADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -525,9 +558,14 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -692,8 +730,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty): @@ -706,6 +744,15 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -747,15 +794,6 @@ hdb_ldap.la: $(hdb_ldap_la_OBJECTS) $(hdb_ldap_la_DEPENDENCIES) $(EXTRA_hdb_ldap libhdb.la: $(libhdb_la_OBJECTS) $(libhdb_la_DEPENDENCIES) $(EXTRA_libhdb_la_DEPENDENCIES) $(AM_V_CCLD)$(libhdb_la_LINK) -rpath $(libdir) $(libhdb_la_OBJECTS) $(libhdb_la_LIBADD) $(LIBS) -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - test_dbinfo$(EXEEXT): $(test_dbinfo_OBJECTS) $(test_dbinfo_DEPENDENCIES) $(EXTRA_test_dbinfo_DEPENDENCIES) @rm -f test_dbinfo$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_dbinfo_OBJECTS) $(test_dbinfo_LDADD) $(LIBS) @@ -778,46 +816,52 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_Event.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_GENERATION.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDBFlags.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDB_Ext_Aliases.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDB_Ext_Constrained_delegation_acl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDB_Ext_KeySet.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDB_Ext_Lan_Manager_OWF.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDB_Ext_PKINIT_acl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDB_Ext_PKINIT_cert.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDB_Ext_PKINIT_hash.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDB_Ext_Password.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDB_extension.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDB_extensions.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_Key.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_Keys.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_Salt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_hdb_entry.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_hdb_entry_alias.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_hdb_keyset.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db3.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbinfo.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ext.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdb-keytab.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdb-ldap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdb-mdb.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdb-mitdb.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdb-sqlite.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdb.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdb_err.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keys.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keytab.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkey.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ndbm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_dbinfo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_hdbkeys.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_hdbplugin.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_mkey.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_Event.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_GENERATION.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDBFlags.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDB_Ext_Aliases.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDB_Ext_Constrained_delegation_acl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDB_Ext_KeySet.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDB_Ext_Lan_Manager_OWF.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDB_Ext_PKINIT_acl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDB_Ext_PKINIT_cert.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDB_Ext_PKINIT_hash.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDB_Ext_Password.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDB_extension.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_HDB_extensions.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_Key.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_Keys.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_Salt.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_hdb_entry.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_hdb_entry_alias.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_hdb_keyset.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/db3.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbinfo.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ext.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdb-keytab.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdb-ldap.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdb-mdb.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdb-mitdb.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdb-sqlite.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdb.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hdb_err.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keys.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keytab.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkey.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ndbm.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_dbinfo.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_hdbkeys.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_hdbplugin.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_mkey.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -939,8 +983,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -977,14 +1023,15 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-local check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-local +all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(HEADERS) all-local installdirs: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -1021,7 +1068,46 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/asn1_Event.Plo + -rm -f ./$(DEPDIR)/asn1_GENERATION.Plo + -rm -f ./$(DEPDIR)/asn1_HDBFlags.Plo + -rm -f ./$(DEPDIR)/asn1_HDB_Ext_Aliases.Plo + -rm -f ./$(DEPDIR)/asn1_HDB_Ext_Constrained_delegation_acl.Plo + -rm -f ./$(DEPDIR)/asn1_HDB_Ext_KeySet.Plo + -rm -f ./$(DEPDIR)/asn1_HDB_Ext_Lan_Manager_OWF.Plo + -rm -f ./$(DEPDIR)/asn1_HDB_Ext_PKINIT_acl.Plo + -rm -f ./$(DEPDIR)/asn1_HDB_Ext_PKINIT_cert.Plo + -rm -f ./$(DEPDIR)/asn1_HDB_Ext_PKINIT_hash.Plo + -rm -f ./$(DEPDIR)/asn1_HDB_Ext_Password.Plo + -rm -f ./$(DEPDIR)/asn1_HDB_extension.Plo + -rm -f ./$(DEPDIR)/asn1_HDB_extensions.Plo + -rm -f ./$(DEPDIR)/asn1_Key.Plo + -rm -f ./$(DEPDIR)/asn1_Keys.Plo + -rm -f ./$(DEPDIR)/asn1_Salt.Plo + -rm -f ./$(DEPDIR)/asn1_hdb_entry.Plo + -rm -f ./$(DEPDIR)/asn1_hdb_entry_alias.Plo + -rm -f ./$(DEPDIR)/asn1_hdb_keyset.Plo + -rm -f ./$(DEPDIR)/common.Plo + -rm -f ./$(DEPDIR)/db.Plo + -rm -f ./$(DEPDIR)/db3.Plo + -rm -f ./$(DEPDIR)/dbinfo.Plo + -rm -f ./$(DEPDIR)/ext.Plo + -rm -f ./$(DEPDIR)/hdb-keytab.Plo + -rm -f ./$(DEPDIR)/hdb-ldap.Plo + -rm -f ./$(DEPDIR)/hdb-mdb.Plo + -rm -f ./$(DEPDIR)/hdb-mitdb.Plo + -rm -f ./$(DEPDIR)/hdb-sqlite.Plo + -rm -f ./$(DEPDIR)/hdb.Plo + -rm -f ./$(DEPDIR)/hdb_err.Plo + -rm -f ./$(DEPDIR)/keys.Plo + -rm -f ./$(DEPDIR)/keytab.Plo + -rm -f ./$(DEPDIR)/mkey.Plo + -rm -f ./$(DEPDIR)/ndbm.Plo + -rm -f ./$(DEPDIR)/print.Plo + -rm -f ./$(DEPDIR)/test_dbinfo.Po + -rm -f ./$(DEPDIR)/test_hdbkeys.Po + -rm -f ./$(DEPDIR)/test_hdbplugin.Po + -rm -f ./$(DEPDIR)/test_mkey.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1068,7 +1154,46 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/asn1_Event.Plo + -rm -f ./$(DEPDIR)/asn1_GENERATION.Plo + -rm -f ./$(DEPDIR)/asn1_HDBFlags.Plo + -rm -f ./$(DEPDIR)/asn1_HDB_Ext_Aliases.Plo + -rm -f ./$(DEPDIR)/asn1_HDB_Ext_Constrained_delegation_acl.Plo + -rm -f ./$(DEPDIR)/asn1_HDB_Ext_KeySet.Plo + -rm -f ./$(DEPDIR)/asn1_HDB_Ext_Lan_Manager_OWF.Plo + -rm -f ./$(DEPDIR)/asn1_HDB_Ext_PKINIT_acl.Plo + -rm -f ./$(DEPDIR)/asn1_HDB_Ext_PKINIT_cert.Plo + -rm -f ./$(DEPDIR)/asn1_HDB_Ext_PKINIT_hash.Plo + -rm -f ./$(DEPDIR)/asn1_HDB_Ext_Password.Plo + -rm -f ./$(DEPDIR)/asn1_HDB_extension.Plo + -rm -f ./$(DEPDIR)/asn1_HDB_extensions.Plo + -rm -f ./$(DEPDIR)/asn1_Key.Plo + -rm -f ./$(DEPDIR)/asn1_Keys.Plo + -rm -f ./$(DEPDIR)/asn1_Salt.Plo + -rm -f ./$(DEPDIR)/asn1_hdb_entry.Plo + -rm -f ./$(DEPDIR)/asn1_hdb_entry_alias.Plo + -rm -f ./$(DEPDIR)/asn1_hdb_keyset.Plo + -rm -f ./$(DEPDIR)/common.Plo + -rm -f ./$(DEPDIR)/db.Plo + -rm -f ./$(DEPDIR)/db3.Plo + -rm -f ./$(DEPDIR)/dbinfo.Plo + -rm -f ./$(DEPDIR)/ext.Plo + -rm -f ./$(DEPDIR)/hdb-keytab.Plo + -rm -f ./$(DEPDIR)/hdb-ldap.Plo + -rm -f ./$(DEPDIR)/hdb-mdb.Plo + -rm -f ./$(DEPDIR)/hdb-mitdb.Plo + -rm -f ./$(DEPDIR)/hdb-sqlite.Plo + -rm -f ./$(DEPDIR)/hdb.Plo + -rm -f ./$(DEPDIR)/hdb_err.Plo + -rm -f ./$(DEPDIR)/keys.Plo + -rm -f ./$(DEPDIR)/keytab.Plo + -rm -f ./$(DEPDIR)/mkey.Plo + -rm -f ./$(DEPDIR)/ndbm.Plo + -rm -f ./$(DEPDIR)/print.Plo + -rm -f ./$(DEPDIR)/test_dbinfo.Po + -rm -f ./$(DEPDIR)/test_hdbkeys.Po + -rm -f ./$(DEPDIR)/test_hdbplugin.Po + -rm -f ./$(DEPDIR)/test_mkey.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1090,10 +1215,10 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \ @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: all check check-am install install-am install-data-am \ - install-strip uninstall-am + install-exec install-strip uninstall-am -.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am \ - check-local clean clean-generic clean-libLTLIBRARIES \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \ + check-am check-local clean clean-generic clean-libLTLIBRARIES \ clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ ctags-am dist-hook distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags distdir dvi \ @@ -1192,11 +1317,20 @@ check-local:: test "$$failed" -eq 0 || exit 1; \ fi +# It's useful for debugging to format generated sources. The default for all +# clang-format styles is to sort includes, but in many cases in-tree we really +# don't want to do that. .x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @if [ -z "$(CLANG_FORMAT)" ]; then \ + cmp -s $< $@ 2> /dev/null || cp $< $@; \ + else \ + cp $< $@.tmp.c; \ + $(CLANG_FORMAT) -style='{BasedOnStyle: Chromium, SortIncludes: false}' -i $@.tmp.c; \ + cmp -s $@.tmp.c $@ 2> /dev/null || mv $@.tmp.c $@; \ + fi .hx.h: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @cmp -s $< $@ 2> /dev/null || cp $< $@; #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ diff --git a/lib/hdb/hdb-mitdb.c b/lib/hdb/hdb-mitdb.c index 74a573441e9e..7a9438cbe1ea 100644 --- a/lib/hdb/hdb-mitdb.c +++ b/lib/hdb/hdb-mitdb.c @@ -1038,6 +1038,9 @@ mdb_remove(krb5_context context, HDB *db, krb5_data key; krb5_data value = { 0, 0 }; + code = mdb_principal2key(context, principal, &key); + if (code) + return code; if ((flags & HDB_F_PRECHECK)) { code = db->hdb__get(context, db, key, &value); krb5_data_free(&key); @@ -1048,7 +1051,6 @@ mdb_remove(krb5_context context, HDB *db, return code; } - mdb_principal2key(context, principal, &key); code = db->hdb__del(context, db, key); krb5_data_free(&key); return code; diff --git a/lib/hdb/keytab.c b/lib/hdb/keytab.c index 966c12f89fb0..81cf2b287261 100644 --- a/lib/hdb/keytab.c +++ b/lib/hdb/keytab.c @@ -159,8 +159,12 @@ find_db (krb5_context context, } } hdb_free_dbinfo(context, &head); - if (*dbname == NULL) - *dbname = strdup(HDB_DEFAULT_DB); + if (*dbname == NULL && + (*dbname = strdup(HDB_DEFAULT_DB)) == NULL) { + free(*mkey); + *mkey = NULL; + return krb5_enomem(context); + } return 0; } diff --git a/lib/hx509/Makefile.am b/lib/hx509/Makefile.am index c7ef53182d83..b21d85202c1f 100644 --- a/lib/hx509/Makefile.am +++ b/lib/hx509/Makefile.am @@ -164,7 +164,7 @@ hxtool-commands.c hxtool-commands.h: hxtool-commands.in $(SLC) dist_hxtool_SOURCES = hxtool.c nodist_hxtool_SOURCES = hxtool-commands.c hxtool-commands.h -$(hxtool_OBJECTS): hxtool-commands.h hx509_err.h +$(hxtool_OBJECTS): hxtool-commands.h $(nodist_include_HEADERS) hxtool_LDADD = \ libhx509.la \ diff --git a/lib/hx509/Makefile.in b/lib/hx509/Makefile.in index 2ebd99d9f1c5..19eabe4bc552 100644 --- a/lib/hx509/Makefile.in +++ b/lib/hx509/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -103,7 +103,6 @@ subdir = lib/hx509 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ $(top_srcdir)/cf/auth-modules.m4 \ - $(top_srcdir)/cf/broken-getaddrinfo.m4 \ $(top_srcdir)/cf/broken-glob.m4 \ $(top_srcdir)/cf/broken-realloc.m4 \ $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ @@ -153,6 +152,10 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \ + "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" +am__EXEEXT_1 = test_name$(EXEEXT) test_expr$(EXEEXT) +PROGRAMS = $(bin_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -180,8 +183,6 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = dist_libhx509_la_OBJECTS = ca.lo cert.lo cms.lo collector.lo crypto.lo \ @@ -211,8 +212,6 @@ am__v_lt_1 = libhx509_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libhx509_la_LDFLAGS) $(LDFLAGS) -o $@ -am__EXEEXT_1 = test_name$(EXEEXT) test_expr$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) dist_hxtool_OBJECTS = hxtool.$(OBJEXT) nodist_hxtool_OBJECTS = hxtool-commands.$(OBJEXT) hxtool_OBJECTS = $(dist_hxtool_OBJECTS) $(nodist_hxtool_OBJECTS) @@ -244,7 +243,43 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/asn1_CertificationRequest.Plo \ + ./$(DEPDIR)/asn1_CertificationRequestInfo.Plo \ + ./$(DEPDIR)/asn1_OCSPBasicOCSPResponse.Plo \ + ./$(DEPDIR)/asn1_OCSPCertID.Plo \ + ./$(DEPDIR)/asn1_OCSPCertStatus.Plo \ + ./$(DEPDIR)/asn1_OCSPInnerRequest.Plo \ + ./$(DEPDIR)/asn1_OCSPKeyHash.Plo \ + ./$(DEPDIR)/asn1_OCSPRequest.Plo \ + ./$(DEPDIR)/asn1_OCSPResponderID.Plo \ + ./$(DEPDIR)/asn1_OCSPResponse.Plo \ + ./$(DEPDIR)/asn1_OCSPResponseBytes.Plo \ + ./$(DEPDIR)/asn1_OCSPResponseData.Plo \ + ./$(DEPDIR)/asn1_OCSPResponseStatus.Plo \ + ./$(DEPDIR)/asn1_OCSPSignature.Plo \ + ./$(DEPDIR)/asn1_OCSPSingleResponse.Plo \ + ./$(DEPDIR)/asn1_OCSPTBSRequest.Plo \ + ./$(DEPDIR)/asn1_OCSPVersion.Plo \ + ./$(DEPDIR)/asn1_id_pkix_ocsp.Plo \ + ./$(DEPDIR)/asn1_id_pkix_ocsp_basic.Plo \ + ./$(DEPDIR)/asn1_id_pkix_ocsp_nonce.Plo ./$(DEPDIR)/ca.Plo \ + ./$(DEPDIR)/cert.Plo ./$(DEPDIR)/cms.Plo \ + ./$(DEPDIR)/collector.Plo ./$(DEPDIR)/crypto-ec.Plo \ + ./$(DEPDIR)/crypto.Plo ./$(DEPDIR)/doxygen.Plo \ + ./$(DEPDIR)/env.Plo ./$(DEPDIR)/error.Plo ./$(DEPDIR)/file.Plo \ + ./$(DEPDIR)/hx509_err.Plo ./$(DEPDIR)/hxtool-commands.Po \ + ./$(DEPDIR)/hxtool.Po ./$(DEPDIR)/keyset.Plo \ + ./$(DEPDIR)/ks_dir.Plo ./$(DEPDIR)/ks_file.Plo \ + ./$(DEPDIR)/ks_keychain.Plo ./$(DEPDIR)/ks_mem.Plo \ + ./$(DEPDIR)/ks_null.Plo ./$(DEPDIR)/ks_p11.Plo \ + ./$(DEPDIR)/ks_p12.Plo ./$(DEPDIR)/lock.Plo \ + ./$(DEPDIR)/name.Plo ./$(DEPDIR)/peer.Plo \ + ./$(DEPDIR)/print.Plo ./$(DEPDIR)/req.Plo \ + ./$(DEPDIR)/revoke.Plo ./$(DEPDIR)/sel-gram.Plo \ + ./$(DEPDIR)/sel-lex.Plo ./$(DEPDIR)/sel.Plo \ + ./$(DEPDIR)/softp11.Plo ./$(DEPDIR)/test_expr.Po \ + ./$(DEPDIR)/test_name.Po ./$(DEPDIR)/test_soft_pkcs11.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -312,8 +347,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no @@ -469,6 +502,7 @@ am__set_TESTS_bases = \ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck TEST_SUITE_LOG = test-suite.log @@ -517,9 +551,12 @@ CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLANG_FORMAT = @CLANG_FORMAT@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DB1LIB = @DB1LIB@ DB3LIB = @DB3LIB@ @@ -537,8 +574,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GCD_MIG = @GCD_MIG@ GREP = @GREP@ GROFF = @GROFF@ @@ -647,6 +686,11 @@ PKG_CONFIG = @PKG_CONFIG@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LDADD = @PTHREAD_LDADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -706,9 +750,14 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1082,8 +1131,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty): @@ -1095,47 +1144,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): - -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } -sel-gram.h: sel-gram.c - @if test ! -f $@; then rm -f sel-gram.c; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) sel-gram.c; else :; fi - -libhx509.la: $(libhx509_la_OBJECTS) $(libhx509_la_DEPENDENCIES) $(EXTRA_libhx509_la_DEPENDENCIES) - $(AM_V_CCLD)$(libhx509_la_LINK) -rpath $(libdir) $(libhx509_la_OBJECTS) $(libhx509_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ @@ -1195,6 +1203,47 @@ clean-checkPROGRAMS: echo " rm -f" $$list; \ rm -f $$list +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } +sel-gram.h: sel-gram.c + @if test ! -f $@; then rm -f sel-gram.c; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) sel-gram.c; else :; fi + +libhx509.la: $(libhx509_la_OBJECTS) $(libhx509_la_DEPENDENCIES) $(EXTRA_libhx509_la_DEPENDENCIES) + $(AM_V_CCLD)$(libhx509_la_LINK) -rpath $(libdir) $(libhx509_la_OBJECTS) $(libhx509_la_LIBADD) $(LIBS) + hxtool$(EXEEXT): $(hxtool_OBJECTS) $(hxtool_DEPENDENCIES) $(EXTRA_hxtool_DEPENDENCIES) @rm -f hxtool$(EXEEXT) $(AM_V_CCLD)$(LINK) $(hxtool_OBJECTS) $(hxtool_LDADD) $(LIBS) @@ -1217,60 +1266,66 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_CertificationRequest.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_CertificationRequestInfo.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPBasicOCSPResponse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPCertID.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPCertStatus.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPInnerRequest.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPKeyHash.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPRequest.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPResponderID.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPResponse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPResponseBytes.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPResponseData.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPResponseStatus.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPSignature.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPSingleResponse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPTBSRequest.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPVersion.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_id_pkix_ocsp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_id_pkix_ocsp_basic.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_id_pkix_ocsp_nonce.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ca.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cert.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cms.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collector.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypto-ec.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypto.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/doxygen.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/env.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hx509_err.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hxtool-commands.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hxtool.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyset.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ks_dir.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ks_file.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ks_keychain.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ks_mem.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ks_null.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ks_p11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ks_p12.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lock.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/name.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/req.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/revoke.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sel-gram.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sel-lex.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sel.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/softp11.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_expr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_name.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_soft_pkcs11.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_CertificationRequest.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_CertificationRequestInfo.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPBasicOCSPResponse.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPCertID.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPCertStatus.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPInnerRequest.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPKeyHash.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPRequest.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPResponderID.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPResponse.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPResponseBytes.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPResponseData.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPResponseStatus.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPSignature.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPSingleResponse.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPTBSRequest.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_OCSPVersion.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_id_pkix_ocsp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_id_pkix_ocsp_basic.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asn1_id_pkix_ocsp_nonce.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ca.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cert.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cms.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collector.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypto-ec.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypto.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/doxygen.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/env.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hx509_err.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hxtool-commands.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hxtool.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyset.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ks_dir.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ks_file.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ks_keychain.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ks_mem.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ks_null.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ks_p11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ks_p12.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lock.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/name.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/req.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/revoke.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sel-gram.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sel-lex.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sel.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/softp11.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_expr.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_name.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_soft_pkcs11.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1506,7 +1561,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ @@ -1519,7 +1574,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: $(check_PROGRAMS) $(check_SCRIPTS) @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -1666,8 +1721,10 @@ test_expr.log: test_expr$(EXEEXT) @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1705,16 +1762,19 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-local +all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(HEADERS) all-local install-binPROGRAMS: install-libLTLIBRARIES +install-checkPROGRAMS: install-libLTLIBRARIES + installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -1757,7 +1817,60 @@ clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ clean-libLTLIBRARIES clean-libtool clean-local mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/asn1_CertificationRequest.Plo + -rm -f ./$(DEPDIR)/asn1_CertificationRequestInfo.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPBasicOCSPResponse.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPCertID.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPCertStatus.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPInnerRequest.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPKeyHash.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPRequest.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPResponderID.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPResponse.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPResponseBytes.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPResponseData.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPResponseStatus.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPSignature.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPSingleResponse.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPTBSRequest.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPVersion.Plo + -rm -f ./$(DEPDIR)/asn1_id_pkix_ocsp.Plo + -rm -f ./$(DEPDIR)/asn1_id_pkix_ocsp_basic.Plo + -rm -f ./$(DEPDIR)/asn1_id_pkix_ocsp_nonce.Plo + -rm -f ./$(DEPDIR)/ca.Plo + -rm -f ./$(DEPDIR)/cert.Plo + -rm -f ./$(DEPDIR)/cms.Plo + -rm -f ./$(DEPDIR)/collector.Plo + -rm -f ./$(DEPDIR)/crypto-ec.Plo + -rm -f ./$(DEPDIR)/crypto.Plo + -rm -f ./$(DEPDIR)/doxygen.Plo + -rm -f ./$(DEPDIR)/env.Plo + -rm -f ./$(DEPDIR)/error.Plo + -rm -f ./$(DEPDIR)/file.Plo + -rm -f ./$(DEPDIR)/hx509_err.Plo + -rm -f ./$(DEPDIR)/hxtool-commands.Po + -rm -f ./$(DEPDIR)/hxtool.Po + -rm -f ./$(DEPDIR)/keyset.Plo + -rm -f ./$(DEPDIR)/ks_dir.Plo + -rm -f ./$(DEPDIR)/ks_file.Plo + -rm -f ./$(DEPDIR)/ks_keychain.Plo + -rm -f ./$(DEPDIR)/ks_mem.Plo + -rm -f ./$(DEPDIR)/ks_null.Plo + -rm -f ./$(DEPDIR)/ks_p11.Plo + -rm -f ./$(DEPDIR)/ks_p12.Plo + -rm -f ./$(DEPDIR)/lock.Plo + -rm -f ./$(DEPDIR)/name.Plo + -rm -f ./$(DEPDIR)/peer.Plo + -rm -f ./$(DEPDIR)/print.Plo + -rm -f ./$(DEPDIR)/req.Plo + -rm -f ./$(DEPDIR)/revoke.Plo + -rm -f ./$(DEPDIR)/sel-gram.Plo + -rm -f ./$(DEPDIR)/sel-lex.Plo + -rm -f ./$(DEPDIR)/sel.Plo + -rm -f ./$(DEPDIR)/softp11.Plo + -rm -f ./$(DEPDIR)/test_expr.Po + -rm -f ./$(DEPDIR)/test_name.Po + -rm -f ./$(DEPDIR)/test_soft_pkcs11.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1806,7 +1919,60 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/asn1_CertificationRequest.Plo + -rm -f ./$(DEPDIR)/asn1_CertificationRequestInfo.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPBasicOCSPResponse.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPCertID.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPCertStatus.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPInnerRequest.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPKeyHash.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPRequest.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPResponderID.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPResponse.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPResponseBytes.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPResponseData.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPResponseStatus.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPSignature.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPSingleResponse.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPTBSRequest.Plo + -rm -f ./$(DEPDIR)/asn1_OCSPVersion.Plo + -rm -f ./$(DEPDIR)/asn1_id_pkix_ocsp.Plo + -rm -f ./$(DEPDIR)/asn1_id_pkix_ocsp_basic.Plo + -rm -f ./$(DEPDIR)/asn1_id_pkix_ocsp_nonce.Plo + -rm -f ./$(DEPDIR)/ca.Plo + -rm -f ./$(DEPDIR)/cert.Plo + -rm -f ./$(DEPDIR)/cms.Plo + -rm -f ./$(DEPDIR)/collector.Plo + -rm -f ./$(DEPDIR)/crypto-ec.Plo + -rm -f ./$(DEPDIR)/crypto.Plo + -rm -f ./$(DEPDIR)/doxygen.Plo + -rm -f ./$(DEPDIR)/env.Plo + -rm -f ./$(DEPDIR)/error.Plo + -rm -f ./$(DEPDIR)/file.Plo + -rm -f ./$(DEPDIR)/hx509_err.Plo + -rm -f ./$(DEPDIR)/hxtool-commands.Po + -rm -f ./$(DEPDIR)/hxtool.Po + -rm -f ./$(DEPDIR)/keyset.Plo + -rm -f ./$(DEPDIR)/ks_dir.Plo + -rm -f ./$(DEPDIR)/ks_file.Plo + -rm -f ./$(DEPDIR)/ks_keychain.Plo + -rm -f ./$(DEPDIR)/ks_mem.Plo + -rm -f ./$(DEPDIR)/ks_null.Plo + -rm -f ./$(DEPDIR)/ks_p11.Plo + -rm -f ./$(DEPDIR)/ks_p12.Plo + -rm -f ./$(DEPDIR)/lock.Plo + -rm -f ./$(DEPDIR)/name.Plo + -rm -f ./$(DEPDIR)/peer.Plo + -rm -f ./$(DEPDIR)/print.Plo + -rm -f ./$(DEPDIR)/req.Plo + -rm -f ./$(DEPDIR)/revoke.Plo + -rm -f ./$(DEPDIR)/sel-gram.Plo + -rm -f ./$(DEPDIR)/sel-lex.Plo + -rm -f ./$(DEPDIR)/sel.Plo + -rm -f ./$(DEPDIR)/softp11.Plo + -rm -f ./$(DEPDIR)/test_expr.Po + -rm -f ./$(DEPDIR)/test_name.Po + -rm -f ./$(DEPDIR)/test_soft_pkcs11.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1828,10 +1994,10 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_includeHEADERS \ @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: all check check-am install install-am install-data-am \ - install-strip uninstall-am + install-exec install-strip uninstall-am -.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \ - check-am check-local clean clean-binPROGRAMS \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \ + check-TESTS check-am check-local clean clean-binPROGRAMS \ clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-libtool clean-local cscopelist-am ctags ctags-am \ dist-hook distclean distclean-compile distclean-generic \ @@ -1933,11 +2099,20 @@ check-local:: test "$$failed" -eq 0 || exit 1; \ fi +# It's useful for debugging to format generated sources. The default for all +# clang-format styles is to sort includes, but in many cases in-tree we really +# don't want to do that. .x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @if [ -z "$(CLANG_FORMAT)" ]; then \ + cmp -s $< $@ 2> /dev/null || cp $< $@; \ + else \ + cp $< $@.tmp.c; \ + $(CLANG_FORMAT) -style='{BasedOnStyle: Chromium, SortIncludes: false}' -i $@.tmp.c; \ + cmp -s $@.tmp.c $@ 2> /dev/null || mv $@.tmp.c $@; \ + fi .hx.h: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @cmp -s $< $@ 2> /dev/null || cp $< $@; #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ @@ -2082,7 +2257,7 @@ $(srcdir)/hx509-private.h: $(dist_libhx509_la_SOURCES) hxtool-commands.c hxtool-commands.h: hxtool-commands.in $(SLC) $(heim_verbose)$(SLC) $(srcdir)/hxtool-commands.in -$(hxtool_OBJECTS): hxtool-commands.h hx509_err.h +$(hxtool_OBJECTS): hxtool-commands.h $(nodist_include_HEADERS) clean-local: @echo "cleaning PKITS" ; rm -rf PKITS_data diff --git a/lib/hx509/cert.c b/lib/hx509/cert.c index dd6d38917499..dcd467c56f9a 100644 --- a/lib/hx509/cert.c +++ b/lib/hx509/cert.c @@ -2200,9 +2200,9 @@ hx509_verify_path(hx509_context context, * EE checking below. */ type = EE_CERT; - /* FALLTHOUGH */ } } + /* FALLTHROUGH */ case EE_CERT: /* * If there where any proxy certificates in the chain diff --git a/lib/hx509/cms.c b/lib/hx509/cms.c index 56dafae51966..1da8a93d343a 100644 --- a/lib/hx509/cms.c +++ b/lib/hx509/cms.c @@ -182,7 +182,7 @@ fill_CMSIdentifier(const hx509_cert cert, &id->u.subjectKeyIdentifier); if (ret == 0) break; - /* FALL THOUGH */ + /* FALLTHROUGH */ case CMS_ID_NAME: { hx509_name name; diff --git a/lib/hx509/crypto.c b/lib/hx509/crypto.c index 5ddc54b9f232..0df91699b513 100644 --- a/lib/hx509/crypto.c +++ b/lib/hx509/crypto.c @@ -904,7 +904,7 @@ static const struct signature_alg sha512_alg = { static const struct signature_alg sha384_alg = { "sha-384", - ASN1_OID_ID_SHA512, + ASN1_OID_ID_SHA384, &_hx509_signature_sha384_data, NULL, NULL, diff --git a/lib/hx509/file.c b/lib/hx509/file.c index 5401af7a0f43..6f34d3b74a9b 100644 --- a/lib/hx509/file.c +++ b/lib/hx509/file.c @@ -230,7 +230,7 @@ hx509_pem_read(hx509_context context, where = INDATA; goto indata; } - /* FALLTHOUGH */ + /* FALLTHROUGH */ case INHEADER: if (buf[0] == '\0') { where = INDATA; diff --git a/lib/hx509/hxtool.c b/lib/hx509/hxtool.c index 0a7048bdf428..af339c50acd4 100644 --- a/lib/hx509/hxtool.c +++ b/lib/hx509/hxtool.c @@ -1327,6 +1327,7 @@ request_create(struct request_create_options *opt, int argc, char **argv) const char *outfile = argv[0]; memset(&key, 0, sizeof(key)); + memset(&signer, 0, sizeof(signer)); get_key(opt->key_string, opt->generate_key_string, diff --git a/lib/hx509/ks_file.c b/lib/hx509/ks_file.c index d7726f084ad7..b9c2f420d5b8 100644 --- a/lib/hx509/ks_file.c +++ b/lib/hx509/ks_file.c @@ -533,7 +533,7 @@ store_func(hx509_context context, void *ctx, hx509_cert c) { struct store_ctx *sc = ctx; heim_octet_string data; - int ret; + int ret = 0; ret = hx509_cert_binary(context, c, &data); if (ret) @@ -554,14 +554,14 @@ store_func(hx509_context context, void *ctx, hx509_cert c) HX509_KEY_FORMAT_DER, &data); if (ret) break; - hx509_pem_write(context, _hx509_private_pem_name(key), NULL, sc->f, - data.data, data.length); + ret = hx509_pem_write(context, _hx509_private_pem_name(key), NULL, + sc->f, data.data, data.length); free(data.data); } break; } - return 0; + return ret; } static int diff --git a/lib/hx509/name.c b/lib/hx509/name.c index ee192e593a90..5cb344b6c161 100644 --- a/lib/hx509/name.c +++ b/lib/hx509/name.c @@ -952,6 +952,7 @@ int hx509_general_name_unparse(GeneralName *name, char **str) { struct rk_strpool *strpool = NULL; + int ret = 0; *str = NULL; @@ -978,7 +979,6 @@ hx509_general_name_unparse(GeneralName *name, char **str) case choice_GeneralName_directoryName: { Name dir; char *s; - int ret; memset(&dir, 0, sizeof(dir)); dir.element = (enum Name_enum)name->u.directoryName.element; dir.u.rdnSequence = name->u.directoryName.u.rdnSequence; @@ -1031,10 +1031,9 @@ hx509_general_name_unparse(GeneralName *name, char **str) default: return EINVAL; } - if (strpool == NULL) + if (ret) + rk_strpoolfree(strpool); + else if (strpool == NULL || (*str = rk_strpoolcollect(strpool)) == NULL) return ENOMEM; - - *str = rk_strpoolcollect(strpool); - - return 0; + return ret; } diff --git a/lib/hx509/sel-gram.c b/lib/hx509/sel-gram.c index 4d60c918f794..c09d1c188bd7 100644 --- a/lib/hx509/sel-gram.c +++ b/lib/hx509/sel-gram.c @@ -1,14 +1,14 @@ -/* A Bison parser, made by GNU Bison 2.3. */ +/* A Bison parser, made by GNU Bison 3.8.2. */ -/* Skeleton implementation for Bison's Yacc-like parsers in C +/* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, + Inc. - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,9 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -36,6 +34,10 @@ /* C LALR(1) parser skeleton written by Richard Stallman, by simplifying the original so-called "semantic" parser. */ +/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, + especially those whose name start with YY_ or yy_. They are + private implementation details that can be changed or removed. */ + /* All symbols defined below should begin with yy or YY, to avoid infringing on user name space. This should be done even for local variables, as they might otherwise be expanded by user macros. @@ -43,11 +45,11 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ -/* Identify Bison output. */ -#define YYBISON 1 +/* Identify Bison output, and Bison version. */ +#define YYBISON 30802 -/* Bison version. */ -#define YYBISON_VERSION "2.3" +/* Bison version string. */ +#define YYBISON_VERSION "3.8.2" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -55,43 +57,16 @@ /* Pure parsers. */ #define YYPURE 0 -/* Using locations. */ -#define YYLSP_NEEDED 0 - - +/* Push parsers. */ +#define YYPUSH 0 -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - kw_TRUE = 258, - kw_FALSE = 259, - kw_AND = 260, - kw_OR = 261, - kw_IN = 262, - kw_TAILMATCH = 263, - NUMBER = 264, - STRING = 265, - IDENTIFIER = 266 - }; -#endif -/* Tokens. */ -#define kw_TRUE 258 -#define kw_FALSE 259 -#define kw_AND 260 -#define kw_OR 261 -#define kw_IN 262 -#define kw_TAILMATCH 263 -#define NUMBER 264 -#define STRING 265 -#define IDENTIFIER 266 +/* Pull parsers. */ +#define YYPULL 1 -/* Copy the first part of user declarations. */ +/* First part of user prologue. */ #line 34 "sel-gram.y" #ifdef HAVE_CONFIG_H @@ -115,77 +90,229 @@ #endif +#line 94 "sel-gram.c" -/* Enabling traces. */ +# ifndef YY_CAST +# ifdef __cplusplus +# define YY_CAST(Type, Val) static_cast<Type> (Val) +# define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast<Type> (Val) +# else +# define YY_CAST(Type, Val) ((Type) (Val)) +# define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val)) +# endif +# endif +# ifndef YY_NULLPTR +# if defined __cplusplus +# if 201103L <= __cplusplus +# define YY_NULLPTR nullptr +# else +# define YY_NULLPTR 0 +# endif +# else +# define YY_NULLPTR ((void*)0) +# endif +# endif + +/* Use api.header.include to #include this header + instead of duplicating it here. */ +#ifndef YY_YY_SEL_GRAM_H_INCLUDED +# define YY_YY_SEL_GRAM_H_INCLUDED +/* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 0 #endif - -/* Enabling verbose error messages. */ -#ifdef YYERROR_VERBOSE -# undef YYERROR_VERBOSE -# define YYERROR_VERBOSE 1 -#else -# define YYERROR_VERBOSE 0 +#if YYDEBUG +extern int yydebug; #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 +/* Token kinds. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + enum yytokentype + { + YYEMPTY = -2, + YYEOF = 0, /* "end of file" */ + YYerror = 256, /* error */ + YYUNDEF = 257, /* "invalid token" */ + kw_TRUE = 258, /* kw_TRUE */ + kw_FALSE = 259, /* kw_FALSE */ + kw_AND = 260, /* kw_AND */ + kw_OR = 261, /* kw_OR */ + kw_IN = 262, /* kw_IN */ + kw_TAILMATCH = 263, /* kw_TAILMATCH */ + NUMBER = 264, /* NUMBER */ + STRING = 265, /* STRING */ + IDENTIFIER = 266 /* IDENTIFIER */ + }; + typedef enum yytokentype yytoken_kind_t; #endif +/* Token kinds. */ +#define YYEMPTY -2 +#define YYEOF 0 +#define YYerror 256 +#define YYUNDEF 257 +#define kw_TRUE 258 +#define kw_FALSE 259 +#define kw_AND 260 +#define kw_OR 261 +#define kw_IN 262 +#define kw_TAILMATCH 263 +#define NUMBER 264 +#define STRING 265 +#define IDENTIFIER 266 +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -#line 57 "sel-gram.y" +union YYSTYPE { +#line 57 "sel-gram.y" + char *string; struct hx_expr *expr; -} -/* Line 193 of yacc.c. */ -#line 146 "sel-gram.c" - YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 + +#line 174 "sel-gram.c" + +}; +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 +# define YYSTYPE_IS_DECLARED 1 #endif +extern YYSTYPE yylval; + + +int yyparse (void); + + +#endif /* !YY_YY_SEL_GRAM_H_INCLUDED */ +/* Symbol kind. */ +enum yysymbol_kind_t +{ + YYSYMBOL_YYEMPTY = -2, + YYSYMBOL_YYEOF = 0, /* "end of file" */ + YYSYMBOL_YYerror = 1, /* error */ + YYSYMBOL_YYUNDEF = 2, /* "invalid token" */ + YYSYMBOL_kw_TRUE = 3, /* kw_TRUE */ + YYSYMBOL_kw_FALSE = 4, /* kw_FALSE */ + YYSYMBOL_kw_AND = 5, /* kw_AND */ + YYSYMBOL_kw_OR = 6, /* kw_OR */ + YYSYMBOL_kw_IN = 7, /* kw_IN */ + YYSYMBOL_kw_TAILMATCH = 8, /* kw_TAILMATCH */ + YYSYMBOL_NUMBER = 9, /* NUMBER */ + YYSYMBOL_STRING = 10, /* STRING */ + YYSYMBOL_IDENTIFIER = 11, /* IDENTIFIER */ + YYSYMBOL_12_ = 12, /* '!' */ + YYSYMBOL_13_ = 13, /* '(' */ + YYSYMBOL_14_ = 14, /* ')' */ + YYSYMBOL_15_ = 15, /* ',' */ + YYSYMBOL_16_ = 16, /* '=' */ + YYSYMBOL_17_ = 17, /* '%' */ + YYSYMBOL_18_ = 18, /* '{' */ + YYSYMBOL_19_ = 19, /* '}' */ + YYSYMBOL_20_ = 20, /* '.' */ + YYSYMBOL_YYACCEPT = 21, /* $accept */ + YYSYMBOL_start = 22, /* start */ + YYSYMBOL_expr = 23, /* expr */ + YYSYMBOL_words = 24, /* words */ + YYSYMBOL_comp = 25, /* comp */ + YYSYMBOL_word = 26, /* word */ + YYSYMBOL_number = 27, /* number */ + YYSYMBOL_string = 28, /* string */ + YYSYMBOL_function = 29, /* function */ + YYSYMBOL_variable = 30, /* variable */ + YYSYMBOL_variables = 31 /* variables */ +}; +typedef enum yysymbol_kind_t yysymbol_kind_t; -/* Copy the second part of user declarations. */ -/* Line 216 of yacc.c. */ -#line 159 "sel-gram.c" #ifdef short # undef short #endif -#ifdef YYTYPE_UINT8 -typedef YYTYPE_UINT8 yytype_uint8; -#else -typedef unsigned char yytype_uint8; +/* On compilers that do not define __PTRDIFF_MAX__ etc., make sure + <limits.h> and (if available) <stdint.h> are included + so that the code can choose integer types of a good width. */ + +#ifndef __PTRDIFF_MAX__ +# include <limits.h> /* INFRINGES ON USER NAME SPACE */ +# if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ +# include <stdint.h> /* INFRINGES ON USER NAME SPACE */ +# define YY_STDINT_H +# endif #endif -#ifdef YYTYPE_INT8 -typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +/* Narrow types that promote to a signed type and that can represent a + signed or unsigned integer of at least N bits. In tables they can + save space and decrease cache pressure. Promoting to a signed type + helps avoid bugs in integer arithmetic. */ + +#ifdef __INT_LEAST8_MAX__ +typedef __INT_LEAST8_TYPE__ yytype_int8; +#elif defined YY_STDINT_H +typedef int_least8_t yytype_int8; +#else typedef signed char yytype_int8; +#endif + +#ifdef __INT_LEAST16_MAX__ +typedef __INT_LEAST16_TYPE__ yytype_int16; +#elif defined YY_STDINT_H +typedef int_least16_t yytype_int16; #else -typedef short int yytype_int8; +typedef short yytype_int16; +#endif + +/* Work around bug in HP-UX 11.23, which defines these macros + incorrectly for preprocessor constants. This workaround can likely + be removed in 2023, as HPE has promised support for HP-UX 11.23 + (aka HP-UX 11i v2) only through the end of 2022; see Table 2 of + <https://h20195.www2.hpe.com/V2/getpdf.aspx/4AA4-7673ENW.pdf>. */ +#ifdef __hpux +# undef UINT_LEAST8_MAX +# undef UINT_LEAST16_MAX +# define UINT_LEAST8_MAX 255 +# define UINT_LEAST16_MAX 65535 #endif -#ifdef YYTYPE_UINT16 -typedef YYTYPE_UINT16 yytype_uint16; +#if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__ +typedef __UINT_LEAST8_TYPE__ yytype_uint8; +#elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \ + && UINT_LEAST8_MAX <= INT_MAX) +typedef uint_least8_t yytype_uint8; +#elif !defined __UINT_LEAST8_MAX__ && UCHAR_MAX <= INT_MAX +typedef unsigned char yytype_uint8; #else -typedef unsigned short int yytype_uint16; +typedef short yytype_uint8; #endif -#ifdef YYTYPE_INT16 -typedef YYTYPE_INT16 yytype_int16; +#if defined __UINT_LEAST16_MAX__ && __UINT_LEAST16_MAX__ <= __INT_MAX__ +typedef __UINT_LEAST16_TYPE__ yytype_uint16; +#elif (!defined __UINT_LEAST16_MAX__ && defined YY_STDINT_H \ + && UINT_LEAST16_MAX <= INT_MAX) +typedef uint_least16_t yytype_uint16; +#elif !defined __UINT_LEAST16_MAX__ && USHRT_MAX <= INT_MAX +typedef unsigned short yytype_uint16; #else -typedef short int yytype_int16; +typedef int yytype_uint16; +#endif + +#ifndef YYPTRDIFF_T +# if defined __PTRDIFF_TYPE__ && defined __PTRDIFF_MAX__ +# define YYPTRDIFF_T __PTRDIFF_TYPE__ +# define YYPTRDIFF_MAXIMUM __PTRDIFF_MAX__ +# elif defined PTRDIFF_MAX +# ifndef ptrdiff_t +# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ +# endif +# define YYPTRDIFF_T ptrdiff_t +# define YYPTRDIFF_MAXIMUM PTRDIFF_MAX +# else +# define YYPTRDIFF_T long +# define YYPTRDIFF_MAXIMUM LONG_MAX +# endif #endif #ifndef YYSIZE_T @@ -193,55 +320,106 @@ typedef short int yytype_int16; # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ # include <stddef.h> /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else -# define YYSIZE_T unsigned int +# define YYSIZE_T unsigned # endif #endif -#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) +#define YYSIZE_MAXIMUM \ + YY_CAST (YYPTRDIFF_T, \ + (YYPTRDIFF_MAXIMUM < YY_CAST (YYSIZE_T, -1) \ + ? YYPTRDIFF_MAXIMUM \ + : YY_CAST (YYSIZE_T, -1))) + +#define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X)) + + +/* Stored state numbers (used for stacks). */ +typedef yytype_int8 yy_state_t; + +/* State numbers in computations. */ +typedef int yy_state_fast_t; #ifndef YY_ # if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include <libintl.h> /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ -# define YY_(msgid) msgid +# define YY_(Msgid) Msgid +# endif +#endif + + +#ifndef YY_ATTRIBUTE_PURE +# if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__) +# define YY_ATTRIBUTE_PURE __attribute__ ((__pure__)) +# else +# define YY_ATTRIBUTE_PURE +# endif +#endif + +#ifndef YY_ATTRIBUTE_UNUSED +# if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__) +# define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) +# else +# define YY_ATTRIBUTE_UNUSED # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YY_USE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YY_USE(E) /* empty */ #endif -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(n) (n) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int i) +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__ +# if __GNUC__ * 100 + __GNUC_MINOR__ < 407 +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") +# else +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") \ + _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# endif +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ + _Pragma ("GCC diagnostic pop") #else -static int -YYID (i) - int i; +# define YY_INITIAL_VALUE(Value) Value #endif -{ - return i; -} +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ #endif -#if ! defined yyoverflow || YYERROR_VERBOSE +#if defined __cplusplus && defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__ +# define YY_IGNORE_USELESS_CAST_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuseless-cast\"") +# define YY_IGNORE_USELESS_CAST_END \ + _Pragma ("GCC diagnostic pop") +#endif +#ifndef YY_IGNORE_USELESS_CAST_BEGIN +# define YY_IGNORE_USELESS_CAST_BEGIN +# define YY_IGNORE_USELESS_CAST_END +#endif + + +#define YY_ASSERT(E) ((void) (0 && (E))) + +#if !defined yyoverflow /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -258,11 +436,11 @@ YYID (i) # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 + /* Use EXIT_SUCCESS as a witness for stdlib.h. */ +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # endif @@ -270,8 +448,8 @@ YYID (i) # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) + /* Pacify GCC's 'empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, and a page size can be as small as 4096 bytes. So we cannot safely @@ -285,88 +463,89 @@ YYID (i) # ifndef YYSTACK_ALLOC_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif -# if (defined __cplusplus && ! defined _STDLIB_H \ +# if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) + && (defined YYFREE || defined free))) # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined malloc && ! defined EXIT_SUCCESS void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined free && ! defined EXIT_SUCCESS void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif # endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ - +#endif /* !defined yyoverflow */ #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss; - YYSTYPE yyvs; - }; + yy_state_t yyss_alloc; + YYSTYPE yyvs_alloc; +}; /* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) +# define YYSTACK_GAP_MAXIMUM (YYSIZEOF (union yyalloc) - 1) /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (YYID (0)) -# endif -# endif +# define YYCOPY_NEEDED 1 /* Relocate STACK from its old location to the new one. The local variables YYSIZE and YYSTACKSIZE give the old and new number of elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYPTRDIFF_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * YYSIZEOF (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / YYSIZEOF (*yyptr); \ + } \ + while (0) #endif +#if defined YYCOPY_NEEDED && YYCOPY_NEEDED +/* Copy COUNT objects from SRC to DST. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(Dst, Src, Count) \ + __builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src))) +# else +# define YYCOPY(Dst, Src, Count) \ + do \ + { \ + YYPTRDIFF_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (Dst)[yyi] = (Src)[yyi]; \ + } \ + while (0) +# endif +# endif +#endif /* !YYCOPY_NEEDED */ + /* YYFINAL -- State number of the termination state. */ #define YYFINAL 21 /* YYLAST -- Last index in YYTABLE. */ @@ -378,18 +557,23 @@ union yyalloc #define YYNNTS 11 /* YYNRULES -- Number of rules. */ #define YYNRULES 26 -/* YYNRULES -- Number of states. */ +/* YYNSTATES -- Number of states. */ #define YYNSTATES 50 -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ -#define YYUNDEFTOK 2 +/* YYMAXUTOK -- Last valid token kind. */ #define YYMAXUTOK 266 -#define YYTRANSLATE(YYX) \ - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ -static const yytype_uint8 yytranslate[] = +/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, with out-of-bounds checking. */ +#define YYTRANSLATE(YYX) \ + (0 <= (YYX) && (YYX) <= YYMAXUTOK \ + ? YY_CAST (yysymbol_kind_t, yytranslate[YYX]) \ + : YYSYMBOL_YYUNDEF) + +/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM + as returned by yylex. */ +static const yytype_int8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -421,31 +605,8 @@ static const yytype_uint8 yytranslate[] = }; #if YYDEBUG -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in - YYRHS. */ -static const yytype_uint8 yyprhs[] = -{ - 0, 0, 3, 5, 7, 9, 12, 16, 20, 24, - 26, 28, 32, 37, 42, 46, 52, 56, 58, 60, - 62, 64, 66, 68, 73, 78, 82 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int8 yyrhs[] = -{ - 22, 0, -1, 23, -1, 3, -1, 4, -1, 12, - 23, -1, 23, 5, 23, -1, 23, 6, 23, -1, - 13, 23, 14, -1, 25, -1, 26, -1, 26, 15, - 24, -1, 26, 16, 16, 26, -1, 26, 12, 16, - 26, -1, 26, 8, 26, -1, 26, 7, 13, 24, - 14, -1, 26, 7, 30, -1, 27, -1, 28, -1, - 29, -1, 30, -1, 9, -1, 10, -1, 11, 13, - 24, 14, -1, 17, 18, 31, 19, -1, 11, 20, - 31, -1, 11, -1 -}; - -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const yytype_uint8 yyrline[] = +/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ +static const yytype_int8 yyrline[] = { 0, 85, 85, 87, 88, 89, 90, 91, 92, 93, 96, 97, 100, 101, 102, 103, 104, 107, 108, 109, @@ -453,68 +614,44 @@ static const yytype_uint8 yyrline[] = }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +/** Accessing symbol of state STATE. */ +#define YY_ACCESSING_SYMBOL(State) YY_CAST (yysymbol_kind_t, yystos[State]) + +#if YYDEBUG || 0 +/* The user-facing name of the symbol whose (internal) number is + YYSYMBOL. No bounds checking. */ +static const char *yysymbol_name (yysymbol_kind_t yysymbol) YY_ATTRIBUTE_UNUSED; + /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "$end", "error", "$undefined", "kw_TRUE", "kw_FALSE", "kw_AND", "kw_OR", - "kw_IN", "kw_TAILMATCH", "NUMBER", "STRING", "IDENTIFIER", "'!'", "'('", - "')'", "','", "'='", "'%'", "'{'", "'}'", "'.'", "$accept", "start", - "expr", "words", "comp", "word", "number", "string", "function", - "variable", "variables", 0 + "\"end of file\"", "error", "\"invalid token\"", "kw_TRUE", "kw_FALSE", + "kw_AND", "kw_OR", "kw_IN", "kw_TAILMATCH", "NUMBER", "STRING", + "IDENTIFIER", "'!'", "'('", "')'", "','", "'='", "'%'", "'{'", "'}'", + "'.'", "$accept", "start", "expr", "words", "comp", "word", "number", + "string", "function", "variable", "variables", YY_NULLPTR }; -#endif -# ifdef YYPRINT -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ -static const yytype_uint16 yytoknum[] = +static const char * +yysymbol_name (yysymbol_kind_t yysymbol) { - 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 266, 33, 40, 41, 44, 61, 37, 123, 125, - 46 -}; -# endif + return yytname[yysymbol]; +} +#endif -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = -{ - 0, 21, 22, 23, 23, 23, 23, 23, 23, 23, - 24, 24, 25, 25, 25, 25, 25, 26, 26, 26, - 26, 27, 28, 29, 30, 31, 31 -}; +#define YYPACT_NINF (-31) -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = -{ - 0, 2, 1, 1, 1, 2, 3, 3, 3, 1, - 1, 3, 4, 4, 3, 5, 3, 1, 1, 1, - 1, 1, 1, 4, 4, 3, 1 -}; +#define yypact_value_is_default(Yyn) \ + ((Yyn) == YYPACT_NINF) -/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state - STATE-NUM when YYTABLE doesn't specify something else to do. Zero - means the default is an error. */ -static const yytype_uint8 yydefact[] = -{ - 0, 3, 4, 21, 22, 0, 0, 0, 0, 0, - 2, 9, 0, 17, 18, 19, 20, 0, 5, 0, - 0, 1, 0, 0, 0, 0, 0, 0, 0, 10, - 8, 26, 0, 6, 7, 0, 16, 14, 0, 0, - 23, 0, 0, 24, 0, 13, 12, 11, 25, 15 -}; +#define YYTABLE_NINF (-1) -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int8 yydefgoto[] = -{ - -1, 9, 10, 28, 11, 12, 13, 14, 15, 16, - 32 -}; +#define yytable_value_is_error(Yyn) \ + 0 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -31 static const yytype_int8 yypact[] = { 22, -31, -31, -31, -31, -1, 22, 22, -11, 27, @@ -524,6 +661,18 @@ static const yytype_int8 yypact[] = -31, 19, 26, -31, 30, -31, -31, -31, -31, -31 }; +/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not specify something else to do. Zero + means the default is an error. */ +static const yytype_int8 yydefact[] = +{ + 0, 3, 4, 21, 22, 0, 0, 0, 0, 0, + 2, 9, 0, 17, 18, 19, 20, 0, 5, 0, + 0, 1, 0, 0, 0, 0, 0, 0, 0, 10, + 8, 26, 0, 6, 7, 0, 16, 14, 0, 0, + 23, 0, 0, 24, 0, 13, 12, 11, 25, 15 +}; + /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { @@ -531,12 +680,17 @@ static const yytype_int8 yypgoto[] = 1 }; -/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero, do what YYDEFACT says. - If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -1 -static const yytype_uint8 yytable[] = +/* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int8 yydefgoto[] = +{ + 0, 9, 10, 28, 11, 12, 13, 14, 15, 16, + 32 +}; + +/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ +static const yytype_int8 yytable[] = { 29, 24, 25, 18, 19, 44, 26, 20, 37, 35, 27, 47, 17, 8, 22, 23, 22, 23, 29, 33, @@ -556,9 +710,9 @@ static const yytype_int8 yycheck[] = 19 }; -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ -static const yytype_uint8 yystos[] = +/* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of + state STATE-NUM. */ +static const yytype_int8 yystos[] = { 0, 3, 4, 9, 10, 11, 12, 13, 17, 22, 23, 25, 26, 27, 28, 29, 30, 13, 23, 23, @@ -567,95 +721,57 @@ static const yytype_uint8 yystos[] = 14, 15, 20, 19, 24, 26, 26, 24, 31, 14 }; -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - - -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ +/* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM. */ +static const yytype_int8 yyr1[] = +{ + 0, 21, 22, 23, 23, 23, 23, 23, 23, 23, + 24, 24, 25, 25, 25, 25, 25, 26, 26, 26, + 26, 27, 28, 29, 30, 31, 31 +}; -#define YYFAIL goto yyerrlab +/* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM. */ +static const yytype_int8 yyr2[] = +{ + 0, 2, 1, 1, 1, 2, 3, 3, 3, 1, + 1, 3, 4, 4, 3, 5, 3, 1, 1, 1, + 1, 1, 1, 4, 4, 3, 1 +}; -#define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (YYID (0)) - - -#define YYTERROR 1 -#define YYERRCODE 256 - - -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) -#endif +enum { YYENOMEM = -2 }; +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab +#define YYNOMEM goto yyexhaustedlab -#ifndef YY_LOCATION_PRINT -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif -#endif +#define YYRECOVERING() (!!yyerrstatus) -/* YYLEX -- calling `yylex' with the right arguments. */ +#define YYBACKUP(Token, Value) \ + do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ + while (0) + +/* Backward compatibility with an undocumented macro. + Use YYerror or YYUNDEF. */ +#define YYERRCODE YYUNDEF -#ifdef YYLEX_PARAM -# define YYLEX yylex (YYLEX_PARAM) -#else -# define YYLEX yylex () -#endif /* Enable debugging if requested. */ #if YYDEBUG @@ -665,80 +781,58 @@ while (YYID (0)) # define YYFPRINTF fprintf # endif -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (YYID (0)) - -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (0) + + + + +# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Kind, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (0) + + +/*-----------------------------------. +| Print this symbol's value on YYO. | +`-----------------------------------*/ + static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif +yy_symbol_value_print (FILE *yyo, + yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep) { + FILE *yyoutput = yyo; + YY_USE (yyoutput); if (!yyvaluep) return; -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); -# endif - switch (yytype) - { - default: - break; - } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YY_USE (yykind); + YY_IGNORE_MAYBE_UNINITIALIZED_END } -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +/*---------------------------. +| Print this symbol on YYO. | +`---------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif +yy_symbol_print (FILE *yyo, + yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep) { - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + YYFPRINTF (yyo, "%s %s (", + yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind)); - yy_symbol_value_print (yyoutput, yytype, yyvaluep); - YYFPRINTF (yyoutput, ")"); + yy_symbol_value_print (yyo, yykind, yyvaluep); + YYFPRINTF (yyo, ")"); } /*------------------------------------------------------------------. @@ -746,80 +840,68 @@ yy_symbol_print (yyoutput, yytype, yyvaluep) | TOP (included). | `------------------------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) -#else static void -yy_stack_print (bottom, top) - yytype_int16 *bottom; - yytype_int16 *top; -#endif +yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop) { YYFPRINTF (stderr, "Stack now"); - for (; bottom <= top; ++bottom) - YYFPRINTF (stderr, " %d", *bottom); + for (; yybottom <= yytop; yybottom++) + { + int yybot = *yybottom; + YYFPRINTF (stderr, " %d", yybot); + } YYFPRINTF (stderr, "\n"); } -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_reduce_print (YYSTYPE *yyvsp, int yyrule) -#else static void -yy_reduce_print (yyvsp, yyrule) - YYSTYPE *yyvsp; - int yyrule; -#endif +yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, + int yyrule) { + int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; - unsigned long int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); + YYFPRINTF (stderr, "Reducing stack by rule %d (line %d):\n", + yyrule - 1, yylno); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { - fprintf (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - ); - fprintf (stderr, "\n"); + YYFPRINTF (stderr, " $%d = ", yyi + 1); + yy_symbol_print (stderr, + YY_ACCESSING_SYMBOL (+yyssp[yyi + 1 - yynrhs]), + &yyvsp[(yyi + 1) - (yynrhs)]); + YYFPRINTF (stderr, "\n"); } } -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyvsp, Rule); \ -} while (YYID (0)) +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyssp, yyvsp, Rule); \ +} while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; #else /* !YYDEBUG */ -# define YYDPRINTF(Args) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YYDPRINTF(Args) ((void) 0) +# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ /* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH +#ifndef YYINITDEPTH # define YYINITDEPTH 200 #endif @@ -834,478 +916,219 @@ int yydebug; # define YYMAXDEPTH 10000 #endif - -#if YYERROR_VERBOSE -# ifndef yystrlen -# if defined __GLIBC__ && defined _STRING_H -# define yystrlen strlen -# else -/* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static YYSIZE_T -yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif -{ - YYSIZE_T yylen; - for (yylen = 0; yystr[yylen]; yylen++) - continue; - return yylen; -} -# endif -# endif - -# ifndef yystpcpy -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -# define yystpcpy stpcpy -# else -/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in - YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static char * -yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif -{ - char *yyd = yydest; - const char *yys = yysrc; - - while ((*yyd++ = *yys++) != '\0') - continue; - - return yyd - 1; -} -# endif -# endif - -# ifndef yytnamerr -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary - quotes and backslashes, so that it's suitable for yyerror. The - heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than - backslash-backslash). YYSTR is taken from yytname. If YYRES is - null, do not copy; instead, return the length of what the result - would have been. */ -static YYSIZE_T -yytnamerr (char *yyres, const char *yystr) -{ - if (*yystr == '"') - { - YYSIZE_T yyn = 0; - char const *yyp = yystr; - - for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - do_not_strip_quotes: ; - } - - if (! yyres) - return yystrlen (yystr); - return yystpcpy (yyres, yystr) - yyres; -} -# endif -/* Copy into YYRESULT an error message about the unexpected token - YYCHAR while in state YYSTATE. Return the number of bytes copied, - including the terminating null byte. If YYRESULT is null, do not - copy anything; just return the number of bytes that would be - copied. As a special case, return 0 if an ordinary "syntax error" - message will do. Return YYSIZE_MAXIMUM if overflow occurs during - size calculation. */ -static YYSIZE_T -yysyntax_error (char *yyresult, int yystate, int yychar) -{ - int yyn = yypact[yystate]; - - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; - else - { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -# if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -# endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } - - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - - if (yysize_overflow) - return YYSIZE_MAXIMUM; - - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yyresult; - int yyi = 0; - while ((*yyp = *yyf) != '\0') - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - } - return yysize; - } -} -#endif /* YYERROR_VERBOSE */ - /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) -#else static void -yydestruct (yymsg, yytype, yyvaluep) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; -#endif +yydestruct (const char *yymsg, + yysymbol_kind_t yykind, YYSTYPE *yyvaluep) { - YYUSE (yyvaluep); - + YY_USE (yyvaluep); if (!yymsg) yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp); - switch (yytype) - { - - default: - break; - } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YY_USE (yykind); + YY_IGNORE_MAYBE_UNINITIALIZED_END } - -/* Prevent warnings from -Wmissing-prototypes. */ -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ - - - -/* The look-ahead symbol. */ +/* Lookahead token kind. */ int yychar; -/* The semantic value of the look-ahead symbol. */ +/* The semantic value of the lookahead symbol. */ YYSTYPE yylval; - /* Number of syntax errors so far. */ int yynerrs; + /*----------. | yyparse. | `----------*/ -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) int yyparse (void) -#else -int -yyparse () - -#endif -#endif { - - int yystate; - int yyn; - int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ - int yytoken = 0; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif - - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. - - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ - - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; - - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; + yy_state_fast_t yystate = 0; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus = 0; + /* Refer to the stacks through separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ + /* Their size. */ + YYPTRDIFF_T yystacksize = YYINITDEPTH; -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) + /* The state stack: array, bottom, top. */ + yy_state_t yyssa[YYINITDEPTH]; + yy_state_t *yyss = yyssa; + yy_state_t *yyssp = yyss; - YYSIZE_T yystacksize = YYINITDEPTH; + /* The semantic value stack: array, bottom, top. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs = yyvsa; + YYSTYPE *yyvsp = yyvs; + int yyn; + /* The return value of yyparse. */ + int yyresult; + /* Lookahead symbol kind. */ + yysymbol_kind_t yytoken = YYSYMBOL_YYEMPTY; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) + /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ int yylen = 0; YYDPRINTF ((stderr, "Starting parse\n")); - yystate = 0; - yyerrstatus = 0; - yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - - yyssp = yyss; - yyvsp = yyvs; + yychar = YYEMPTY; /* Cause a token to be read. */ goto yysetstate; + /*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | +| yynewstate -- push a new state, which is found in yystate. | `------------------------------------------------------------*/ - yynewstate: +yynewstate: /* In all cases, when you get here, the value and location stacks have just been pushed. So pushing a state here evens the stacks. */ yyssp++; - yysetstate: - *yyssp = yystate; + +/*--------------------------------------------------------------------. +| yysetstate -- set current state (the top of the stack) to yystate. | +`--------------------------------------------------------------------*/ +yysetstate: + YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + YY_ASSERT (0 <= yystate && yystate < YYNSTATES); + YY_IGNORE_USELESS_CAST_BEGIN + *yyssp = YY_CAST (yy_state_t, yystate); + YY_IGNORE_USELESS_CAST_END + YY_STACK_PRINT (yyss, yyssp); if (yyss + yystacksize - 1 <= yyssp) +#if !defined yyoverflow && !defined YYSTACK_RELOCATE + YYNOMEM; +#else { /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; + YYPTRDIFF_T yysize = yyssp - yyss + 1; -#ifdef yyoverflow +# if defined yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - - &yystacksize); - - yyss = yyss1; - yyvs = yyvs1; + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + yy_state_t *yyss1 = yyss; + YYSTYPE *yyvs1 = yyvs; + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * YYSIZEOF (*yyssp), + &yyvs1, yysize * YYSIZEOF (*yyvsp), + &yystacksize); + yyss = yyss1; + yyvs = yyvs1; } -#else /* no yyoverflow */ -# ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; -# else +# else /* defined YYSTACK_RELOCATE */ /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + YYNOMEM; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; + yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); - + yy_state_t *yyss1 = yyss; + union yyalloc *yyptr = + YY_CAST (union yyalloc *, + YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize)))); + if (! yyptr) + YYNOMEM; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); # undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); } # endif -#endif /* no yyoverflow */ yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; - - YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + YY_IGNORE_USELESS_CAST_BEGIN + YYDPRINTF ((stderr, "Stack size increased to %ld\n", + YY_CAST (long, yystacksize))); + YY_IGNORE_USELESS_CAST_END if (yyss + yystacksize - 1 <= yyssp) - YYABORT; + YYABORT; } +#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */ - YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + + if (yystate == YYFINAL) + YYACCEPT; goto yybackup; + /*-----------. | yybackup. | `-----------*/ yybackup: - /* Do appropriate processing given the current state. Read a - look-ahead token if we need one and don't already have one. */ + lookahead token if we need one and don't already have one. */ - /* First try to decide what to do without reference to look-ahead token. */ + /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; - if (yyn == YYPACT_NINF) + if (yypact_value_is_default (yyn)) goto yydefault; - /* Not known => get a look-ahead token if don't already have one. */ + /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ + /* YYCHAR is either empty, or end-of-input, or a valid lookahead. */ if (yychar == YYEMPTY) { - YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; + YYDPRINTF ((stderr, "Reading a token\n")); + yychar = yylex (); } if (yychar <= YYEOF) { - yychar = yytoken = YYEOF; + yychar = YYEOF; + yytoken = YYSYMBOL_YYEOF; YYDPRINTF ((stderr, "Now at end of input.\n")); } + else if (yychar == YYerror) + { + /* The scanner already issued an error message, process directly + to error recovery. But do not keep the error token as + lookahead, it is too special and may lead us to an endless + loop in error recovery. */ + yychar = YYUNDEF; + yytoken = YYSYMBOL_YYerror; + goto yyerrlab1; + } else { yytoken = YYTRANSLATE (yychar); @@ -1320,30 +1143,26 @@ yybackup: yyn = yytable[yyn]; if (yyn <= 0) { - if (yyn == 0 || yyn == YYTABLE_NINF) - goto yyerrlab; + if (yytable_value_is_error (yyn)) + goto yyerrlab; yyn = -yyn; goto yyreduce; } - if (yyn == YYFINAL) - YYACCEPT; - /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; - /* Shift the look-ahead token. */ + /* Shift the lookahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - - /* Discard the shifted token unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; - yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END + /* Discard the shifted token. */ + yychar = YYEMPTY; goto yynewstate; @@ -1358,14 +1177,14 @@ yydefault: /*-----------------------------. -| yyreduce -- Do a reduction. | +| yyreduce -- do a reduction. | `-----------------------------*/ yyreduce: /* yyn is the number of a rule to reduce with. */ yylen = yyr2[yyn]; /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. + '$$ = $1'. Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison @@ -1378,230 +1197,230 @@ yyreduce: YY_REDUCE_PRINT (yyn); switch (yyn) { - case 2: + case 2: /* start: expr */ #line 85 "sel-gram.y" - { _hx509_expr_input.expr = (yyvsp[(1) - (1)].expr); } + { _hx509_expr_input.expr = (yyvsp[0].expr); } +#line 1204 "sel-gram.c" break; - case 3: + case 3: /* expr: kw_TRUE */ #line 87 "sel-gram.y" - { (yyval.expr) = _hx509_make_expr(op_TRUE, NULL, NULL); } + { (yyval.expr) = _hx509_make_expr(op_TRUE, NULL, NULL); } +#line 1210 "sel-gram.c" break; - case 4: + case 4: /* expr: kw_FALSE */ #line 88 "sel-gram.y" - { (yyval.expr) = _hx509_make_expr(op_FALSE, NULL, NULL); } + { (yyval.expr) = _hx509_make_expr(op_FALSE, NULL, NULL); } +#line 1216 "sel-gram.c" break; - case 5: + case 5: /* expr: '!' expr */ #line 89 "sel-gram.y" - { (yyval.expr) = _hx509_make_expr(op_NOT, (yyvsp[(2) - (2)].expr), NULL); } + { (yyval.expr) = _hx509_make_expr(op_NOT, (yyvsp[0].expr), NULL); } +#line 1222 "sel-gram.c" break; - case 6: + case 6: /* expr: expr kw_AND expr */ #line 90 "sel-gram.y" - { (yyval.expr) = _hx509_make_expr(op_AND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } + { (yyval.expr) = _hx509_make_expr(op_AND, (yyvsp[-2].expr), (yyvsp[0].expr)); } +#line 1228 "sel-gram.c" break; - case 7: + case 7: /* expr: expr kw_OR expr */ #line 91 "sel-gram.y" - { (yyval.expr) = _hx509_make_expr(op_OR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } + { (yyval.expr) = _hx509_make_expr(op_OR, (yyvsp[-2].expr), (yyvsp[0].expr)); } +#line 1234 "sel-gram.c" break; - case 8: + case 8: /* expr: '(' expr ')' */ #line 92 "sel-gram.y" - { (yyval.expr) = (yyvsp[(2) - (3)].expr); } + { (yyval.expr) = (yyvsp[-1].expr); } +#line 1240 "sel-gram.c" break; - case 9: + case 9: /* expr: comp */ #line 93 "sel-gram.y" - { (yyval.expr) = _hx509_make_expr(op_COMP, (yyvsp[(1) - (1)].expr), NULL); } + { (yyval.expr) = _hx509_make_expr(op_COMP, (yyvsp[0].expr), NULL); } +#line 1246 "sel-gram.c" break; - case 10: + case 10: /* words: word */ #line 96 "sel-gram.y" - { (yyval.expr) = _hx509_make_expr(expr_WORDS, (yyvsp[(1) - (1)].expr), NULL); } + { (yyval.expr) = _hx509_make_expr(expr_WORDS, (yyvsp[0].expr), NULL); } +#line 1252 "sel-gram.c" break; - case 11: + case 11: /* words: word ',' words */ #line 97 "sel-gram.y" - { (yyval.expr) = _hx509_make_expr(expr_WORDS, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } + { (yyval.expr) = _hx509_make_expr(expr_WORDS, (yyvsp[-2].expr), (yyvsp[0].expr)); } +#line 1258 "sel-gram.c" break; - case 12: + case 12: /* comp: word '=' '=' word */ #line 100 "sel-gram.y" - { (yyval.expr) = _hx509_make_expr(comp_EQ, (yyvsp[(1) - (4)].expr), (yyvsp[(4) - (4)].expr)); } + { (yyval.expr) = _hx509_make_expr(comp_EQ, (yyvsp[-3].expr), (yyvsp[0].expr)); } +#line 1264 "sel-gram.c" break; - case 13: + case 13: /* comp: word '!' '=' word */ #line 101 "sel-gram.y" - { (yyval.expr) = _hx509_make_expr(comp_NE, (yyvsp[(1) - (4)].expr), (yyvsp[(4) - (4)].expr)); } + { (yyval.expr) = _hx509_make_expr(comp_NE, (yyvsp[-3].expr), (yyvsp[0].expr)); } +#line 1270 "sel-gram.c" break; - case 14: + case 14: /* comp: word kw_TAILMATCH word */ #line 102 "sel-gram.y" - { (yyval.expr) = _hx509_make_expr(comp_TAILEQ, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } + { (yyval.expr) = _hx509_make_expr(comp_TAILEQ, (yyvsp[-2].expr), (yyvsp[0].expr)); } +#line 1276 "sel-gram.c" break; - case 15: + case 15: /* comp: word kw_IN '(' words ')' */ #line 103 "sel-gram.y" - { (yyval.expr) = _hx509_make_expr(comp_IN, (yyvsp[(1) - (5)].expr), (yyvsp[(4) - (5)].expr)); } + { (yyval.expr) = _hx509_make_expr(comp_IN, (yyvsp[-4].expr), (yyvsp[-1].expr)); } +#line 1282 "sel-gram.c" break; - case 16: + case 16: /* comp: word kw_IN variable */ #line 104 "sel-gram.y" - { (yyval.expr) = _hx509_make_expr(comp_IN, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } + { (yyval.expr) = _hx509_make_expr(comp_IN, (yyvsp[-2].expr), (yyvsp[0].expr)); } +#line 1288 "sel-gram.c" break; - case 17: + case 17: /* word: number */ #line 107 "sel-gram.y" - { (yyval.expr) = (yyvsp[(1) - (1)].expr); } + { (yyval.expr) = (yyvsp[0].expr); } +#line 1294 "sel-gram.c" break; - case 18: + case 18: /* word: string */ #line 108 "sel-gram.y" - { (yyval.expr) = (yyvsp[(1) - (1)].expr); } + { (yyval.expr) = (yyvsp[0].expr); } +#line 1300 "sel-gram.c" break; - case 19: + case 19: /* word: function */ #line 109 "sel-gram.y" - { (yyval.expr) = (yyvsp[(1) - (1)].expr); } + { (yyval.expr) = (yyvsp[0].expr); } +#line 1306 "sel-gram.c" break; - case 20: + case 20: /* word: variable */ #line 110 "sel-gram.y" - { (yyval.expr) = (yyvsp[(1) - (1)].expr); } + { (yyval.expr) = (yyvsp[0].expr); } +#line 1312 "sel-gram.c" break; - case 21: + case 21: /* number: NUMBER */ #line 113 "sel-gram.y" - { (yyval.expr) = _hx509_make_expr(expr_NUMBER, (yyvsp[(1) - (1)].string), NULL); } + { (yyval.expr) = _hx509_make_expr(expr_NUMBER, (yyvsp[0].string), NULL); } +#line 1318 "sel-gram.c" break; - case 22: + case 22: /* string: STRING */ #line 114 "sel-gram.y" - { (yyval.expr) = _hx509_make_expr(expr_STRING, (yyvsp[(1) - (1)].string), NULL); } + { (yyval.expr) = _hx509_make_expr(expr_STRING, (yyvsp[0].string), NULL); } +#line 1324 "sel-gram.c" break; - case 23: + case 23: /* function: IDENTIFIER '(' words ')' */ #line 116 "sel-gram.y" - { - (yyval.expr) = _hx509_make_expr(expr_FUNCTION, (yyvsp[(1) - (4)].string), (yyvsp[(3) - (4)].expr)); } + { + (yyval.expr) = _hx509_make_expr(expr_FUNCTION, (yyvsp[-3].string), (yyvsp[-1].expr)); } +#line 1331 "sel-gram.c" break; - case 24: + case 24: /* variable: '%' '{' variables '}' */ #line 119 "sel-gram.y" - { (yyval.expr) = (yyvsp[(3) - (4)].expr); } + { (yyval.expr) = (yyvsp[-1].expr); } +#line 1337 "sel-gram.c" break; - case 25: + case 25: /* variables: IDENTIFIER '.' variables */ #line 122 "sel-gram.y" - { - (yyval.expr) = _hx509_make_expr(expr_VAR, (yyvsp[(1) - (3)].string), (yyvsp[(3) - (3)].expr)); } + { + (yyval.expr) = _hx509_make_expr(expr_VAR, (yyvsp[-2].string), (yyvsp[0].expr)); } +#line 1344 "sel-gram.c" break; - case 26: + case 26: /* variables: IDENTIFIER */ #line 124 "sel-gram.y" - { - (yyval.expr) = _hx509_make_expr(expr_VAR, (yyvsp[(1) - (1)].string), NULL); } + { + (yyval.expr) = _hx509_make_expr(expr_VAR, (yyvsp[0].string), NULL); } +#line 1351 "sel-gram.c" break; -/* Line 1267 of yacc.c. */ -#line 1512 "sel-gram.c" +#line 1355 "sel-gram.c" + default: break; } - YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); + /* User semantic actions sometimes alter yychar, and that requires + that yytoken be updated with the new translation. We take the + approach of translating immediately before every use of yytoken. + One alternative is translating here after every semantic action, + but that translation would be missed if the semantic action invokes + YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or + if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an + incorrect destructor might then be invoked immediately. In the + case of YYERROR or YYBACKUP, subsequent parser actions might lead + to an incorrect destructor call or verbose syntax error message + before the lookahead is translated. */ + YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, &yyloc); YYPOPSTACK (yylen); yylen = 0; - YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; - - /* Now `shift' the result of the reduction. Determine what state + /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTOKENS]; + { + const int yylhs = yyr1[yyn] - YYNTOKENS; + const int yyi = yypgoto[yylhs] + *yyssp; + yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp + ? yytable[yyi] + : yydefgoto[yylhs]); + } goto yynewstate; -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ +/*--------------------------------------. +| yyerrlab -- here on detecting error. | +`--------------------------------------*/ yyerrlab: + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = yychar == YYEMPTY ? YYSYMBOL_YYEMPTY : YYTRANSLATE (yychar); /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { ++yynerrs; -#if ! YYERROR_VERBOSE yyerror (YY_("syntax error")); -#else - { - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (yymsg); - } - else - { - yyerror (YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } - } -#endif } - - if (yyerrstatus == 3) { - /* If just tried and failed to reuse look-ahead token after an - error, discard it. */ + /* If just tried and failed to reuse lookahead token after an + error, discard it. */ if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } else - { - yydestruct ("Error: discarding", - yytoken, &yylval); - yychar = YYEMPTY; - } + { + yydestruct ("Error: discarding", + yytoken, &yylval); + yychar = YYEMPTY; + } } - /* Else will try to reuse look-ahead token after shifting the error + /* Else will try to reuse lookahead token after shifting the error token. */ goto yyerrlab1; @@ -1610,14 +1429,13 @@ yyerrlab: | yyerrorlab -- error raised explicitly by YYERROR. | `---------------------------------------------------*/ yyerrorlab: + /* Pacify compilers when the user code never invokes YYERROR and the + label yyerrorlab therefore never appears in user code. */ + if (0) + YYERROR; + ++yynerrs; - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) - goto yyerrorlab; - - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ YYPOPSTACK (yylen); yylen = 0; @@ -1630,42 +1448,42 @@ yyerrorlab: | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ + yyerrstatus = 3; /* Each real token shifted decrements this. */ + /* Pop stack until we find a state that shifts the error token. */ for (;;) { yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } + if (!yypact_value_is_default (yyn)) + { + yyn += YYSYMBOL_YYerror; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYSYMBOL_YYerror) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } /* Pop the current state because it cannot handle the error token. */ if (yyssp == yyss) - YYABORT; + YYABORT; yydestruct ("Error: popping", - yystos[yystate], yyvsp); + YY_ACCESSING_SYMBOL (yystate), yyvsp); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } - if (yyn == YYFINAL) - YYACCEPT; - + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); + YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp); yystate = yyn; goto yynewstate; @@ -1676,50 +1494,53 @@ yyerrlab1: `-------------------------------------*/ yyacceptlab: yyresult = 0; - goto yyreturn; + goto yyreturnlab; + /*-----------------------------------. | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ yyabortlab: yyresult = 1; - goto yyreturn; + goto yyreturnlab; -#ifndef yyoverflow -/*-------------------------------------------------. -| yyexhaustedlab -- memory exhaustion comes here. | -`-------------------------------------------------*/ + +/*-----------------------------------------------------------. +| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here. | +`-----------------------------------------------------------*/ yyexhaustedlab: yyerror (YY_("memory exhausted")); yyresult = 2; - /* Fall through. */ -#endif + goto yyreturnlab; + -yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval); - /* Do not reclaim the symbols of the rule which action triggered +/*----------------------------------------------------------. +| yyreturnlab -- parsing is finished, clean up and return. | +`----------------------------------------------------------*/ +yyreturnlab: + if (yychar != YYEMPTY) + { + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = YYTRANSLATE (yychar); + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval); + } + /* Do not reclaim the symbols of the rule whose action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); YY_STACK_PRINT (yyss, yyssp); while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); + YY_ACCESSING_SYMBOL (+*yyssp), yyvsp); YYPOPSTACK (1); } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif -#if YYERROR_VERBOSE - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); -#endif - /* Make sure YYID is used. */ - return YYID (yyresult); -} - + return yyresult; +} diff --git a/lib/hx509/sel-gram.h b/lib/hx509/sel-gram.h index 9642ac7fdb12..04880d2492ff 100644 --- a/lib/hx509/sel-gram.h +++ b/lib/hx509/sel-gram.h @@ -1,14 +1,14 @@ -/* A Bison parser, made by GNU Bison 2.3. */ +/* A Bison parser, made by GNU Bison 3.8.2. */ -/* Skeleton interface for Bison's Yacc-like parsers in C +/* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, + Inc. - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,9 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -33,24 +31,46 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ -/* Tokens. */ +/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, + especially those whose name start with YY_ or yy_. They are + private implementation details that can be changed or removed. */ + +#ifndef YY_YY_SEL_GRAM_H_INCLUDED +# define YY_YY_SEL_GRAM_H_INCLUDED +/* Debug traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif +#if YYDEBUG +extern int yydebug; +#endif + +/* Token kinds. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - kw_TRUE = 258, - kw_FALSE = 259, - kw_AND = 260, - kw_OR = 261, - kw_IN = 262, - kw_TAILMATCH = 263, - NUMBER = 264, - STRING = 265, - IDENTIFIER = 266 - }; + enum yytokentype + { + YYEMPTY = -2, + YYEOF = 0, /* "end of file" */ + YYerror = 256, /* error */ + YYUNDEF = 257, /* "invalid token" */ + kw_TRUE = 258, /* kw_TRUE */ + kw_FALSE = 259, /* kw_FALSE */ + kw_AND = 260, /* kw_AND */ + kw_OR = 261, /* kw_OR */ + kw_IN = 262, /* kw_IN */ + kw_TAILMATCH = 263, /* kw_TAILMATCH */ + NUMBER = 264, /* NUMBER */ + STRING = 265, /* STRING */ + IDENTIFIER = 266 /* IDENTIFIER */ + }; + typedef enum yytokentype yytoken_kind_t; #endif -/* Tokens. */ +/* Token kinds. */ +#define YYEMPTY -2 +#define YYEOF 0 +#define YYerror 256 +#define YYUNDEF 257 #define kw_TRUE 258 #define kw_FALSE 259 #define kw_AND 260 @@ -61,23 +81,28 @@ #define STRING 265 #define IDENTIFIER 266 - - - +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -#line 57 "sel-gram.y" +union YYSTYPE { +#line 57 "sel-gram.y" + char *string; struct hx_expr *expr; -} -/* Line 1529 of yacc.c. */ -#line 76 "sel-gram.h" - YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 + +#line 94 "sel-gram.h" + +}; +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 +# define YYSTYPE_IS_DECLARED 1 #endif + extern YYSTYPE yylval; + +int yyparse (void); + + +#endif /* !YY_YY_SEL_GRAM_H_INCLUDED */ diff --git a/lib/hx509/sel-lex.c b/lib/hx509/sel-lex.c index c2044a435dc8..44bd8d3f5213 100644 --- a/lib/hx509/sel-lex.c +++ b/lib/hx509/sel-lex.c @@ -1,5 +1,5 @@ -#line 3 "sel-lex.c" +#line 2 "sel-lex.c" #define YY_INT_ALIGNED short int @@ -7,8 +7,8 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 35 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -46,7 +46,6 @@ typedef int16_t flex_int16_t; typedef uint16_t flex_uint16_t; typedef int32_t flex_int32_t; typedef uint32_t flex_uint32_t; -typedef uint64_t flex_uint64_t; #else typedef signed char flex_int8_t; typedef short int flex_int16_t; @@ -54,7 +53,6 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -85,63 +83,61 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! FLEXINT_H */ - -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) +#endif /* ! C99 */ -#define YY_USE_CONST +#endif /* ! FLEXINT_H */ -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ +/* begin standard C++ headers. */ -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* Returned upon end-of-file. */ #define YY_NULL 0 -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. +/* Promotes a possibly negative, possibly signed char to an + * integer in range [0..255] for use as an array index. */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) /* Enter a start condition. This macro really ought to take a parameter, * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ #define BEGIN (yy_start) = 1 + 2 * - /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ #define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START - /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ) - +#define YY_NEW_FILE yyrestart( yyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -158,15 +154,16 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; typedef size_t yy_size_t; #endif -extern yy_size_t yyleng; +extern int yyleng; extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + #define YY_LESS_LINENO(n) + #define YY_LINENO_REWIND_TO(ptr) /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ @@ -181,7 +178,6 @@ extern FILE *yyin, *yyout; YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) - #define unput(c) yyunput( c, (yytext_ptr) ) #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -196,12 +192,12 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -224,7 +220,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -252,7 +248,7 @@ struct yy_buffer_state /* Stack of input buffers. */ static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ -static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ +static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */ /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general @@ -263,7 +259,6 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ : NULL) - /* Same as previous macro, but useful when we know that the buffer stack is not * NULL or when we need an lvalue. For internal use only. */ @@ -271,11 +266,11 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ -yy_size_t yyleng; +static int yy_n_chars; /* number of characters read into yy_ch_buf */ +int yyleng; /* Points to current character in buffer. */ -static char *yy_c_buf_p = (char *) 0; +static char *yy_c_buf_p = NULL; static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ @@ -284,82 +279,78 @@ static int yy_start = 0; /* start state number */ */ static int yy_did_buffer_switch_on_eof; -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); - -static void yyensure_buffer_stack (void ); -static void yy_load_buffer_state (void ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); +void yyrestart ( FILE *input_file ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); +void yy_delete_buffer ( YY_BUFFER_STATE b ); +void yy_flush_buffer ( YY_BUFFER_STATE b ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state ( void ); -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) +static void yyensure_buffer_stack ( void ); +static void yy_load_buffer_state ( void ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len ); -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); +void *yyalloc ( yy_size_t ); +void *yyrealloc ( void *, yy_size_t ); +void yyfree ( void * ); #define yy_new_buffer yy_create_buffer - #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } - #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } - #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) /* Begin user sect3 */ +typedef flex_uint8_t YY_CHAR; -typedef unsigned char YY_CHAR; - -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; +FILE *yyin = NULL, *yyout = NULL; typedef int yy_state_type; extern int yylineno; - int yylineno = 1; extern char *yytext; +#ifdef yytext_ptr +#undef yytext_ptr +#endif #define yytext_ptr yytext -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -static void yy_fatal_error (yyconst char msg[] ); +static yy_state_type yy_get_previous_state ( void ); +static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); +static int yy_get_next_buffer ( void ); +static void yynoreturn yy_fatal_error ( const char* msg ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ (yytext_ptr) = yy_bp; \ - yyleng = (yy_size_t) (yy_cp - yy_bp); \ + yyleng = (int) (yy_cp - yy_bp); \ (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; - #define YY_NUM_RULES 12 #define YY_END_OF_BUFFER 13 /* This struct is not used in this scanner, @@ -369,7 +360,7 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[36] = +static const flex_int16_t yy_accept[36] = { 0, 0, 0, 13, 12, 11, 9, 10, 8, 7, 7, 7, 7, 7, 7, 7, 7, 7, 5, 4, 7, @@ -377,7 +368,7 @@ static yyconst flex_int16_t yy_accept[36] = 7, 7, 7, 6, 0 } ; -static yyconst flex_int32_t yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -409,14 +400,14 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[23] = +static const YY_CHAR yy_meta[23] = { 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 } ; -static yyconst flex_int16_t yy_base[37] = +static const flex_int16_t yy_base[37] = { 0, 0, 0, 43, 44, 44, 44, 44, 44, 25, 0, 34, 23, 20, 16, 0, 28, 22, 0, 0, 22, @@ -424,7 +415,7 @@ static yyconst flex_int16_t yy_base[37] = 6, 17, 12, 0, 44, 22 } ; -static yyconst flex_int16_t yy_def[37] = +static const flex_int16_t yy_def[37] = { 0, 35, 1, 35, 35, 35, 35, 35, 35, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, @@ -432,7 +423,7 @@ static yyconst flex_int16_t yy_def[37] = 36, 36, 36, 36, 0, 35 } ; -static yyconst flex_int16_t yy_nxt[67] = +static const flex_int16_t yy_nxt[67] = { 0, 4, 5, 6, 7, 8, 4, 9, 10, 10, 10, 10, 11, 10, 12, 10, 10, 10, 13, 10, 10, @@ -443,7 +434,7 @@ static yyconst flex_int16_t yy_nxt[67] = 35, 35, 35, 35, 35, 35 } ; -static yyconst flex_int16_t yy_chk[67] = +static const flex_int16_t yy_chk[67] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -540,7 +531,8 @@ struct hx_expr_input _hx509_expr_input; #undef ECHO -#line 544 "sel-lex.c" +#line 534 "sel-lex.c" +#line 535 "sel-lex.c" #define INITIAL 0 @@ -556,36 +548,36 @@ struct hx_expr_input _hx509_expr_input; #define YY_EXTRA_TYPE void * #endif -static int yy_init_globals (void ); +static int yy_init_globals ( void ); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy (void ); +int yylex_destroy ( void ); -int yyget_debug (void ); +int yyget_debug ( void ); -void yyset_debug (int debug_flag ); +void yyset_debug ( int debug_flag ); -YY_EXTRA_TYPE yyget_extra (void ); +YY_EXTRA_TYPE yyget_extra ( void ); -void yyset_extra (YY_EXTRA_TYPE user_defined ); +void yyset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *yyget_in (void ); +FILE *yyget_in ( void ); -void yyset_in (FILE * in_str ); +void yyset_in ( FILE * _in_str ); -FILE *yyget_out (void ); +FILE *yyget_out ( void ); -void yyset_out (FILE * out_str ); +void yyset_out ( FILE * _out_str ); -yy_size_t yyget_leng (void ); + int yyget_leng ( void ); -char *yyget_text (void ); +char *yyget_text ( void ); -int yyget_lineno (void ); +int yyget_lineno ( void ); -void yyset_lineno (int line_number ); +void yyset_lineno ( int _line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -593,35 +585,43 @@ void yyset_lineno (int line_number ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap (void ); +extern "C" int yywrap ( void ); #else -extern int yywrap (void ); +extern int yywrap ( void ); #endif #endif - static void yyunput (int c,char *buf_ptr ); +#ifndef YY_NO_UNPUT + + static void yyunput ( int c, char *buf_ptr ); +#endif + #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy ( char *, const char *, int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen ( const char * ); #endif #ifndef YY_NO_INPUT - #ifdef __cplusplus -static int yyinput (void ); +static int yyinput ( void ); #else -static int input (void ); +static int input ( void ); #endif #endif /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -629,7 +629,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO fwrite( yytext, yyleng, 1, yyout ) +#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -640,7 +640,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - yy_size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -653,7 +653,7 @@ static int input (void ); else \ { \ errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -708,7 +708,7 @@ extern int yylex (void); /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK break; +#define YY_BREAK /*LINTED*/break; #endif #define YY_RULE_SETUP \ @@ -718,15 +718,10 @@ extern int yylex (void); */ YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; -#line 73 "sel-lex.l" - - -#line 729 "sel-lex.c" - if ( !(yy_init) ) { (yy_init) = 1; @@ -747,13 +742,19 @@ YY_DECL if ( ! YY_CURRENT_BUFFER ) { yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_load_buffer_state( ); + yy_load_buffer_state( ); } - while ( 1 ) /* loops until end-of-file is reached */ + { +#line 73 "sel-lex.l" + + +#line 755 "sel-lex.c" + + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { yy_cp = (yy_c_buf_p); @@ -769,7 +770,7 @@ YY_DECL yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -779,9 +780,9 @@ yy_match: { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 36 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } while ( yy_base[yy_current_state] != 44 ); @@ -950,7 +951,7 @@ case YY_STATE_EOF(INITIAL): { (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap( ) ) + if ( yywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -1003,6 +1004,7 @@ case YY_STATE_EOF(INITIAL): "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ + } /* end of user's declarations */ } /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer @@ -1014,9 +1016,9 @@ case YY_STATE_EOF(INITIAL): */ static int yy_get_next_buffer (void) { - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); - register int number_to_move, i; + char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + char *source = (yytext_ptr); + int number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -1045,7 +1047,7 @@ static int yy_get_next_buffer (void) /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1); for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -1058,21 +1060,21 @@ static int yy_get_next_buffer (void) else { - yy_size_t num_to_read = + int num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; int yy_c_buf_p_offset = (int) ((yy_c_buf_p) - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { - yy_size_t new_size = b->yy_buf_size * 2; + int new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -1081,11 +1083,12 @@ static int yy_get_next_buffer (void) b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); + yyrealloc( (void *) b->yy_ch_buf, + (yy_size_t) (b->yy_buf_size + 2) ); } else /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; + b->yy_ch_buf = NULL; if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( @@ -1113,7 +1116,7 @@ static int yy_get_next_buffer (void) if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ); + yyrestart( yyin ); } else @@ -1127,12 +1130,15 @@ static int yy_get_next_buffer (void) else ret_val = EOB_ACT_CONTINUE_SCAN; - if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ - yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } (yy_n_chars) += number_to_move; @@ -1148,14 +1154,14 @@ static int yy_get_next_buffer (void) static yy_state_type yy_get_previous_state (void) { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; yy_current_state = (yy_start); for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1165,9 +1171,9 @@ static int yy_get_next_buffer (void) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 36 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; } return yy_current_state; @@ -1180,10 +1186,10 @@ static int yy_get_next_buffer (void) */ static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) { - register int yy_is_jam; - register char *yy_cp = (yy_c_buf_p); + int yy_is_jam; + char *yy_cp = (yy_c_buf_p); - register YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1193,17 +1199,19 @@ static int yy_get_next_buffer (void) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 36 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; yy_is_jam = (yy_current_state == 35); - return yy_is_jam ? 0 : yy_current_state; + return yy_is_jam ? 0 : yy_current_state; } - static void yyunput (int c, register char * yy_bp ) +#ifndef YY_NO_UNPUT + + static void yyunput (int c, char * yy_bp ) { - register char *yy_cp; + char *yy_cp; yy_cp = (yy_c_buf_p); @@ -1213,10 +1221,10 @@ static int yy_get_next_buffer (void) if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register yy_size_t number_to_move = (yy_n_chars) + 2; - register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + int number_to_move = (yy_n_chars) + 2; + char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; - register char *source = + char *source = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) @@ -1225,7 +1233,7 @@ static int yy_get_next_buffer (void) yy_cp += (int) (dest - source); yy_bp += (int) (dest - source); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = - (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; + (yy_n_chars) = (int) YY_CURRENT_BUFFER_LVALUE->yy_buf_size; if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) YY_FATAL_ERROR( "flex scanner push-back overflow" ); @@ -1238,6 +1246,8 @@ static int yy_get_next_buffer (void) (yy_c_buf_p) = yy_cp; } +#endif + #ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput (void) @@ -1262,7 +1272,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (int) ((yy_c_buf_p) - (yytext_ptr)); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -1279,13 +1289,13 @@ static int yy_get_next_buffer (void) */ /* Reset buffer status. */ - yyrestart(yyin ); + yyrestart( yyin ); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap( ) ) + if ( yywrap( ) ) return 0; if ( ! (yy_did_buffer_switch_on_eof) ) @@ -1323,11 +1333,11 @@ static int yy_get_next_buffer (void) if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - yy_load_buffer_state( ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file ); + yy_load_buffer_state( ); } /** Switch to a different input buffer. @@ -1355,7 +1365,7 @@ static int yy_get_next_buffer (void) } YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); + yy_load_buffer_state( ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag @@ -1383,7 +1393,7 @@ static void yy_load_buffer_state (void) { YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -1392,13 +1402,13 @@ static void yy_load_buffer_state (void) /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer(b,file ); + yy_init_buffer( b, file ); return b; } @@ -1417,15 +1427,11 @@ static void yy_load_buffer_state (void) YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ); + yyfree( (void *) b->yy_ch_buf ); - yyfree((void *) b ); + yyfree( (void *) b ); } -#ifndef __cplusplus -extern int isatty (int ); -#endif /* __cplusplus */ - /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a yyrestart() or at EOF. @@ -1435,7 +1441,7 @@ extern int isatty (int ); { int oerrno = errno; - yy_flush_buffer(b ); + yy_flush_buffer( b ); b->yy_input_file = file; b->yy_fill_buffer = 1; @@ -1478,7 +1484,7 @@ extern int isatty (int ); b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); + yy_load_buffer_state( ); } /** Pushes the new state onto the stack. The new state becomes @@ -1509,7 +1515,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) YY_CURRENT_BUFFER_LVALUE = new_buffer; /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } @@ -1528,7 +1534,7 @@ void yypop_buffer_state (void) --(yy_buffer_stack_top); if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } } @@ -1546,15 +1552,15 @@ static void yyensure_buffer_stack (void) * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. */ - num_to_alloc = 1; + num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + (yy_buffer_stack_max) = num_to_alloc; (yy_buffer_stack_top) = 0; return; @@ -1563,7 +1569,7 @@ static void yyensure_buffer_stack (void) if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; + yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = (yy_buffer_stack_max) + grow_size; (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc @@ -1583,7 +1589,7 @@ static void yyensure_buffer_stack (void) * @param base the character buffer * @param size the size in bytes of the character buffer * - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) { @@ -1593,23 +1599,23 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ - return 0; + return NULL; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; - b->yy_input_file = 0; + b->yy_input_file = NULL; b->yy_n_chars = b->yy_buf_size; b->yy_is_interactive = 0; b->yy_at_bol = 1; b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer(b ); + yy_switch_to_buffer( b ); return b; } @@ -1622,28 +1628,29 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) * @note If you want to scan bytes that may contain NUL values, then use * yy_scan_bytes() instead. */ -YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) +YY_BUFFER_STATE yy_scan_string (const char * yystr ) { - return yy_scan_bytes(yystr,strlen(yystr) ); + return yy_scan_bytes( yystr, (int) strlen(yystr) ); } /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. + * @param yybytes the byte buffer to scan + * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; - yy_size_t n, i; + yy_size_t n; + int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) yyalloc(n ); + n = (yy_size_t) (_yybytes_len + 2); + buf = (char *) yyalloc( n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -1652,7 +1659,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer(buf,n ); + b = yy_scan_buffer( buf, n ); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -1668,9 +1675,9 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg ) +static void yynoreturn yy_fatal_error (const char* msg ) { - (void) fprintf( stderr, "%s\n", msg ); + fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -1698,7 +1705,7 @@ static void yy_fatal_error (yyconst char* msg ) */ int yyget_lineno (void) { - + return yylineno; } @@ -1721,7 +1728,7 @@ FILE *yyget_out (void) /** Get the length of the current token. * */ -yy_size_t yyget_leng (void) +int yyget_leng (void) { return yyleng; } @@ -1736,29 +1743,29 @@ char *yyget_text (void) } /** Set the current line number. - * @param line_number + * @param _line_number line number * */ -void yyset_lineno (int line_number ) +void yyset_lineno (int _line_number ) { - yylineno = line_number; + yylineno = _line_number; } /** Set the input stream. This does not discard the current * input buffer. - * @param in_str A readable stream. + * @param _in_str A readable stream. * * @see yy_switch_to_buffer */ -void yyset_in (FILE * in_str ) +void yyset_in (FILE * _in_str ) { - yyin = in_str ; + yyin = _in_str ; } -void yyset_out (FILE * out_str ) +void yyset_out (FILE * _out_str ) { - yyout = out_str ; + yyout = _out_str ; } int yyget_debug (void) @@ -1766,9 +1773,9 @@ int yyget_debug (void) return yy_flex_debug; } -void yyset_debug (int bdebug ) +void yyset_debug (int _bdebug ) { - yy_flex_debug = bdebug ; + yy_flex_debug = _bdebug ; } static int yy_init_globals (void) @@ -1777,10 +1784,10 @@ static int yy_init_globals (void) * This function is called from yylex_destroy(), so don't allocate here. */ - (yy_buffer_stack) = 0; + (yy_buffer_stack) = NULL; (yy_buffer_stack_top) = 0; (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = (char *) 0; + (yy_c_buf_p) = NULL; (yy_init) = 0; (yy_start) = 0; @@ -1789,8 +1796,8 @@ static int yy_init_globals (void) yyin = stdin; yyout = stdout; #else - yyin = (FILE *) 0; - yyout = (FILE *) 0; + yyin = NULL; + yyout = NULL; #endif /* For future reference: Set errno on error, since we are called by @@ -1805,7 +1812,7 @@ int yylex_destroy (void) /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); + yy_delete_buffer( YY_CURRENT_BUFFER ); YY_CURRENT_BUFFER_LVALUE = NULL; yypop_buffer_state(); } @@ -1826,18 +1833,19 @@ int yylex_destroy (void) */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +static void yy_flex_strncpy (char* s1, const char * s2, int n ) { - register int i; + + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) +static int yy_flex_strlen (const char * s ) { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; @@ -1847,11 +1855,12 @@ static int yy_flex_strlen (yyconst char * s ) void *yyalloc (yy_size_t size ) { - return (void *) malloc( size ); + return malloc(size); } void *yyrealloc (void * ptr, yy_size_t size ) { + /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -1859,12 +1868,12 @@ void *yyrealloc (void * ptr, yy_size_t size ) * any pointer type to void*, and deal with argument conversions * as though doing an assignment. */ - return (void *) realloc( (char *) ptr, size ); + return realloc(ptr, size); } void yyfree (void * ptr ) { - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" @@ -1872,7 +1881,6 @@ void yyfree (void * ptr ) #line 90 "sel-lex.l" - static char * handle_string(void) { diff --git a/lib/hx509/softp11.c b/lib/hx509/softp11.c index f93863b7c980..eeb9ae373425 100644 --- a/lib/hx509/softp11.c +++ b/lib/hx509/softp11.c @@ -342,6 +342,9 @@ add_object_attribute(struct st_object *o, struct st_attr *a; int i; + if (pValue == NULL && ulValueLen) + return CKR_ARGUMENTS_BAD; + i = o->num_attributes; a = realloc(o->attrs, (i + 1) * sizeof(o->attrs[0])); if (a == NULL) @@ -352,7 +355,8 @@ add_object_attribute(struct st_object *o, o->attrs[i].attribute.pValue = malloc(ulValueLen); if (o->attrs[i].attribute.pValue == NULL && ulValueLen != 0) return CKR_DEVICE_MEMORY; - memcpy(o->attrs[i].attribute.pValue, pValue, ulValueLen); + if (ulValueLen) + memcpy(o->attrs[i].attribute.pValue, pValue, ulValueLen); o->attrs[i].attribute.ulValueLen = ulValueLen; o->num_attributes++; diff --git a/lib/ipc/Makefile.in b/lib/ipc/Makefile.in index 2c9cab8f66a6..2e6403991e24 100644 --- a/lib/ipc/Makefile.in +++ b/lib/ipc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -101,7 +101,6 @@ subdir = lib/ipc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ $(top_srcdir)/cf/auth-modules.m4 \ - $(top_srcdir)/cf/broken-getaddrinfo.m4 \ $(top_srcdir)/cf/broken-glob.m4 \ $(top_srcdir)/cf/broken-realloc.m4 \ $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ @@ -151,6 +150,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +PROGRAMS = $(noinst_PROGRAMS) LTLIBRARIES = $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = libheim_ipcc_la_DEPENDENCIES = $(LIB_heimbase) $(am__DEPENDENCIES_1) \ @@ -174,7 +174,6 @@ dist_libheim_ipcs_la_OBJECTS = server.lo common.lo @have_gcd_TRUE@nodist_libheim_ipcs_la_OBJECTS = $(am__objects_2) libheim_ipcs_la_OBJECTS = $(dist_libheim_ipcs_la_OBJECTS) \ $(nodist_libheim_ipcs_la_OBJECTS) -PROGRAMS = $(noinst_PROGRAMS) tc_SOURCES = tc.c tc_OBJECTS = tc.$(OBJEXT) tc_DEPENDENCIES = libheim-ipcc.la $(am__DEPENDENCIES_1) @@ -198,7 +197,13 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/client.Plo ./$(DEPDIR)/common.Plo \ + ./$(DEPDIR)/heim_ipcServer.Plo ./$(DEPDIR)/heim_ipcUser.Plo \ + ./$(DEPDIR)/heim_ipc_asyncServer.Plo \ + ./$(DEPDIR)/heim_ipc_asyncUser.Plo \ + ./$(DEPDIR)/heim_ipc_replyUser.Plo ./$(DEPDIR)/server.Plo \ + ./$(DEPDIR)/tc.Po ./$(DEPDIR)/ts-http.Po ./$(DEPDIR)/ts.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -275,8 +280,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no @@ -432,6 +435,7 @@ am__set_TESTS_bases = \ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck TEST_SUITE_LOG = test-suite.log @@ -477,9 +481,12 @@ CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLANG_FORMAT = @CLANG_FORMAT@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DB1LIB = @DB1LIB@ DB3LIB = @DB3LIB@ @@ -497,8 +504,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GCD_MIG = @GCD_MIG@ GREP = @GREP@ GROFF = @GROFF@ @@ -607,6 +616,11 @@ PKG_CONFIG = @PKG_CONFIG@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LDADD = @PTHREAD_LDADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -666,9 +680,14 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -760,8 +779,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty): @@ -774,6 +793,15 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) @list='$(noinst_LTLIBRARIES)'; \ @@ -791,15 +819,6 @@ libheim-ipcc.la: $(libheim_ipcc_la_OBJECTS) $(libheim_ipcc_la_DEPENDENCIES) $(EX libheim-ipcs.la: $(libheim_ipcs_la_OBJECTS) $(libheim_ipcs_la_DEPENDENCIES) $(EXTRA_libheim_ipcs_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libheim_ipcs_la_OBJECTS) $(libheim_ipcs_la_LIBADD) $(LIBS) -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - tc$(EXEEXT): $(tc_OBJECTS) $(tc_DEPENDENCIES) $(EXTRA_tc_DEPENDENCIES) @rm -f tc$(EXEEXT) $(AM_V_CCLD)$(LINK) $(tc_OBJECTS) $(tc_LDADD) $(LIBS) @@ -818,17 +837,23 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heim_ipcServer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heim_ipcUser.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heim_ipc_asyncServer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heim_ipc_asyncUser.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heim_ipc_replyUser.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ts-http.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ts.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heim_ipcServer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heim_ipcUser.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heim_ipc_asyncServer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heim_ipc_asyncUser.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heim_ipc_replyUser.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ts-http.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ts.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1037,7 +1062,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ @@ -1050,7 +1075,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -1085,8 +1110,10 @@ recheck: all @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1122,7 +1149,7 @@ distdir: $(DISTFILES) check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-local +all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(HEADERS) all-local installdirs: for dir in "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -1167,7 +1194,17 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/client.Plo + -rm -f ./$(DEPDIR)/common.Plo + -rm -f ./$(DEPDIR)/heim_ipcServer.Plo + -rm -f ./$(DEPDIR)/heim_ipcUser.Plo + -rm -f ./$(DEPDIR)/heim_ipc_asyncServer.Plo + -rm -f ./$(DEPDIR)/heim_ipc_asyncUser.Plo + -rm -f ./$(DEPDIR)/heim_ipc_replyUser.Plo + -rm -f ./$(DEPDIR)/server.Plo + -rm -f ./$(DEPDIR)/tc.Po + -rm -f ./$(DEPDIR)/ts-http.Po + -rm -f ./$(DEPDIR)/ts.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1214,7 +1251,17 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/client.Plo + -rm -f ./$(DEPDIR)/common.Plo + -rm -f ./$(DEPDIR)/heim_ipcServer.Plo + -rm -f ./$(DEPDIR)/heim_ipcUser.Plo + -rm -f ./$(DEPDIR)/heim_ipc_asyncServer.Plo + -rm -f ./$(DEPDIR)/heim_ipc_asyncUser.Plo + -rm -f ./$(DEPDIR)/heim_ipc_replyUser.Plo + -rm -f ./$(DEPDIR)/server.Plo + -rm -f ./$(DEPDIR)/tc.Po + -rm -f ./$(DEPDIR)/ts-http.Po + -rm -f ./$(DEPDIR)/ts.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1236,18 +1283,19 @@ uninstall-am: uninstall-includeHEADERS $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: check-am install-am install-data-am install-strip uninstall-am -.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \ - check-am check-local clean clean-generic clean-libtool \ - clean-noinstLTLIBRARIES clean-noinstPROGRAMS cscopelist-am \ - ctags ctags-am dist-hook distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-hook install-dvi \ - install-dvi-am install-exec install-exec-am install-exec-local \ - install-html install-html-am install-includeHEADERS \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \ + check-TESTS check-am check-local clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ + cscopelist-am ctags ctags-am dist-hook distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-hook install-dvi install-dvi-am install-exec \ + install-exec-am install-exec-local install-html \ + install-html-am install-includeHEADERS install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ recheck tags tags-am uninstall uninstall-am uninstall-hook \ @@ -1334,11 +1382,20 @@ check-local:: test "$$failed" -eq 0 || exit 1; \ fi +# It's useful for debugging to format generated sources. The default for all +# clang-format styles is to sort includes, but in many cases in-tree we really +# don't want to do that. .x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @if [ -z "$(CLANG_FORMAT)" ]; then \ + cmp -s $< $@ 2> /dev/null || cp $< $@; \ + else \ + cp $< $@.tmp.c; \ + $(CLANG_FORMAT) -style='{BasedOnStyle: Chromium, SortIncludes: false}' -i $@.tmp.c; \ + cmp -s $@.tmp.c $@ 2> /dev/null || mv $@.tmp.c $@; \ + fi .hx.h: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @cmp -s $< $@ 2> /dev/null || cp $< $@; #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ diff --git a/lib/ipc/client.c b/lib/ipc/client.c index a51e91c99bf1..b49cb22cf349 100644 --- a/lib/ipc/client.c +++ b/lib/ipc/client.c @@ -332,10 +332,8 @@ connect_unix(struct path_ctx *s) return errno; rk_cloexec(s->fd); - if (connect(s->fd, (struct sockaddr *)&addr, sizeof(addr)) != 0) { - close(s->fd); + if (connect(s->fd, (struct sockaddr *)&addr, sizeof(addr)) != 0) return errno; - } return 0; } diff --git a/lib/kadm5/Makefile.am b/lib/kadm5/Makefile.am index de9a208227a3..9d8aba0dedbf 100644 --- a/lib/kadm5/Makefile.am +++ b/lib/kadm5/Makefile.am @@ -3,6 +3,7 @@ include $(top_srcdir)/Makefile.am.common libkadm5srv_la_CPPFLAGS = -I$(srcdir)/../krb5 +libkadm5clnt_la_CPPFLAGS = -I$(srcdir)/../krb5 lib_LTLIBRARIES = libkadm5srv.la libkadm5clnt.la libkadm5srv_la_LDFLAGS = -version-info 8:1:0 @@ -31,6 +32,7 @@ libkadm5clnt_la_LIBADD = \ libexec_PROGRAMS = ipropd-master ipropd-slave default_keys_SOURCES = default_keys.c +default_keys_CPPFLAGS = -I$(srcdir)/../krb5 kadm5includedir = $(includedir)/kadm5 buildkadm5include = $(buildinclude)/kadm5 @@ -124,8 +126,10 @@ dist_iprop_log_SOURCES = iprop-log.c nodist_iprop_log_SOURCES = iprop-commands.c ipropd_master_SOURCES = ipropd_master.c ipropd_common.c iprop.h kadm5_locl.h +ipropd_master_CPPFLAGS = -I$(srcdir)/../krb5 ipropd_slave_SOURCES = ipropd_slave.c ipropd_common.c iprop.h kadm5_locl.h +ipropd_slave_CPPFLAGS = -I$(srcdir)/../krb5 man_MANS = kadm5_pwcheck.3 iprop.8 iprop-log.8 @@ -153,6 +157,7 @@ iprop_log_LDADD = \ $(LIB_dlopen) \ $(LIB_pidfile) +iprop_log_CPPFLAGS = -I$(srcdir)/../krb5 iprop-commands.c iprop-commands.h: iprop-commands.in $(SLC) $(srcdir)/iprop-commands.in diff --git a/lib/kadm5/Makefile.in b/lib/kadm5/Makefile.in index 4bbec3368320..b6ab85522856 100644 --- a/lib/kadm5/Makefile.in +++ b/lib/kadm5/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -106,7 +106,6 @@ subdir = lib/kadm5 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ $(top_srcdir)/cf/auth-modules.m4 \ - $(top_srcdir)/cf/broken-getaddrinfo.m4 \ $(top_srcdir)/cf/broken-glob.m4 \ $(top_srcdir)/cf/broken-realloc.m4 \ $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ @@ -156,6 +155,11 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" \ + "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" \ + "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(kadm5includedir)" \ + "$(DESTDIR)$(kadm5includedir)" +PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -183,19 +187,21 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libexecdir)" \ - "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man3dir)" \ - "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(kadm5includedir)" \ - "$(DESTDIR)$(kadm5includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = libkadm5clnt_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ../krb5/libkrb5.la $(am__DEPENDENCIES_1) -dist_libkadm5clnt_la_OBJECTS = ad.lo chpass_c.lo client_glue.lo \ - common_glue.lo create_c.lo delete_c.lo destroy_c.lo flush_c.lo \ - free.lo get_c.lo get_princs_c.lo init_c.lo marshall.lo \ - modify_c.lo privs_c.lo randkey_c.lo rename_c.lo send_recv.lo -nodist_libkadm5clnt_la_OBJECTS = kadm5_err.lo +dist_libkadm5clnt_la_OBJECTS = libkadm5clnt_la-ad.lo \ + libkadm5clnt_la-chpass_c.lo libkadm5clnt_la-client_glue.lo \ + libkadm5clnt_la-common_glue.lo libkadm5clnt_la-create_c.lo \ + libkadm5clnt_la-delete_c.lo libkadm5clnt_la-destroy_c.lo \ + libkadm5clnt_la-flush_c.lo libkadm5clnt_la-free.lo \ + libkadm5clnt_la-get_c.lo libkadm5clnt_la-get_princs_c.lo \ + libkadm5clnt_la-init_c.lo libkadm5clnt_la-marshall.lo \ + libkadm5clnt_la-modify_c.lo libkadm5clnt_la-privs_c.lo \ + libkadm5clnt_la-randkey_c.lo libkadm5clnt_la-rename_c.lo \ + libkadm5clnt_la-send_recv.lo +nodist_libkadm5clnt_la_OBJECTS = libkadm5clnt_la-kadm5_err.lo libkadm5clnt_la_OBJECTS = $(dist_libkadm5clnt_la_OBJECTS) \ $(nodist_libkadm5clnt_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) @@ -234,8 +240,7 @@ sample_passwd_check_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(sample_passwd_check_la_LDFLAGS) \ $(LDFLAGS) -o $@ -PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS) -am_default_keys_OBJECTS = default_keys.$(OBJEXT) +am_default_keys_OBJECTS = default_keys-default_keys.$(OBJEXT) default_keys_OBJECTS = $(am_default_keys_OBJECTS) default_keys_LDADD = $(LDADD) default_keys_DEPENDENCIES = libkadm5srv.la \ @@ -246,8 +251,8 @@ default_keys_DEPENDENCIES = libkadm5srv.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -dist_iprop_log_OBJECTS = iprop-log.$(OBJEXT) -nodist_iprop_log_OBJECTS = iprop-commands.$(OBJEXT) +dist_iprop_log_OBJECTS = iprop_log-iprop-log.$(OBJEXT) +nodist_iprop_log_OBJECTS = iprop_log-iprop-commands.$(OBJEXT) iprop_log_OBJECTS = $(dist_iprop_log_OBJECTS) \ $(nodist_iprop_log_OBJECTS) iprop_log_DEPENDENCIES = libkadm5srv.la \ @@ -259,8 +264,8 @@ iprop_log_DEPENDENCIES = libkadm5srv.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am_ipropd_master_OBJECTS = ipropd_master.$(OBJEXT) \ - ipropd_common.$(OBJEXT) +am_ipropd_master_OBJECTS = ipropd_master-ipropd_master.$(OBJEXT) \ + ipropd_master-ipropd_common.$(OBJEXT) ipropd_master_OBJECTS = $(am_ipropd_master_OBJECTS) ipropd_master_LDADD = $(LDADD) ipropd_master_DEPENDENCIES = libkadm5srv.la \ @@ -271,8 +276,8 @@ ipropd_master_DEPENDENCIES = libkadm5srv.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -am_ipropd_slave_OBJECTS = ipropd_slave.$(OBJEXT) \ - ipropd_common.$(OBJEXT) +am_ipropd_slave_OBJECTS = ipropd_slave-ipropd_slave.$(OBJEXT) \ + ipropd_slave-ipropd_common.$(OBJEXT) ipropd_slave_OBJECTS = $(am_ipropd_slave_OBJECTS) ipropd_slave_LDADD = $(LDADD) ipropd_slave_DEPENDENCIES = libkadm5srv.la \ @@ -307,7 +312,63 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/default_keys-default_keys.Po \ + ./$(DEPDIR)/iprop_log-iprop-commands.Po \ + ./$(DEPDIR)/iprop_log-iprop-log.Po \ + ./$(DEPDIR)/ipropd_master-ipropd_common.Po \ + ./$(DEPDIR)/ipropd_master-ipropd_master.Po \ + ./$(DEPDIR)/ipropd_slave-ipropd_common.Po \ + ./$(DEPDIR)/ipropd_slave-ipropd_slave.Po \ + ./$(DEPDIR)/libkadm5clnt_la-ad.Plo \ + ./$(DEPDIR)/libkadm5clnt_la-chpass_c.Plo \ + ./$(DEPDIR)/libkadm5clnt_la-client_glue.Plo \ + ./$(DEPDIR)/libkadm5clnt_la-common_glue.Plo \ + ./$(DEPDIR)/libkadm5clnt_la-create_c.Plo \ + ./$(DEPDIR)/libkadm5clnt_la-delete_c.Plo \ + ./$(DEPDIR)/libkadm5clnt_la-destroy_c.Plo \ + ./$(DEPDIR)/libkadm5clnt_la-flush_c.Plo \ + ./$(DEPDIR)/libkadm5clnt_la-free.Plo \ + ./$(DEPDIR)/libkadm5clnt_la-get_c.Plo \ + ./$(DEPDIR)/libkadm5clnt_la-get_princs_c.Plo \ + ./$(DEPDIR)/libkadm5clnt_la-init_c.Plo \ + ./$(DEPDIR)/libkadm5clnt_la-kadm5_err.Plo \ + ./$(DEPDIR)/libkadm5clnt_la-marshall.Plo \ + ./$(DEPDIR)/libkadm5clnt_la-modify_c.Plo \ + ./$(DEPDIR)/libkadm5clnt_la-privs_c.Plo \ + ./$(DEPDIR)/libkadm5clnt_la-randkey_c.Plo \ + ./$(DEPDIR)/libkadm5clnt_la-rename_c.Plo \ + ./$(DEPDIR)/libkadm5clnt_la-send_recv.Plo \ + ./$(DEPDIR)/libkadm5srv_la-acl.Plo \ + ./$(DEPDIR)/libkadm5srv_la-bump_pw_expire.Plo \ + ./$(DEPDIR)/libkadm5srv_la-chpass_s.Plo \ + ./$(DEPDIR)/libkadm5srv_la-common_glue.Plo \ + ./$(DEPDIR)/libkadm5srv_la-context_s.Plo \ + ./$(DEPDIR)/libkadm5srv_la-create_s.Plo \ + ./$(DEPDIR)/libkadm5srv_la-delete_s.Plo \ + ./$(DEPDIR)/libkadm5srv_la-destroy_s.Plo \ + ./$(DEPDIR)/libkadm5srv_la-ent_setup.Plo \ + ./$(DEPDIR)/libkadm5srv_la-error.Plo \ + ./$(DEPDIR)/libkadm5srv_la-flush_s.Plo \ + ./$(DEPDIR)/libkadm5srv_la-free.Plo \ + ./$(DEPDIR)/libkadm5srv_la-get_princs_s.Plo \ + ./$(DEPDIR)/libkadm5srv_la-get_s.Plo \ + ./$(DEPDIR)/libkadm5srv_la-init_s.Plo \ + ./$(DEPDIR)/libkadm5srv_la-kadm5_err.Plo \ + ./$(DEPDIR)/libkadm5srv_la-keys.Plo \ + ./$(DEPDIR)/libkadm5srv_la-log.Plo \ + ./$(DEPDIR)/libkadm5srv_la-marshall.Plo \ + ./$(DEPDIR)/libkadm5srv_la-modify_s.Plo \ + ./$(DEPDIR)/libkadm5srv_la-password_quality.Plo \ + ./$(DEPDIR)/libkadm5srv_la-privs_s.Plo \ + ./$(DEPDIR)/libkadm5srv_la-randkey_s.Plo \ + ./$(DEPDIR)/libkadm5srv_la-rename_s.Plo \ + ./$(DEPDIR)/libkadm5srv_la-server_glue.Plo \ + ./$(DEPDIR)/libkadm5srv_la-set_keys.Plo \ + ./$(DEPDIR)/libkadm5srv_la-set_modifier.Plo \ + ./$(DEPDIR)/libkadm5srv_la-setkey3_s.Plo \ + ./$(DEPDIR)/sample_passwd_check.Plo \ + ./$(DEPDIR)/test_pw_quality.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -366,8 +427,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/Makefile.am.common \ $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/depcomp \ @@ -393,9 +452,12 @@ CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLANG_FORMAT = @CLANG_FORMAT@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DB1LIB = @DB1LIB@ DB3LIB = @DB3LIB@ @@ -413,8 +475,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GCD_MIG = @GCD_MIG@ GREP = @GREP@ GROFF = @GROFF@ @@ -523,6 +587,11 @@ PKG_CONFIG = @PKG_CONFIG@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LDADD = @PTHREAD_LDADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -582,9 +651,14 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -626,6 +700,7 @@ heim_verbose = $(heim_verbose_$(V)) heim_verbose_ = $(heim_verbose_$(AM_DEFAULT_VERBOSITY)) heim_verbose_0 = @echo " GEN "$@; libkadm5srv_la_CPPFLAGS = -I$(srcdir)/../krb5 +libkadm5clnt_la_CPPFLAGS = -I$(srcdir)/../krb5 lib_LTLIBRARIES = libkadm5srv.la libkadm5clnt.la libkadm5srv_la_LDFLAGS = -version-info 8:1:0 $(am__append_2) libkadm5clnt_la_LDFLAGS = -version-info 7:1:0 $(am__append_1) @@ -640,6 +715,7 @@ libkadm5clnt_la_LIBADD = \ $(LIB_com_err) ../krb5/libkrb5.la $(LIBADD_roken) default_keys_SOURCES = default_keys.c +default_keys_CPPFLAGS = -I$(srcdir)/../krb5 kadm5includedir = $(includedir)/kadm5 buildkadm5include = $(buildinclude)/kadm5 dist_kadm5include_HEADERS = admin.h private.h kadm5-pwcheck.h \ @@ -715,7 +791,9 @@ libkadm5srv_la_DEPENDENCIES = \ dist_iprop_log_SOURCES = iprop-log.c nodist_iprop_log_SOURCES = iprop-commands.c ipropd_master_SOURCES = ipropd_master.c ipropd_common.c iprop.h kadm5_locl.h +ipropd_master_CPPFLAGS = -I$(srcdir)/../krb5 ipropd_slave_SOURCES = ipropd_slave.c ipropd_common.c iprop.h kadm5_locl.h +ipropd_slave_CPPFLAGS = -I$(srcdir)/../krb5 man_MANS = kadm5_pwcheck.3 iprop.8 iprop-log.8 LDADD = \ libkadm5srv.la \ @@ -741,6 +819,7 @@ iprop_log_LDADD = \ $(LIB_dlopen) \ $(LIB_pidfile) +iprop_log_CPPFLAGS = -I$(srcdir)/../krb5 CLEANFILES = kadm5_err.c kadm5_err.h iprop-commands.h iprop-commands.c ALL_OBJECTS = $(libkadm5clnt_la_OBJECTS) $(libkadm5srv_la_OBJECTS) \ $(ipropd_master_OBJECTS) $(ipropd_slave_OBJECTS) \ @@ -786,8 +865,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty): @@ -800,61 +879,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -libkadm5clnt.la: $(libkadm5clnt_la_OBJECTS) $(libkadm5clnt_la_DEPENDENCIES) $(EXTRA_libkadm5clnt_la_DEPENDENCIES) - $(AM_V_CCLD)$(libkadm5clnt_la_LINK) -rpath $(libdir) $(libkadm5clnt_la_OBJECTS) $(libkadm5clnt_la_LIBADD) $(LIBS) - -libkadm5srv.la: $(libkadm5srv_la_OBJECTS) $(libkadm5srv_la_DEPENDENCIES) $(EXTRA_libkadm5srv_la_DEPENDENCIES) - $(AM_V_CCLD)$(libkadm5srv_la_LINK) -rpath $(libdir) $(libkadm5srv_la_OBJECTS) $(libkadm5srv_la_LIBADD) $(LIBS) - -sample_passwd_check.la: $(sample_passwd_check_la_OBJECTS) $(sample_passwd_check_la_DEPENDENCIES) $(EXTRA_sample_passwd_check_la_DEPENDENCIES) - $(AM_V_CCLD)$(sample_passwd_check_la_LINK) $(sample_passwd_check_la_OBJECTS) $(sample_passwd_check_la_LIBADD) $(LIBS) - clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ echo " rm -f" $$list; \ @@ -971,6 +995,61 @@ clean-sbinPROGRAMS: echo " rm -f" $$list; \ rm -f $$list +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libkadm5clnt.la: $(libkadm5clnt_la_OBJECTS) $(libkadm5clnt_la_DEPENDENCIES) $(EXTRA_libkadm5clnt_la_DEPENDENCIES) + $(AM_V_CCLD)$(libkadm5clnt_la_LINK) -rpath $(libdir) $(libkadm5clnt_la_OBJECTS) $(libkadm5clnt_la_LIBADD) $(LIBS) + +libkadm5srv.la: $(libkadm5srv_la_OBJECTS) $(libkadm5srv_la_DEPENDENCIES) $(EXTRA_libkadm5srv_la_DEPENDENCIES) + $(AM_V_CCLD)$(libkadm5srv_la_LINK) -rpath $(libdir) $(libkadm5srv_la_OBJECTS) $(libkadm5srv_la_LIBADD) $(LIBS) + +sample_passwd_check.la: $(sample_passwd_check_la_OBJECTS) $(sample_passwd_check_la_DEPENDENCIES) $(EXTRA_sample_passwd_check_la_DEPENDENCIES) + $(AM_V_CCLD)$(sample_passwd_check_la_LINK) $(sample_passwd_check_la_OBJECTS) $(sample_passwd_check_la_LIBADD) $(LIBS) + default_keys$(EXEEXT): $(default_keys_OBJECTS) $(default_keys_DEPENDENCIES) $(EXTRA_default_keys_DEPENDENCIES) @rm -f default_keys$(EXEEXT) $(AM_V_CCLD)$(LINK) $(default_keys_OBJECTS) $(default_keys_LDADD) $(LIBS) @@ -997,61 +1076,68 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ad.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chpass_c.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client_glue.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common_glue.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/create_c.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/default_keys.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/delete_c.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/destroy_c.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flush_c.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/free.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_c.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/get_princs_c.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init_c.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iprop-commands.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iprop-log.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipropd_common.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipropd_master.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipropd_slave.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kadm5_err.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-acl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-bump_pw_expire.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-chpass_s.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-common_glue.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-context_s.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-create_s.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-delete_s.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-destroy_s.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-ent_setup.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-error.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-flush_s.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-free.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-get_princs_s.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-get_s.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-init_s.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-kadm5_err.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-keys.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-log.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-marshall.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-modify_s.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-password_quality.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-privs_s.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-randkey_s.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-rename_s.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-server_glue.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-set_keys.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-set_modifier.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-setkey3_s.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/marshall.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modify_c.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/privs_c.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/randkey_c.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rename_c.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sample_passwd_check.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/send_recv.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_pw_quality.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/default_keys-default_keys.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iprop_log-iprop-commands.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iprop_log-iprop-log.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipropd_master-ipropd_common.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipropd_master-ipropd_master.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipropd_slave-ipropd_common.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipropd_slave-ipropd_slave.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5clnt_la-ad.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5clnt_la-chpass_c.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5clnt_la-client_glue.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5clnt_la-common_glue.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5clnt_la-create_c.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5clnt_la-delete_c.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5clnt_la-destroy_c.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5clnt_la-flush_c.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5clnt_la-free.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5clnt_la-get_c.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5clnt_la-get_princs_c.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5clnt_la-init_c.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5clnt_la-kadm5_err.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5clnt_la-marshall.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5clnt_la-modify_c.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5clnt_la-privs_c.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5clnt_la-randkey_c.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5clnt_la-rename_c.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5clnt_la-send_recv.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-acl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-bump_pw_expire.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-chpass_s.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-common_glue.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-context_s.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-create_s.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-delete_s.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-destroy_s.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-ent_setup.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-error.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-flush_s.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-free.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-get_princs_s.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-get_s.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-init_s.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-kadm5_err.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-keys.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-log.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-marshall.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-modify_s.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-password_quality.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-privs_s.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-randkey_s.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-rename_s.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-server_glue.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-set_keys.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-set_modifier.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkadm5srv_la-setkey3_s.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sample_passwd_check.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_pw_quality.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1074,6 +1160,139 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +libkadm5clnt_la-ad.lo: ad.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5clnt_la-ad.lo -MD -MP -MF $(DEPDIR)/libkadm5clnt_la-ad.Tpo -c -o libkadm5clnt_la-ad.lo `test -f 'ad.c' || echo '$(srcdir)/'`ad.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5clnt_la-ad.Tpo $(DEPDIR)/libkadm5clnt_la-ad.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ad.c' object='libkadm5clnt_la-ad.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5clnt_la-ad.lo `test -f 'ad.c' || echo '$(srcdir)/'`ad.c + +libkadm5clnt_la-chpass_c.lo: chpass_c.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5clnt_la-chpass_c.lo -MD -MP -MF $(DEPDIR)/libkadm5clnt_la-chpass_c.Tpo -c -o libkadm5clnt_la-chpass_c.lo `test -f 'chpass_c.c' || echo '$(srcdir)/'`chpass_c.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5clnt_la-chpass_c.Tpo $(DEPDIR)/libkadm5clnt_la-chpass_c.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='chpass_c.c' object='libkadm5clnt_la-chpass_c.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5clnt_la-chpass_c.lo `test -f 'chpass_c.c' || echo '$(srcdir)/'`chpass_c.c + +libkadm5clnt_la-client_glue.lo: client_glue.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5clnt_la-client_glue.lo -MD -MP -MF $(DEPDIR)/libkadm5clnt_la-client_glue.Tpo -c -o libkadm5clnt_la-client_glue.lo `test -f 'client_glue.c' || echo '$(srcdir)/'`client_glue.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5clnt_la-client_glue.Tpo $(DEPDIR)/libkadm5clnt_la-client_glue.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='client_glue.c' object='libkadm5clnt_la-client_glue.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5clnt_la-client_glue.lo `test -f 'client_glue.c' || echo '$(srcdir)/'`client_glue.c + +libkadm5clnt_la-common_glue.lo: common_glue.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5clnt_la-common_glue.lo -MD -MP -MF $(DEPDIR)/libkadm5clnt_la-common_glue.Tpo -c -o libkadm5clnt_la-common_glue.lo `test -f 'common_glue.c' || echo '$(srcdir)/'`common_glue.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5clnt_la-common_glue.Tpo $(DEPDIR)/libkadm5clnt_la-common_glue.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common_glue.c' object='libkadm5clnt_la-common_glue.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5clnt_la-common_glue.lo `test -f 'common_glue.c' || echo '$(srcdir)/'`common_glue.c + +libkadm5clnt_la-create_c.lo: create_c.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5clnt_la-create_c.lo -MD -MP -MF $(DEPDIR)/libkadm5clnt_la-create_c.Tpo -c -o libkadm5clnt_la-create_c.lo `test -f 'create_c.c' || echo '$(srcdir)/'`create_c.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5clnt_la-create_c.Tpo $(DEPDIR)/libkadm5clnt_la-create_c.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='create_c.c' object='libkadm5clnt_la-create_c.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5clnt_la-create_c.lo `test -f 'create_c.c' || echo '$(srcdir)/'`create_c.c + +libkadm5clnt_la-delete_c.lo: delete_c.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5clnt_la-delete_c.lo -MD -MP -MF $(DEPDIR)/libkadm5clnt_la-delete_c.Tpo -c -o libkadm5clnt_la-delete_c.lo `test -f 'delete_c.c' || echo '$(srcdir)/'`delete_c.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5clnt_la-delete_c.Tpo $(DEPDIR)/libkadm5clnt_la-delete_c.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='delete_c.c' object='libkadm5clnt_la-delete_c.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5clnt_la-delete_c.lo `test -f 'delete_c.c' || echo '$(srcdir)/'`delete_c.c + +libkadm5clnt_la-destroy_c.lo: destroy_c.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5clnt_la-destroy_c.lo -MD -MP -MF $(DEPDIR)/libkadm5clnt_la-destroy_c.Tpo -c -o libkadm5clnt_la-destroy_c.lo `test -f 'destroy_c.c' || echo '$(srcdir)/'`destroy_c.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5clnt_la-destroy_c.Tpo $(DEPDIR)/libkadm5clnt_la-destroy_c.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='destroy_c.c' object='libkadm5clnt_la-destroy_c.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5clnt_la-destroy_c.lo `test -f 'destroy_c.c' || echo '$(srcdir)/'`destroy_c.c + +libkadm5clnt_la-flush_c.lo: flush_c.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5clnt_la-flush_c.lo -MD -MP -MF $(DEPDIR)/libkadm5clnt_la-flush_c.Tpo -c -o libkadm5clnt_la-flush_c.lo `test -f 'flush_c.c' || echo '$(srcdir)/'`flush_c.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5clnt_la-flush_c.Tpo $(DEPDIR)/libkadm5clnt_la-flush_c.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='flush_c.c' object='libkadm5clnt_la-flush_c.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5clnt_la-flush_c.lo `test -f 'flush_c.c' || echo '$(srcdir)/'`flush_c.c + +libkadm5clnt_la-free.lo: free.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5clnt_la-free.lo -MD -MP -MF $(DEPDIR)/libkadm5clnt_la-free.Tpo -c -o libkadm5clnt_la-free.lo `test -f 'free.c' || echo '$(srcdir)/'`free.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5clnt_la-free.Tpo $(DEPDIR)/libkadm5clnt_la-free.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='free.c' object='libkadm5clnt_la-free.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5clnt_la-free.lo `test -f 'free.c' || echo '$(srcdir)/'`free.c + +libkadm5clnt_la-get_c.lo: get_c.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5clnt_la-get_c.lo -MD -MP -MF $(DEPDIR)/libkadm5clnt_la-get_c.Tpo -c -o libkadm5clnt_la-get_c.lo `test -f 'get_c.c' || echo '$(srcdir)/'`get_c.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5clnt_la-get_c.Tpo $(DEPDIR)/libkadm5clnt_la-get_c.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='get_c.c' object='libkadm5clnt_la-get_c.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5clnt_la-get_c.lo `test -f 'get_c.c' || echo '$(srcdir)/'`get_c.c + +libkadm5clnt_la-get_princs_c.lo: get_princs_c.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5clnt_la-get_princs_c.lo -MD -MP -MF $(DEPDIR)/libkadm5clnt_la-get_princs_c.Tpo -c -o libkadm5clnt_la-get_princs_c.lo `test -f 'get_princs_c.c' || echo '$(srcdir)/'`get_princs_c.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5clnt_la-get_princs_c.Tpo $(DEPDIR)/libkadm5clnt_la-get_princs_c.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='get_princs_c.c' object='libkadm5clnt_la-get_princs_c.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5clnt_la-get_princs_c.lo `test -f 'get_princs_c.c' || echo '$(srcdir)/'`get_princs_c.c + +libkadm5clnt_la-init_c.lo: init_c.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5clnt_la-init_c.lo -MD -MP -MF $(DEPDIR)/libkadm5clnt_la-init_c.Tpo -c -o libkadm5clnt_la-init_c.lo `test -f 'init_c.c' || echo '$(srcdir)/'`init_c.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5clnt_la-init_c.Tpo $(DEPDIR)/libkadm5clnt_la-init_c.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='init_c.c' object='libkadm5clnt_la-init_c.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5clnt_la-init_c.lo `test -f 'init_c.c' || echo '$(srcdir)/'`init_c.c + +libkadm5clnt_la-marshall.lo: marshall.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5clnt_la-marshall.lo -MD -MP -MF $(DEPDIR)/libkadm5clnt_la-marshall.Tpo -c -o libkadm5clnt_la-marshall.lo `test -f 'marshall.c' || echo '$(srcdir)/'`marshall.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5clnt_la-marshall.Tpo $(DEPDIR)/libkadm5clnt_la-marshall.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='marshall.c' object='libkadm5clnt_la-marshall.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5clnt_la-marshall.lo `test -f 'marshall.c' || echo '$(srcdir)/'`marshall.c + +libkadm5clnt_la-modify_c.lo: modify_c.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5clnt_la-modify_c.lo -MD -MP -MF $(DEPDIR)/libkadm5clnt_la-modify_c.Tpo -c -o libkadm5clnt_la-modify_c.lo `test -f 'modify_c.c' || echo '$(srcdir)/'`modify_c.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5clnt_la-modify_c.Tpo $(DEPDIR)/libkadm5clnt_la-modify_c.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='modify_c.c' object='libkadm5clnt_la-modify_c.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5clnt_la-modify_c.lo `test -f 'modify_c.c' || echo '$(srcdir)/'`modify_c.c + +libkadm5clnt_la-privs_c.lo: privs_c.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5clnt_la-privs_c.lo -MD -MP -MF $(DEPDIR)/libkadm5clnt_la-privs_c.Tpo -c -o libkadm5clnt_la-privs_c.lo `test -f 'privs_c.c' || echo '$(srcdir)/'`privs_c.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5clnt_la-privs_c.Tpo $(DEPDIR)/libkadm5clnt_la-privs_c.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='privs_c.c' object='libkadm5clnt_la-privs_c.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5clnt_la-privs_c.lo `test -f 'privs_c.c' || echo '$(srcdir)/'`privs_c.c + +libkadm5clnt_la-randkey_c.lo: randkey_c.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5clnt_la-randkey_c.lo -MD -MP -MF $(DEPDIR)/libkadm5clnt_la-randkey_c.Tpo -c -o libkadm5clnt_la-randkey_c.lo `test -f 'randkey_c.c' || echo '$(srcdir)/'`randkey_c.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5clnt_la-randkey_c.Tpo $(DEPDIR)/libkadm5clnt_la-randkey_c.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='randkey_c.c' object='libkadm5clnt_la-randkey_c.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5clnt_la-randkey_c.lo `test -f 'randkey_c.c' || echo '$(srcdir)/'`randkey_c.c + +libkadm5clnt_la-rename_c.lo: rename_c.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5clnt_la-rename_c.lo -MD -MP -MF $(DEPDIR)/libkadm5clnt_la-rename_c.Tpo -c -o libkadm5clnt_la-rename_c.lo `test -f 'rename_c.c' || echo '$(srcdir)/'`rename_c.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5clnt_la-rename_c.Tpo $(DEPDIR)/libkadm5clnt_la-rename_c.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rename_c.c' object='libkadm5clnt_la-rename_c.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5clnt_la-rename_c.lo `test -f 'rename_c.c' || echo '$(srcdir)/'`rename_c.c + +libkadm5clnt_la-send_recv.lo: send_recv.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5clnt_la-send_recv.lo -MD -MP -MF $(DEPDIR)/libkadm5clnt_la-send_recv.Tpo -c -o libkadm5clnt_la-send_recv.lo `test -f 'send_recv.c' || echo '$(srcdir)/'`send_recv.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5clnt_la-send_recv.Tpo $(DEPDIR)/libkadm5clnt_la-send_recv.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='send_recv.c' object='libkadm5clnt_la-send_recv.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5clnt_la-send_recv.lo `test -f 'send_recv.c' || echo '$(srcdir)/'`send_recv.c + +libkadm5clnt_la-kadm5_err.lo: kadm5_err.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5clnt_la-kadm5_err.lo -MD -MP -MF $(DEPDIR)/libkadm5clnt_la-kadm5_err.Tpo -c -o libkadm5clnt_la-kadm5_err.lo `test -f 'kadm5_err.c' || echo '$(srcdir)/'`kadm5_err.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5clnt_la-kadm5_err.Tpo $(DEPDIR)/libkadm5clnt_la-kadm5_err.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kadm5_err.c' object='libkadm5clnt_la-kadm5_err.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5clnt_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5clnt_la-kadm5_err.lo `test -f 'kadm5_err.c' || echo '$(srcdir)/'`kadm5_err.c + libkadm5srv_la-acl.lo: acl.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5srv_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkadm5srv_la-acl.lo -MD -MP -MF $(DEPDIR)/libkadm5srv_la-acl.Tpo -c -o libkadm5srv_la-acl.lo `test -f 'acl.c' || echo '$(srcdir)/'`acl.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkadm5srv_la-acl.Tpo $(DEPDIR)/libkadm5srv_la-acl.Plo @@ -1270,6 +1489,104 @@ libkadm5srv_la-kadm5_err.lo: kadm5_err.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkadm5srv_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkadm5srv_la-kadm5_err.lo `test -f 'kadm5_err.c' || echo '$(srcdir)/'`kadm5_err.c +default_keys-default_keys.o: default_keys.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(default_keys_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT default_keys-default_keys.o -MD -MP -MF $(DEPDIR)/default_keys-default_keys.Tpo -c -o default_keys-default_keys.o `test -f 'default_keys.c' || echo '$(srcdir)/'`default_keys.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/default_keys-default_keys.Tpo $(DEPDIR)/default_keys-default_keys.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='default_keys.c' object='default_keys-default_keys.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(default_keys_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o default_keys-default_keys.o `test -f 'default_keys.c' || echo '$(srcdir)/'`default_keys.c + +default_keys-default_keys.obj: default_keys.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(default_keys_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT default_keys-default_keys.obj -MD -MP -MF $(DEPDIR)/default_keys-default_keys.Tpo -c -o default_keys-default_keys.obj `if test -f 'default_keys.c'; then $(CYGPATH_W) 'default_keys.c'; else $(CYGPATH_W) '$(srcdir)/default_keys.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/default_keys-default_keys.Tpo $(DEPDIR)/default_keys-default_keys.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='default_keys.c' object='default_keys-default_keys.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(default_keys_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o default_keys-default_keys.obj `if test -f 'default_keys.c'; then $(CYGPATH_W) 'default_keys.c'; else $(CYGPATH_W) '$(srcdir)/default_keys.c'; fi` + +iprop_log-iprop-log.o: iprop-log.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(iprop_log_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iprop_log-iprop-log.o -MD -MP -MF $(DEPDIR)/iprop_log-iprop-log.Tpo -c -o iprop_log-iprop-log.o `test -f 'iprop-log.c' || echo '$(srcdir)/'`iprop-log.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/iprop_log-iprop-log.Tpo $(DEPDIR)/iprop_log-iprop-log.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='iprop-log.c' object='iprop_log-iprop-log.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(iprop_log_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iprop_log-iprop-log.o `test -f 'iprop-log.c' || echo '$(srcdir)/'`iprop-log.c + +iprop_log-iprop-log.obj: iprop-log.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(iprop_log_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iprop_log-iprop-log.obj -MD -MP -MF $(DEPDIR)/iprop_log-iprop-log.Tpo -c -o iprop_log-iprop-log.obj `if test -f 'iprop-log.c'; then $(CYGPATH_W) 'iprop-log.c'; else $(CYGPATH_W) '$(srcdir)/iprop-log.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/iprop_log-iprop-log.Tpo $(DEPDIR)/iprop_log-iprop-log.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='iprop-log.c' object='iprop_log-iprop-log.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(iprop_log_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iprop_log-iprop-log.obj `if test -f 'iprop-log.c'; then $(CYGPATH_W) 'iprop-log.c'; else $(CYGPATH_W) '$(srcdir)/iprop-log.c'; fi` + +iprop_log-iprop-commands.o: iprop-commands.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(iprop_log_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iprop_log-iprop-commands.o -MD -MP -MF $(DEPDIR)/iprop_log-iprop-commands.Tpo -c -o iprop_log-iprop-commands.o `test -f 'iprop-commands.c' || echo '$(srcdir)/'`iprop-commands.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/iprop_log-iprop-commands.Tpo $(DEPDIR)/iprop_log-iprop-commands.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='iprop-commands.c' object='iprop_log-iprop-commands.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(iprop_log_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iprop_log-iprop-commands.o `test -f 'iprop-commands.c' || echo '$(srcdir)/'`iprop-commands.c + +iprop_log-iprop-commands.obj: iprop-commands.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(iprop_log_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iprop_log-iprop-commands.obj -MD -MP -MF $(DEPDIR)/iprop_log-iprop-commands.Tpo -c -o iprop_log-iprop-commands.obj `if test -f 'iprop-commands.c'; then $(CYGPATH_W) 'iprop-commands.c'; else $(CYGPATH_W) '$(srcdir)/iprop-commands.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/iprop_log-iprop-commands.Tpo $(DEPDIR)/iprop_log-iprop-commands.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='iprop-commands.c' object='iprop_log-iprop-commands.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(iprop_log_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iprop_log-iprop-commands.obj `if test -f 'iprop-commands.c'; then $(CYGPATH_W) 'iprop-commands.c'; else $(CYGPATH_W) '$(srcdir)/iprop-commands.c'; fi` + +ipropd_master-ipropd_master.o: ipropd_master.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ipropd_master_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ipropd_master-ipropd_master.o -MD -MP -MF $(DEPDIR)/ipropd_master-ipropd_master.Tpo -c -o ipropd_master-ipropd_master.o `test -f 'ipropd_master.c' || echo '$(srcdir)/'`ipropd_master.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ipropd_master-ipropd_master.Tpo $(DEPDIR)/ipropd_master-ipropd_master.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ipropd_master.c' object='ipropd_master-ipropd_master.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ipropd_master_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ipropd_master-ipropd_master.o `test -f 'ipropd_master.c' || echo '$(srcdir)/'`ipropd_master.c + +ipropd_master-ipropd_master.obj: ipropd_master.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ipropd_master_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ipropd_master-ipropd_master.obj -MD -MP -MF $(DEPDIR)/ipropd_master-ipropd_master.Tpo -c -o ipropd_master-ipropd_master.obj `if test -f 'ipropd_master.c'; then $(CYGPATH_W) 'ipropd_master.c'; else $(CYGPATH_W) '$(srcdir)/ipropd_master.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ipropd_master-ipropd_master.Tpo $(DEPDIR)/ipropd_master-ipropd_master.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ipropd_master.c' object='ipropd_master-ipropd_master.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ipropd_master_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ipropd_master-ipropd_master.obj `if test -f 'ipropd_master.c'; then $(CYGPATH_W) 'ipropd_master.c'; else $(CYGPATH_W) '$(srcdir)/ipropd_master.c'; fi` + +ipropd_master-ipropd_common.o: ipropd_common.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ipropd_master_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ipropd_master-ipropd_common.o -MD -MP -MF $(DEPDIR)/ipropd_master-ipropd_common.Tpo -c -o ipropd_master-ipropd_common.o `test -f 'ipropd_common.c' || echo '$(srcdir)/'`ipropd_common.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ipropd_master-ipropd_common.Tpo $(DEPDIR)/ipropd_master-ipropd_common.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ipropd_common.c' object='ipropd_master-ipropd_common.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ipropd_master_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ipropd_master-ipropd_common.o `test -f 'ipropd_common.c' || echo '$(srcdir)/'`ipropd_common.c + +ipropd_master-ipropd_common.obj: ipropd_common.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ipropd_master_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ipropd_master-ipropd_common.obj -MD -MP -MF $(DEPDIR)/ipropd_master-ipropd_common.Tpo -c -o ipropd_master-ipropd_common.obj `if test -f 'ipropd_common.c'; then $(CYGPATH_W) 'ipropd_common.c'; else $(CYGPATH_W) '$(srcdir)/ipropd_common.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ipropd_master-ipropd_common.Tpo $(DEPDIR)/ipropd_master-ipropd_common.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ipropd_common.c' object='ipropd_master-ipropd_common.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ipropd_master_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ipropd_master-ipropd_common.obj `if test -f 'ipropd_common.c'; then $(CYGPATH_W) 'ipropd_common.c'; else $(CYGPATH_W) '$(srcdir)/ipropd_common.c'; fi` + +ipropd_slave-ipropd_slave.o: ipropd_slave.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ipropd_slave_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ipropd_slave-ipropd_slave.o -MD -MP -MF $(DEPDIR)/ipropd_slave-ipropd_slave.Tpo -c -o ipropd_slave-ipropd_slave.o `test -f 'ipropd_slave.c' || echo '$(srcdir)/'`ipropd_slave.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ipropd_slave-ipropd_slave.Tpo $(DEPDIR)/ipropd_slave-ipropd_slave.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ipropd_slave.c' object='ipropd_slave-ipropd_slave.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ipropd_slave_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ipropd_slave-ipropd_slave.o `test -f 'ipropd_slave.c' || echo '$(srcdir)/'`ipropd_slave.c + +ipropd_slave-ipropd_slave.obj: ipropd_slave.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ipropd_slave_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ipropd_slave-ipropd_slave.obj -MD -MP -MF $(DEPDIR)/ipropd_slave-ipropd_slave.Tpo -c -o ipropd_slave-ipropd_slave.obj `if test -f 'ipropd_slave.c'; then $(CYGPATH_W) 'ipropd_slave.c'; else $(CYGPATH_W) '$(srcdir)/ipropd_slave.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ipropd_slave-ipropd_slave.Tpo $(DEPDIR)/ipropd_slave-ipropd_slave.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ipropd_slave.c' object='ipropd_slave-ipropd_slave.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ipropd_slave_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ipropd_slave-ipropd_slave.obj `if test -f 'ipropd_slave.c'; then $(CYGPATH_W) 'ipropd_slave.c'; else $(CYGPATH_W) '$(srcdir)/ipropd_slave.c'; fi` + +ipropd_slave-ipropd_common.o: ipropd_common.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ipropd_slave_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ipropd_slave-ipropd_common.o -MD -MP -MF $(DEPDIR)/ipropd_slave-ipropd_common.Tpo -c -o ipropd_slave-ipropd_common.o `test -f 'ipropd_common.c' || echo '$(srcdir)/'`ipropd_common.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ipropd_slave-ipropd_common.Tpo $(DEPDIR)/ipropd_slave-ipropd_common.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ipropd_common.c' object='ipropd_slave-ipropd_common.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ipropd_slave_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ipropd_slave-ipropd_common.o `test -f 'ipropd_common.c' || echo '$(srcdir)/'`ipropd_common.c + +ipropd_slave-ipropd_common.obj: ipropd_common.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ipropd_slave_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ipropd_slave-ipropd_common.obj -MD -MP -MF $(DEPDIR)/ipropd_slave-ipropd_common.Tpo -c -o ipropd_slave-ipropd_common.obj `if test -f 'ipropd_common.c'; then $(CYGPATH_W) 'ipropd_common.c'; else $(CYGPATH_W) '$(srcdir)/ipropd_common.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ipropd_slave-ipropd_common.Tpo $(DEPDIR)/ipropd_slave-ipropd_common.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ipropd_common.c' object='ipropd_slave-ipropd_common.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ipropd_slave_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ipropd_slave-ipropd_common.obj `if test -f 'ipropd_common.c'; then $(CYGPATH_W) 'ipropd_common.c'; else $(CYGPATH_W) '$(srcdir)/ipropd_common.c'; fi` + mostlyclean-libtool: -rm -f *.lo @@ -1455,8 +1772,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1493,10 +1812,16 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) \ +all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(MANS) $(HEADERS) \ all-local +install-checkPROGRAMS: install-libLTLIBRARIES + +install-libexecPROGRAMS: install-libLTLIBRARIES + +install-sbinPROGRAMS: install-libLTLIBRARIES + installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(kadm5includedir)" "$(DESTDIR)$(kadm5includedir)"; do \ + for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(kadm5includedir)" "$(DESTDIR)$(kadm5includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1537,7 +1862,62 @@ clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-noinstPROGRAMS clean-sbinPROGRAMS mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/default_keys-default_keys.Po + -rm -f ./$(DEPDIR)/iprop_log-iprop-commands.Po + -rm -f ./$(DEPDIR)/iprop_log-iprop-log.Po + -rm -f ./$(DEPDIR)/ipropd_master-ipropd_common.Po + -rm -f ./$(DEPDIR)/ipropd_master-ipropd_master.Po + -rm -f ./$(DEPDIR)/ipropd_slave-ipropd_common.Po + -rm -f ./$(DEPDIR)/ipropd_slave-ipropd_slave.Po + -rm -f ./$(DEPDIR)/libkadm5clnt_la-ad.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-chpass_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-client_glue.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-common_glue.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-create_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-delete_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-destroy_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-flush_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-free.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-get_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-get_princs_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-init_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-kadm5_err.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-marshall.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-modify_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-privs_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-randkey_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-rename_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-send_recv.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-acl.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-bump_pw_expire.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-chpass_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-common_glue.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-context_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-create_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-delete_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-destroy_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-ent_setup.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-error.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-flush_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-free.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-get_princs_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-get_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-init_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-kadm5_err.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-keys.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-log.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-marshall.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-modify_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-password_quality.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-privs_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-randkey_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-rename_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-server_glue.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-set_keys.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-set_modifier.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-setkey3_s.Plo + -rm -f ./$(DEPDIR)/sample_passwd_check.Plo + -rm -f ./$(DEPDIR)/test_pw_quality.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1586,7 +1966,62 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/default_keys-default_keys.Po + -rm -f ./$(DEPDIR)/iprop_log-iprop-commands.Po + -rm -f ./$(DEPDIR)/iprop_log-iprop-log.Po + -rm -f ./$(DEPDIR)/ipropd_master-ipropd_common.Po + -rm -f ./$(DEPDIR)/ipropd_master-ipropd_master.Po + -rm -f ./$(DEPDIR)/ipropd_slave-ipropd_common.Po + -rm -f ./$(DEPDIR)/ipropd_slave-ipropd_slave.Po + -rm -f ./$(DEPDIR)/libkadm5clnt_la-ad.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-chpass_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-client_glue.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-common_glue.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-create_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-delete_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-destroy_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-flush_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-free.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-get_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-get_princs_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-init_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-kadm5_err.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-marshall.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-modify_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-privs_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-randkey_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-rename_c.Plo + -rm -f ./$(DEPDIR)/libkadm5clnt_la-send_recv.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-acl.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-bump_pw_expire.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-chpass_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-common_glue.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-context_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-create_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-delete_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-destroy_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-ent_setup.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-error.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-flush_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-free.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-get_princs_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-get_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-init_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-kadm5_err.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-keys.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-log.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-marshall.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-modify_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-password_quality.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-privs_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-randkey_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-rename_s.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-server_glue.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-set_keys.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-set_modifier.Plo + -rm -f ./$(DEPDIR)/libkadm5srv_la-setkey3_s.Plo + -rm -f ./$(DEPDIR)/sample_passwd_check.Plo + -rm -f ./$(DEPDIR)/test_pw_quality.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1613,8 +2048,8 @@ uninstall-man: uninstall-man3 uninstall-man8 .MAKE: check-am install-am install-data-am install-strip uninstall-am -.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am \ - check-local clean clean-checkPROGRAMS clean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \ + check-am check-local clean clean-checkPROGRAMS clean-generic \ clean-libLTLIBRARIES clean-libexecPROGRAMS clean-libtool \ clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ clean-sbinPROGRAMS cscopelist-am ctags ctags-am dist-hook \ @@ -1719,11 +2154,20 @@ check-local:: test "$$failed" -eq 0 || exit 1; \ fi +# It's useful for debugging to format generated sources. The default for all +# clang-format styles is to sort includes, but in many cases in-tree we really +# don't want to do that. .x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @if [ -z "$(CLANG_FORMAT)" ]; then \ + cmp -s $< $@ 2> /dev/null || cp $< $@; \ + else \ + cp $< $@.tmp.c; \ + $(CLANG_FORMAT) -style='{BasedOnStyle: Chromium, SortIncludes: false}' -i $@.tmp.c; \ + cmp -s $@.tmp.c $@ 2> /dev/null || mv $@.tmp.c $@; \ + fi .hx.h: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @cmp -s $< $@ 2> /dev/null || cp $< $@; #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ diff --git a/lib/kadm5/get_s.c b/lib/kadm5/get_s.c index 8f9e7e9089f1..5cfc93a951dc 100644 --- a/lib/kadm5/get_s.c +++ b/lib/kadm5/get_s.c @@ -123,31 +123,26 @@ kadm5_s_get_principal(void *server_handle, kadm5_server_context *context = server_handle; kadm5_ret_t ret; hdb_entry_ex ent; - int hdb_is_rw = 1; memset(&ent, 0, sizeof(ent)); memset(out, 0, sizeof(*out)); if (!context->keep_open) { - ret = context->db->hdb_open(context->context, context->db, O_RDWR, 0); - if (ret == EPERM || ret == EACCES) { - ret = context->db->hdb_open(context->context, context->db, O_RDONLY, 0); - hdb_is_rw = 0; - } + ret = context->db->hdb_open(context->context, context->db, O_RDONLY, 0); if (ret) return ret; } /* - * Attempt to recover the log. This will generally fail on slaves, - * and we can't tell if we're on a slave here. + * We may want to attempt to recover the log on read operations, but we + * because the HDB/log lock order is reversed on slaves, in order to avoid + * lock contention from kadm5srv apps we need to make sure that the the HDB + * open for read-write is optimistic and attempts only a non-blocking lock, + * and if it doesn't get it then it should fallback to read-only. But we + * don't have that option in the hdb_open() interface at this time. * - * Perhaps we could set a flag in the kadm5_server_context to - * indicate whether a read has been done without recovering the log, - * in which case we could fail any subsequent writes. + * For now we won't attempt to recover the log. */ - if (hdb_is_rw && kadm5_log_init_nb(context) == 0) - (void) kadm5_log_end(context); ret = context->db->hdb_fetch_kvno(context->context, context->db, princ, HDB_F_DECRYPT|HDB_F_ALL_KVNOS| @@ -319,7 +314,7 @@ kadm5_s_get_principal(void *server_handle, ret = hdb_entry_get_password(context->context, context->db, &ent.entry, &pw); if (ret == 0) { - ret = add_tl_data(out, KRB5_TL_PASSWORD, pw, strlen(pw) + 1); + (void) add_tl_data(out, KRB5_TL_PASSWORD, pw, strlen(pw) + 1); free(pw); } krb5_clear_error_message(context->context); diff --git a/lib/kadm5/init_c.c b/lib/kadm5/init_c.c index 6eddfb8711a0..0436fb127cd5 100644 --- a/lib/kadm5/init_c.c +++ b/lib/kadm5/init_c.c @@ -584,7 +584,7 @@ kadm5_c_init_with_context(krb5_context context, void **server_handle) { kadm5_ret_t ret; - kadm5_client_context *ctx; + kadm5_client_context *ctx = NULL; krb5_ccache cc; ret = _kadm5_c_init_context(&ctx, realm_params, context); diff --git a/lib/kadm5/iprop-log.cat8 b/lib/kadm5/iprop-log.cat8 index a71587396e42..9549037e9cc2 100644 --- a/lib/kadm5/iprop-log.cat8 +++ b/lib/kadm5/iprop-log.cat8 @@ -1,96 +1,95 @@ - IPROP-LOG(8) BSD System Manager's Manual IPROP-LOG(8) -NNAAMMEE - iipprroopp--lloogg -- examine and maintain the iprop log file +[1mNAME[0m + [1miprop-log [22m-- examine and maintain the iprop log file -SSYYNNOOPPSSIISS - iipprroopp--lloogg [----vveerrssiioonn] [--hh | ----hheellpp] _c_o_m_m_a_n_d +[1mSYNOPSIS[0m + [1miprop-log [22m[[1m--version[22m] [[1m-h [22m| [1m--help[22m] [4mcommand[0m - iipprroopp--lloogg ttrruunnccaattee [--cc _f_i_l_e | ----ccoonnffiigg--ffiillee==_f_i_l_e] [--rr _s_t_r_i_n_g | - ----rreeaallmm==_s_t_r_i_n_g] [--KK _i_n_t_e_g_e_r | ----kkeeeepp--eennttrriieess==_i_n_t_e_g_e_r] [--BB - _i_n_t_e_g_e_r | ----mmaaxx--bbyytteess==_i_n_t_e_g_e_r] [--RR | ----rreesseett] [--hh | ----hheellpp] - [_l_o_g_-_f_i_l_e] + [1miprop-log truncate [22m[[1m-c [4m[22mfile[24m | [1m--config-file=[4m[22mfile[24m] [[1m-r [4m[22mstring[24m | + [1m--realm=[4m[22mstring[24m] [[1m-K [4m[22minteger[24m | [1m--keep-entries=[4m[22minteger[24m] [[1m-B[0m + [4minteger[24m | [1m--max-bytes=[4m[22minteger[24m] [[1m-R [22m| [1m--reset[22m] [[1m-h [22m| [1m--help[22m] + [[4mlog-file[24m] - iipprroopp--lloogg dduummpp [--cc _f_i_l_e | ----ccoonnffiigg--ffiillee==_f_i_l_e] [--rr _s_t_r_i_n_g | - ----rreeaallmm==_s_t_r_i_n_g] [--nn | ----nnoo--lloocckk] [--RR | ----rreevveerrssee] [--hh | ----hheellpp] - [_l_o_g_-_f_i_l_e] + [1miprop-log dump [22m[[1m-c [4m[22mfile[24m | [1m--config-file=[4m[22mfile[24m] [[1m-r [4m[22mstring[24m | + [1m--realm=[4m[22mstring[24m] [[1m-n [22m| [1m--no-lock[22m] [[1m-R [22m| [1m--reverse[22m] [[1m-h [22m| [1m--help[22m] + [[4mlog-file[24m] - iipprroopp--lloogg rreeppllaayy [----ssttaarrtt--vveerrssiioonn==_v_e_r_s_i_o_n_-_n_u_m_b_e_r] - [----eenndd--vveerrssiioonn==_v_e_r_s_i_o_n_-_n_u_m_b_e_r] [--cc _f_i_l_e | ----ccoonnffiigg--ffiillee==_f_i_l_e] - [--rr _s_t_r_i_n_g | ----rreeaallmm==_s_t_r_i_n_g] [--hh | ----hheellpp] [_l_o_g_-_f_i_l_e] + [1miprop-log replay [22m[[1m--start-version=[4m[22mversion-number[24m] + [[1m--end-version=[4m[22mversion-number[24m] [[1m-c [4m[22mfile[24m | [1m--config-file=[4m[22mfile[24m] + [[1m-r [4m[22mstring[24m | [1m--realm=[4m[22mstring[24m] [[1m-h [22m| [1m--help[22m] [[4mlog-file[24m] - iipprroopp--lloogg llaasstt--vveerrssiioonn [--cc _f_i_l_e | ----ccoonnffiigg--ffiillee==_f_i_l_e] [--rr _s_t_r_i_n_g | - ----rreeaallmm==_s_t_r_i_n_g] [--nn | ----nnoo--lloocckk] [--hh | ----hheellpp] [_l_o_g_-_f_i_l_e_s] + [1miprop-log last-version [22m[[1m-c [4m[22mfile[24m | [1m--config-file=[4m[22mfile[24m] [[1m-r [4m[22mstring[24m | + [1m--realm=[4m[22mstring[24m] [[1m-n [22m| [1m--no-lock[22m] [[1m-h [22m| [1m--help[22m] [[4mlog-files[24m] - iipprroopp--lloogg ssiiggnnaall [--cc _f_i_l_e | ----ccoonnffiigg--ffiillee==_f_i_l_e] [--rr _s_t_r_i_n_g | - ----rreeaallmm==_s_t_r_i_n_g] [--hh | ----hheellpp] + [1miprop-log signal [22m[[1m-c [4m[22mfile[24m | [1m--config-file=[4m[22mfile[24m] [[1m-r [4m[22mstring[24m | + [1m--realm=[4m[22mstring[24m] [[1m-h [22m| [1m--help[22m] -DDEESSCCRRIIPPTTIIOONN +[1mDESCRIPTION[0m Supported options: - ----vveerrssiioonn + [1m--version[0m - --hh, ----hheellpp + [1m-h[22m, [1m--help[0m command can be one of the following: truncate - --cc _f_i_l_e, ----ccoonnffiigg--ffiillee==_f_i_l_e + [1m-c [4m[22mfile[24m, [1m--config-file=[4m[22mfile[0m configuration file - --rr _s_t_r_i_n_g, ----rreeaallmm==_s_t_r_i_n_g + [1m-r [4m[22mstring[24m, [1m--realm=[4m[22mstring[0m realm - --KK _i_n_t_e_g_e_r, ----kkeeeepp--eennttrriieess==_i_n_t_e_g_e_r + [1m-K [4m[22minteger[24m, [1m--keep-entries=[4m[22minteger[0m - --BB _i_n_t_e_g_e_r, ----mmaaxx--bbyytteess==_i_n_t_e_g_e_r + [1m-B [4m[22minteger[24m, [1m--max-bytes=[4m[22minteger[0m - --RR, ----rreesseett + [1m-R[22m, [1m--reset[0m - If ----rreesseett is given, then the given, configured, or default log + If [1m--reset [22mis given, then the given, configured, or default log file will be truncated and will start at version 1. This forces full propagations to all slave KDCs. Otherwise the log will be truncated but some entries will be - preserved, as specified by the ----kkeeeepp--eennttrriieess and/or - ----mmaaxx--bbyytteess options. The largest number of ----kkeeeepp--eennttrriieess - entries that are available and fit in the given ----mmaaxx--bbyytteess - option will be used. The ----kkeeeepp--eennttrriieess --ooppttiioonn --ddeeffaauullttss --ttoo - --110000,, --aanndd --tthhee ----mmaaxx--bbyytteess option defaults to the _l_o_g_-_m_a_x_-_s_i_z_e + preserved, as specified by the [1m--keep-entries [22mand/or + [1m--max-bytes [22moptions. The largest number of [1m--keep-entries [22men- + tries that are available and fit in the given [1m--max-bytes [22mop- + tion will be used. The [1m--keep-entries -option -defaults -to[0m + [1m-100, -and -the --max-bytes [22moption defaults to the [4mlog-max-size[0m parameter in the configuration. dump - --cc _f_i_l_e, ----ccoonnffiigg--ffiillee==_f_i_l_e + [1m-c [4m[22mfile[24m, [1m--config-file=[4m[22mfile[0m configuration file - --rr _s_t_r_i_n_g, ----rreeaallmm==_s_t_r_i_n_g + [1m-r [4m[22mstring[24m, [1m--realm=[4m[22mstring[0m realm - --nn _s_t_r_i_n_g, ----nnoo--lloocckk + [1m-n [4m[22mstring[24m, [1m--no-lock[0m - --RR _s_t_r_i_n_g, ----rreevveerrssee + [1m-R [4m[22mstring[24m, [1m--reverse[0m Print out all entries in the given, configured, or default log - file to standard output. If the --nn option is used then don't - lock the iprop log file. If the --RR option is used, then print + file to standard output. If the [1m-n [22moption is used then don't + lock the iprop log file. If the [1m-R [22moption is used, then print the entries in reverse order (this can be useful when the log is very large). replay - ----ssttaarrtt--vveerrssiioonn==_v_e_r_s_i_o_n_-_n_u_m_b_e_r + [1m--start-version=[4m[22mversion-number[0m start replay with this version - ----eenndd--vveerrssiioonn==_v_e_r_s_i_o_n_-_n_u_m_b_e_r + [1m--end-version=[4m[22mversion-number[0m end replay with this version - --cc _f_i_l_e, ----ccoonnffiigg--ffiillee==_f_i_l_e + [1m-c [4m[22mfile[24m, [1m--config-file=[4m[22mfile[0m configuration file - --rr _s_t_r_i_n_g, ----rreeaallmm==_s_t_r_i_n_g + [1m-r [4m[22mstring[24m, [1m--realm=[4m[22mstring[0m realm Replay the changes from specified entries (or all if none is @@ -99,13 +98,13 @@ DDEESSCCRRIIPPTTIIOONN last-version - --cc _f_i_l_e, ----ccoonnffiigg--ffiillee==_f_i_l_e + [1m-c [4m[22mfile[24m, [1m--config-file=[4m[22mfile[0m configuration file - --rr _s_t_r_i_n_g, ----rreeaallmm==_s_t_r_i_n_g + [1m-r [4m[22mstring[24m, [1m--realm=[4m[22mstring[0m realm - --nn _s_t_r_i_n_g, ----nnoo--lloocckk + [1m-n [4m[22mstring[24m, [1m--no-lock[0m prints the version of the last record in each of the given log files, or the configured, or the default log file if none is @@ -113,17 +112,17 @@ DDEESSCCRRIIPPTTIIOONN signal - --cc _f_i_l_e, ----ccoonnffiigg--ffiillee==_f_i_l_e + [1m-c [4m[22mfile[24m, [1m--config-file=[4m[22mfile[0m configuration file - --rr _s_t_r_i_n_g, ----rreeaallmm==_s_t_r_i_n_g + [1m-r [4m[22mstring[24m, [1m--realm=[4m[22mstring[0m realm Signals the ipropd-master daemon to send updates to slaves. Normally kadmin does this every time it writes to the database, so this should rarely be needed. -SSEEEE AALLSSOO +[1mSEE ALSO[0m iprop(8) BSD February 18, 2007 BSD diff --git a/lib/kadm5/iprop.cat8 b/lib/kadm5/iprop.cat8 index 36b87b1a351b..53ade60e88e0 100644 --- a/lib/kadm5/iprop.cat8 +++ b/lib/kadm5/iprop.cat8 @@ -1,36 +1,35 @@ - IPROP(8) BSD System Manager's Manual IPROP(8) -NNAAMMEE - iipprroopp, iipprrooppdd--mmaasstteerr, iipprrooppdd--ssllaavvee -- propagate transactions from a Heim- +[1mNAME[0m + [1miprop[22m, [1mipropd-master[22m, [1mipropd-slave [22m-- propagate transactions from a Heim- dal Kerberos master KDC to slave KDCs -SSYYNNOOPPSSIISS - iipprrooppdd--mmaasstteerr [--cc _s_t_r_i_n_g | ----ccoonnffiigg--ffiillee==_s_t_r_i_n_g] [--rr _s_t_r_i_n_g | - ----rreeaallmm==_s_t_r_i_n_g] [--kk _k_s_p_e_c | ----kkeeyyttaabb==_k_s_p_e_c] [--dd _f_i_l_e | - ----ddaattaabbaassee==_f_i_l_e] [----ssllaavvee--ssttaattss--ffiillee==_f_i_l_e] - [----ttiimmee--mmiissssiinngg==_t_i_m_e] [----ttiimmee--ggoonnee==_t_i_m_e] [----ddeettaacchh] - [----vveerrssiioonn] [----hheellpp] - iipprrooppdd--ssllaavvee [--cc _s_t_r_i_n_g | ----ccoonnffiigg--ffiillee==_s_t_r_i_n_g] [--rr _s_t_r_i_n_g | - ----rreeaallmm==_s_t_r_i_n_g] [--kk _k_s_p_e_c | ----kkeeyyttaabb==_k_s_p_e_c] - [----ttiimmee--lloosstt==_t_i_m_e] [----ddeettaacchh] [----vveerrssiioonn] [----hheellpp] _m_a_s_t_e_r - -DDEESSCCRRIIPPTTIIOONN - iipprrooppdd--mmaasstteerr is used to propagate changes to a Heimdal Kerberos database +[1mSYNOPSIS[0m + [1mipropd-master [22m[[1m-c [4m[22mstring[24m | [1m--config-file=[4m[22mstring[24m] [[1m-r [4m[22mstring[24m | + [1m--realm=[4m[22mstring[24m] [[1m-k [4m[22mkspec[24m | [1m--keytab=[4m[22mkspec[24m] [[1m-d [4m[22mfile[24m | + [1m--database=[4m[22mfile[24m] [[1m--slave-stats-file=[4m[22mfile[24m] + [[1m--time-missing=[4m[22mtime[24m] [[1m--time-gone=[4m[22mtime[24m] [[1m--detach[22m] + [[1m--version[22m] [[1m--help[22m] + [1mipropd-slave [22m[[1m-c [4m[22mstring[24m | [1m--config-file=[4m[22mstring[24m] [[1m-r [4m[22mstring[24m | + [1m--realm=[4m[22mstring[24m] [[1m-k [4m[22mkspec[24m | [1m--keytab=[4m[22mkspec[24m] + [[1m--time-lost=[4m[22mtime[24m] [[1m--detach[22m] [[1m--version[22m] [[1m--help[22m] [4mmaster[0m + +[1mDESCRIPTION[0m + [1mipropd-master [22mis used to propagate changes to a Heimdal Kerberos database from the master Kerberos server on which it runs to slave Kerberos - servers running iipprrooppdd--ssllaavvee. + servers running [1mipropd-slave[22m. - The slaves are specified by the contents of the _s_l_a_v_e_s file in the KDC's - database directory, e.g. _/_v_a_r_/_h_e_i_m_d_a_l_/_s_l_a_v_e_s. This has principals one + The slaves are specified by the contents of the [4mslaves[24m file in the KDC's + database directory, e.g. [4m/var/heimdal/slaves[24m. This has principals one per-line of the form - iprop/_s_l_a_v_e@_R_E_A_L_M - where _s_l_a_v_e is the hostname of the slave server in the given _R_E_A_L_M, e.g. + iprop/[4mslave[24m@[4mREALM[0m + where [4mslave[24m is the hostname of the slave server in the given [4mREALM[24m, e.g. iprop/kerberos-1.example.com@EXAMPLE.COM - On a slave, the argument _m_a_s_t_e_r specifies the hostname of the master + On a slave, the argument [4mmaster[24m specifies the hostname of the master server from which to receive updates. In contrast to hprop(8), which sends the whole database to the slaves - regularly, iipprroopp normally sends only the changes as they happen on the + regularly, [1miprop [22mnormally sends only the changes as they happen on the master. The master keeps track of all the changes by assigning a version number to every transaction to the database. The slaves know which was the latest version they saw, and in this way it can be determined if they @@ -40,74 +39,74 @@ DDEESSCCRRIIPPTTIIOONN The log of transactions is also used to implement a two-phase commit (with roll-forward for recovery) method of updating the HDB. Transac- - tions are first recorded in the log, then in the HDB, then the log is - updated to mark the transaction as committed. + tions are first recorded in the log, then in the HDB, then the log is up- + dated to mark the transaction as committed. - The changes are propagated over a secure channel (on port 2121 by - default). This should normally be defined as ``iprop/tcp'' in - _/_e_t_c_/_s_e_r_v_i_c_e_s or another source of the services database. The master and - slaves must each have access to a keytab with keys for the iipprroopp service - principal on the local host. + The changes are propagated over a secure channel (on port 2121 by de- + fault). This should normally be defined as "iprop/tcp" in [4m/etc/services[0m + or another source of the services database. The master and slaves must + each have access to a keytab with keys for the [1miprop [22mservice principal on + the local host. - There is a keep-alive feature logged in the master's _s_l_a_v_e_-_s_t_a_t_s file - (e.g. _/_v_a_r_/_h_e_i_m_d_a_l_/_s_l_a_v_e_-_s_t_a_t_s). + There is a keep-alive feature logged in the master's [4mslave-stats[24m file + (e.g. [4m/var/heimdal/slave-stats[24m). - Supported options for iipprrooppdd--mmaasstteerr: + Supported options for [1mipropd-master[22m: - --cc _s_t_r_i_n_g, ----ccoonnffiigg--ffiillee==_s_t_r_i_n_g + [1m-c [4m[22mstring[24m, [1m--config-file=[4m[22mstring[0m - --rr _s_t_r_i_n_g, ----rreeaallmm==_s_t_r_i_n_g + [1m-r [4m[22mstring[24m, [1m--realm=[4m[22mstring[0m - --kk _k_s_p_e_c, ----kkeeyyttaabb==_k_s_p_e_c + [1m-k [4m[22mkspec[24m, [1m--keytab=[4m[22mkspec[0m keytab to get authentication from - --dd _f_i_l_e, ----ddaattaabbaassee==_f_i_l_e + [1m-d [4m[22mfile[24m, [1m--database=[4m[22mfile[0m Database (default per KDC) - ----ssllaavvee--ssttaattss--ffiillee==_f_i_l_e + [1m--slave-stats-file=[4m[22mfile[0m file for slave status information - ----ttiimmee--mmiissssiinngg==_t_i_m_e + [1m--time-missing=[4m[22mtime[0m time before slave is polled for presence (default 2 min) - ----ttiimmee--ggoonnee==_t_i_m_e - time of inactivity after which a slave is considered gone - (default 5 min) + [1m--time-gone=[4m[22mtime[0m + time of inactivity after which a slave is considered gone (de- + fault 5 min) - ----ddeettaacchh + [1m--detach[0m detach from console - ----vveerrssiioonn + [1m--version[0m - ----hheellpp + [1m--help[0m - Supported options for iipprrooppdd--ssllaavvee: + Supported options for [1mipropd-slave[22m: - --cc _s_t_r_i_n_g, ----ccoonnffiigg--ffiillee==_s_t_r_i_n_g + [1m-c [4m[22mstring[24m, [1m--config-file=[4m[22mstring[0m - --rr _s_t_r_i_n_g, ----rreeaallmm==_s_t_r_i_n_g + [1m-r [4m[22mstring[24m, [1m--realm=[4m[22mstring[0m - --kk _k_s_p_e_c, ----kkeeyyttaabb==_k_s_p_e_c + [1m-k [4m[22mkspec[24m, [1m--keytab=[4m[22mkspec[0m keytab to get authentication from - ----ttiimmee--lloosstt==_t_i_m_e + [1m--time-lost=[4m[22mtime[0m time before server is considered lost (default 5 min) - ----ddeettaacchh + [1m--detach[0m detach from console - ----vveerrssiioonn + [1m--version[0m - ----hheellpp + [1m--help[0m Time arguments for the relevant options above may be specified in forms like 5 min, 300 s, or simply a number of seconds. -FFIILLEESS - _s_l_a_v_e_s, _s_l_a_v_e_-_s_t_a_t_s in the database directory. _i_p_r_o_p_d_-_m_a_s_t_e_r_._p_i_d, - _i_p_r_o_p_d_-_s_l_a_v_e_._p_i_d in the database directory, or in the directory named by +[1mFILES[0m + [4mslaves[24m, [4mslave-stats[24m in the database directory. [4mipropd-master.pid[24m, + [4mipropd-slave.pid[24m in the database directory, or in the directory named by the HEIM_PIDFILE_DIR environment variable. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5.conf(5), hprop(8), hpropd(8), iprop-log(8), kdc(8). BSD May 24, 2005 BSD diff --git a/lib/kadm5/ipropd_master.c b/lib/kadm5/ipropd_master.c index d0fdc8e26f10..3d4218f03a78 100644 --- a/lib/kadm5/ipropd_master.c +++ b/lib/kadm5/ipropd_master.c @@ -121,6 +121,7 @@ make_listen_socket (krb5_context context, const char *port_str) return fd; } + struct slave { krb5_socket_t fd; struct sockaddr_in addr; @@ -128,10 +129,45 @@ struct slave { krb5_auth_context ac; uint32_t version; uint32_t version_tstamp; + uint32_t version_ack; time_t seen; unsigned long flags; #define SLAVE_F_DEAD 0x1 #define SLAVE_F_AYT 0x2 +#define SLAVE_F_READY 0x4 + /* + * We'll use non-blocking I/O so no slave can hold us back. + * + * We call the state left over from a partial write a "tail". + * + * The krb5_data holding an KRB-PRIV will be the write buffer. + */ + struct { + /* Every message we send is a KRB-PRIV with a 4-byte length prefixed */ + uint8_t header_buf[4]; + krb5_data header; + krb5_data packet; + size_t packet_off; + /* For send_complete() we need an sp as part of the tail */ + krb5_storage *dump; + uint32_t vno; + } tail; + struct { + uint8_t header_buf[4]; + krb5_data packet; + size_t offset; + int hlen; + } input; + /* + * Continuation for fair diff sending we send N entries at a time. + */ + struct { + off_t off_next_version; /* offset in log of next diff */ + uint32_t initial_version; /* at time of previous diff */ + uint32_t initial_tstamp; /* at time of previous diff */ + uint32_t last_version_sent; + int more; /* need to send more diffs */ + } next_diff; struct slave *next; }; @@ -220,6 +256,11 @@ remove_slave (krb5_context context, slave *s, slave **root) if (s->ac) krb5_auth_con_free (context, s->ac); + /* Free any pending input/output state */ + krb5_data_free(&s->input.packet); + krb5_data_free(&s->tail.packet); + krb5_storage_free(s->tail.dump); + for (p = root; *p; p = &(*p)->next) if (*p == s) { *p = s->next; @@ -239,13 +280,17 @@ add_slave (krb5_context context, krb5_keytab keytab, slave **root, krb5_ticket *ticket = NULL; char hostname[128]; - s = malloc(sizeof(*s)); + s = calloc(1, sizeof(*s)); if (s == NULL) { krb5_warnx (context, "add_slave: no memory"); return; } s->name = NULL; s->ac = NULL; + s->input.packet.data = NULL; + s->tail.header.data = NULL; + s->tail.packet.data = NULL; + s->tail.dump = NULL; addr_len = sizeof(s->addr); s->fd = accept (fd, (struct sockaddr *)&s->addr, &addr_len); @@ -253,6 +298,7 @@ add_slave (krb5_context context, krb5_keytab keytab, slave **root, krb5_warn (context, rk_SOCK_ERRNO, "accept"); goto error; } + if (master_hostname) strlcpy(hostname, master_hostname, sizeof(hostname)); else @@ -267,6 +313,35 @@ add_slave (krb5_context context, krb5_keytab keytab, slave **root, ret = krb5_recvauth (context, &s->ac, &s->fd, IPROP_VERSION, server, 0, keytab, &ticket); + + /* + * We'll be doing non-blocking I/O only after authentication. We don't + * want to get stuck talking to any one slave. + * + * If we get a partial write, we'll finish writing when the socket becomes + * writable. + * + * Partial reads will be treated as EOF, causing the slave to be marked + * dead. + * + * To do non-blocking I/O for authentication we'll have to implement our + * own krb5_recvauth(). + */ + socket_set_nonblocking(s->fd, 1); + + /* + * We write message lengths separately from the payload, and may do + * back-to-back small writes when flushing pending input and then a new + * update. Avoid Nagle delays. + */ +#if defined(IPPROTO_TCP) && defined(TCP_NODELAY) + { + int nodelay = 1; + (void) setsockopt(s->fd, IPPROTO_TCP, TCP_NODELAY, + (void *)&nodelay, sizeof(nodelay)); + } +#endif + krb5_free_principal (context, server); if (ret) { krb5_warn (context, ret, "krb5_recvauth"); @@ -304,6 +379,7 @@ add_slave (krb5_context context, krb5_keytab keytab, slave **root, krb5_warnx (context, "connection from %s", s->name); s->version = 0; + s->version_ack = 0; s->flags = 0; slave_seen(s); s->next = *root; @@ -372,6 +448,8 @@ write_dump (krb5_context context, krb5_storage *dump, */ ret = krb5_store_uint32(dump, 0); + if (ret) + return ret; ret = hdb_create (context, &db, database); if (ret) @@ -452,14 +530,146 @@ write_dump (krb5_context context, krb5_storage *dump, } static int -send_complete (krb5_context context, slave *s, const char *database, - uint32_t current_version, uint32_t oldest_version, - uint32_t initial_log_tstamp) +mk_priv_tail(krb5_context context, slave *s, krb5_data *data) +{ + uint32_t len; + int ret; + + ret = krb5_mk_priv(context, s->ac, data, &s->tail.packet, NULL); + if (ret) + return ret; + + len = s->tail.packet.length; + _krb5_put_int(s->tail.header_buf, len, sizeof(s->tail.header_buf)); + s->tail.header.length = sizeof(s->tail.header_buf); + s->tail.header.data = s->tail.header_buf; + return 0; +} + +static int +have_tail(slave *s) +{ + return s->tail.header.length || s->tail.packet.length || s->tail.dump; +} + +static int +more_diffs(slave *s) +{ + return s->next_diff.more; +} + +#define SEND_COMPLETE_MAX_RECORDS 50 +#define SEND_DIFFS_MAX_RECORDS 50 + +static int +send_tail(krb5_context context, slave *s) +{ + krb5_data data; + ssize_t bytes = 0; + size_t rem = 0; + size_t n; + int ret; + + if (! have_tail(s)) + return 0; + + /* + * For the case where we're continuing a send_complete() send up to + * SEND_COMPLETE_MAX_RECORDS records now, and the rest asynchronously + * later. This ensures that sending a complete dump to a slow-to-drain + * client does not prevent others from getting serviced. + */ + for (n = 0; n < SEND_COMPLETE_MAX_RECORDS; n++) { + if (! have_tail(s)) + return 0; + + if (s->tail.header.length) { + bytes = krb5_net_write(context, &s->fd, + s->tail.header.data, + s->tail.header.length); + if (bytes < 0) + goto err; + + s->tail.header.length -= bytes; + s->tail.header.data = (char *)s->tail.header.data + bytes; + rem = s->tail.header.length; + if (rem) + goto ewouldblock; + } + + if (s->tail.packet.length) { + bytes = krb5_net_write(context, &s->fd, + (char *)s->tail.packet.data + s->tail.packet_off, + s->tail.packet.length - s->tail.packet_off); + if (bytes < 0) + goto err; + s->tail.packet_off += bytes; + if (bytes) + slave_seen(s); + rem = s->tail.packet.length - s->tail.packet_off; + if (rem) + goto ewouldblock; + + krb5_data_free(&s->tail.packet); + s->tail.packet_off = 0; + } + + if (s->tail.dump == NULL) + return 0; + + /* + * We're in the middle of a send_complete() that was interrupted by + * EWOULDBLOCK. Continue the sending of the dump. + */ + ret = krb5_ret_data(s->tail.dump, &data); + if (ret == HEIM_ERR_EOF) { + krb5_storage_free(s->tail.dump); + s->tail.dump = NULL; + s->version = s->tail.vno; + return 0; + } + + if (ret) { + krb5_warn(context, ret, "failed to read entry from dump!"); + } else { + ret = mk_priv_tail(context, s, &data); + krb5_data_free(&data); + if (ret == 0) + continue; + krb5_warn(context, ret, "failed to make and send a KRB-PRIV to %s", + s->name); + } + + slave_dead(context, s); + return ret; + } + + if (ret == 0 && s->tail.dump != NULL) + return EWOULDBLOCK; + +err: + if (errno != EAGAIN && errno != EWOULDBLOCK) { + krb5_warn(context, ret = errno, + "error sending diffs to now-dead slave %s", s->name); + slave_dead(context, s); + return ret; + } + +ewouldblock: + if (verbose) + krb5_warnx(context, "would block writing %llu bytes to slave %s", + (unsigned long long)rem, s->name); + return EWOULDBLOCK; +} + +static int +send_complete(krb5_context context, slave *s, const char *database, + uint32_t current_version, uint32_t oldest_version, + uint32_t initial_log_tstamp) { krb5_error_code ret; krb5_storage *dump = NULL; uint32_t vno = 0; - krb5_data data; int fd = -1; struct stat st; char *dfn; @@ -517,7 +727,6 @@ send_complete (krb5_context context, slave *s, const char *database, * If the current dump has an appropriate version, then we can * break out of the loop and send the file below. */ - if (ret == 0 && vno != 0 && st.st_mtime > initial_log_tstamp && vno >= oldest_version && vno <= current_version) break; @@ -583,38 +792,18 @@ send_complete (krb5_context context, slave *s, const char *database, /* * Leaving the above loop, dump should have a ptr right after the initial * 4 byte DB version number and we should have a shared lock on the file - * (which we may have just created), so we are reading to simply blast + * (which we may have just created), so we are reading to start sending * the data down the wire. + * + * Note: (krb5_storage_from_fd() dup()'s the fd) */ - for (;;) { - ret = krb5_ret_data(dump, &data); - if (ret == HEIM_ERR_EOF) { - ret = 0; /* EOF is not an error, it's success */ - goto done; - } - - if (ret) { - krb5_warn(context, ret, "krb5_ret_data(dump, &data)"); - slave_dead(context, s); - goto done; - } - - ret = krb5_write_priv_message(context, s->ac, &s->fd, &data); - krb5_data_free(&data); - - if (ret) { - krb5_warn (context, ret, "krb5_write_priv_message"); - slave_dead(context, s); - goto done; - } - } + s->tail.dump = dump; + s->tail.vno = vno; + dump = NULL; + ret = send_tail(context, s); done: - if (!ret) { - s->version = vno; - slave_seen(s); - } if (fd != -1) close(fd); if (dump) @@ -633,6 +822,14 @@ send_are_you_there (krb5_context context, slave *s) if (s->flags & (SLAVE_F_DEAD|SLAVE_F_AYT)) return 0; + /* + * Write any remainder of previous write, if we can. If we'd block we'll + * return EWOULDBLOCK. + */ + ret = send_tail(context, s); + if (ret) + return ret; + krb5_warnx(context, "slave %s missing, sending AYT", s->name); s->flags |= SLAVE_F_AYT; @@ -644,232 +841,465 @@ send_are_you_there (krb5_context context, slave *s) if (sp == NULL) { krb5_warnx (context, "are_you_there: krb5_data_alloc"); slave_dead(context, s); - return 1; + return ENOMEM; } ret = krb5_store_uint32(sp, ARE_YOU_THERE); krb5_storage_free (sp); - if (ret == 0) { - ret = krb5_write_priv_message(context, s->ac, &s->fd, &data); + if (ret == 0) + ret = mk_priv_tail(context, s, &data); + if (ret == 0) + ret = send_tail(context, s); + if (ret && ret != EWOULDBLOCK) { + krb5_warn(context, ret, "are_you_there"); + slave_dead(context, s); + } + return ret; +} - if (ret) { - krb5_warn(context, ret, "are_you_there: krb5_write_priv_message"); - slave_dead(context, s); - return 1; - } +static int +diffready(krb5_context context, slave *s) +{ + /* + * Don't send any diffs until slave has sent an I_HAVE telling us the + * initial version number! + */ + if ((s->flags & SLAVE_F_READY) == 0) + return 0; + + if (s->flags & SLAVE_F_DEAD) { + if (verbose) + krb5_warnx(context, "not sending diffs to dead slave %s", s->name); + return 0; } - return 0; + /* Write any remainder of previous write, if we can. */ + if (send_tail(context, s) != 0) + return 0; + + return 1; } static int -send_diffs (kadm5_server_context *server_context, slave *s, int log_fd, - const char *database, uint32_t current_version, - uint32_t current_tstamp) +nodiffs(krb5_context context, slave *s, uint32_t current_version) { - krb5_context context = server_context->context; krb5_storage *sp; - uint32_t ver, initial_version, initial_version2; - uint32_t initial_tstamp, initial_tstamp2; - enum kadm_ops op; - uint32_t len; - off_t right, left; - krb5_ssize_t bytes; krb5_data data; - int ret = 0; + int ret; - if (s->flags & SLAVE_F_DEAD) { - krb5_warnx(context, "not sending diffs to dead slave %s", s->name); + if (s->version < current_version) return 0; - } - if (s->version == current_version) { - char buf[4]; - - sp = krb5_storage_from_mem(buf, 4); - if (sp == NULL) - krb5_errx(context, IPROPD_RESTART, "krb5_storage_from_mem"); - ret = krb5_store_uint32(sp, YOU_HAVE_LAST_VERSION); - krb5_storage_free(sp); - data.data = buf; - data.length = 4; - if (ret == 0) { - ret = krb5_write_priv_message(context, s->ac, &s->fd, &data); - if (ret) { - krb5_warn(context, ret, "send_diffs: failed to send to slave"); - slave_dead(context, s); - } - krb5_warnx(context, "slave %s in sync already at version %ld", - s->name, (long)s->version); - } - return ret; - } + /* + * If we had sent a partial diff, and now they're caught up, then there's + * no more. + */ + s->next_diff.more = 0; if (verbose) - krb5_warnx(context, "sending diffs to live-seeming slave %s", s->name); + krb5_warnx(context, "slave %s version %ld already sent", s->name, + (long)s->version); + sp = krb5_storage_emem(); + if (sp == NULL) + krb5_errx(context, IPROPD_RESTART, "krb5_storage_from_mem"); + + ret = krb5_store_uint32(sp, YOU_HAVE_LAST_VERSION); + if (ret == 0) { + krb5_data_zero(&data); + ret = krb5_storage_to_data(sp, &data); + } + krb5_storage_free(sp); + if (ret == 0) { + ret = mk_priv_tail(context, s, &data); + krb5_data_free(&data); + } + if (ret == 0) + send_tail(context, s); + + return 1; +} + +/* + * Lock the log and return initial version and timestamp + */ +static int +get_first(kadm5_server_context *server_context, int log_fd, + uint32_t *initial_verp, uint32_t *initial_timep) +{ + krb5_context context = server_context->context; + int ret; /* - * XXX The code that makes the diffs should be made a separate function, - * then error handling (send_are_you_there() or slave_dead()) can be done - * here. + * We don't want to perform tight retry loops on log access errors, so on + * error mark the slave dead. The slave reconnect after a delay... */ - if (flock(log_fd, LOCK_SH) == -1) { krb5_warn(context, errno, "could not obtain shared lock on log file"); - send_are_you_there(context, s); - return errno; + return -1; } + ret = kadm5_log_get_version_fd(server_context, log_fd, LOG_VERSION_FIRST, - &initial_version, &initial_tstamp); - sp = kadm5_log_goto_end(server_context, log_fd); - flock(log_fd, LOCK_UN); - if (ret) { - if (sp != NULL) - krb5_storage_free(sp); - krb5_warn(context, ret, "send_diffs: failed to read log"); - send_are_you_there(context, s); - return ret; - } - if (sp == NULL) { - send_are_you_there(context, s); - krb5_warn(context, errno ? errno : EINVAL, - "send_diffs: failed to read log"); - return errno ? errno : EINVAL; - } - /* - * We're not holding any locks here, so we can't prevent truncations. - * - * We protect against this by re-checking that the initial version and - * timestamp are the same before and after this loop. - */ - right = krb5_storage_seek(sp, 0, SEEK_CUR); - if (right == (off_t)-1) { - krb5_storage_free(sp); - send_are_you_there(context, s); - return errno; + initial_verp, initial_timep); + if (ret != 0) { + flock(log_fd, LOCK_UN); + krb5_warnx(context, "could not read initial log entry"); + return -1; } + + return 0; +} + +/*- + * Find the left end of the diffs in the log we want to send. + * + * - On success, return a positive offset to the first new entry, retaining + * a read lock on the log file. + * - On error, return a negative offset, with the lock released. + * - If we simply find no successor entry in the log, return zero + * with the lock released, which indicates that fallback to send_complete() + * is needed. + */ +static off_t +get_left(kadm5_server_context *server_context, slave *s, krb5_storage *sp, + int log_fd, uint32_t current_version, + uint32_t *initial_verp, uint32_t *initial_timep) +{ + krb5_context context = server_context->context; + off_t pos; + off_t left; + int ret; + for (;;) { - ret = kadm5_log_previous (context, sp, &ver, NULL, &op, &len); - if (ret) - krb5_err(context, IPROPD_RESTART, ret, - "send_diffs: failed to find previous entry"); - left = krb5_storage_seek(sp, -16, SEEK_CUR); - if (left == (off_t)-1) { - krb5_storage_free(sp); - send_are_you_there(context, s); - return errno; + uint32_t ver = s->version; + + /* This acquires a read lock on success */ + ret = get_first(server_context, log_fd, + initial_verp, initial_timep); + if (ret != 0) + return -1; + + /* When the slave version is out of range, send the whole database. */ + if (ver == 0 || ver < *initial_verp || ver > current_version) { + flock(log_fd, LOCK_UN); + return 0; } - if (ver == s->version + 1) - break; + + /* Avoid seeking past the last committed record */ + if (kadm5_log_goto_end(server_context, sp) != 0 || + (pos = krb5_storage_seek(sp, 0, SEEK_CUR)) < 0) + goto err; /* - * We don't expect to reach the slave's version, except when it is - * starting empty with the uber record. + * First try to see if we can find it quickly by seeking to the right + * end of the previous diff sent. */ - if (ver == s->version && !(ver == 0 && op == kadm_nop)) { + if (s->next_diff.last_version_sent > 0 && + s->next_diff.off_next_version > 0 && + s->next_diff.off_next_version < pos && + s->next_diff.initial_version == *initial_verp && + s->next_diff.initial_tstamp == *initial_timep) { /* - * This shouldn't happen, but recall we're not holding a lock on - * the log. + * Sanity check that the left version matches what we wanted, the + * log may have been truncated since. */ - krb5_storage_free(sp); - krb5_warnx(context, "iprop log truncated while sending diffs to " - "slave?? ver = %lu", (unsigned long)ver); - send_are_you_there(context, s); - return 0; + left = s->next_diff.off_next_version; + if (krb5_storage_seek(sp, left, SEEK_SET) != left) + goto err; + if (kadm5_log_next(context, sp, &ver, NULL, NULL, NULL) == 0 && + ver == s->next_diff.last_version_sent + 1) + return left; } - /* If we've reached the uber record, send the complete database */ - if (left == 0 || (ver == 0 && op == kadm_nop)) { - krb5_storage_free(sp); - krb5_warnx(context, - "slave %s (version %lu) out of sync with master " - "(first version in log %lu), sending complete database", - s->name, (unsigned long)s->version, (unsigned long)ver); - return send_complete (context, s, database, current_version, ver, - initial_tstamp); - } + if (krb5_storage_seek(sp, pos, SEEK_SET) != pos) + goto err; + + /* + * Drop the lock and try to find the left entry by seeking backward + * from the end of the end of the log. If we succeed, re-acquire the + * lock, update "next_diff", and retry the fast-path. + */ + flock(log_fd, LOCK_UN); + + /* Slow path: seek backwards, entry by entry, from the end */ + for (;;) { + enum kadm_ops op; + uint32_t len; + + ret = kadm5_log_previous(context, sp, &ver, NULL, &op, &len); + if (ret) + return -1; + left = krb5_storage_seek(sp, -16, SEEK_CUR); + if (left < 0) + return left; + if (ver == s->version + 1) + break; + + /* + * We don't expect to reach the slave's version, unless the log + * has been modified after we released the lock. + */ + if (ver == s->version) { + krb5_warnx(context, "iprop log truncated while sending diffs " + "to slave?? ver = %lu", (unsigned long)ver); + return -1; + } + + /* If we've reached the uber record, send the complete database */ + if (left == 0 || (ver == 0 && op == kadm_nop)) + return 0; + } + assert(ver == s->version + 1); + + /* Set up the fast-path pre-conditions */ + s->next_diff.last_version_sent = s->version; + s->next_diff.off_next_version = left; + s->next_diff.initial_version = *initial_verp; + s->next_diff.initial_tstamp = *initial_timep; + + /* + * If we loop then we're hoping to hit the fast path so we can return a + * non-zero, positive left offset with the lock held. + * + * We just updated the fast path pre-conditions, so unless a log + * truncation event happens between the point where we dropped the lock + * and the point where we rearcuire it above, we will hit the fast + * path. + */ } - assert(ver == s->version + 1); + return left; - krb5_warnx(context, - "syncing slave %s from version %lu to version %lu", - s->name, (unsigned long)s->version, - (unsigned long)current_version); + err: + flock(log_fd, LOCK_UN); + return -1; +} - ret = krb5_data_alloc (&data, right - left + 4); - if (ret) { - krb5_storage_free(sp); - krb5_warn (context, ret, "send_diffs: krb5_data_alloc"); - send_are_you_there(context, s); - return 1; +static off_t +get_right(krb5_context context, int log_fd, krb5_storage *sp, + int lastver, slave *s, off_t left, uint32_t *verp) +{ + int ret = 0; + int i = 0; + uint32_t ver = s->version; + off_t right = krb5_storage_seek(sp, left, SEEK_SET); + + if (right <= 0) { + flock(log_fd, LOCK_UN); + return -1; } - bytes = krb5_storage_read(sp, (char *)data.data + 4, data.length - 4); - krb5_storage_free(sp); - if (bytes != data.length - 4) { - krb5_warnx(context, "iprop log truncated while sending diffs to " - "slave?? ver = %lu", (unsigned long)ver); - send_are_you_there(context, s); - return 1; + + /* The "lastver" bound should preclude us reaching EOF */ + for (; ret == 0 && i < SEND_DIFFS_MAX_RECORDS && ver < lastver; ++i) { + uint32_t logver; + + ret = kadm5_log_next(context, sp, &logver, NULL, NULL, NULL); + if (logver != ++ver) + ret = KADM5_LOG_CORRUPT; } - /* - * Check that we have the same log initial version and timestamp now as - * when we dropped the shared lock on the log file! Else we could be - * sending garbage to the slave. - */ - if (flock(log_fd, LOCK_SH) == -1) { - krb5_warn(context, errno, "could not obtain shared lock on log file"); - send_are_you_there(context, s); - return 1; + if (ret == 0) + right = krb5_storage_seek(sp, 0, SEEK_CUR); + else + right = -1; + if (right <= 0) { + flock(log_fd, LOCK_UN); + return -1; } - ret = kadm5_log_get_version_fd(server_context, log_fd, LOG_VERSION_FIRST, - &initial_version2, &initial_tstamp2); - flock(log_fd, LOCK_UN); - if (ret) { - krb5_warn(context, ret, - "send_diffs: failed to read log while producing diffs"); - send_are_you_there(context, s); - return 1; + *verp = ver; + return right; +} + +static void +send_diffs(kadm5_server_context *server_context, slave *s, int log_fd, + const char *database, uint32_t current_version) +{ + krb5_context context = server_context->context; + krb5_storage *sp; + uint32_t initial_version; + uint32_t initial_tstamp; + uint32_t ver; + off_t left = 0; + off_t right = 0; + krb5_ssize_t bytes; + krb5_data data; + int ret = 0; + + if (!diffready(context, s) || nodiffs(context, s, current_version)) + return; + + if (verbose) + krb5_warnx(context, "sending diffs to live-seeming slave %s", s->name); + + sp = krb5_storage_from_fd(log_fd); + if (sp == NULL) + krb5_err(context, IPROPD_RESTART_SLOW, ENOMEM, + "send_diffs: out of memory"); + + left = get_left(server_context, s, sp, log_fd, current_version, + &initial_version, &initial_tstamp); + if (left < 0) { + krb5_storage_free(sp); + slave_dead(context, s); + return; } - if (initial_version != initial_version2 || - initial_tstamp != initial_tstamp2) { - krb5_warn(context, ret, - "send_diffs: log truncated while producing diffs"); - send_are_you_there(context, s); - return 1; + + if (left == 0) { + /* Slave's version is not in the log, fall back on send_complete() */ + krb5_storage_free(sp); + send_complete(context, s, database, current_version, + initial_version, initial_tstamp); + return; } - sp = krb5_storage_from_data (&data); + /* We still hold the read lock, if right > 0 */ + right = get_right(server_context->context, log_fd, sp, current_version, + s, left, &ver); + if (right == left) { + flock(log_fd, LOCK_UN); + krb5_storage_free(sp); + return; + } + if (right < left) { + assert(right < 0); + krb5_storage_free(sp); + slave_dead(context, s); + return; + } + + if (krb5_storage_seek(sp, left, SEEK_SET) != left) { + ret = errno ? errno : EIO; + flock(log_fd, LOCK_UN); + krb5_warn(context, ret, "send_diffs: krb5_storage_seek"); + krb5_storage_free(sp); + slave_dead(context, s); + return; + } + + ret = krb5_data_alloc(&data, right - left + 4); + if (ret) { + flock(log_fd, LOCK_UN); + krb5_warn(context, ret, "send_diffs: krb5_data_alloc"); + krb5_storage_free(sp); + slave_dead(context, s); + return; + } + + bytes = krb5_storage_read(sp, (char *)data.data + 4, data.length - 4); + flock(log_fd, LOCK_UN); + krb5_storage_free(sp); + if (bytes != data.length - 4) + krb5_errx(context, IPROPD_RESTART, "locked log truncated???"); + + sp = krb5_storage_from_data(&data); if (sp == NULL) { - krb5_warnx (context, "send_diffs: krb5_storage_from_data"); - send_are_you_there(context, s); - return 1; + krb5_err(context, IPROPD_RESTART_SLOW, ENOMEM, "out of memory"); + krb5_warnx(context, "send_diffs: krb5_storage_from_data"); + return; } - krb5_store_uint32 (sp, FOR_YOU); + krb5_store_uint32(sp, FOR_YOU); krb5_storage_free(sp); - ret = krb5_write_priv_message(context, s->ac, &s->fd, &data); + ret = mk_priv_tail(context, s, &data); krb5_data_free(&data); + if (ret == 0) { + /* Save the fast-path continuation */ + s->next_diff.last_version_sent = ver; + s->next_diff.off_next_version = right; + s->next_diff.initial_version = initial_version; + s->next_diff.initial_tstamp = initial_tstamp; + s->next_diff.more = ver < current_version; + ret = send_tail(context, s); + + krb5_warnx(context, + "syncing slave %s from version %lu to version %lu", + s->name, (unsigned long)s->version, + (unsigned long)ver); + s->version = ver; + } - if (ret) { - krb5_warn (context, ret, "send_diffs: krb5_write_priv_message"); - slave_dead(context, s); - return 1; + if (ret && ret != EWOULDBLOCK) { + krb5_warn(context, ret, "send_diffs: making or sending " + "KRB-PRIV message"); + slave_dead(context, s); + return; } slave_seen(s); + return; +} + +/* Sensible bound on slave message size */ +#define SLAVE_MSG_MAX 65536 - s->version = current_version; +static int +fill_input(krb5_context context, slave *s) +{ + krb5_error_code ret; - krb5_warnx(context, "slave %s is now up to date (%u)", s->name, s->version); + if (s->input.hlen < 4) { + uint8_t *buf = s->input.header_buf + s->input.hlen; + size_t len = 4 - s->input.hlen; + krb5_ssize_t bytes = krb5_net_read(context, &s->fd, buf, len); + + if (bytes == 0) + return HEIM_ERR_EOF; + if (bytes < 0) { + if (errno == EWOULDBLOCK || errno == EAGAIN) + return EWOULDBLOCK; + return errno ? errno : EIO; + } + s->input.hlen += bytes; + if (bytes < len) + return EWOULDBLOCK; + + buf = s->input.header_buf; + len = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]; + if (len > SLAVE_MSG_MAX) + return EINVAL; + ret = krb5_data_alloc(&s->input.packet, len); + if (ret != 0) + return ret; + } + if (s->input.offset < s->input.packet.length) { + u_char *buf = (u_char *)s->input.packet.data + s->input.offset; + size_t len = s->input.packet.length - s->input.offset; + krb5_ssize_t bytes = krb5_net_read(context, &s->fd, buf, len); + + if (bytes == 0) + return HEIM_ERR_EOF; + if (bytes < 0) { + if (errno == EWOULDBLOCK || errno == EAGAIN) + return EWOULDBLOCK; + return errno ? errno : EIO; + } + s->input.offset += bytes; + if (bytes != len) + return EWOULDBLOCK; + } return 0; } static int -process_msg (kadm5_server_context *server_context, slave *s, int log_fd, - const char *database, uint32_t current_version, - uint32_t current_tstamp) +read_msg(krb5_context context, slave *s, krb5_data *out) +{ + int ret = fill_input(context, s); + + if (ret != 0) + return ret; + + ret = krb5_rd_priv(context, s->ac, &s->input.packet, out, NULL); + + /* Prepare for next packet */ + krb5_data_free(&s->input.packet); + s->input.offset = 0; + s->input.hlen = 0; + + return ret; +} + +static int +process_msg(kadm5_server_context *server_context, slave *s, int log_fd, + const char *database, uint32_t current_version) { krb5_context context = server_context->context; int ret = 0; @@ -877,10 +1307,11 @@ process_msg (kadm5_server_context *server_context, slave *s, int log_fd, krb5_storage *sp; uint32_t tmp; - ret = krb5_read_priv_message(context, s->ac, &s->fd, &out); - if(ret) { - krb5_warn(context, ret, "error reading message from %s", s->name); - return 1; + ret = read_msg(context, s, &out); + if (ret) { + if (ret != EWOULDBLOCK) + krb5_warn(context, ret, "error reading message from %s", s->name); + return ret; } sp = krb5_storage_from_mem(out.data, out.length); @@ -901,25 +1332,48 @@ process_msg (kadm5_server_context *server_context, slave *s, int log_fd, krb5_warnx(context, "process_msg: client send too little I_HAVE data"); break; } - /* new started slave that have old log */ - if (s->version == 0 && tmp != 0) { + /* + * XXX Make the slave send the timestamp as well, and try to get it + * here, and pass it to send_diffs(). + */ + /* + * New slave whose version number we've not yet seen. If the version + * number is zero, the slave has no data, and we'll send a complete + * database (that happens in send_diffs()). Otherwise, we'll record a + * non-zero initial version and attempt an incremental update. + * + * NOTE!: Once the slave is "ready" (its first I_HAVE has conveyed its + * initial version), we MUST NOT update s->version to the slave's + * I_HAVE version, since we may already have sent later updates, and + * MUST NOT send them again, otherwise we can get further and further + * out of sync resending larger and larger diffs. The "not yet ready" + * is an essential precondition for setting s->version to the value + * in the I_HAVE message. This happens only once when the slave + * first connects. + */ + if (!(s->flags & SLAVE_F_READY)) { if (current_version < tmp) { - krb5_warnx(context, "Slave %s (version %u) have later version " - "the master (version %u) OUT OF SYNC", + krb5_warnx(context, "Slave %s (version %u) has later version " + "than the master (version %u) OUT OF SYNC", s->name, tmp, current_version); + /* Force send_complete() */ + tmp = 0; } - if (verbose) - krb5_warnx(context, "slave %s updated from %u to %u", - s->name, s->version, tmp); + /* + * Mark the slave as ready for updates based on incoming signals. + * Prior to the initial I_HAVE, we don't know the slave's version + * number, and MUST not send it anything, since we'll needlessly + * attempt to send the whole database! + */ s->version = tmp; + s->flags |= SLAVE_F_READY; + if (verbose) + krb5_warnx(context, "slave %s ready for updates from version %u", + s->name, tmp); } - if (tmp < s->version) { - krb5_warnx(context, "Slave %s claims to not have " - "version we already sent to it", s->name); - s->version = tmp; - } - ret = send_diffs(server_context, s, log_fd, database, current_version, - current_tstamp); + if ((s->version_ack = tmp) < s->version) + break; + send_diffs(server_context, s, log_fd, database, current_version); break; case I_AM_HERE : if (verbose) @@ -1035,7 +1489,7 @@ write_stats(krb5_context context, slave *slaves, uint32_t current_version) } else rtbl_add_column_entry(tbl, SLAVE_ADDRESS, "<unknown>"); - snprintf(str, sizeof(str), "%u", (unsigned)slaves->version); + snprintf(str, sizeof(str), "%u", (unsigned)slaves->version_ack); rtbl_add_column_entry(tbl, SLAVE_VERSION, str); if (slaves->flags & SLAVE_F_DEAD) @@ -1044,7 +1498,10 @@ write_stats(krb5_context context, slave *slaves, uint32_t current_version) rtbl_add_column_entry(tbl, SLAVE_STATUS, "Up"); ret = krb5_format_time(context, slaves->seen, str, sizeof(str), TRUE); - rtbl_add_column_entry(tbl, SLAVE_SEEN, str); + if (ret) + rtbl_add_column_entry(tbl, SLAVE_SEEN, "<error-formatting-time>"); + else + rtbl_add_column_entry(tbl, SLAVE_SEEN, str); slaves = slaves->next; } @@ -1105,7 +1562,6 @@ main(int argc, char **argv) int log_fd; slave *slaves = NULL; uint32_t current_version = 0, old_version = 0; - uint32_t current_tstamp = 0; krb5_keytab keytab; char **files; int aret; @@ -1198,7 +1654,7 @@ main(int argc, char **argv) krb5_err(context, 1, errno, "shared flock %s", server_context->log_context.log_file); kadm5_log_get_version_fd(server_context, log_fd, LOG_VERSION_LAST, - ¤t_version, ¤t_tstamp); + ¤t_version, NULL); flock(log_fd, LOCK_UN); signal_fd = make_signal_socket (context); @@ -1212,7 +1668,7 @@ main(int argc, char **argv) while (exit_flag == 0){ slave *p; - fd_set readset; + fd_set readset, writeset; int max_fd = 0; struct timeval to = {30, 0}; uint32_t vers; @@ -1225,6 +1681,7 @@ main(int argc, char **argv) #endif FD_ZERO(&readset); + FD_ZERO(&writeset); FD_SET(signal_fd, &readset); max_fd = max(max_fd, signal_fd); FD_SET(listen_fd, &readset); @@ -1238,11 +1695,12 @@ main(int argc, char **argv) if (p->flags & SLAVE_F_DEAD) continue; FD_SET(p->fd, &readset); + if (have_tail(p) || more_diffs(p)) + FD_SET(p->fd, &writeset); max_fd = max(max_fd, p->fd); } - ret = select (max_fd + 1, - &readset, NULL, NULL, &to); + ret = select(max_fd + 1, &readset, &writeset, NULL, &to); if (ret < 0) { if (errno == EINTR) continue; @@ -1260,7 +1718,7 @@ main(int argc, char **argv) log_fd = open(server_context->log_context.log_file, O_RDONLY, 0); if (log_fd < 0) - krb5_err(context, 1, IPROPD_RESTART_SLOW, "open %s", + krb5_err(context, IPROPD_RESTART_SLOW, errno, "open %s", server_context->log_context.log_file); if (fstat(log_fd, &st) == -1) @@ -1271,7 +1729,7 @@ main(int argc, char **argv) krb5_err(context, IPROPD_RESTART, errno, "shared flock %s", server_context->log_context.log_file); kadm5_log_get_version_fd(server_context, log_fd, LOG_VERSION_LAST, - ¤t_version, ¤t_tstamp); + ¤t_version, NULL); flock(log_fd, LOCK_UN); } @@ -1284,19 +1742,20 @@ main(int argc, char **argv) krb5_err(context, IPROPD_RESTART, errno, "could not lock log file"); kadm5_log_get_version_fd(server_context, log_fd, LOG_VERSION_LAST, - ¤t_version, ¤t_tstamp); + ¤t_version, NULL); flock(log_fd, LOCK_UN); if (current_version > old_version) { - krb5_warnx(context, - "Missed a signal, updating slaves %lu to %lu", - (unsigned long)old_version, - (unsigned long)current_version); + if (verbose) + krb5_warnx(context, + "Missed a signal, updating slaves %lu to %lu", + (unsigned long)old_version, + (unsigned long)current_version); for (p = slaves; p != NULL; p = p->next) { if (p->flags & SLAVE_F_DEAD) continue; - send_diffs (server_context, p, log_fd, database, - current_version, current_tstamp); + send_diffs(server_context, p, log_fd, database, + current_version); } old_version = current_version; } @@ -1327,7 +1786,7 @@ main(int argc, char **argv) krb5_err(context, IPROPD_RESTART, errno, "shared flock %s", server_context->log_context.log_file); kadm5_log_get_version_fd(server_context, log_fd, LOG_VERSION_LAST, - ¤t_version, ¤t_tstamp); + ¤t_version, NULL); flock(log_fd, LOCK_UN); if (current_version != old_version) { /* @@ -1342,31 +1801,44 @@ main(int argc, char **argv) * breaking backwards compatibility for the protocol or * adding new messages to it. */ - krb5_warnx(context, - "Got a signal, updating slaves %lu to %lu", - (unsigned long)old_version, - (unsigned long)current_version); + if (verbose) + krb5_warnx(context, + "Got a signal, updating slaves %lu to %lu", + (unsigned long)old_version, + (unsigned long)current_version); for (p = slaves; p != NULL; p = p->next) { if (p->flags & SLAVE_F_DEAD) continue; - send_diffs (server_context, p, log_fd, database, - current_version, current_tstamp); + send_diffs(server_context, p, log_fd, database, + current_version); } } else { - krb5_warnx(context, - "Got a signal, but no update in log version %lu", - (unsigned long)current_version); + if (verbose) + krb5_warnx(context, + "Got a signal, but no update in log version %lu", + (unsigned long)current_version); } } + for (p = slaves; p != NULL; p = p->next) { + if (!(p->flags & SLAVE_F_DEAD) && + FD_ISSET(p->fd, &writeset) && + ((have_tail(p) && send_tail(context, p) == 0) || + (!have_tail(p) && more_diffs(p)))) { + send_diffs(server_context, p, log_fd, database, + current_version); + } + } + for(p = slaves; p != NULL; p = p->next) { if (p->flags & SLAVE_F_DEAD) continue; if (ret && FD_ISSET(p->fd, &readset)) { --ret; assert(ret >= 0); - if(process_msg (server_context, p, log_fd, database, - current_version, current_tstamp)) + ret = process_msg(server_context, p, log_fd, database, + current_version); + if (ret && ret != EWOULDBLOCK) slave_dead(context, p); } else if (slave_gone_p (p)) slave_dead(context, p); diff --git a/lib/kadm5/ipropd_slave.c b/lib/kadm5/ipropd_slave.c index 0ec529ccf1d4..c5c65f6c1834 100644 --- a/lib/kadm5/ipropd_slave.c +++ b/lib/kadm5/ipropd_slave.c @@ -99,6 +99,15 @@ connect_to_master (krb5_context context, const char *master, if (setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one)) < 0) krb5_warn(context, errno, "setsockopt(SO_KEEPALIVE) failed"); + /* + * We write message lengths separately from the payload, avoid Nagle + * delays. + */ +#if defined(IPPROTO_TCP) && defined(TCP_NODELAY) + (void) setsockopt(s, IPPROTO_TCP, TCP_NODELAY, + (void *)&one, sizeof(one)); +#endif + return s; } @@ -1003,11 +1012,14 @@ main(int argc, char **argv) if (verbose) krb5_warnx(context, "master sent us a ping"); is_up_to_date(context, status_file, server_context); - ret = ihave(context, auth_context, master_fd, - server_context->log_context.version); - if (ret) - connected = FALSE; - + /* + * We used to send an I_HAVE here. But the master may send + * ARE_YOU_THERE messages in response to local, possibly- + * transient errors, and if that happens and we respond with an + * I_HAVE then we'll loop hard if the error was not transient. + * + * So we don't ihave() here. + */ send_im_here(context, master_fd, auth_context); break; case YOU_HAVE_LAST_VERSION: diff --git a/lib/kadm5/kadm5-private.h b/lib/kadm5/kadm5-private.h index 3f102fd89878..fb43e5ace3a5 100644 --- a/lib/kadm5/kadm5-private.h +++ b/lib/kadm5/kadm5-private.h @@ -321,10 +321,15 @@ kadm5_log_get_version_fd ( uint32_t */*ver*/, uint32_t */*tstamp*/); -krb5_storage * +kadm5_ret_t kadm5_log_goto_end ( kadm5_server_context */*server_context*/, - int /*fd*/); + krb5_storage */*sp*/); + +kadm5_ret_t +kadm5_log_goto_first ( + kadm5_server_context */*server_context*/, + krb5_storage */*sp*/); kadm5_ret_t kadm5_log_init (kadm5_server_context */*server_context*/); @@ -347,6 +352,15 @@ kadm5_log_modify ( uint32_t /*mask*/); kadm5_ret_t +kadm5_log_next ( + krb5_context /*context*/, + krb5_storage */*sp*/, + uint32_t */*verp*/, + time_t */*tstampp*/, + enum kadm_ops */*opp*/, + uint32_t */*lenp*/); + +kadm5_ret_t kadm5_log_nop ( kadm5_server_context */*context*/, enum kadm_nop_type /*nop_type*/); diff --git a/lib/kadm5/kadm5_locl.h b/lib/kadm5/kadm5_locl.h index 11c3ed1bd201..cb0b1b4cb1a0 100644 --- a/lib/kadm5/kadm5_locl.h +++ b/lib/kadm5/kadm5_locl.h @@ -67,6 +67,12 @@ #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_TCP_H +#include <netinet/tcp.h> +#endif #ifdef HAVE_SYS_UN_H #include <sys/un.h> #endif @@ -74,6 +80,7 @@ #include <netdb.h> #endif #include <fnmatch.h> +#include <krb5_locl.h> #include "admin.h" #include "kadm5_err.h" #include <hdb.h> diff --git a/lib/kadm5/kadm5_pwcheck.cat3 b/lib/kadm5/kadm5_pwcheck.cat3 index c06434683420..6f9f9d367097 100644 --- a/lib/kadm5/kadm5_pwcheck.cat3 +++ b/lib/kadm5/kadm5_pwcheck.cat3 @@ -1,38 +1,37 @@ - KADM5_PWCHECK(3) BSD Library Functions Manual KADM5_PWCHECK(3) -NNAAMMEE - kkrrbb55__ppwwcchheecckk, kkaaddmm55__sseettuupp__ppaasssswwdd__qquuaalliittyy__cchheecckk, - kkaaddmm55__aadddd__ppaasssswwdd__qquuaalliittyy__vveerriiffiieerr, kkaaddmm55__cchheecckk__ppaasssswwoorrdd__qquuaalliittyy -- Heim- +[1mNAME[0m + [1mkrb5_pwcheck[22m, [1mkadm5_setup_passwd_quality_check[22m, + [1mkadm5_add_passwd_quality_verifier[22m, [1mkadm5_check_password_quality [22m-- Heim- dal warning and error functions -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkadm5srv, -lkadm5srv) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkaaddmm55--pprroottooss..hh>> - ##iinncclluuddee <<kkaaddmm55--ppwwcchheecckk..hh>> +[1mSYNOPSIS[0m + [1m#include <kadm5-protos.h>[0m + [1m#include <kadm5-pwcheck.h>[0m - _v_o_i_d - kkaaddmm55__sseettuupp__ppaasssswwdd__qquuaalliittyy__cchheecckk(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _c_o_n_s_t _c_h_a_r _*_c_h_e_c_k___l_i_b_r_a_r_y, _c_o_n_s_t _c_h_a_r _*_c_h_e_c_k___f_u_n_c_t_i_o_n); + [4mvoid[0m + [1mkadm5_setup_passwd_quality_check[22m([4mkrb5_context[24m [4mcontext[24m, + [4mconst[24m [4mchar[24m [4m*check_library[24m, [4mconst[24m [4mchar[24m [4m*check_function[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkaaddmm55__aadddd__ppaasssswwdd__qquuaalliittyy__vveerriiffiieerr(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _c_o_n_s_t _c_h_a_r _*_c_h_e_c_k___l_i_b_r_a_r_y); + [4mkrb5_error_code[0m + [1mkadm5_add_passwd_quality_verifier[22m([4mkrb5_context[24m [4mcontext[24m, + [4mconst[24m [4mchar[24m [4m*check_library[24m); - _c_o_n_s_t _c_h_a_r _* - kkaaddmm55__cchheecckk__ppaasssswwoorrdd__qquuaalliittyy(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l, _k_r_b_5___d_a_t_a _*_p_w_d___d_a_t_a); + [4mconst[24m [4mchar[24m [4m*[0m + [1mkadm5_check_password_quality[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_principal[24m [4mprincipal[24m, [4mkrb5_data[24m [4m*pwd_data[24m); - _i_n_t - ((**kkaaddmm55__ppaasssswwdd__qquuaalliittyy__cchheecckk__ffuunncc))(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l, _k_r_b_5___d_a_t_a _*_p_a_s_s_w_o_r_d, _c_o_n_s_t _c_h_a_r _*_t_u_n_i_n_g, - _c_h_a_r _*_m_e_s_s_a_g_e, _s_i_z_e___t _l_e_n_g_t_h); + [4mint[0m + [1m(*kadm5_passwd_quality_check_func)[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_principal[24m [4mprincipal[24m, [4mkrb5_data[24m [4m*password[24m, [4mconst[24m [4mchar[24m [4m*tuning[24m, + [4mchar[24m [4m*message[24m, [4msize_t[24m [4mlength[24m); -DDEESSCCRRIIPPTTIIOONN - These functions perform the quality check for the heimdal database - library. +[1mDESCRIPTION[0m + These functions perform the quality check for the heimdal database li- + brary. There are two versions of the shared object API; the old version (0) is deprecated, but still supported. The new version (1) supports multiple @@ -40,29 +39,29 @@ DDEESSCCRRIIPPTTIIOONN for details. The password quality checker will run all policies that are configured by - the user. If any policy rejects the password, the password will be - rejected. + the user. If any policy rejects the password, the password will be re- + jected. Policy names are of the form `module-name:policy-name' or, if the the policy name is unique enough, just `policy-name'. -IIMMPPLLEEMMEENNTTIINNGG AA PPAASSSSWWOORRDD QQUUAALLIITTYY CCHHEECCKKIINNGG SSHHAARREEDD OOBBJJEECCTT +[1mIMPLEMENTING A PASSWORD QUALITY CHECKING SHARED OBJECT[0m (This refers to the version 1 API only.) Module shared objects may conveniently be compiled and linked with libtool(1). An object needs to export a symbol called - `kadm5_password_verifier' of the type _s_t_r_u_c_t _k_a_d_m_5___p_w___p_o_l_i_c_y___v_e_r_i_f_i_e_r. + `kadm5_password_verifier' of the type [4mstruct[24m [4mkadm5_pw_policy_verifier[24m. - Its _n_a_m_e and _v_e_n_d_o_r fields should contain the obvious information. _n_a_m_e + Its [4mname[24m and [4mvendor[24m fields should contain the obvious information. [4mname[0m must match the `module-name' portion of the policy name (the part before the colon), if the policy name contains a colon, or the policy will not - be run. _v_e_r_s_i_o_n should be KADM5_PASSWD_VERSION_V1. + be run. [4mversion[24m should be KADM5_PASSWD_VERSION_V1. - _f_u_n_c_s contains an array of _s_t_r_u_c_t _k_a_d_m_5___p_w___p_o_l_i_c_y___c_h_e_c_k___f_u_n_c structures - that is terminated with an entry whose _n_a_m_e component is NULL. The _n_a_m_e + [4mfuncs[24m contains an array of [4mstruct[24m [4mkadm5_pw_policy_check_func[24m structures + that is terminated with an entry whose [4mname[24m component is NULL. The [4mname[0m field of the array must match the `policy-name' portion of a policy name (the part after the colon, or the complete policy name if there is no - colon) specified by the user or the policy will not be run. The _f_u_n_c + colon) specified by the user or the policy will not be run. The [4mfunc[0m fields of the array elements are functions that are exported by the mod- ule to be called to check the password. They get the following argu- ments: the Kerberos context, principal, password, a tuning parameter, @@ -71,18 +70,18 @@ IIMMPPLLEEMMEENNTTIINNGG AA PPAASSSSWWOORRDD QQUUAALLI is acceptable, the function returns zero. Otherwise it returns non-zero and fills in the message buffer with an appropriate explanation. -RRUUNNNNIINNGG TTHHEE CCHHEECCKKSS - kkaaddmm55__sseettuupp__ppaasssswwdd__qquuaalliittyy__cchheecckk sets up type 0 checks. It sets up all +[1mRUNNING THE CHECKS[0m + [1mkadm5_setup_passwd_quality_check [22msets up type 0 checks. It sets up all type 0 checks defined in krb5.conf(5) if called with the last two argu- ments null. - kkaaddmm55__aadddd__ppaasssswwdd__qquuaalliittyy__vveerriiffiieerr sets up type 1 checks. It sets up all + [1mkadm5_add_passwd_quality_verifier [22msets up type 1 checks. It sets up all type 1 tests defined in krb5.conf(5) if called with a null second argu- - ment. kkaaddmm55__cchheecckk__ppaasssswwoorrdd__qquuaalliittyy runs the checks in the order in which + ment. [1mkadm5_check_password_quality [22mruns the checks in the order in which they are defined in krb5.conf(5) and the order in which they occur in a - module's _f_u_n_c_s array until one returns non-zero. + module's [4mfuncs[24m array until one returns non-zero. -SSEEEE AALLSSOO +[1mSEE ALSO[0m libtool(1), krb5(3), krb5.conf(5) HEIMDAL February 29, 2004 HEIMDAL diff --git a/lib/kadm5/libkadm5srv-exports.def b/lib/kadm5/libkadm5srv-exports.def index ecffbb91c48c..7ed0910d0377 100644 --- a/lib/kadm5/libkadm5srv-exports.def +++ b/lib/kadm5/libkadm5srv-exports.def @@ -63,6 +63,7 @@ EXPORTS ;! kadm5_log_signal_socket kadm5_log_signal_socket_info ;! kadm5_log_previous + kadm5_log_goto_first kadm5_log_goto_end kadm5_log_foreach kadm5_log_get_version_fd @@ -75,6 +76,7 @@ EXPORTS kadm5_log_init_nb kadm5_log_init_nolock kadm5_log_init_sharedlock + kadm5_log_next kadm5_log_nop kadm5_log_truncate kadm5_log_modify diff --git a/lib/kadm5/log.c b/lib/kadm5/log.c index a284fd3e5d3c..f005f217858e 100644 --- a/lib/kadm5/log.c +++ b/lib/kadm5/log.c @@ -464,7 +464,6 @@ get_max_log_size(krb5_context context) } static kadm5_ret_t truncate_if_needed(kadm5_server_context *); -static krb5_storage *log_goto_first(kadm5_server_context *, int); /* * Get the version and timestamp metadata of either the first, or last @@ -474,7 +473,7 @@ static krb5_storage *log_goto_first(kadm5_server_context *, int); * uber record which must be 0, or else we need to upgrade the log. * * If `which' is LOG_VERSION_FIRST, then this gets the metadata for the - * logically first entry past the uberblock, or returns HEIM_EOF if + * logically first entry past the uberblock, or returns HEIM_ERR_EOF if * only the uber record is present. * * If `which' is LOG_VERSION_LAST, then this gets metadata for the last @@ -504,37 +503,35 @@ kadm5_log_get_version_fd(kadm5_server_context *server_context, int fd, *ver = 0; *tstamp = 0; + sp = krb5_storage_from_fd(fd); + if (sp == NULL) + return errno ? errno : ENOMEM; + switch (which) { case LOG_VERSION_LAST: - sp = kadm5_log_goto_end(server_context, fd); - if (sp == NULL) - return errno; - ret = get_version_prev(sp, ver, tstamp); - krb5_storage_free(sp); + ret = kadm5_log_goto_end(server_context, sp); + if (ret == 0) + ret = get_version_prev(sp, ver, tstamp); break; case LOG_VERSION_FIRST: - sp = log_goto_first(server_context, fd); - if (sp == NULL) - return errno; - ret = get_header(sp, LOG_DOPEEK, ver, tstamp, NULL, NULL); - krb5_storage_free(sp); + ret = kadm5_log_goto_first(server_context, sp); + if (ret == 0) + ret = get_header(sp, LOG_DOPEEK, ver, tstamp, NULL, NULL); break; case LOG_VERSION_UBER: - sp = krb5_storage_from_fd(server_context->log_context.log_fd); - if (sp == NULL) - return errno; if (krb5_storage_seek(sp, 0, SEEK_SET) == 0) ret = get_header(sp, LOG_DOPEEK, ver, tstamp, &op, &len); else ret = errno; if (ret == 0 && (op != kadm_nop || len != LOG_UBER_LEN || *ver != 0)) ret = KADM5_LOG_NEEDS_UPGRADE; - krb5_storage_free(sp); break; default: - return ENOTSUP; + ret = ENOTSUP; + break; } + krb5_storage_free(sp); return ret; } @@ -1828,12 +1825,14 @@ kadm5_log_recover(kadm5_server_context *context, enum kadm_recover_mode mode) replay_data.ver = 0; replay_data.mode = mode; - sp = kadm5_log_goto_end(context, context->log_context.log_fd); + sp = krb5_storage_from_fd(context->log_context.log_fd); if (sp == NULL) return errno ? errno : EIO; + ret = kadm5_log_goto_end(context, sp); - ret = kadm5_log_foreach(context, kadm_forward | kadm_unconfirmed, - NULL, recover_replay, &replay_data); + if (ret == 0) + ret = kadm5_log_foreach(context, kadm_forward | kadm_unconfirmed, + NULL, recover_replay, &replay_data); if (ret == 0 && mode == kadm_recover_commit && replay_data.count != 1) ret = KADM5_LOG_CORRUPT; krb5_storage_free(sp); @@ -1885,7 +1884,7 @@ kadm5_log_foreach(kadm5_server_context *context, */ sp = krb5_storage_from_fd(fd); if (sp == NULL) - return errno; + return errno ? errno : ENOMEM; log_end = krb5_storage_seek(sp, 0, SEEK_END); if (log_end == -1 || @@ -1896,9 +1895,12 @@ kadm5_log_foreach(kadm5_server_context *context, } } else { /* Get the end of the log based on the uber entry */ - sp = kadm5_log_goto_end(context, fd); + sp = krb5_storage_from_fd(fd); if (sp == NULL) - return errno; + return errno ? errno : ENOMEM; + ret = kadm5_log_goto_end(context, sp); + if (ret != 0) + return ret; log_end = krb5_storage_seek(sp, 0, SEEK_CUR); } @@ -2047,81 +2049,50 @@ kadm5_log_foreach(kadm5_server_context *context, } /* - * Go to the second record, which, if we have an uber record, will be - * the first record. + * Go to the first record, which, if we have an uber record, will be + * the second record. */ -static krb5_storage * -log_goto_first(kadm5_server_context *server_context, int fd) +kadm5_ret_t +kadm5_log_goto_first(kadm5_server_context *server_context, krb5_storage *sp) { - krb5_storage *sp; enum kadm_ops op; uint32_t ver, len; kadm5_ret_t ret; - if (fd == -1) { - errno = EINVAL; - return NULL; - } - - sp = krb5_storage_from_fd(fd); - if (sp == NULL) - return NULL; - if (krb5_storage_seek(sp, 0, SEEK_SET) == -1) - return NULL; + return KADM5_LOG_CORRUPT; ret = get_header(sp, LOG_DOPEEK, &ver, NULL, &op, &len); - if (ret) { - krb5_storage_free(sp); - errno = ret; - return NULL; - } - if (op == kadm_nop && len == LOG_UBER_LEN && seek_next(sp) == -1) { - krb5_storage_free(sp); - return NULL; - } - return sp; + if (ret) + return ret; + if (op == kadm_nop && len == LOG_UBER_LEN && seek_next(sp) == -1) + return KADM5_LOG_CORRUPT; + return 0; } /* * Go to end of log. - * - * XXX This really needs to return a kadm5_ret_t and either output a - * krb5_storage * via an argument, or take one as input. */ - -krb5_storage * -kadm5_log_goto_end(kadm5_server_context *server_context, int fd) +kadm5_ret_t +kadm5_log_goto_end(kadm5_server_context *server_context, krb5_storage *sp) { krb5_error_code ret = 0; - krb5_storage *sp; enum kadm_ops op; uint32_t ver, len; uint32_t tstamp; uint64_t off; - if (fd == -1) { - errno = EINVAL; - return NULL; - } - - sp = krb5_storage_from_fd(fd); - if (sp == NULL) - return NULL; - - if (krb5_storage_seek(sp, 0, SEEK_SET) == -1) { - ret = errno; - goto fail; - } + if (krb5_storage_seek(sp, 0, SEEK_SET) == -1) + return errno; ret = get_header(sp, LOG_NOPEEK, &ver, &tstamp, &op, &len); if (ret == HEIM_ERR_EOF) { (void) krb5_storage_seek(sp, 0, SEEK_SET); - return sp; + return 0; } if (ret == KADM5_LOG_CORRUPT) goto truncate; if (ret) - goto fail; + return ret; if (op == kadm_nop && len == LOG_UBER_LEN) { /* New style log */ @@ -2130,12 +2101,12 @@ kadm5_log_goto_end(kadm5_server_context *server_context, int fd) goto truncate; if (krb5_storage_seek(sp, off, SEEK_SET) == -1) - goto fail; + return ret; if (off >= LOG_UBER_SZ) { ret = get_version_prev(sp, &ver, NULL); if (ret == 0) - return sp; + return 0; } /* Invalid offset in uber entry */ goto truncate; @@ -2153,7 +2124,7 @@ kadm5_log_goto_end(kadm5_server_context *server_context, int fd) ret = get_version_prev(sp, &ver, NULL); if (ret) goto truncate; - return sp; + return 0; truncate: /* If we can, truncate */ @@ -2162,18 +2133,64 @@ truncate: if (ret == 0) { krb5_warn(server_context->context, ret, "Invalid log; truncating to recover"); - if (krb5_storage_seek(sp, 0, SEEK_END) == -1) - return NULL; - return sp; + if (krb5_storage_seek(sp, 0, SEEK_END) >= 0) + return 0; } } + ret = KADM5_LOG_CORRUPT; krb5_warn(server_context->context, ret, "Invalid log; truncate to recover"); + return ret; +} -fail: - errno = ret; - krb5_storage_free(sp); - return NULL; +/* + * Return the next log entry. + * + * The pointer in `sp' is assumed to be at the end of an entry. On success, + * the `sp' pointer is set to the next entry (not the data portion). In case + * of error, it's not changed at all. + */ +kadm5_ret_t +kadm5_log_next(krb5_context context, + krb5_storage *sp, + uint32_t *verp, + time_t *tstampp, + enum kadm_ops *opp, + uint32_t *lenp) +{ + uint32_t len = 0; + uint32_t len2 = 0; + uint32_t ver = verp ? *verp : 0; + uint32_t ver2; + uint32_t tstamp = tstampp ? *tstampp : 0; + enum kadm_ops op = kadm_nop; + off_t off = krb5_storage_seek(sp, 0, SEEK_CUR); + kadm5_ret_t ret = get_header(sp, LOG_NOPEEK, &ver, &tstamp, &op, &len); + + /* Validate the trailer */ + if (ret == 0 && krb5_storage_seek(sp, len, SEEK_CUR) == -1) + ret = errno; + + if (ret == 0) + ret = krb5_ret_uint32(sp, &len2); + if (ret == 0) + ret = krb5_ret_uint32(sp, &ver2); + if (ret == 0 && (len != len2 || ver != ver2)) + ret = KADM5_LOG_CORRUPT; + if (ret != 0) { + (void) krb5_storage_seek(sp, off, SEEK_SET); + return ret; + } + + if (verp) + *verp = ver; + if (tstampp) + *tstampp = tstamp; + if (opp) + *opp = op; + if (lenp) + *lenp = len; + return 0; } /* @@ -2547,11 +2564,15 @@ kadm5_log_truncate(kadm5_server_context *context, size_t keep, size_t maxbytes) /* Done. Now rebuild the log_context state. */ (void) lseek(context->log_context.log_fd, off, SEEK_SET); - sp = kadm5_log_goto_end(context, context->log_context.log_fd); + sp = krb5_storage_from_fd(context->log_context.log_fd); if (sp == NULL) - return ENOMEM; - ret = get_version_prev(sp, &context->log_context.version, &last_tstamp); - context->log_context.last_time = last_tstamp; + return errno ? errno : krb5_enomem(context->context); + ret = kadm5_log_goto_end(context, sp); + if (ret == 0) { + ret = get_version_prev(sp, &context->log_context.version, &last_tstamp); + if (ret == 0) + context->log_context.last_time = last_tstamp; + } krb5_storage_free(sp); return ret; } diff --git a/lib/kadm5/set_keys.c b/lib/kadm5/set_keys.c index c3fcc2e6d700..7a63358ed4fd 100644 --- a/lib/kadm5/set_keys.c +++ b/lib/kadm5/set_keys.c @@ -177,6 +177,8 @@ _kadm5_set_keys2(kadm5_server_context *context, /* A current key; add to current key set */ setup_Key(&key, &salt, key_data, i); ret = add_Keys(&keys, &key); + if (ret) + goto out; continue; } diff --git a/lib/kadm5/test_pw_quality.c b/lib/kadm5/test_pw_quality.c index ebef429c4753..6544afd95422 100644 --- a/lib/kadm5/test_pw_quality.c +++ b/lib/kadm5/test_pw_quality.c @@ -31,10 +31,14 @@ * SUCH DAMAGE. */ -#include "kadm5_locl.h" +#include <string.h> +#include <stdlib.h> #include <getarg.h> -RCSID("$Id$"); +#include <roken.h> +#include <krb5.h> + +#include "admin.h" static int version_flag; static int help_flag; diff --git a/lib/kadm5/version-script.map b/lib/kadm5/version-script.map index cc1282d50f10..8544f4c080de 100644 --- a/lib/kadm5/version-script.map +++ b/lib/kadm5/version-script.map @@ -65,6 +65,7 @@ HEIMDAL_KAMD5_SERVER_1.0 { kadm5_log_signal_master; kadm5_log_signal_socket; kadm5_log_previous; + kadm5_log_goto_first; kadm5_log_goto_end; kadm5_log_foreach; kadm5_log_get_version_fd; @@ -77,6 +78,7 @@ HEIMDAL_KAMD5_SERVER_1.0 { kadm5_log_init_nb; kadm5_log_init_nolock; kadm5_log_init_sharedlock; + kadm5_log_next; kadm5_log_nop; kadm5_log_truncate; kadm5_log_modify; diff --git a/lib/kafs/Makefile.in b/lib/kafs/Makefile.in index 63d0b7184765..398c30d9cdd5 100644 --- a/lib/kafs/Makefile.in +++ b/lib/kafs/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -100,7 +100,6 @@ subdir = lib/kafs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ $(top_srcdir)/cf/auth-modules.m4 \ - $(top_srcdir)/cf/broken-getaddrinfo.m4 \ $(top_srcdir)/cf/broken-glob.m4 \ $(top_srcdir)/cf/broken-realloc.m4 \ $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ @@ -214,7 +213,12 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/afskrb5.Plo ./$(DEPDIR)/afslib.Plo \ + ./$(DEPDIR)/afssys.Plo ./$(DEPDIR)/common.Plo \ + ./$(DEPDIR)/resolve.Plo ./$(DEPDIR)/rxkad_kdf.Plo \ + ./$(DEPDIR)/strlcpy.Plo ./$(DEPDIR)/strsep.Plo \ + ./$(DEPDIR)/strtok_r.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -264,8 +268,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/Makefile.am.common \ $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/depcomp \ @@ -291,9 +293,12 @@ CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLANG_FORMAT = @CLANG_FORMAT@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DB1LIB = @DB1LIB@ DB3LIB = @DB3LIB@ @@ -311,8 +316,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GCD_MIG = @GCD_MIG@ GREP = @GREP@ GROFF = @GROFF@ @@ -421,6 +428,11 @@ PKG_CONFIG = @PKG_CONFIG@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LDADD = @PTHREAD_LDADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -480,9 +492,14 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -584,8 +601,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty): @@ -642,15 +659,21 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/afskrb5.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/afslib.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/afssys.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resolve.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rxkad_kdf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcpy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strsep.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtok_r.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/afskrb5.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/afslib.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/afssys.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resolve.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rxkad_kdf.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcpy.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strsep.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtok_r.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -815,8 +838,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -894,7 +919,15 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/afskrb5.Plo + -rm -f ./$(DEPDIR)/afslib.Plo + -rm -f ./$(DEPDIR)/afssys.Plo + -rm -f ./$(DEPDIR)/common.Plo + -rm -f ./$(DEPDIR)/resolve.Plo + -rm -f ./$(DEPDIR)/rxkad_kdf.Plo + -rm -f ./$(DEPDIR)/strlcpy.Plo + -rm -f ./$(DEPDIR)/strsep.Plo + -rm -f ./$(DEPDIR)/strtok_r.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -941,7 +974,15 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/afskrb5.Plo + -rm -f ./$(DEPDIR)/afslib.Plo + -rm -f ./$(DEPDIR)/afssys.Plo + -rm -f ./$(DEPDIR)/common.Plo + -rm -f ./$(DEPDIR)/resolve.Plo + -rm -f ./$(DEPDIR)/rxkad_kdf.Plo + -rm -f ./$(DEPDIR)/strlcpy.Plo + -rm -f ./$(DEPDIR)/strsep.Plo + -rm -f ./$(DEPDIR)/strtok_r.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -966,8 +1007,8 @@ uninstall-man: uninstall-man3 .MAKE: check-am install-am install-data-am install-strip uninstall-am -.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am \ - check-local clean clean-generic clean-libLTLIBRARIES \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \ + check-am check-local clean clean-generic clean-libLTLIBRARIES \ clean-libtool cscopelist-am ctags ctags-am dist-hook distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ @@ -1066,11 +1107,20 @@ check-local:: test "$$failed" -eq 0 || exit 1; \ fi +# It's useful for debugging to format generated sources. The default for all +# clang-format styles is to sort includes, but in many cases in-tree we really +# don't want to do that. .x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @if [ -z "$(CLANG_FORMAT)" ]; then \ + cmp -s $< $@ 2> /dev/null || cp $< $@; \ + else \ + cp $< $@.tmp.c; \ + $(CLANG_FORMAT) -style='{BasedOnStyle: Chromium, SortIncludes: false}' -i $@.tmp.c; \ + cmp -s $@.tmp.c $@ 2> /dev/null || mv $@.tmp.c $@; \ + fi .hx.h: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @cmp -s $< $@ 2> /dev/null || cp $< $@; #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ diff --git a/lib/kafs/afskrb5.c b/lib/kafs/afskrb5.c index 6033f2958b45..0077016f6242 100644 --- a/lib/kafs/afskrb5.c +++ b/lib/kafs/afskrb5.c @@ -85,8 +85,6 @@ v5_to_kt(krb5_creds *cred, uid_t uid, struct kafs_token *kt, int local524) return ENOMEM; kt->ticket_len = cred->ticket.length; memcpy(kt->ticket, cred->ticket.data, kt->ticket_len); - - ret = 0; } diff --git a/lib/kafs/afssysdefs.h b/lib/kafs/afssysdefs.h index 9143bbdf7ee9..18734e36b557 100644 --- a/lib/kafs/afssysdefs.h +++ b/lib/kafs/afssysdefs.h @@ -104,10 +104,6 @@ #define AFS_SYSCALL 210 #endif -#ifdef __APPLE__ /* MacOS X */ -#define AFS_SYSCALL 230 -#endif - #ifdef SYS_afs_syscall #define AFS_SYSCALL3 SYS_afs_syscall #endif diff --git a/lib/kafs/kafs.cat3 b/lib/kafs/kafs.cat3 index d388e043ed6d..7180273c615a 100644 --- a/lib/kafs/kafs.cat3 +++ b/lib/kafs/kafs.cat3 @@ -1,96 +1,95 @@ - KAFS(3) BSD Library Functions Manual KAFS(3) -NNAAMMEE - kk__hhaassaaffss, kk__hhaassaaffss__rreecchheecckk, kk__ppiiooccttll, kk__uunnlloogg, kk__sseettppaagg, - kk__aaffss__cceellll__ooff__ffiillee, kkaaffss__sseett__vveerrbboossee, kkaaffss__sseettttookkeenn__rrxxkkaadd, kkaaffss__sseettttookkeenn, - kkrrbb__aaffsslloogg, kkrrbb__aaffsslloogg__uuiidd, kkaaffss__sseettttookkeenn55, kkrrbb55__aaffsslloogg, kkrrbb55__aaffsslloogg__uuiidd +[1mNAME[0m + [1mk_hasafs[22m, [1mk_hasafs_recheck[22m, [1mk_pioctl[22m, [1mk_unlog[22m, [1mk_setpag[22m, + [1mk_afs_cell_of_file[22m, [1mkafs_set_verbose[22m, [1mkafs_settoken_rxkad[22m, [1mkafs_settoken[22m, + [1mkrb_afslog[22m, [1mkrb_afslog_uid[22m, [1mkafs_settoken5[22m, [1mkrb5_afslog[22m, [1mkrb5_afslog_uid[0m -- AFS library -LLIIBBRRAARRYY +[1mLIBRARY[0m AFS cache manager access library (libkafs, -lkafs) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkaaffss..hh>> +[1mSYNOPSIS[0m + [1m#include <kafs.h>[0m - _i_n_t - kk__aaffss__cceellll__ooff__ffiillee(_c_o_n_s_t _c_h_a_r _*_p_a_t_h, _c_h_a_r _*_c_e_l_l, _i_n_t _l_e_n); + [4mint[0m + [1mk_afs_cell_of_file[22m([4mconst[24m [4mchar[24m [4m*path[24m, [4mchar[24m [4m*cell[24m, [4mint[24m [4mlen[24m); - _i_n_t - kk__hhaassaaffss(_v_o_i_d); + [4mint[0m + [1mk_hasafs[22m([4mvoid[24m); - _i_n_t - kk__hhaassaaffss__rreecchheecckk(_v_o_i_d); + [4mint[0m + [1mk_hasafs_recheck[22m([4mvoid[24m); - _i_n_t - kk__ppiiooccttll(_c_h_a_r _*_a___p_a_t_h, _i_n_t _o___o_p_c_o_d_e, _s_t_r_u_c_t _V_i_c_e_I_o_c_t_l _*_a___p_a_r_a_m_s_P, - _i_n_t _a___f_o_l_l_o_w_S_y_m_l_i_n_k_s); + [4mint[0m + [1mk_pioctl[22m([4mchar[24m [4m*a_path[24m, [4mint[24m [4mo_opcode[24m, [4mstruct[24m [4mViceIoctl[24m [4m*a_paramsP[24m, + [4mint[24m [4ma_followSymlinks[24m); - _i_n_t - kk__sseettppaagg(_v_o_i_d); + [4mint[0m + [1mk_setpag[22m([4mvoid[24m); - _i_n_t - kk__uunnlloogg(_v_o_i_d); + [4mint[0m + [1mk_unlog[22m([4mvoid[24m); - _v_o_i_d - kkaaffss__sseett__vveerrbboossee(_v_o_i_d _(_*_f_u_n_c_)_(_v_o_i_d _*_, _c_o_n_s_t _c_h_a_r _*_, _i_n_t_), _v_o_i_d _*); + [4mvoid[0m + [1mkafs_set_verbose[22m([4mvoid[24m [4m(*func)(void[24m [4m*,[24m [4mconst[24m [4mchar[24m [4m*,[24m [4mint)[24m, [4mvoid[24m [4m*[24m); - _i_n_t - kkaaffss__sseettttookkeenn__rrxxkkaadd(_c_o_n_s_t _c_h_a_r _*_c_e_l_l, _s_t_r_u_c_t _C_l_e_a_r_T_o_k_e_n _*_t_o_k_e_n, - _v_o_i_d _*_t_i_c_k_e_t, _s_i_z_e___t _t_i_c_k_e_t___l_e_n); + [4mint[0m + [1mkafs_settoken_rxkad[22m([4mconst[24m [4mchar[24m [4m*cell[24m, [4mstruct[24m [4mClearToken[24m [4m*token[24m, + [4mvoid[24m [4m*ticket[24m, [4msize_t[24m [4mticket_len[24m); - _i_n_t - kkaaffss__sseettttookkeenn(_c_o_n_s_t _c_h_a_r _*_c_e_l_l, _u_i_d___t _u_i_d, _C_R_E_D_E_N_T_I_A_L_S _*_c); + [4mint[0m + [1mkafs_settoken[22m([4mconst[24m [4mchar[24m [4m*cell[24m, [4muid_t[24m [4muid[24m, [4mCREDENTIALS[24m [4m*c[24m); - kkrrbb__aaffsslloogg(_c_h_a_r _*_c_e_l_l, _c_h_a_r _*_r_e_a_l_m); + [1mkrb_afslog[22m([4mchar[24m [4m*cell[24m, [4mchar[24m [4m*realm[24m); - _i_n_t - kkrrbb__aaffsslloogg__uuiidd(_c_h_a_r _*_c_e_l_l, _c_h_a_r _*_r_e_a_l_m, _u_i_d___t _u_i_d); + [4mint[0m + [1mkrb_afslog_uid[22m([4mchar[24m [4m*cell[24m, [4mchar[24m [4m*realm[24m, [4muid_t[24m [4muid[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aaffsslloogg__uuiidd(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_c_a_c_h_e _i_d, _c_o_n_s_t _c_h_a_r _*_c_e_l_l, - _k_r_b_5___c_o_n_s_t___r_e_a_l_m _r_e_a_l_m, _u_i_d___t _u_i_d); + [4mkrb5_error_code[0m + [1mkrb5_afslog_uid[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_ccache[24m [4mid[24m, [4mconst[24m [4mchar[24m [4m*cell[24m, + [4mkrb5_const_realm[24m [4mrealm[24m, [4muid_t[24m [4muid[24m); - _i_n_t - kkaaffss__sseettttookkeenn55(_c_o_n_s_t _c_h_a_r _*_c_e_l_l, _u_i_d___t _u_i_d, _k_r_b_5___c_r_e_d_s _*_c); + [4mint[0m + [1mkafs_settoken5[22m([4mconst[24m [4mchar[24m [4m*cell[24m, [4muid_t[24m [4muid[24m, [4mkrb5_creds[24m [4m*c[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aaffsslloogg(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_c_a_c_h_e _i_d, _c_o_n_s_t _c_h_a_r _*_c_e_l_l, - _k_r_b_5___c_o_n_s_t___r_e_a_l_m _r_e_a_l_m); + [4mkrb5_error_code[0m + [1mkrb5_afslog[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_ccache[24m [4mid[24m, [4mconst[24m [4mchar[24m [4m*cell[24m, + [4mkrb5_const_realm[24m [4mrealm[24m); -DDEESSCCRRIIPPTTIIOONN - kk__hhaassaaffss() initializes some library internal structures, and tests for +[1mDESCRIPTION[0m + [1mk_hasafs[22m() initializes some library internal structures, and tests for the presence of AFS in the kernel, none of the other functions should be - called before kk__hhaassaaffss() is called, or if it fails. + called before [1mk_hasafs[22m() is called, or if it fails. - kk__hhaassaaffss__rreecchheecckk() forces a recheck if a AFS client has started since - last time kk__hhaassaaffss() or kk__hhaassaaffss__rreecchheecckk() was called. + [1mk_hasafs_recheck[22m() forces a recheck if a AFS client has started since + last time [1mk_hasafs[22m() or [1mk_hasafs_recheck[22m() was called. - kkaaffss__sseett__vveerrbboossee() set a log function that will be called each time the + [1mkafs_set_verbose[22m() set a log function that will be called each time the kafs library does something important so that the application using libkafs can output verbose logging. Calling the function - _k_a_f_s___s_e_t___v_e_r_b_o_s_e with the function argument set to NULL will stop libkafs + [4mkafs_set_verbose[24m with the function argument set to NULL will stop libkafs from calling the logging function (if set). - kkaaffss__sseettttookkeenn__rrxxkkaadd() set rxkad with the _t_o_k_e_n and _t_i_c_k_e_t (that have the - length _t_i_c_k_e_t___l_e_n) for a given _c_e_l_l. + [1mkafs_settoken_rxkad[22m() set rxkad with the [4mtoken[24m and [4mticket[24m (that have the + length [4mticket_len[24m) for a given [4mcell[24m. - kkaaffss__sseettttookkeenn() and kkaaffss__sseettttookkeenn55() work the same way as - kkaaffss__sseettttookkeenn__rrxxkkaadd() but internally converts the Kerberos 4 or 5 creden- + [1mkafs_settoken[22m() and [1mkafs_settoken5[22m() work the same way as + [1mkafs_settoken_rxkad[22m() but internally converts the Kerberos 4 or 5 creden- tial to a afs cleartoken and ticket. - kkrrbb__aaffsslloogg(), and kkrrbb__aaffsslloogg__uuiidd() obtains new tokens (and possibly tick- - ets) for the specified _c_e_l_l and _r_e_a_l_m. If _c_e_l_l is NULL, the local cell - is used. If _r_e_a_l_m is NULL, the function tries to guess what realm to use. + [1mkrb_afslog[22m(), and [1mkrb_afslog_uid[22m() obtains new tokens (and possibly tick- + ets) for the specified [4mcell[24m and [4mrealm[24m. If [4mcell[24m is NULL, the local cell + is used. If [4mrealm[24m is NULL, the function tries to guess what realm to use. Unless you have some good knowledge of what cell or realm to use, you - should pass NULL. kkrrbb__aaffsslloogg() will use the real user-id for the ViceId - field in the token, kkrrbb__aaffsslloogg__uuiidd() will use _u_i_d. + should pass NULL. [1mkrb_afslog[22m() will use the real user-id for the ViceId + field in the token, [1mkrb_afslog_uid[22m() will use [4muid[24m. - kkrrbb55__aaffsslloogg(), and kkrrbb55__aaffsslloogg__uuiidd() are the Kerberos 5 equivalents of - kkrrbb__aaffsslloogg(), and kkrrbb__aaffsslloogg__uuiidd(). + [1mkrb5_afslog[22m(), and [1mkrb5_afslog_uid[22m() are the Kerberos 5 equivalents of + [1mkrb_afslog[22m(), and [1mkrb_afslog_uid[22m(). - kkrrbb55__aaffsslloogg(), kkaaffss__sseettttookkeenn55() can be configured to behave differently - via a kkrrbb55__aappppddeeffaauulltt option afs-use-524 in _k_r_b_5_._c_o_n_f. Possible values + [1mkrb5_afslog[22m(), [1mkafs_settoken5[22m() can be configured to behave differently + via a [1mkrb5_appdefault [22moption afs-use-524 in [4mkrb5.conf[24m. Possible values for afs-use-524 are: yes use the 524 server in the realm to convert the ticket @@ -110,39 +109,39 @@ DDEESSCCRRIIPPTTIIOONN afs-use-524 = yes libkafs will use the libkafs as application name when running the - kkrrbb55__aappppddeeffaauulltt function call. + [1mkrb5_appdefault [22mfunction call. - The (uppercased) cell name is used as the realm to the kkrrbb55__aappppddeeffaauulltt - ffuunnccttiioonn.. + The (uppercased) cell name is used as the realm to the [1mkrb5_appdefault[0m + [1mfunction.[0m - kk__aaffss__cceellll__ooff__ffiillee() will in _c_e_l_l return the cell of a specified file, no - more than _l_e_n characters is put in _c_e_l_l. + [1mk_afs_cell_of_file[22m() will in [4mcell[24m return the cell of a specified file, no + more than [4mlen[24m characters is put in [4mcell[24m. - kk__ppiiooccttll() does a ppiiooccttll() system call with the specified arguments. This - function is equivalent to llppiiooccttll(). + [1mk_pioctl[22m() does a [1mpioctl[22m() system call with the specified arguments. This + function is equivalent to [1mlpioctl[22m(). - kk__sseettppaagg() initializes a new PAG. + [1mk_setpag[22m() initializes a new PAG. - kk__uunnlloogg() removes destroys all tokens in the current PAG. + [1mk_unlog[22m() removes destroys all tokens in the current PAG. -RREETTUURRNN VVAALLUUEESS - kk__hhaassaaffss() returns 1 if AFS is present in the kernel, 0 otherwise. - kkrrbb__aaffsslloogg() and kkrrbb__aaffsslloogg__uuiidd() returns 0 on success, or a Kerberos - error number on failure. kk__aaffss__cceellll__ooff__ffiillee(), kk__ppiiooccttll(), kk__sseettppaagg(), - and kk__uunnlloogg() all return the value of the underlaying system call, 0 on - success. +[1mRETURN VALUES[0m + [1mk_hasafs[22m() returns 1 if AFS is present in the kernel, 0 otherwise. + [1mkrb_afslog[22m() and [1mkrb_afslog_uid[22m() returns 0 on success, or a Kerberos er- + ror number on failure. [1mk_afs_cell_of_file[22m(), [1mk_pioctl[22m(), [1mk_setpag[22m(), and + [1mk_unlog[22m() all return the value of the underlaying system call, 0 on suc- + cess. -EENNVVIIRROONNMMEENNTT - The following environment variable affect the mode of operation of kkaaffss: +[1mENVIRONMENT[0m + The following environment variable affect the mode of operation of [1mkafs[22m: - AFS_SYSCALL Normally, kkaaffss will try to figure out the correct system + AFS_SYSCALL Normally, [1mkafs [22mwill try to figure out the correct system call(s) that are used by AFS by itself. If it does not man- age to do that, or does it incorrectly, you can set this variable to the system call number or list of system call numbers that should be used. -EEXXAAMMPPLLEESS - The following code from llooggiinn will obtain a new PAG and tokens for the +[1mEXAMPLES[0m + The following code from [1mlogin [22mwill obtain a new PAG and tokens for the local cell and the cell of the users home directory. if (k_hasafs()) { @@ -153,23 +152,23 @@ EEXXAAMMPPLLEESS krb_afslog(NULL, NULL); } -EERRRROORRSS - If any of these functions (apart from kk__hhaassaaffss()) is called without AFS +[1mERRORS[0m + If any of these functions (apart from [1mk_hasafs[22m()) is called without AFS being present in the kernel, the process will usually (depending on the operating system) receive a SIGSYS signal. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5_appdefault(3), krb5.conf(5) - Transarc Corporation, "File Server/Cache Manager Interface", _A_F_S_-_3 - _P_r_o_g_r_a_m_m_e_r_'_s _R_e_f_e_r_e_n_c_e, 1991. + Transarc Corporation, "File Server/Cache Manager Interface", [4mAFS-3[0m + [4mProgrammer's[24m [4mReference[24m, 1991. -FFIILLEESS - libkafs will search for _T_h_i_s_C_e_l_l _a_n_d _T_h_e_s_e_C_e_l_l_s in the following loca- - tions: _/_u_s_r_/_v_i_c_e_/_e_t_c, _/_e_t_c_/_o_p_e_n_a_f_s, _/_v_a_r_/_d_b_/_o_p_e_n_a_f_s_/_e_t_c, _/_u_s_r_/_a_r_l_a_/_e_t_c, - _/_e_t_c_/_a_r_l_a, and _/_e_t_c_/_a_f_s +[1mFILES[0m + libkafs will search for [4mThisCell[24m [4mand[24m [4mTheseCells[24m in the following loca- + tions: [4m/usr/vice/etc[24m, [4m/etc/openafs[24m, [4m/var/db/openafs/etc[24m, [4m/usr/arla/etc[24m, + [4m/etc/arla[24m, and [4m/etc/afs[0m -BBUUGGSS +[1mBUGS[0m AFS_SYSCALL has no effect under AIX. HEIMDAL May 1, 2006 HEIMDAL diff --git a/lib/kafs/rxkad_kdf.c b/lib/kafs/rxkad_kdf.c index 21dd3543d836..174fa3a6189a 100644 --- a/lib/kafs/rxkad_kdf.c +++ b/lib/kafs/rxkad_kdf.c @@ -37,6 +37,7 @@ * SUCH DAMAGE. */ +#define HC_DEPRECATED_CRYPTO #include "kafs_locl.h" static int rxkad_derive_des_key(const void *, size_t, char[8]); diff --git a/lib/kdfs/Makefile.in b/lib/kdfs/Makefile.in index b9579b318707..20498539f4a6 100644 --- a/lib/kdfs/Makefile.in +++ b/lib/kdfs/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -98,7 +98,6 @@ subdir = lib/kdfs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ $(top_srcdir)/cf/auth-modules.m4 \ - $(top_srcdir)/cf/broken-getaddrinfo.m4 \ $(top_srcdir)/cf/broken-glob.m4 \ $(top_srcdir)/cf/broken-realloc.m4 \ $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ @@ -199,7 +198,8 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/k5dfspag.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -243,8 +243,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/Makefile.am.common \ $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/depcomp \ @@ -270,9 +268,12 @@ CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLANG_FORMAT = @CLANG_FORMAT@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DB1LIB = @DB1LIB@ DB3LIB = @DB3LIB@ @@ -290,8 +291,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GCD_MIG = @GCD_MIG@ GREP = @GREP@ GROFF = @GROFF@ @@ -400,6 +403,11 @@ PKG_CONFIG = @PKG_CONFIG@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LDADD = @PTHREAD_LDADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -459,9 +467,14 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -529,8 +542,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty): @@ -587,7 +600,13 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/k5dfspag.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/k5dfspag.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -667,8 +686,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -745,7 +766,7 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/k5dfspag.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -792,7 +813,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/k5dfspag.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -814,8 +835,8 @@ uninstall-am: uninstall-libLTLIBRARIES $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: check-am install-am install-data-am install-strip uninstall-am -.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am \ - check-local clean clean-generic clean-libLTLIBRARIES \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \ + check-am check-local clean clean-generic clean-libLTLIBRARIES \ clean-libtool cscopelist-am ctags ctags-am dist-hook distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ @@ -912,11 +933,20 @@ check-local:: test "$$failed" -eq 0 || exit 1; \ fi +# It's useful for debugging to format generated sources. The default for all +# clang-format styles is to sort includes, but in many cases in-tree we really +# don't want to do that. .x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @if [ -z "$(CLANG_FORMAT)" ]; then \ + cmp -s $< $@ 2> /dev/null || cp $< $@; \ + else \ + cp $< $@.tmp.c; \ + $(CLANG_FORMAT) -style='{BasedOnStyle: Chromium, SortIncludes: false}' -i $@.tmp.c; \ + cmp -s $@.tmp.c $@ 2> /dev/null || mv $@.tmp.c $@; \ + fi .hx.h: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @cmp -s $< $@ 2> /dev/null || cp $< $@; #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ diff --git a/lib/krb5/Makefile.in b/lib/krb5/Makefile.in index 8107e6bcd60e..cc7f98b0d8ab 100644 --- a/lib/krb5/Makefile.in +++ b/lib/krb5/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -121,7 +121,6 @@ subdir = lib/krb5 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ $(top_srcdir)/cf/auth-modules.m4 \ - $(top_srcdir)/cf/broken-getaddrinfo.m4 \ $(top_srcdir)/cf/broken-glob.m4 \ $(top_srcdir)/cf/broken-realloc.m4 \ $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ @@ -171,6 +170,23 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \ + "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" \ + "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)" \ + "$(DESTDIR)$(includedir)" "$(DESTDIR)$(krb5dir)" \ + "$(DESTDIR)$(includedir)" +am__EXEEXT_1 = aes-test$(EXEEXT) derived-key-test$(EXEEXT) \ + n-fold-test$(EXEEXT) parse-name-test$(EXEEXT) \ + pseudo-random-test$(EXEEXT) store-test$(EXEEXT) \ + string-to-key-test$(EXEEXT) test_acl$(EXEEXT) \ + test_addr$(EXEEXT) test_cc$(EXEEXT) test_config$(EXEEXT) \ + test_fx$(EXEEXT) test_prf$(EXEEXT) test_store$(EXEEXT) \ + test_crypto_wrapping$(EXEEXT) test_keytab$(EXEEXT) \ + test_mem$(EXEEXT) test_pac$(EXEEXT) test_plugin$(EXEEXT) \ + test_princ$(EXEEXT) test_pkinit_dh2key$(EXEEXT) \ + test_pknistkdf$(EXEEXT) test_time$(EXEEXT) \ + test_expand_toks$(EXEEXT) test_x500$(EXEEXT) +PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -198,11 +214,6 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" \ - "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(krb5dir)" \ - "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = @have_scc_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) @@ -302,18 +313,6 @@ am_librfc3961_la_OBJECTS = librfc3961_la-crc.lo \ librfc3961_la-salt-des3.lo librfc3961_la-sp800-108-kdf.lo \ librfc3961_la-store-int.lo librfc3961_la-warn.lo librfc3961_la_OBJECTS = $(am_librfc3961_la_OBJECTS) -am__EXEEXT_1 = aes-test$(EXEEXT) derived-key-test$(EXEEXT) \ - n-fold-test$(EXEEXT) parse-name-test$(EXEEXT) \ - pseudo-random-test$(EXEEXT) store-test$(EXEEXT) \ - string-to-key-test$(EXEEXT) test_acl$(EXEEXT) \ - test_addr$(EXEEXT) test_cc$(EXEEXT) test_config$(EXEEXT) \ - test_fx$(EXEEXT) test_prf$(EXEEXT) test_store$(EXEEXT) \ - test_crypto_wrapping$(EXEEXT) test_keytab$(EXEEXT) \ - test_mem$(EXEEXT) test_pac$(EXEEXT) test_plugin$(EXEEXT) \ - test_princ$(EXEEXT) test_pkinit_dh2key$(EXEEXT) \ - test_pknistkdf$(EXEEXT) test_time$(EXEEXT) \ - test_expand_toks$(EXEEXT) test_x500$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) aes_test_SOURCES = aes-test.c aes_test_OBJECTS = aes-test.$(OBJEXT) aes_test_LDADD = $(LDADD) @@ -599,7 +598,185 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/aes-test.Po \ + ./$(DEPDIR)/derived-key-test.Po ./$(DEPDIR)/krbhst-test.Po \ + ./$(DEPDIR)/libkrb5_la-acache.Plo \ + ./$(DEPDIR)/libkrb5_la-acl.Plo \ + ./$(DEPDIR)/libkrb5_la-add_et_list.Plo \ + ./$(DEPDIR)/libkrb5_la-addr_families.Plo \ + ./$(DEPDIR)/libkrb5_la-aname_to_localname.Plo \ + ./$(DEPDIR)/libkrb5_la-appdefault.Plo \ + ./$(DEPDIR)/libkrb5_la-asn1_glue.Plo \ + ./$(DEPDIR)/libkrb5_la-auth_context.Plo \ + ./$(DEPDIR)/libkrb5_la-build_ap_req.Plo \ + ./$(DEPDIR)/libkrb5_la-build_auth.Plo \ + ./$(DEPDIR)/libkrb5_la-cache.Plo \ + ./$(DEPDIR)/libkrb5_la-changepw.Plo \ + ./$(DEPDIR)/libkrb5_la-codec.Plo \ + ./$(DEPDIR)/libkrb5_la-config_file.Plo \ + ./$(DEPDIR)/libkrb5_la-constants.Plo \ + ./$(DEPDIR)/libkrb5_la-context.Plo \ + ./$(DEPDIR)/libkrb5_la-convert_creds.Plo \ + ./$(DEPDIR)/libkrb5_la-copy_host_realm.Plo \ + ./$(DEPDIR)/libkrb5_la-crc.Plo \ + ./$(DEPDIR)/libkrb5_la-creds.Plo \ + ./$(DEPDIR)/libkrb5_la-crypto-aes-sha1.Plo \ + ./$(DEPDIR)/libkrb5_la-crypto-aes-sha2.Plo \ + ./$(DEPDIR)/libkrb5_la-crypto-algs.Plo \ + ./$(DEPDIR)/libkrb5_la-crypto-arcfour.Plo \ + ./$(DEPDIR)/libkrb5_la-crypto-des-common.Plo \ + ./$(DEPDIR)/libkrb5_la-crypto-des.Plo \ + ./$(DEPDIR)/libkrb5_la-crypto-des3.Plo \ + ./$(DEPDIR)/libkrb5_la-crypto-evp.Plo \ + ./$(DEPDIR)/libkrb5_la-crypto-null.Plo \ + ./$(DEPDIR)/libkrb5_la-crypto-pk.Plo \ + ./$(DEPDIR)/libkrb5_la-crypto-rand.Plo \ + ./$(DEPDIR)/libkrb5_la-crypto.Plo \ + ./$(DEPDIR)/libkrb5_la-data.Plo \ + ./$(DEPDIR)/libkrb5_la-db_plugin.Plo \ + ./$(DEPDIR)/libkrb5_la-dcache.Plo \ + ./$(DEPDIR)/libkrb5_la-deprecated.Plo \ + ./$(DEPDIR)/libkrb5_la-digest.Plo \ + ./$(DEPDIR)/libkrb5_la-doxygen.Plo \ + ./$(DEPDIR)/libkrb5_la-eai_to_heim_errno.Plo \ + ./$(DEPDIR)/libkrb5_la-enomem.Plo \ + ./$(DEPDIR)/libkrb5_la-error_string.Plo \ + ./$(DEPDIR)/libkrb5_la-expand_hostname.Plo \ + ./$(DEPDIR)/libkrb5_la-expand_path.Plo \ + ./$(DEPDIR)/libkrb5_la-fast.Plo \ + ./$(DEPDIR)/libkrb5_la-fcache.Plo \ + ./$(DEPDIR)/libkrb5_la-free.Plo \ + ./$(DEPDIR)/libkrb5_la-free_host_realm.Plo \ + ./$(DEPDIR)/libkrb5_la-generate_seq_number.Plo \ + ./$(DEPDIR)/libkrb5_la-generate_subkey.Plo \ + ./$(DEPDIR)/libkrb5_la-get_addrs.Plo \ + ./$(DEPDIR)/libkrb5_la-get_cred.Plo \ + ./$(DEPDIR)/libkrb5_la-get_default_principal.Plo \ + ./$(DEPDIR)/libkrb5_la-get_default_realm.Plo \ + ./$(DEPDIR)/libkrb5_la-get_for_creds.Plo \ + ./$(DEPDIR)/libkrb5_la-get_host_realm.Plo \ + ./$(DEPDIR)/libkrb5_la-get_in_tkt.Plo \ + ./$(DEPDIR)/libkrb5_la-get_port.Plo \ + ./$(DEPDIR)/libkrb5_la-heim_err.Plo \ + ./$(DEPDIR)/libkrb5_la-init_creds.Plo \ + ./$(DEPDIR)/libkrb5_la-init_creds_pw.Plo \ + ./$(DEPDIR)/libkrb5_la-k524_err.Plo \ + ./$(DEPDIR)/libkrb5_la-kcm.Plo \ + ./$(DEPDIR)/libkrb5_la-keyblock.Plo \ + ./$(DEPDIR)/libkrb5_la-keytab.Plo \ + ./$(DEPDIR)/libkrb5_la-keytab_any.Plo \ + ./$(DEPDIR)/libkrb5_la-keytab_file.Plo \ + ./$(DEPDIR)/libkrb5_la-keytab_keyfile.Plo \ + ./$(DEPDIR)/libkrb5_la-keytab_memory.Plo \ + ./$(DEPDIR)/libkrb5_la-krb5_err.Plo \ + ./$(DEPDIR)/libkrb5_la-krb_err.Plo \ + ./$(DEPDIR)/libkrb5_la-krbhst.Plo \ + ./$(DEPDIR)/libkrb5_la-kuserok.Plo \ + ./$(DEPDIR)/libkrb5_la-log.Plo \ + ./$(DEPDIR)/libkrb5_la-mcache.Plo \ + ./$(DEPDIR)/libkrb5_la-misc.Plo \ + ./$(DEPDIR)/libkrb5_la-mit_glue.Plo \ + ./$(DEPDIR)/libkrb5_la-mk_error.Plo \ + ./$(DEPDIR)/libkrb5_la-mk_priv.Plo \ + ./$(DEPDIR)/libkrb5_la-mk_rep.Plo \ + ./$(DEPDIR)/libkrb5_la-mk_req.Plo \ + ./$(DEPDIR)/libkrb5_la-mk_req_ext.Plo \ + ./$(DEPDIR)/libkrb5_la-mk_safe.Plo \ + ./$(DEPDIR)/libkrb5_la-n-fold.Plo \ + ./$(DEPDIR)/libkrb5_la-net_read.Plo \ + ./$(DEPDIR)/libkrb5_la-net_write.Plo \ + ./$(DEPDIR)/libkrb5_la-pac.Plo \ + ./$(DEPDIR)/libkrb5_la-padata.Plo \ + ./$(DEPDIR)/libkrb5_la-pcache.Plo \ + ./$(DEPDIR)/libkrb5_la-pkinit-ec.Plo \ + ./$(DEPDIR)/libkrb5_la-pkinit.Plo \ + ./$(DEPDIR)/libkrb5_la-plugin.Plo \ + ./$(DEPDIR)/libkrb5_la-principal.Plo \ + ./$(DEPDIR)/libkrb5_la-prog_setup.Plo \ + ./$(DEPDIR)/libkrb5_la-prompter_posix.Plo \ + ./$(DEPDIR)/libkrb5_la-rd_cred.Plo \ + ./$(DEPDIR)/libkrb5_la-rd_error.Plo \ + ./$(DEPDIR)/libkrb5_la-rd_priv.Plo \ + ./$(DEPDIR)/libkrb5_la-rd_rep.Plo \ + ./$(DEPDIR)/libkrb5_la-rd_req.Plo \ + ./$(DEPDIR)/libkrb5_la-rd_safe.Plo \ + ./$(DEPDIR)/libkrb5_la-read_message.Plo \ + ./$(DEPDIR)/libkrb5_la-recvauth.Plo \ + ./$(DEPDIR)/libkrb5_la-replay.Plo \ + ./$(DEPDIR)/libkrb5_la-salt-aes-sha1.Plo \ + ./$(DEPDIR)/libkrb5_la-salt-aes-sha2.Plo \ + ./$(DEPDIR)/libkrb5_la-salt-arcfour.Plo \ + ./$(DEPDIR)/libkrb5_la-salt-des.Plo \ + ./$(DEPDIR)/libkrb5_la-salt-des3.Plo \ + ./$(DEPDIR)/libkrb5_la-salt.Plo \ + ./$(DEPDIR)/libkrb5_la-scache.Plo \ + ./$(DEPDIR)/libkrb5_la-send_to_kdc.Plo \ + ./$(DEPDIR)/libkrb5_la-sendauth.Plo \ + ./$(DEPDIR)/libkrb5_la-set_default_realm.Plo \ + ./$(DEPDIR)/libkrb5_la-sock_principal.Plo \ + ./$(DEPDIR)/libkrb5_la-sp800-108-kdf.Plo \ + ./$(DEPDIR)/libkrb5_la-store-int.Plo \ + ./$(DEPDIR)/libkrb5_la-store.Plo \ + ./$(DEPDIR)/libkrb5_la-store_emem.Plo \ + ./$(DEPDIR)/libkrb5_la-store_fd.Plo \ + ./$(DEPDIR)/libkrb5_la-store_mem.Plo \ + ./$(DEPDIR)/libkrb5_la-store_sock.Plo \ + ./$(DEPDIR)/libkrb5_la-ticket.Plo \ + ./$(DEPDIR)/libkrb5_la-time.Plo \ + ./$(DEPDIR)/libkrb5_la-transited.Plo \ + ./$(DEPDIR)/libkrb5_la-verify_init.Plo \ + ./$(DEPDIR)/libkrb5_la-verify_user.Plo \ + ./$(DEPDIR)/libkrb5_la-version.Plo \ + ./$(DEPDIR)/libkrb5_la-warn.Plo \ + ./$(DEPDIR)/libkrb5_la-write_message.Plo \ + ./$(DEPDIR)/librfc3961_la-crc.Plo \ + ./$(DEPDIR)/librfc3961_la-crypto-aes-sha1.Plo \ + ./$(DEPDIR)/librfc3961_la-crypto-aes-sha2.Plo \ + ./$(DEPDIR)/librfc3961_la-crypto-algs.Plo \ + ./$(DEPDIR)/librfc3961_la-crypto-arcfour.Plo \ + ./$(DEPDIR)/librfc3961_la-crypto-des-common.Plo \ + ./$(DEPDIR)/librfc3961_la-crypto-des.Plo \ + ./$(DEPDIR)/librfc3961_la-crypto-des3.Plo \ + ./$(DEPDIR)/librfc3961_la-crypto-evp.Plo \ + ./$(DEPDIR)/librfc3961_la-crypto-null.Plo \ + ./$(DEPDIR)/librfc3961_la-crypto-pk.Plo \ + ./$(DEPDIR)/librfc3961_la-crypto-rand.Plo \ + ./$(DEPDIR)/librfc3961_la-crypto-stubs.Plo \ + ./$(DEPDIR)/librfc3961_la-crypto.Plo \ + ./$(DEPDIR)/librfc3961_la-data.Plo \ + ./$(DEPDIR)/librfc3961_la-enomem.Plo \ + ./$(DEPDIR)/librfc3961_la-error_string.Plo \ + ./$(DEPDIR)/librfc3961_la-keyblock.Plo \ + ./$(DEPDIR)/librfc3961_la-n-fold.Plo \ + ./$(DEPDIR)/librfc3961_la-salt-aes-sha1.Plo \ + ./$(DEPDIR)/librfc3961_la-salt-aes-sha2.Plo \ + ./$(DEPDIR)/librfc3961_la-salt-arcfour.Plo \ + ./$(DEPDIR)/librfc3961_la-salt-des.Plo \ + ./$(DEPDIR)/librfc3961_la-salt-des3.Plo \ + ./$(DEPDIR)/librfc3961_la-salt.Plo \ + ./$(DEPDIR)/librfc3961_la-sp800-108-kdf.Plo \ + ./$(DEPDIR)/librfc3961_la-store-int.Plo \ + ./$(DEPDIR)/librfc3961_la-warn.Plo ./$(DEPDIR)/n-fold-test.Po \ + ./$(DEPDIR)/parse-name-test.Po \ + ./$(DEPDIR)/pseudo-random-test.Po ./$(DEPDIR)/store-test.Po \ + ./$(DEPDIR)/string-to-key-test.Po ./$(DEPDIR)/test_acl.Po \ + ./$(DEPDIR)/test_addr.Po ./$(DEPDIR)/test_alname.Po \ + ./$(DEPDIR)/test_ap-req.Po ./$(DEPDIR)/test_canon.Po \ + ./$(DEPDIR)/test_cc.Po ./$(DEPDIR)/test_config.Po \ + ./$(DEPDIR)/test_crypto.Po ./$(DEPDIR)/test_crypto_wrapping.Po \ + ./$(DEPDIR)/test_expand_toks.Po ./$(DEPDIR)/test_forward.Po \ + ./$(DEPDIR)/test_fx.Po ./$(DEPDIR)/test_get_addrs.Po \ + ./$(DEPDIR)/test_gic.Po ./$(DEPDIR)/test_hostname.Po \ + ./$(DEPDIR)/test_keytab.Po ./$(DEPDIR)/test_kuserok.Po \ + ./$(DEPDIR)/test_mem.Po ./$(DEPDIR)/test_pac.Po \ + ./$(DEPDIR)/test_pkinit_dh2key.Po \ + ./$(DEPDIR)/test_pknistkdf.Po ./$(DEPDIR)/test_plugin.Po \ + ./$(DEPDIR)/test_prf.Po ./$(DEPDIR)/test_princ.Po \ + ./$(DEPDIR)/test_renew.Po ./$(DEPDIR)/test_rfc3961.Po \ + ./$(DEPDIR)/test_set_kvno0.Po ./$(DEPDIR)/test_store.Po \ + ./$(DEPDIR)/test_time.Po ./$(DEPDIR)/test_x500.Po \ + ./$(DEPDIR)/verify_krb5_conf.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -672,8 +849,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no @@ -829,6 +1004,7 @@ am__set_TESTS_bases = \ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck TEST_SUITE_LOG = test-suite.log @@ -876,9 +1052,12 @@ CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLANG_FORMAT = @CLANG_FORMAT@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DB1LIB = @DB1LIB@ DB3LIB = @DB3LIB@ @@ -896,8 +1075,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GCD_MIG = @GCD_MIG@ GREP = @GREP@ GROFF = @GROFF@ @@ -1006,6 +1187,11 @@ PKG_CONFIG = @PKG_CONFIG@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LDADD = @PTHREAD_LDADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -1065,9 +1251,14 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1457,8 +1648,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty): @@ -1470,58 +1661,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): - -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -libkrb5.la: $(libkrb5_la_OBJECTS) $(libkrb5_la_DEPENDENCIES) $(EXTRA_libkrb5_la_DEPENDENCIES) - $(AM_V_CCLD)$(libkrb5_la_LINK) -rpath $(libdir) $(libkrb5_la_OBJECTS) $(libkrb5_la_LIBADD) $(LIBS) - -librfc3961.la: $(librfc3961_la_OBJECTS) $(librfc3961_la_DEPENDENCIES) $(EXTRA_librfc3961_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(librfc3961_la_OBJECTS) $(librfc3961_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ @@ -1590,6 +1729,58 @@ clean-noinstPROGRAMS: echo " rm -f" $$list; \ rm -f $$list +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libkrb5.la: $(libkrb5_la_OBJECTS) $(libkrb5_la_DEPENDENCIES) $(EXTRA_libkrb5_la_DEPENDENCIES) + $(AM_V_CCLD)$(libkrb5_la_LINK) -rpath $(libdir) $(libkrb5_la_OBJECTS) $(libkrb5_la_LIBADD) $(LIBS) + +librfc3961.la: $(librfc3961_la_OBJECTS) $(librfc3961_la_DEPENDENCIES) $(EXTRA_librfc3961_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(librfc3961_la_OBJECTS) $(librfc3961_la_LIBADD) $(LIBS) + aes-test$(EXEEXT): $(aes_test_OBJECTS) $(aes_test_DEPENDENCIES) $(EXTRA_aes_test_DEPENDENCIES) @rm -f aes-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(aes_test_OBJECTS) $(aes_test_LDADD) $(LIBS) @@ -1752,202 +1943,208 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aes-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/derived-key-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krbhst-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-acache.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-acl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-add_et_list.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-addr_families.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-aname_to_localname.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-appdefault.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-asn1_glue.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-auth_context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-build_ap_req.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-build_auth.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-cache.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-changepw.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-codec.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-config_file.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-constants.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-context.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-convert_creds.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-copy_host_realm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-creds.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-aes-sha1.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-aes-sha2.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-algs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-arcfour.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-des-common.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-des.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-des3.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-evp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-null.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-pk.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-rand.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-data.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-db_plugin.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-dcache.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-deprecated.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-digest.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-doxygen.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-eai_to_heim_errno.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-enomem.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-error_string.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-expand_hostname.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-expand_path.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-fast.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-fcache.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-free.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-free_host_realm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-generate_seq_number.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-generate_subkey.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-get_addrs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-get_cred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-get_default_principal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-get_default_realm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-get_for_creds.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-get_host_realm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-get_in_tkt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-get_port.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-heim_err.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-init_creds.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-init_creds_pw.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-k524_err.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-kcm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-keyblock.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-keytab.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-keytab_any.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-keytab_file.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-keytab_keyfile.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-keytab_memory.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-krb5_err.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-krb_err.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-krbhst.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-kuserok.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-log.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-mcache.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-misc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-mit_glue.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-mk_error.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-mk_priv.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-mk_rep.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-mk_req.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-mk_req_ext.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-mk_safe.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-n-fold.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-net_read.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-net_write.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-pac.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-padata.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-pcache.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-pkinit-ec.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-pkinit.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-plugin.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-principal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-prog_setup.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-prompter_posix.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-rd_cred.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-rd_error.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-rd_priv.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-rd_rep.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-rd_req.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-rd_safe.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-read_message.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-recvauth.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-replay.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-salt-aes-sha1.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-salt-aes-sha2.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-salt-arcfour.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-salt-des.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-salt-des3.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-salt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-scache.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-send_to_kdc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-sendauth.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-set_default_realm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-sock_principal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-sp800-108-kdf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-store-int.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-store.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-store_emem.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-store_fd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-store_mem.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-store_sock.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-ticket.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-time.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-transited.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-verify_init.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-verify_user.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-version.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-warn.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-write_message.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-aes-sha1.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-aes-sha2.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-algs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-arcfour.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-des-common.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-des.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-des3.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-evp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-null.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-pk.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-rand.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-stubs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-data.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-enomem.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-error_string.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-keyblock.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-n-fold.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-salt-aes-sha1.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-salt-aes-sha2.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-salt-arcfour.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-salt-des.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-salt-des3.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-salt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-sp800-108-kdf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-store-int.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-warn.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/n-fold-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-name-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pseudo-random-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/store-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string-to-key-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_acl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_addr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_alname.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ap-req.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_canon.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_config.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_crypto.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_crypto_wrapping.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_expand_toks.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_forward.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_fx.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_get_addrs.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gic.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_hostname.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_keytab.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_kuserok.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_mem.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_pac.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_pkinit_dh2key.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_pknistkdf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_plugin.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_prf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_princ.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_renew.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_rfc3961.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_set_kvno0.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_store.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_time.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_x500.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/verify_krb5_conf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aes-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/derived-key-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krbhst-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-acache.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-acl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-add_et_list.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-addr_families.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-aname_to_localname.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-appdefault.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-asn1_glue.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-auth_context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-build_ap_req.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-build_auth.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-cache.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-changepw.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-codec.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-config_file.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-constants.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-context.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-convert_creds.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-copy_host_realm.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crc.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-creds.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-aes-sha1.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-aes-sha2.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-algs.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-arcfour.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-des-common.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-des.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-des3.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-evp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-null.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-pk.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto-rand.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-crypto.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-data.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-db_plugin.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-dcache.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-deprecated.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-digest.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-doxygen.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-eai_to_heim_errno.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-enomem.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-error_string.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-expand_hostname.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-expand_path.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-fast.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-fcache.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-free.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-free_host_realm.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-generate_seq_number.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-generate_subkey.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-get_addrs.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-get_cred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-get_default_principal.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-get_default_realm.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-get_for_creds.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-get_host_realm.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-get_in_tkt.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-get_port.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-heim_err.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-init_creds.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-init_creds_pw.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-k524_err.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-kcm.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-keyblock.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-keytab.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-keytab_any.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-keytab_file.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-keytab_keyfile.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-keytab_memory.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-krb5_err.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-krb_err.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-krbhst.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-kuserok.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-log.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-mcache.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-misc.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-mit_glue.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-mk_error.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-mk_priv.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-mk_rep.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-mk_req.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-mk_req_ext.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-mk_safe.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-n-fold.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-net_read.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-net_write.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-pac.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-padata.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-pcache.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-pkinit-ec.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-pkinit.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-plugin.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-principal.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-prog_setup.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-prompter_posix.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-rd_cred.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-rd_error.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-rd_priv.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-rd_rep.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-rd_req.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-rd_safe.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-read_message.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-recvauth.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-replay.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-salt-aes-sha1.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-salt-aes-sha2.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-salt-arcfour.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-salt-des.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-salt-des3.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-salt.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-scache.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-send_to_kdc.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-sendauth.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-set_default_realm.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-sock_principal.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-sp800-108-kdf.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-store-int.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-store.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-store_emem.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-store_fd.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-store_mem.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-store_sock.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-ticket.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-time.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-transited.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-verify_init.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-verify_user.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-version.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-warn.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkrb5_la-write_message.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crc.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-aes-sha1.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-aes-sha2.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-algs.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-arcfour.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-des-common.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-des.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-des3.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-evp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-null.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-pk.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-rand.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto-stubs.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-crypto.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-data.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-enomem.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-error_string.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-keyblock.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-n-fold.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-salt-aes-sha1.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-salt-aes-sha2.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-salt-arcfour.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-salt-des.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-salt-des3.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-salt.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-sp800-108-kdf.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-store-int.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/librfc3961_la-warn.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/n-fold-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-name-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pseudo-random-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/store-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string-to-key-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_acl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_addr.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_alname.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ap-req.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_canon.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_config.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_crypto.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_crypto_wrapping.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_expand_toks.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_forward.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_fx.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_get_addrs.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gic.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_hostname.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_keytab.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_kuserok.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_mem.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_pac.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_pkinit_dh2key.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_pknistkdf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_plugin.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_prf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_princ.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_renew.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_rfc3961.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_set_kvno0.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_store.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_time.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_x500.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/verify_krb5_conf.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -3469,7 +3666,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ @@ -3482,7 +3679,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: $(check_PROGRAMS) $(check_DATA) @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -3692,8 +3889,10 @@ test_x500.log: test_x500$(EXEEXT) @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -3730,12 +3929,14 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_DATA) $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) \ +all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(MANS) $(HEADERS) \ all-local install-binPROGRAMS: install-libLTLIBRARIES +install-checkPROGRAMS: install-libLTLIBRARIES + installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(krb5dir)" "$(DESTDIR)$(includedir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(krb5dir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -3779,7 +3980,202 @@ clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/aes-test.Po + -rm -f ./$(DEPDIR)/derived-key-test.Po + -rm -f ./$(DEPDIR)/krbhst-test.Po + -rm -f ./$(DEPDIR)/libkrb5_la-acache.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-acl.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-add_et_list.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-addr_families.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-aname_to_localname.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-appdefault.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-asn1_glue.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-auth_context.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-build_ap_req.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-build_auth.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-cache.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-changepw.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-codec.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-config_file.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-constants.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-context.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-convert_creds.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-copy_host_realm.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crc.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-creds.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-aes-sha1.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-aes-sha2.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-algs.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-arcfour.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-des-common.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-des.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-des3.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-evp.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-null.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-pk.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-rand.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-data.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-db_plugin.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-dcache.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-deprecated.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-digest.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-doxygen.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-eai_to_heim_errno.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-enomem.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-error_string.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-expand_hostname.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-expand_path.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-fast.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-fcache.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-free.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-free_host_realm.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-generate_seq_number.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-generate_subkey.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-get_addrs.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-get_cred.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-get_default_principal.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-get_default_realm.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-get_for_creds.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-get_host_realm.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-get_in_tkt.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-get_port.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-heim_err.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-init_creds.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-init_creds_pw.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-k524_err.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-kcm.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-keyblock.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-keytab.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-keytab_any.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-keytab_file.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-keytab_keyfile.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-keytab_memory.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-krb5_err.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-krb_err.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-krbhst.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-kuserok.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-log.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-mcache.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-misc.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-mit_glue.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-mk_error.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-mk_priv.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-mk_rep.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-mk_req.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-mk_req_ext.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-mk_safe.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-n-fold.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-net_read.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-net_write.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-pac.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-padata.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-pcache.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-pkinit-ec.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-pkinit.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-plugin.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-principal.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-prog_setup.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-prompter_posix.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-rd_cred.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-rd_error.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-rd_priv.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-rd_rep.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-rd_req.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-rd_safe.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-read_message.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-recvauth.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-replay.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-salt-aes-sha1.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-salt-aes-sha2.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-salt-arcfour.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-salt-des.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-salt-des3.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-salt.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-scache.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-send_to_kdc.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-sendauth.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-set_default_realm.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-sock_principal.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-sp800-108-kdf.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-store-int.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-store.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-store_emem.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-store_fd.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-store_mem.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-store_sock.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-ticket.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-time.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-transited.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-verify_init.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-verify_user.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-version.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-warn.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-write_message.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crc.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-aes-sha1.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-aes-sha2.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-algs.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-arcfour.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-des-common.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-des.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-des3.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-evp.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-null.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-pk.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-rand.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-stubs.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-data.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-enomem.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-error_string.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-keyblock.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-n-fold.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-salt-aes-sha1.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-salt-aes-sha2.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-salt-arcfour.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-salt-des.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-salt-des3.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-salt.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-sp800-108-kdf.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-store-int.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-warn.Plo + -rm -f ./$(DEPDIR)/n-fold-test.Po + -rm -f ./$(DEPDIR)/parse-name-test.Po + -rm -f ./$(DEPDIR)/pseudo-random-test.Po + -rm -f ./$(DEPDIR)/store-test.Po + -rm -f ./$(DEPDIR)/string-to-key-test.Po + -rm -f ./$(DEPDIR)/test_acl.Po + -rm -f ./$(DEPDIR)/test_addr.Po + -rm -f ./$(DEPDIR)/test_alname.Po + -rm -f ./$(DEPDIR)/test_ap-req.Po + -rm -f ./$(DEPDIR)/test_canon.Po + -rm -f ./$(DEPDIR)/test_cc.Po + -rm -f ./$(DEPDIR)/test_config.Po + -rm -f ./$(DEPDIR)/test_crypto.Po + -rm -f ./$(DEPDIR)/test_crypto_wrapping.Po + -rm -f ./$(DEPDIR)/test_expand_toks.Po + -rm -f ./$(DEPDIR)/test_forward.Po + -rm -f ./$(DEPDIR)/test_fx.Po + -rm -f ./$(DEPDIR)/test_get_addrs.Po + -rm -f ./$(DEPDIR)/test_gic.Po + -rm -f ./$(DEPDIR)/test_hostname.Po + -rm -f ./$(DEPDIR)/test_keytab.Po + -rm -f ./$(DEPDIR)/test_kuserok.Po + -rm -f ./$(DEPDIR)/test_mem.Po + -rm -f ./$(DEPDIR)/test_pac.Po + -rm -f ./$(DEPDIR)/test_pkinit_dh2key.Po + -rm -f ./$(DEPDIR)/test_pknistkdf.Po + -rm -f ./$(DEPDIR)/test_plugin.Po + -rm -f ./$(DEPDIR)/test_prf.Po + -rm -f ./$(DEPDIR)/test_princ.Po + -rm -f ./$(DEPDIR)/test_renew.Po + -rm -f ./$(DEPDIR)/test_rfc3961.Po + -rm -f ./$(DEPDIR)/test_set_kvno0.Po + -rm -f ./$(DEPDIR)/test_store.Po + -rm -f ./$(DEPDIR)/test_time.Po + -rm -f ./$(DEPDIR)/test_x500.Po + -rm -f ./$(DEPDIR)/verify_krb5_conf.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -3828,7 +4224,202 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/aes-test.Po + -rm -f ./$(DEPDIR)/derived-key-test.Po + -rm -f ./$(DEPDIR)/krbhst-test.Po + -rm -f ./$(DEPDIR)/libkrb5_la-acache.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-acl.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-add_et_list.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-addr_families.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-aname_to_localname.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-appdefault.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-asn1_glue.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-auth_context.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-build_ap_req.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-build_auth.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-cache.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-changepw.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-codec.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-config_file.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-constants.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-context.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-convert_creds.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-copy_host_realm.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crc.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-creds.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-aes-sha1.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-aes-sha2.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-algs.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-arcfour.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-des-common.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-des.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-des3.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-evp.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-null.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-pk.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto-rand.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-crypto.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-data.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-db_plugin.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-dcache.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-deprecated.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-digest.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-doxygen.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-eai_to_heim_errno.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-enomem.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-error_string.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-expand_hostname.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-expand_path.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-fast.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-fcache.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-free.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-free_host_realm.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-generate_seq_number.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-generate_subkey.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-get_addrs.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-get_cred.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-get_default_principal.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-get_default_realm.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-get_for_creds.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-get_host_realm.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-get_in_tkt.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-get_port.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-heim_err.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-init_creds.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-init_creds_pw.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-k524_err.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-kcm.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-keyblock.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-keytab.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-keytab_any.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-keytab_file.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-keytab_keyfile.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-keytab_memory.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-krb5_err.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-krb_err.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-krbhst.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-kuserok.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-log.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-mcache.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-misc.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-mit_glue.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-mk_error.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-mk_priv.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-mk_rep.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-mk_req.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-mk_req_ext.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-mk_safe.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-n-fold.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-net_read.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-net_write.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-pac.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-padata.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-pcache.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-pkinit-ec.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-pkinit.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-plugin.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-principal.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-prog_setup.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-prompter_posix.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-rd_cred.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-rd_error.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-rd_priv.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-rd_rep.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-rd_req.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-rd_safe.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-read_message.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-recvauth.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-replay.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-salt-aes-sha1.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-salt-aes-sha2.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-salt-arcfour.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-salt-des.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-salt-des3.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-salt.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-scache.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-send_to_kdc.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-sendauth.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-set_default_realm.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-sock_principal.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-sp800-108-kdf.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-store-int.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-store.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-store_emem.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-store_fd.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-store_mem.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-store_sock.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-ticket.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-time.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-transited.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-verify_init.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-verify_user.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-version.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-warn.Plo + -rm -f ./$(DEPDIR)/libkrb5_la-write_message.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crc.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-aes-sha1.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-aes-sha2.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-algs.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-arcfour.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-des-common.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-des.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-des3.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-evp.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-null.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-pk.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-rand.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto-stubs.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-crypto.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-data.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-enomem.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-error_string.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-keyblock.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-n-fold.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-salt-aes-sha1.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-salt-aes-sha2.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-salt-arcfour.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-salt-des.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-salt-des3.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-salt.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-sp800-108-kdf.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-store-int.Plo + -rm -f ./$(DEPDIR)/librfc3961_la-warn.Plo + -rm -f ./$(DEPDIR)/n-fold-test.Po + -rm -f ./$(DEPDIR)/parse-name-test.Po + -rm -f ./$(DEPDIR)/pseudo-random-test.Po + -rm -f ./$(DEPDIR)/store-test.Po + -rm -f ./$(DEPDIR)/string-to-key-test.Po + -rm -f ./$(DEPDIR)/test_acl.Po + -rm -f ./$(DEPDIR)/test_addr.Po + -rm -f ./$(DEPDIR)/test_alname.Po + -rm -f ./$(DEPDIR)/test_ap-req.Po + -rm -f ./$(DEPDIR)/test_canon.Po + -rm -f ./$(DEPDIR)/test_cc.Po + -rm -f ./$(DEPDIR)/test_config.Po + -rm -f ./$(DEPDIR)/test_crypto.Po + -rm -f ./$(DEPDIR)/test_crypto_wrapping.Po + -rm -f ./$(DEPDIR)/test_expand_toks.Po + -rm -f ./$(DEPDIR)/test_forward.Po + -rm -f ./$(DEPDIR)/test_fx.Po + -rm -f ./$(DEPDIR)/test_get_addrs.Po + -rm -f ./$(DEPDIR)/test_gic.Po + -rm -f ./$(DEPDIR)/test_hostname.Po + -rm -f ./$(DEPDIR)/test_keytab.Po + -rm -f ./$(DEPDIR)/test_kuserok.Po + -rm -f ./$(DEPDIR)/test_mem.Po + -rm -f ./$(DEPDIR)/test_pac.Po + -rm -f ./$(DEPDIR)/test_pkinit_dh2key.Po + -rm -f ./$(DEPDIR)/test_pknistkdf.Po + -rm -f ./$(DEPDIR)/test_plugin.Po + -rm -f ./$(DEPDIR)/test_prf.Po + -rm -f ./$(DEPDIR)/test_princ.Po + -rm -f ./$(DEPDIR)/test_renew.Po + -rm -f ./$(DEPDIR)/test_rfc3961.Po + -rm -f ./$(DEPDIR)/test_set_kvno0.Po + -rm -f ./$(DEPDIR)/test_store.Po + -rm -f ./$(DEPDIR)/test_time.Po + -rm -f ./$(DEPDIR)/test_x500.Po + -rm -f ./$(DEPDIR)/verify_krb5_conf.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -3855,8 +4446,8 @@ uninstall-man: uninstall-man3 uninstall-man5 uninstall-man7 \ .MAKE: check-am install-am install-data-am install-strip uninstall-am -.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \ - check-am check-local clean clean-binPROGRAMS \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \ + check-TESTS check-am check-local clean clean-binPROGRAMS \ clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ cscopelist-am ctags ctags-am dist-hook distclean \ @@ -3960,11 +4551,20 @@ check-local:: test "$$failed" -eq 0 || exit 1; \ fi +# It's useful for debugging to format generated sources. The default for all +# clang-format styles is to sort includes, but in many cases in-tree we really +# don't want to do that. .x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @if [ -z "$(CLANG_FORMAT)" ]; then \ + cmp -s $< $@ 2> /dev/null || cp $< $@; \ + else \ + cp $< $@.tmp.c; \ + $(CLANG_FORMAT) -style='{BasedOnStyle: Chromium, SortIncludes: false}' -i $@.tmp.c; \ + cmp -s $@.tmp.c $@ 2> /dev/null || mv $@.tmp.c $@; \ + fi .hx.h: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @cmp -s $< $@ 2> /dev/null || cp $< $@; #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ diff --git a/lib/krb5/acl.c b/lib/krb5/acl.c index 90c91e661c0d..4365a7a0f5d8 100644 --- a/lib/krb5/acl.c +++ b/lib/krb5/acl.c @@ -246,7 +246,7 @@ krb5_acl_match_file(krb5_context context, ...) { krb5_error_code ret; - struct acl_field *acl; + struct acl_field *acl = NULL; char buf[256]; va_list ap; FILE *f; diff --git a/lib/krb5/addr_families.c b/lib/krb5/addr_families.c index 7ac0fa93f9d5..16fe4a8c1e46 100644 --- a/lib/krb5/addr_families.c +++ b/lib/krb5/addr_families.c @@ -525,7 +525,7 @@ arange_parse_addr (krb5_context context, return ret; } - if(high.len != 1 && high.val[0].addr_type != low.val[0].addr_type) { + if(high.len != 1 || high.val[0].addr_type != low.val[0].addr_type) { krb5_free_addresses(context, &low); krb5_free_addresses(context, &high); return -1; diff --git a/lib/krb5/aes-test.c b/lib/krb5/aes-test.c index 7bca78ab6068..5526b910fe4f 100644 --- a/lib/krb5/aes-test.c +++ b/lib/krb5/aes-test.c @@ -328,7 +328,8 @@ krb_enc(krb5_context context, } if (decrypt.length != clear->length || - memcmp(decrypt.data, clear->data, decrypt.length) != 0) { + (decrypt.length && + memcmp(decrypt.data, clear->data, decrypt.length) != 0)) { krb5_warnx(context, "clear text not same"); return EINVAL; } @@ -568,7 +569,8 @@ krb_enc_mit(krb5_context context, return ret; if (decrypt.length != clear->length || - memcmp(decrypt.data, clear->data, decrypt.length) != 0) { + (decrypt.length && + memcmp(decrypt.data, clear->data, decrypt.length) != 0)) { krb5_warnx(context, "clear text not same"); return EINVAL; } diff --git a/lib/krb5/config_file.c b/lib/krb5/config_file.c index b9e40666620b..6293bd72ddb9 100644 --- a/lib/krb5/config_file.c +++ b/lib/krb5/config_file.c @@ -353,6 +353,9 @@ krb5_config_parse_debug (struct fileptr *f, char buf[KRB5_BUFSIZ]; krb5_error_code ret; + *lineno = 0; + *err_message = ""; + while (config_fgets(buf, sizeof(buf), f) != NULL) { char *p; diff --git a/lib/krb5/context.c b/lib/krb5/context.c index 5660f7f36b9b..58ed4761056f 100644 --- a/lib/krb5/context.c +++ b/lib/krb5/context.c @@ -101,7 +101,7 @@ init_context_from_config_file(krb5_context context) krb5_error_code ret; const char * tmp; char **s; - krb5_enctype *tmptypes; + krb5_enctype *tmptypes = NULL; INIT_FIELD(context, time, max_skew, 5 * 60, "clockskew"); INIT_FIELD(context, time, kdc_timeout, 30, "kdc_timeout"); diff --git a/lib/krb5/crypto.h b/lib/krb5/crypto.h index 6b0fe8d85aab..ede0338442ec 100644 --- a/lib/krb5/crypto.h +++ b/lib/krb5/crypto.h @@ -130,9 +130,9 @@ struct _krb5_encryption_type { krb5_crypto, const krb5_data *, krb5_data *); }; -#define ENCRYPTION_USAGE(U) (((U) << 8) | 0xAA) -#define INTEGRITY_USAGE(U) (((U) << 8) | 0x55) -#define CHECKSUM_USAGE(U) (((U) << 8) | 0x99) +#define ENCRYPTION_USAGE(U) ((int32_t)((((uint32_t)(U)) << 8)) | 0xAA) +#define INTEGRITY_USAGE(U) ((int32_t)((((uint32_t)(U)) << 8)) | 0x55) +#define CHECKSUM_USAGE(U) ((int32_t)((((uint32_t)(U)) << 8)) | 0x99) /* Checksums */ diff --git a/lib/krb5/deprecated.c b/lib/krb5/deprecated.c index 5530e841b3b9..0871aaf71db3 100644 --- a/lib/krb5/deprecated.c +++ b/lib/krb5/deprecated.c @@ -324,15 +324,13 @@ krb5_keytab_key_proc (krb5_context context, ret = krb5_kt_get_entry (context, real_keytab, principal, 0, enctype, &entry); + if (ret == 0) { + ret = krb5_copy_keyblock (context, &entry.keyblock, key); + krb5_kt_free_entry(context, &entry); + } if (keytab == NULL) krb5_kt_close (context, real_keytab); - - if (ret) - return ret; - - ret = krb5_copy_keyblock (context, &entry.keyblock, key); - krb5_kt_free_entry(context, &entry); return ret; } diff --git a/lib/krb5/enomem.c b/lib/krb5/enomem.c index 0e67fa8794c2..7f0aaeb35f83 100644 --- a/lib/krb5/enomem.c +++ b/lib/krb5/enomem.c @@ -33,10 +33,10 @@ #include "krb5_locl.h" +#undef krb5_enomem krb5_error_code krb5_enomem(krb5_context context) { krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", "")); return ENOMEM; } - diff --git a/lib/krb5/get_cred.c b/lib/krb5/get_cred.c index b5dae62b0210..70b3e5f41447 100644 --- a/lib/krb5/get_cred.c +++ b/lib/krb5/get_cred.c @@ -420,7 +420,7 @@ get_cred_kdc(krb5_context context, TGS_REQ req; krb5_data enc; krb5_data resp; - krb5_kdc_rep rep; + krb5_kdc_rep rep = {0}; KRB_ERROR error; krb5_error_code ret; unsigned nonce; @@ -540,7 +540,6 @@ get_cred_kdc(krb5_context context, if(ret) goto out; - memset(&rep, 0, sizeof(rep)); if(decode_TGS_REP(resp.data, resp.length, &rep.kdc_rep, &len) == 0) { unsigned eflags = 0; @@ -684,15 +683,16 @@ static int not_found(krb5_context context, krb5_const_principal p, krb5_error_code code) { krb5_error_code ret; + const char *err; char *str; + err = krb5_get_error_message(context, code); ret = krb5_unparse_name(context, p, &str); if(ret) { krb5_clear_error_message(context); return code; } - krb5_set_error_message(context, code, - N_("Matching credential (%s) not found", ""), str); + krb5_set_error_message(context, code, N_("%s (%s)", ""), err, str); free(str); return code; } diff --git a/lib/krb5/init_creds_pw.c b/lib/krb5/init_creds_pw.c index a225a5f44280..4e1088be182b 100644 --- a/lib/krb5/init_creds_pw.c +++ b/lib/krb5/init_creds_pw.c @@ -1541,15 +1541,13 @@ keytab_key_proc(krb5_context context, krb5_enctype enctype, ret = krb5_kt_get_entry (context, real_keytab, principal, 0, enctype, &entry); + if (ret == 0) { + ret = krb5_copy_keyblock(context, &entry.keyblock, key); + krb5_kt_free_entry(context, &entry); + } if (keytab == NULL) krb5_kt_close (context, real_keytab); - - if (ret) - return ret; - - ret = krb5_copy_keyblock (context, &entry.keyblock, key); - krb5_kt_free_entry(context, &entry); return ret; } diff --git a/lib/krb5/kerberos.cat8 b/lib/krb5/kerberos.cat8 index 1ea1675a46dd..65093c0dce4c 100644 --- a/lib/krb5/kerberos.cat8 +++ b/lib/krb5/kerberos.cat8 @@ -1,18 +1,17 @@ - KERBEROS(8) BSD System Manager's Manual KERBEROS(8) -NNAAMMEE - kkeerrbbeerrooss -- introduction to the Kerberos system +[1mNAME[0m + [1mkerberos [22m-- introduction to the Kerberos system -DDEESSCCRRIIPPTTIIOONN +[1mDESCRIPTION[0m Kerberos is a network authentication system. Its purpose is to securely authenticate users and services in an insecure network environment. This is done with a Kerberos server acting as a trusted third party, keeping a database with secret keys for all users and services (collec- - tively called _p_r_i_n_c_i_p_a_l_s). + tively called [4mprincipals[24m). - Each principal belongs to exactly one _r_e_a_l_m, which is the administrative + Each principal belongs to exactly one [4mrealm[24m, which is the administrative domain in Kerberos. A realm usually corresponds to an organisation, and the realm should normally be derived from that organisation's domain name. A realm is served by one or more Kerberos servers. @@ -21,21 +20,21 @@ DDEESSCCRRIIPPTTIIOONN `authenticators' which together prove the principal's identity. When you login to the Kerberos system, either through the normal system - login or with the kinit(1) program, you acquire a _t_i_c_k_e_t _g_r_a_n_t_i_n_g _t_i_c_k_e_t - which allows you to get new tickets for other services, such as tteellnneett or - ffttpp, without giving your password. + login or with the kinit(1) program, you acquire a [4mticket[24m [4mgranting[24m [4mticket[0m + which allows you to get new tickets for other services, such as [1mtelnet [22mor + [1mftp[22m, without giving your password. For more information on how Kerberos works, and other general Kerberos questions see the Kerberos FAQ at - hhttttpp::////wwwwww..ccmmff..nnrrll..nnaavvyy..mmiill//kkrrbb//kkeerrbbeerrooss--ffaaqq..hhttmmll. + [1mhttp://www.cmf.nrl.navy.mil/krb/kerberos-faq.html[0m For setup instructions see the Heimdal Texinfo manual. -SSEEEE AALLSSOO +[1mSEE ALSO[0m ftp(1), kdestroy(1), kinit(1), klist(1), kpasswd(1), telnet(1), krb5(3), krb5.conf(5), kadmin(1), kdc(8), ktutil(1) -HHIISSTTOORRYY +[1mHISTORY[0m The Kerberos authentication system was developed in the late 1980's as part of the Athena Project at the Massachusetts Institute of Technology. Versions one through three never reached outside MIT, but version 4 was @@ -51,7 +50,7 @@ HHIISSTTOORRYY on adding extensibility and internationalization have started (Kerberos extensions), and a new RFC will hopefully appear soon. - This manual page is part of the HHeeiimmddaall Kerberos 5 distribution, which + This manual page is part of the [1mHeimdal [22mKerberos 5 distribution, which has been in development at the Royal Institute of Technology in Stock- holm, Sweden, since about 1997. diff --git a/lib/krb5/keytab.c b/lib/krb5/keytab.c index ca37e292a4b3..4977a62f21c4 100644 --- a/lib/krb5/keytab.c +++ b/lib/krb5/keytab.c @@ -359,10 +359,11 @@ krb5_kt_read_service_key(krb5_context context, krb5_enctype enctype, krb5_keyblock **key) { - krb5_keytab keytab; + krb5_keytab keytab = NULL; /* Quiet lint */ krb5_keytab_entry entry; krb5_error_code ret; + memset(&entry, 0, sizeof(entry)); if (keyprocarg) ret = krb5_kt_resolve (context, keyprocarg, &keytab); else @@ -372,11 +373,11 @@ krb5_kt_read_service_key(krb5_context context, return ret; ret = krb5_kt_get_entry (context, keytab, principal, vno, enctype, &entry); + if (ret == 0) { + ret = krb5_copy_keyblock (context, &entry.keyblock, key); + krb5_kt_free_entry(context, &entry); + } krb5_kt_close (context, keytab); - if (ret) - return ret; - ret = krb5_copy_keyblock (context, &entry.keyblock, key); - krb5_kt_free_entry(context, &entry); return ret; } @@ -483,11 +484,13 @@ KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL krb5_kt_close(krb5_context context, krb5_keytab id) { - krb5_error_code ret; + krb5_error_code ret = 0; - ret = (*id->close)(context, id); - memset(id, 0, sizeof(*id)); - free(id); + if (id) { + ret = (id->close)(context, id); + memset(id, 0, sizeof(*id)); + free(id); + } return ret; } @@ -621,6 +624,7 @@ krb5_kt_get_entry_wrapped(krb5_context context, if(id->get) return (*id->get)(context, id, principal, kvno, enctype, entry); + memset(&tmp, 0, sizeof(tmp)); ret = krb5_kt_start_seq_get (context, id, &cursor); if (ret) { /* This is needed for krb5_verify_init_creds, but keep error @@ -732,21 +736,21 @@ krb5_kt_copy_entry_contents(krb5_context context, krb5_error_code ret; memset(out, 0, sizeof(*out)); - out->vno = in->vno; ret = krb5_copy_principal (context, in->principal, &out->principal); if (ret) - goto fail; + return ret; ret = krb5_copy_keyblock_contents (context, &in->keyblock, &out->keyblock); - if (ret) - goto fail; + if (ret) { + krb5_free_principal(context, out->principal); + memset(out, 0, sizeof(*out)); + return ret; + } + out->vno = in->vno; out->timestamp = in->timestamp; return 0; -fail: - krb5_kt_free_entry (context, out); - return ret; } /** @@ -927,6 +931,7 @@ krb5_kt_have_content(krb5_context context, krb5_error_code ret; char *name; + memset(&entry, 0, sizeof(entry)); ret = krb5_kt_start_seq_get(context, id, &cursor); if (ret) goto notfound; diff --git a/lib/krb5/krb5-plugin.7 b/lib/krb5/krb5-plugin.7 index 49204d2f6b46..5ba68c645134 100644 --- a/lib/krb5/krb5-plugin.7 +++ b/lib/krb5/krb5-plugin.7 @@ -169,16 +169,16 @@ follows: .Bd -literal -offset indent #include <krb5/an2ln_plugin.h> -static krb5_error_code +static krb5_error_code KRB5_CALLCONV nouser_plug_init(krb5_context context, void **ctx) { *ctx = NULL; return 0; } -static void nouser_plug_fini(void *ctx) { } +static void KRB5_CALLCONV nouser_plug_fini(void *ctx) { } -static krb5_error_code +static krb5_error_code KRB5_CALLCONV nouser_plug_an2ln(void *plug_ctx, krb5_context context, const char *rule, krb5_const_principal aname, @@ -210,16 +210,16 @@ there exists a built-in plugin with this functionality; see .Bd -literal -offset indent #include <krb5/kuserok_plugin.h> -static krb5_error_code +static krb5_error_code KRB5_CALLCONV reject_plug_init(krb5_context context, void **ctx) { *ctx = NULL; return 0; } -static void reject_plug_fini(void *ctx) { } +static void KRB5_CALLCONV reject_plug_fini(void *ctx) { } -static krb5_error_code +static krb5_error_code KRB5_CALLCONV reject_plug_kuserok(void *plug_ctx, krb5_context context, const char *rule, unsigned int flags, const char *k5login_dir, const char *luser, krb5_const_principal principal, diff --git a/lib/krb5/krb5-plugin.cat7 b/lib/krb5/krb5-plugin.cat7 index 6d8ac426ace7..c691ebef47f1 100644 --- a/lib/krb5/krb5-plugin.cat7 +++ b/lib/krb5/krb5-plugin.cat7 @@ -1,26 +1,25 @@ - KRB5-PLUGIN(7) BSD Miscellaneous Information Manual KRB5-PLUGIN(7) -NNAAMMEE - kkrrbb55--pplluuggiinn -- plugin interface for Heimdal +[1mNAME[0m + [1mkrb5-plugin [22m-- plugin interface for Heimdal -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> - ##iinncclluuddee <<kkrrbb55//aann22llnn__pplluuggiinn..hh>> - ##iinncclluuddee <<kkrrbb55//ccccaacchhee__pplluuggiinn..hh>> - ##iinncclluuddee <<kkrrbb55//ddbb__pplluuggiinn..hh>> - ##iinncclluuddee <<kkrrbb55//kkuusseerrookk__pplluuggiinn..hh>> - ##iinncclluuddee <<kkrrbb55//llooccaattee__pplluuggiinn..hh>> - ##iinncclluuddee <<kkrrbb55//sseenndd__ttoo__kkddcc__pplluuggiinn..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m + [1m#include <krb5/an2ln_plugin.h>[0m + [1m#include <krb5/ccache_plugin.h>[0m + [1m#include <krb5/db_plugin.h>[0m + [1m#include <krb5/kuserok_plugin.h>[0m + [1m#include <krb5/locate_plugin.h>[0m + [1m#include <krb5/send_to_kdc_plugin.h>[0m -DDEESSCCRRIIPPTTIIOONN +[1mDESCRIPTION[0m Heimdal has a plugin interface. Plugins may be statically linked into Heimdal and registered via the krb5_plugin_register(3) function, or they may be dynamically loaded from shared objects present in the Heimdal plugins directories. Plugins consist of a C struct whose struct name is given in the associ- - ated header file, such as, for example, _k_r_b_5_p_l_u_g_i_n___k_u_s_e_r_o_k___f_t_a_b_l_e and a + ated header file, such as, for example, [4mkrb5plugin_kuserok_ftable[24m and a pointer to which is either registered via krb5_plugin_register(3) or found in a shared object via a symbol lookup for the symbol name defined in the associated header file (e.g., "kuserok" for the plugin for @@ -28,13 +27,13 @@ DDEESSCCRRIIPPTTIIOONN The plugin structs for all plugin types always begin with the same three common fields: - 1. _m_i_n_o_r___v_e_r_s_i_o_n , an int. Plugin minor versions are defined in each + 1. [4mminor_version[24m , an int. Plugin minor versions are defined in each plugin type's associated header file. - 2. _i_n_i_t , a pointer to a function with two arguments, a krb5_context + 2. [4minit[24m , a pointer to a function with two arguments, a krb5_context and a void **, returning a krb5_error_code. This function will be called to initialize a plugin-specific context in the form of a void * that will be output through the init function's second argument. - 3. _f_i_n_i , a pointer to a function of one argument, a void *, consisting + 3. [4mfini[24m , a pointer to a function of one argument, a void *, consisting of the plugin's context to be destroyed, and returning void. Each plugin type must add zero or more fields to this struct following @@ -48,7 +47,7 @@ DDEESSCCRRIIPPTTIIOONN There is a database plugin system intended for many of the uses of data- bases in Heimdal. The plugin is expected to call heim_db_register(3) - from its _i_n_i_t entry point to register a DB type. The DB plugin's _f_i_n_i + from its [4minit[24m entry point to register a DB type. The DB plugin's [4mfini[0m function must do nothing, and the plugin must not provide any other entry points. @@ -61,12 +60,12 @@ DDEESSCCRRIIPPTTIIOONN const char *luser, krb5_const_principal principal, krb5_boolean *result) - The _l_u_s_e_r , _p_r_i_n_c_i_p_a_l and _r_e_s_u_l_t arguments are self-explanatory (see - krb5_kuserok(3) ). The _p_l_u_g___c_t_x argument is the context output by the - plugin's init function. The _r_u_l_e argument is a kuserok rule from the + The [4mluser[24m , [4mprincipal[24m and [4mresult[24m arguments are self-explanatory (see + krb5_kuserok(3) ). The [4mplug_ctx[24m argument is the context output by the + plugin's init function. The [4mrule[24m argument is a kuserok rule from the krb5.conf file; each plugin is invoked once for each rule until all plug- - ins fail or one succeeds. The _k_5_l_o_g_i_n___d_i_r argument provides an alterna- - tive k5login file location, if not NULL. The _f_l_a_g_s argument indicates + ins fail or one succeeds. The [4mk5login_dir[24m argument provides an alterna- + tive k5login file location, if not NULL. The [4mflags[24m argument indicates whether the plugin may call krb5_aname_to_localname(3) (KUSEROK_ANAME_TO_LNAME_OK), and whether k5login databases are expected to be authoritative (KUSEROK_K5LOGIN_IS_AUTHORITATIVE). @@ -80,31 +79,31 @@ DDEESSCCRRIIPPTTIIOONN an2ln(void *plug_ctx, krb5_context context, const char *rule, krb5_const_principal aname, set_result_f set_res_f, void *set_res_ctx) - The arguments for the _a_n_2_l_n plugin are similar to those of the kuserok - plugin, but the result, being a string, is set by calling the _s_e_t___r_e_s___f - function argument with the _s_e_t___r_e_s___c_t_x and result string as arguments. - The _s_e_t___r_e_s___f function will make a copy of the string. + The arguments for the [4man2ln[24m plugin are similar to those of the kuserok + plugin, but the result, being a string, is set by calling the [4mset_res_f[0m + function argument with the [4mset_res_ctx[24m and result string as arguments. + The [4mset_res_f[24m function will make a copy of the string. -FFIILLEESS - libdir/plugin/krb5/* Shared objects containing plugins for - Heimdal. +[1mFILES[0m + libdir/plugin/krb5/* + Shared objects containing plugins for Heimdal. -EEXXAAMMPPLLEESS +[1mEXAMPLES[0m An example an2ln plugin that maps principals to a constant "nouser" fol- lows: #include <krb5/an2ln_plugin.h> - static krb5_error_code + static krb5_error_code KRB5_CALLCONV nouser_plug_init(krb5_context context, void **ctx) { *ctx = NULL; return 0; } - static void nouser_plug_fini(void *ctx) { } + static void KRB5_CALLCONV nouser_plug_fini(void *ctx) { } - static krb5_error_code + static krb5_error_code KRB5_CALLCONV nouser_plug_an2ln(void *plug_ctx, krb5_context context, const char *rule, krb5_const_principal aname, @@ -133,16 +132,16 @@ EEXXAAMMPPLLEESS #include <krb5/kuserok_plugin.h> - static krb5_error_code + static krb5_error_code KRB5_CALLCONV reject_plug_init(krb5_context context, void **ctx) { *ctx = NULL; return 0; } - static void reject_plug_fini(void *ctx) { } + static void KRB5_CALLCONV reject_plug_fini(void *ctx) { } - static krb5_error_code + static krb5_error_code KRB5_CALLCONV reject_plug_kuserok(void *plug_ctx, krb5_context context, const char *rule, unsigned int flags, const char *k5login_dir, const char *luser, krb5_const_principal principal, @@ -162,7 +161,7 @@ EEXXAAMMPPLLEESS reject_plug_kuserok, }; -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5_plugin_register(3) krb5_kuserok(3) krb5_aname_to_localname(3) HEIMDAL December 21, 2011 HEIMDAL diff --git a/lib/krb5/krb5.conf.5 b/lib/krb5/krb5.conf.5 index e7a25af6100b..8a0f0847a487 100644 --- a/lib/krb5/krb5.conf.5 +++ b/lib/krb5/krb5.conf.5 @@ -135,6 +135,19 @@ Forward credentials to remote host (for .Xr rsh 1 , .Xr telnet 1 , etc). +.It Li historical_anon_pkinit = Va boolean +Enable legacy anonymous pkinit command-line syntax. +With this option set to +.Li true, +the +.Xr kinit 1 +.Fl Fl anonymous +command with no principal argument specified will request an anonymous pkinit +ticket from the default realm. +If a principal argument is specified, it is used as an explicit realm name for +anonymous pkinit even without an +.Li @ +prefix. .El .It Li [libdefaults] .Bl -tag -width "xxx" -offset indent @@ -641,8 +654,21 @@ Allow address-less tickets. .\" XXX .It Li allow-anonymous = Va BOOL If the kdc is allowed to hand out anonymous tickets. +.It Li historical_anon_realm = Va boolean +Enables pre-7.0 non-RFC-comformant KDC behavior. +With this option set to +.Li true +the client realm in anonymous pkinit AS replies will be the requested realm, +rather than the RFC-conformant +.Li WELLKNOWN:ANONYMOUS +realm. +This can have a security impact on servers that expect to grant access to +anonymous-but-authenticated to the KDC users of the realm in question: +they would also grant access to unauthenticated anonymous users. +As such, it is not recommend to set this option to +.Li true. .It Li encode_as_rep_as_tgs_rep = Va BOOL -Encode as-rep as tgs-rep tobe compatible with mistakes older DCE secd did. +Encode as-rep as tgs-rep to be compatible with mistakes older DCE secd did. .\" XXX .It Li kdc_warn_pwexpire = Va TIME The time before expiration that the user should be warned that her diff --git a/lib/krb5/krb5.conf.cat5 b/lib/krb5/krb5.conf.cat5 index 619fdc3cd25f..03a2c0ce42a6 100644 --- a/lib/krb5/krb5.conf.cat5 +++ b/lib/krb5/krb5.conf.cat5 @@ -1,14 +1,13 @@ - KRB5.CONF(5) BSD File Formats Manual KRB5.CONF(5) -NNAAMMEE - kkrrbb55..ccoonnff -- configuration file for Kerberos 5 +[1mNAME[0m + [1mkrb5.conf [22m-- configuration file for Kerberos 5 -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m -DDEESSCCRRIIPPTTIIOONN - The kkrrbb55..ccoonnff file specifies several configuration parameters for the +[1mDESCRIPTION[0m + The [1mkrb5.conf [22mfile specifies several configuration parameters for the Kerberos 5 library, as well as for some programs. The file consists of one or more sections, containing a number of bind- @@ -42,8 +41,8 @@ DDEESSCCRRIIPPTTIIOONN STRINGs consists of one or more non-whitespace characters. - STRINGs that are specified later in this man-page uses the following - notation. + STRINGs that are specified later in this man-page uses the following no- + tation. boolean values can be either yes/true or no/false. @@ -67,179 +66,188 @@ DDEESSCCRRIIPPTTIIOONN Specifies the default values to be used for Kerberos applica- tions. You can specify defaults per application, realm, or a combination of these. The preference order is: - 1. _a_p_p_l_i_c_a_t_i_o_n _r_e_a_l_m _o_p_t_i_o_n - 2. _a_p_p_l_i_c_a_t_i_o_n _o_p_t_i_o_n - 3. _r_e_a_l_m _o_p_t_i_o_n - 4. _o_p_t_i_o_n + 1. [4mapplication[24m [4mrealm[24m [4moption[0m + 2. [4mapplication[24m [4moption[0m + 3. [4mrealm[24m [4moption[0m + 4. [4moption[0m The supported options are: - forwardable = _b_o_o_l_e_a_n + forwardable = [4mboolean[0m When obtaining initial credentials, make the cre- dentials forwardable. - proxiable = _b_o_o_l_e_a_n + proxiable = [4mboolean[0m When obtaining initial credentials, make the cre- dentials proxiable. - no-addresses = _b_o_o_l_e_a_n + no-addresses = [4mboolean[0m When obtaining initial credentials, request them for an empty set of addresses, making the tickets valid from any address. - ticket_lifetime = _t_i_m_e + ticket_lifetime = [4mtime[0m Default ticket lifetime. - renew_lifetime = _t_i_m_e + renew_lifetime = [4mtime[0m Default renewable ticket lifetime. - encrypt = _b_o_o_l_e_a_n + encrypt = [4mboolean[0m Use encryption, when available. - forward = _b_o_o_l_e_a_n + forward = [4mboolean[0m Forward credentials to remote host (for rsh(1), telnet(1), etc). + historical_anon_pkinit = [4mboolean[0m + Enable legacy anonymous pkinit command-line syntax. + With this option set to true, the kinit(1) + [1m--anonymous [22mcommand with no principal argument + specified will request an anonymous pkinit ticket + from the default realm. If a principal argument is + specified, it is used as an explicit realm name for + anonymous pkinit even without an @ prefix. + [libdefaults] - default_realm = _R_E_A_L_M + default_realm = [4mREALM[0m Default realm to use, this is also known as your - ``local realm''. The default is the result of - kkrrbb55__ggeett__hhoosstt__rreeaallmm(_l_o_c_a_l _h_o_s_t_n_a_m_e). + "local realm". The default is the result of + [1mkrb5_get_host_realm[22m([4mlocal[24m [4mhostname[24m). - allow_weak_crypto = _b_o_o_l_e_a_n + allow_weak_crypto = [4mboolean[0m are weak crypto algorithms allowed to be used, among others, DES is considered weak. - clockskew = _t_i_m_e + clockskew = [4mtime[0m Maximum time differential (in seconds) allowed when comparing times. Default is 300 seconds (five min- utes). - kdc_timeout = _t_i_m_e - Maximum time to wait for a reply from the kdc, - default is 3 seconds. + kdc_timeout = [4mtime[0m + Maximum time to wait for a reply from the kdc, de- + fault is 3 seconds. capath = { - _d_e_s_t_i_n_a_t_i_o_n_-_r_e_a_l_m = _n_e_x_t_-_h_o_p_-_r_e_a_l_m + [4mdestination-realm[24m = [4mnext-hop-realm[0m ... } This is deprecated, see the capaths section below. - default_cc_type = _c_c_t_y_p_e + default_cc_type = [4mcctype[0m sets the default credentials type. - default_cc_name = _c_c_n_a_m_e + default_cc_name = [4mccname[0m the default credentials cache name. If you want to change the type only use default_cc_type. The string can contain variables that are expanded on runtime. The Only supported variable currently is %{uid} which expands to the current user id. - default_etypes = _e_t_y_p_e_s _._._. - A list of default encryption types to use. - (Default: all enctypes if allow_weak_crypto = TRUE, + default_etypes = [4metypes[24m [4m...[0m + A list of default encryption types to use. (De- + fault: all enctypes if allow_weak_crypto = TRUE, else all enctypes except single DES enctypes.) - default_as_etypes = _e_t_y_p_e_s _._._. - A list of default encryption types to use in AS - requests. (Default: the value of default_etypes.) + default_as_etypes = [4metypes[24m [4m...[0m + A list of default encryption types to use in AS re- + quests. (Default: the value of default_etypes.) - default_tgs_etypes = _e_t_y_p_e_s _._._. + default_tgs_etypes = [4metypes[24m [4m...[0m A list of default encryption types to use in TGS requests. (Default: the value of default_etypes.) - default_etypes_des = _e_t_y_p_e_s _._._. - A list of default encryption types to use when - requesting a DES credential. + default_etypes_des = [4metypes[24m [4m...[0m + A list of default encryption types to use when re- + questing a DES credential. - default_keytab_name = _k_e_y_t_a_b + default_keytab_name = [4mkeytab[0m The keytab to use if no other is specified, default - is ``FILE:/etc/krb5.keytab''. + is "FILE:/etc/krb5.keytab". - dns_lookup_kdc = _b_o_o_l_e_a_n + dns_lookup_kdc = [4mboolean[0m Use DNS SRV records to lookup KDC services loca- tion. - dns_lookup_realm = _b_o_o_l_e_a_n + dns_lookup_realm = [4mboolean[0m Use DNS TXT records to lookup domain to realm map- pings. - kdc_timesync = _b_o_o_l_e_a_n + kdc_timesync = [4mboolean[0m Try to keep track of the time differential between the local machine and the KDC, and then compensate for that when issuing requests. - max_retries = _n_u_m_b_e_r + max_retries = [4mnumber[0m The max number of times to try to contact each KDC. - large_msg_size = _n_u_m_b_e_r + large_msg_size = [4mnumber[0m The threshold where protocols with tiny maximum message sizes are not considered usable to send messages to the KDC. - ticket_lifetime = _t_i_m_e + ticket_lifetime = [4mtime[0m Default ticket lifetime. - renew_lifetime = _t_i_m_e + renew_lifetime = [4mtime[0m Default renewable ticket lifetime. - forwardable = _b_o_o_l_e_a_n + forwardable = [4mboolean[0m When obtaining initial credentials, make the cre- dentials forwardable. This option is also valid in the [realms] section. - proxiable = _b_o_o_l_e_a_n + proxiable = [4mboolean[0m When obtaining initial credentials, make the cre- dentials proxiable. This option is also valid in the [realms] section. - verify_ap_req_nofail = _b_o_o_l_e_a_n + verify_ap_req_nofail = [4mboolean[0m If enabled, failure to verify credentials against a local key is a fatal error. The application has to be able to read the corresponding service key for - this to work. Some applications, like su(1), - enable this option unconditionally. + this to work. Some applications, like su(1), en- + able this option unconditionally. - warn_pwexpire = _t_i_m_e + warn_pwexpire = [4mtime[0m How soon to warn for expiring password. Default is seven days. - http_proxy = _p_r_o_x_y_-_s_p_e_c + http_proxy = [4mproxy-spec[0m A HTTP-proxy to use when talking to the KDC via HTTP. - dns_proxy = _p_r_o_x_y_-_s_p_e_c + dns_proxy = [4mproxy-spec[0m Enable using DNS via HTTP. - extra_addresses = _a_d_d_r_e_s_s _._._. + extra_addresses = [4maddress[24m [4m...[0m A list of addresses to get tickets for along with all local addresses. - time_format = _s_t_r_i_n_g + time_format = [4mstring[0m How to print time strings in logs, this string is passed to strftime(3). - date_format = _s_t_r_i_n_g + date_format = [4mstring[0m How to print date strings in logs, this string is passed to strftime(3). - log_utc = _b_o_o_l_e_a_n + log_utc = [4mboolean[0m Write log-entries using UTC instead of your local time zone. - scan_interfaces = _b_o_o_l_e_a_n - Scan all network interfaces for addresses, as - opposed to simply using the address associated with + scan_interfaces = [4mboolean[0m + Scan all network interfaces for addresses, as op- + posed to simply using the address associated with the system's host name. - fcache_version = _i_n_t + fcache_version = [4mint[0m Use file credential cache format version specified. - fcc-mit-ticketflags = _b_o_o_l_e_a_n + fcc-mit-ticketflags = [4mboolean[0m Use MIT compatible format for file credential cache. It's the field ticketflags that is stored in reverse bit order for older than Heimdal 0.7. @@ -252,19 +260,19 @@ DDEESSCCRRIIPPTTIIOONN useful when the GSS-API server input the wrong server name into the gss_accept_sec_context call. - k5login_directory = _d_i_r_e_c_t_o_r_y + k5login_directory = [4mdirectory[0m Alternative location for user .k5login files. This option is provided for compatibility with MIT krb5 configuration files. - k5login_authoritative = _b_o_o_l_e_a_n + k5login_authoritative = [4mboolean[0m If true then if a principal is not found in k5login files then krb5_userok(3) will not fallback on principal to username mapping. This option is pro- vided for compatibility with MIT krb5 configuration files. - kuserok = _r_u_l_e _._._. + kuserok = [4mrule[24m [4m...[0m Specifies krb5_userok(3) behavior. If multiple values are given, then krb5_userok(3) will evaluate them in order until one succeeds or all fail. @@ -272,22 +280,22 @@ DDEESSCCRRIIPPTTIIOONN in plugins described below. Default: USER-K5LOGIN SIMPLE DENY. - kuserok = _D_E_N_Y + kuserok = [4mDENY[0m If set and evaluated then krb5_userok(3) will deny access to the given username no matter what the principal name might be. - kuserok = _S_I_M_P_L_E + kuserok = [4mSIMPLE[0m If set and evaluated then krb5_userok(3) will use principal to username mapping (see auth_to_local below). If the principal maps to the requested username then access is allowed. - kuserok = _S_Y_S_T_E_M_-_K_5_L_O_G_I_N_[_:_d_i_r_e_c_t_o_r_y_] + kuserok = [4mSYSTEM-K5LOGIN[:directory][0m If set and evaluated then krb5_userok(3) will use - k5login files named after the _l_u_s_e_r argument to + k5login files named after the [4mluser[24m argument to krb5_userok(3) in the given directory or in - _/_e_t_c_/_k_5_l_o_g_i_n_._d_/. K5login files are text files, + [4m/etc/k5login.d/[24m. K5login files are text files, with each line containing just a principal name; principals apearing in a user's k5login file are permitted access to the user's account. Note: this @@ -296,31 +304,31 @@ DDEESSCCRRIIPPTTIIOONN sions/ACLs are expected due to the k5login location being a system location. - kuserok = _U_S_E_R_-_K_5_L_O_G_I_N + kuserok = [4mUSER-K5LOGIN[0m If set and evaluated then krb5_userok(3) will use - _~_l_u_s_e_r_/_._k_5_l_o_g_i_n and _~_l_u_s_e_r_/_._k_5_l_o_g_i_n_._d_/_*. User + [4m~luser/.k5login[24m and [4m~luser/.k5login.d/*[24m. User k5login files and directories must be owned by the user and must not have world nor group write per- missions. - aname2lname-text-db = _f_i_l_e_n_a_m_e - The named file must be a sorted (in increasing - order) text file where every line consists of an - unparsed principal name optionally followed by - whitespace and a username. The aname2lname func- - tion will do a binary search on this file, if con- - figured, looking for lines that match the given - principal name, and if found the given username - will be used, or, if the username is missing, an - error will be returned. If the file doesn't exist, - or if no matching line is found then other plugins - will be allowed to run. + aname2lname-text-db = [4mfilename[0m + The named file must be a sorted (in increasing or- + der) text file where every line consists of an un- + parsed principal name optionally followed by white- + space and a username. The aname2lname function + will do a binary search on this file, if config- + ured, looking for lines that match the given prin- + cipal name, and if found the given username will be + used, or, if the username is missing, an error will + be returned. If the file doesn't exist, or if no + matching line is found then other plugins will be + allowed to run. fcache_strict_checking strict checking in FILE credential caches that owner, no symlink and permissions is correct. - name_canon_rules = _r_u_l_e_s + name_canon_rules = [4mrules[0m One or more service principal name canonicalization rules. Each rule consists of one or more tokens separated by colon (':'). Currently these rules @@ -334,17 +342,17 @@ DDEESSCCRRIIPPTTIIOONN NOTE: Name canonicalization rules are an experimen- tal feature. - The first token is a rule type, one of: _a_s_-_i_s_, - _q_u_a_l_i_f_y_, _o_r _n_s_s_. + The first token is a rule type, one of: [4mas-is,[0m + [4mqualify,[24m [4mor[24m [4mnss.[0m Any remaining tokens must be options tokens: - _u_s_e___f_a_s_t (use FAST to protect TGS exchanges; cur- - rently not supported), _u_s_e___d_n_s_s_e_c (use DNSSEC to + [4muse_fast[24m (use FAST to protect TGS exchanges; cur- + rently not supported), [4muse_dnssec[24m (use DNSSEC to protect hostname lookups; currently not supported), - _c_c_a_c_h_e___o_n_l_y , _u_s_e___r_e_f_e_r_r_a_l_s_, _n_o___r_e_f_e_r_r_a_l_s_, - _l_o_o_k_u_p___r_e_a_l_m_, _m_i_n_d_o_t_s_=_N_, _m_a_x_d_o_t_s_=_N_, _o_r_d_e_r_=_N_, - domain= _d_o_m_a_i_n_, realm= _r_e_a_l_m_, match_domain= _d_o_m_a_i_n_, - and match_realm= _r_e_a_l_m_. + [4mccache_only[24m , [4muse_referrals,[24m [4mno_referrals,[0m + [4mlookup_realm,[24m [4mmindots=N,[24m [4mmaxdots=N,[24m [4morder=N,[24m do- + main= [4mdomain,[24m realm= [4mrealm,[24m match_domain= [4mdomain,[0m + and match_realm= [4mrealm.[0m When trying to obtain a service ticket for a host- based service principal name, name canonicalization @@ -356,18 +364,18 @@ DDEESSCCRRIIPPTTIIOONN one. For each rule the system checks that the hostname - has at least _m_i_n_d_o_t_s periods (if given) in it, at - most _m_a_x_d_o_t_s periods (if given), that the hostname - ends in the given _m_a_t_c_h___d_o_m_a_i_n (if given), and that - the realm of the principal matches the _m_a_t_c_h___r_e_a_l_m + has at least [4mmindots[24m periods (if given) in it, at + most [4mmaxdots[24m periods (if given), that the hostname + ends in the given [4mmatch_domain[24m (if given), and that + the realm of the principal matches the [4mmatch_realm[0m (if given). - _A_s_-_i_s rules leave the hostname unmodified but may - set a realm. _Q_u_a_l_i_f_y rules qualify the hostname - with the given _d_o_m_a_i_n and also may set the realm. - The _n_s_s rule uses the system resolver to lookup the + [4mAs-is[24m rules leave the hostname unmodified but may + set a realm. [4mQualify[24m rules qualify the hostname + with the given [4mdomain[24m and also may set the realm. + The [4mnss[24m rule uses the system resolver to lookup the host's canonical name and is usually not secure. - Note that using the _n_s_s rule type implies having to + Note that using the [4mnss[24m rule type implies having to have principal aliases in the HDB (though not nec- essarily in keytabs). @@ -376,9 +384,9 @@ DDEESSCCRRIIPPTTIIOONN matched. The order in which rules are applied is as follows: - first all the rules with explicit _o_r_d_e_r then all + first all the rules with explicit [4morder[24m then all other rules in the order in which they appear. If - any two rules have the same explicit _o_r_d_e_r, their + any two rules have the same explicit [4morder[24m, their order of appearance in krb5.conf breaks the tie. Explicitly specifying order can be useful where tools read and write the configuration file without @@ -386,15 +394,15 @@ DDEESSCCRRIIPPTTIIOONN Malformed rules are ignored. - allow_hierarchical_capaths = _b_o_o_l_e_a_n + allow_hierarchical_capaths = [4mboolean[0m When validating cross-realm transit paths, absent any explicit capath from the client realm to the server realm, allow a hierarchical transit path via - the common ancestor domain of the two realms. - Defaults to true. Note, absent an explicit set- - ting, hierarchical capaths are always used by the - KDC when generating a referral to a destination - with which is no direct trust. + the common ancestor domain of the two realms. De- + faults to true. Note, absent an explicit setting, + hierarchical capaths are always used by the KDC + when generating a referral to a destination with + which is no direct trust. [domain_realm] This is a list of mappings from DNS domain to Kerberos realm. @@ -405,39 +413,39 @@ DDEESSCCRRIIPPTTIIOONN The domain can be either a full name of a host or a trailing component, in the latter case the domain-string should start with a period. The trailing component only matches hosts that - are in the same domain, ie ``.example.com'' matches - ``foo.example.com'', but not ``foo.test.example.com''. + are in the same domain, ie ".example.com" matches + "foo.example.com", but not "foo.test.example.com". - The realm may be the token `dns_locate', in which case the - actual realm will be determined using DNS (independently of - the setting of the `dns_lookup_realm' option). + The realm may be the token `dns_locate', in which case the ac- + tual realm will be determined using DNS (independently of the + setting of the `dns_lookup_realm' option). [realms] - _R_E_A_L_M = { + [4mREALM[24m = { - kdc = _[_s_e_r_v_i_c_e_/_]_h_o_s_t_[_:_p_o_r_t_] + kdc = [4m[service/]host[:port][0m Specifies a list of kdcs for this realm. - If the optional _p_o_r_t is absent, the - default value for the ``kerberos/udp'' - ``kerberos/tcp'', and ``http/tcp'' port - (depending on service) will be used. - The kdcs will be used in the order that - they are specified. - - The optional _s_e_r_v_i_c_e specifies over what + If the optional [4mport[24m is absent, the de- + fault value for the "kerberos/udp" + "kerberos/tcp", and "http/tcp" port (de- + pending on service) will be used. The + kdcs will be used in the order that they + are specified. + + The optional [4mservice[24m specifies over what medium the kdc should be contacted. - Possible services are ``udp'', ``tcp'', - and ``http''. Http can also be written - as ``http://''. Default service is - ``udp'' and ``tcp''. + Possible services are "udp", "tcp", and + "http". Http can also be written as + "http://". Default service is "udp" and + "tcp". - admin_server = _h_o_s_t_[_:_p_o_r_t_] + admin_server = [4mhost[:port][0m Specifies the admin server for this realm, where all the modifications to the database are performed. - kpasswd_server = _h_o_s_t_[_:_p_o_r_t_] + kpasswd_server = [4mhost[:port][0m Points to the server where all the pass- word changes are performed. If there is no such entry, the kpasswd port on the @@ -450,10 +458,10 @@ DDEESSCCRRIIPPTTIIOONN auth_to_local_names = { - _p_r_i_n_c_i_p_a_l___n_a_m_e _= _u_s_e_r_n_a_m_e - The given _p_r_i_n_c_i_p_a_l___n_a_m_e will + [4mprincipal_name[24m [4m=[24m [4musername[0m + The given [4mprincipal_name[24m will be mapped to the given - _u_s_e_r_n_a_m_e if the _R_E_A_L_M is a + [4musername[24m if the [4mREALM[24m is a default realm. } @@ -461,69 +469,69 @@ DDEESSCCRRIIPPTTIIOONN auth_to_local = HEIMDAL_DEFAULT Use the Heimdal default principal to username mapping. Applies to principals - from the _R_E_A_L_M if and only if _R_E_A_L_M is a + from the [4mREALM[24m if and only if [4mREALM[24m is a default realm. auth_to_local = DEFAULT Use the MIT default principal to user- name mapping. Applies to principals - from the _R_E_A_L_M if and only if _R_E_A_L_M is a + from the [4mREALM[24m if and only if [4mREALM[24m is a default realm. auth_to_local = DB:/path/to/db.txt Use a binary search of the given DB. The DB must be a flat-text file sortedf - in the "C" locale, with each record - being a line (separated by either LF or + in the "C" locale, with each record be- + ing a line (separated by either LF or CRLF) consisting of a principal name followed by whitespace followed by a username. Applies to principals from - the _R_E_A_L_M if and only if _R_E_A_L_M is a - default realm. + the [4mREALM[24m if and only if [4mREALM[24m is a de- + fault realm. auth_to_local = DB:/path/to/db Use the given DB, if there's a plugin for it. Applies to principals from the - _R_E_A_L_M if and only if _R_E_A_L_M is a default + [4mREALM[24m if and only if [4mREALM[24m is a default realm. auth_to_local = RULE:... Use the given rule, if there's a plugin for it. Applies to principals from the - _R_E_A_L_M if and only if _R_E_A_L_M is a default + [4mREALM[24m if and only if [4mREALM[24m is a default realm. auth_to_local = NONE No additional principal to username map- ping is done. Note that - _a_u_t_h___t_o___l_o_c_a_l___n_a_m_e_s and any preceding - _a_u_t_h___t_o___l_o_c_a_l rules have precedence. + [4mauth_to_local_names[24m and any preceding + [4mauth_to_local[24m rules have precedence. } [capaths] - _c_l_i_e_n_t_-_r_e_a_l_m = { + [4mclient-realm[24m = { - _s_e_r_v_e_r_-_r_e_a_l_m = _h_o_p_-_r_e_a_l_m _._._. + [4mserver-realm[24m = [4mhop-realm[24m [4m...[0m This serves two purposes. First the - first listed _h_o_p_-_r_e_a_l_m tells a client + first listed [4mhop-realm[24m tells a client which realm it should contact in order to ultimately obtain credentials for a - service in the _s_e_r_v_e_r_-_r_e_a_l_m. Secondly, + service in the [4mserver-realm[24m. Secondly, it tells the KDC (and other servers) which realms are allowed in a multi-hop - traversal from _c_l_i_e_n_t_-_r_e_a_l_m to - _s_e_r_v_e_r_-_r_e_a_l_m. Except for the client + traversal from [4mclient-realm[24m to + [4mserver-realm[24m. Except for the client case, the order of the realms are not important. - _} + [4m}[0m [logging] - _e_n_t_i_t_y = _d_e_s_t_i_n_a_t_i_o_n - Specifies that _e_n_t_i_t_y should use the specified + [4mentity[24m = [4mdestination[0m + Specifies that [4mentity[24m should use the specified destination for logging. See the krb5_openlog(3) manual page for a list of defined destinations. @@ -531,71 +539,71 @@ DDEESSCCRRIIPPTTIIOONN database = { - dbname = _[_D_A_T_B_A_S_E_T_Y_P_E_:_]_D_A_T_A_B_A_S_E_N_A_M_E + dbname = [4m[DATBASETYPE:]DATABASENAME[0m Use this database for this realm. The - _D_A_T_A_B_A_S_E_T_Y_P_E should be one of 'lmdb', + [4mDATABASETYPE[24m should be one of 'lmdb', 'db3', 'db1', 'db', 'sqlite', or 'ldap'. See the info documetation how to config- ure different database backends. - realm = _R_E_A_L_M + realm = [4mREALM[0m Specifies the realm that will be stored in this database. It realm isn't set, it will used as the default database, there can only be one entry that doesn't have a realm stanza. - mkey_file = _F_I_L_E_N_A_M_E + mkey_file = [4mFILENAME[0m Use this keytab file for the master key of this database. If not specified - _D_A_T_A_B_A_S_E_N_A_M_E.mkey will be used. + [4mDATABASENAME[24m.mkey will be used. acl_file = PA FILENAME Use this file for the ACL list of this database. - log_file = _F_I_L_E_N_A_M_E + log_file = [4mFILENAME[0m Use this file as the log of changes per- formed to the database. This file is - used by iipprrooppdd--mmaasstteerr for propagating + used by [1mipropd-master [22mfor propagating changes to slaves. It is also used by - kkaaddmmiinndd and kkaaddmmiinn (when used with the - -l option), and by all applications - using lliibbkkaaddmm55 with the local backend, - for two-phase commit functionality. - Slaves also use this. Setting this to - //ddeevv//nnuullll disables two-phase commit and - incremental propagation. Use iipprroopp--lloogg + [1mkadmind [22mand [1mkadmin [22m(when used with the + -l option), and by all applications us- + ing [1mlibkadm5 [22mwith the local backend, for + two-phase commit functionality. Slaves + also use this. Setting this to + [1m/dev/null [22mdisables two-phase commit and + incremental propagation. Use [1miprop-log[0m to show the contents of this log file. - log-max-size = _n_u_m_b_e_r + log-max-size = [4mnumber[0m When the log reaches this size (in bytes), the log will be truncated, sav- ing some entries, and keeping the latest - version number so as to not disrupt - incremental propagation. If set to a - negative value then automatic log trun- - cation will be disabled. Defaults to + version number so as to not disrupt in- + cremental propagation. If set to a neg- + ative value then automatic log trunca- + tion will be disabled. Defaults to 52428800 (50MB). } - max-request = _S_I_Z_E + max-request = [4mSIZE[0m Maximum size of a kdc request. - require-preauth = _B_O_O_L + require-preauth = [4mBOOL[0m If set pre-authentication is required. - ports = _l_i_s_t _o_f _p_o_r_t_s + ports = [4mlist[24m [4mof[24m [4mports[0m List of ports the kdc should listen to. - addresses = _l_i_s_t _o_f _i_n_t_e_r_f_a_c_e_s + addresses = [4mlist[24m [4mof[24m [4minterfaces[0m List of addresses the kdc should bind to. - enable-http = _B_O_O_L + enable-http = [4mBOOL[0m Should the kdc answer kdc-requests over http. - tgt-use-strongest-session-key = _B_O_O_L + tgt-use-strongest-session-key = [4mBOOL[0m If this is TRUE then the KDC will prefer the strongest key from the client's AS-REQ or TGS-REQ enctype list for the ticket session key that is @@ -605,86 +613,98 @@ DDEESSCCRRIIPPTTIIOONN REQ enctype list that is also supported by the KDC and the target principal. Defaults to FALSE. - svc-use-strongest-session-key = _B_O_O_L + svc-use-strongest-session-key = [4mBOOL[0m Like tgt-use-strongest-session-key, but applies to the session key enctype of tickets for services other than krbtgt principals. Defaults to FALSE. - preauth-use-strongest-session-key = _B_O_O_L + preauth-use-strongest-session-key = [4mBOOL[0m If TRUE then select the strongest possible enctype from the client's AS-REQ for PA-ETYPE-INFO2 (i.e., for password-based pre-authentication). Else pick the first supported enctype from the client's AS- REQ. Defaults to FALSE. - use-strongest-server-key = _B_O_O_L - If TRUE then the KDC picks, for the ticket - encrypted part's key, the first supported enctype + use-strongest-server-key = [4mBOOL[0m + If TRUE then the KDC picks, for the ticket en- + crypted part's key, the first supported enctype from the target service principal's hdb entry's current keyset. Else the KDC picks the first sup- ported enctype from the target service principal's hdb entry's current keyset. Defaults to TRUE. - check-ticket-addresses = _B_O_O_L - Verify the addresses in the tickets used in tgs - requests. + check-ticket-addresses = [4mBOOL[0m + Verify the addresses in the tickets used in tgs re- + quests. - allow-null-ticket-addresses = _B_O_O_L + allow-null-ticket-addresses = [4mBOOL[0m Allow address-less tickets. - allow-anonymous = _B_O_O_L + allow-anonymous = [4mBOOL[0m If the kdc is allowed to hand out anonymous tick- ets. - encode_as_rep_as_tgs_rep = _B_O_O_L - Encode as-rep as tgs-rep tobe compatible with mis- + historical_anon_realm = [4mboolean[0m + Enables pre-7.0 non-RFC-comformant KDC behavior. + With this option set to true the client realm in + anonymous pkinit AS replies will be the requested + realm, rather than the RFC-conformant + WELLKNOWN:ANONYMOUS realm. This can have a secu- + rity impact on servers that expect to grant access + to anonymous-but-authenticated to the KDC users of + the realm in question: they would also grant access + to unauthenticated anonymous users. As such, it is + not recommend to set this option to true. + + encode_as_rep_as_tgs_rep = [4mBOOL[0m + Encode as-rep as tgs-rep to be compatible with mis- takes older DCE secd did. - kdc_warn_pwexpire = _T_I_M_E + kdc_warn_pwexpire = [4mTIME[0m The time before expiration that the user should be warned that her password is about to expire. - logging = _L_o_g_g_i_n_g + logging = [4mLogging[0m What type of logging the kdc should use, see also [logging]/kdc. - hdb-ldap-structural-object _s_t_r_u_c_t_u_r_a_l _o_b_j_e_c_t + hdb-ldap-structural-object [4mstructural[24m [4mobject[0m If the LDAP backend is used for storing principals, this is the structural object that will be used - when creating and when reading objects. The - default value is account . + when creating and when reading objects. The de- + fault value is account . - hdb-ldap-create-base _c_r_e_a_t_i_o_n _d_n + hdb-ldap-create-base [4mcreation[24m [4mdn[0m is the dn that will be appended to the principal when creating entries. Default value is the search dn. - enable-digest = _B_O_O_L + enable-digest = [4mBOOL[0m Should the kdc answer digest requests. The default is FALSE. - digests_allowed = _l_i_s_t _o_f _d_i_g_e_s_t_s + digests_allowed = [4mlist[24m [4mof[24m [4mdigests[0m Specifies the digests the kdc will reply to. The default is ntlm-v2. - kx509_ca = _f_i_l_e + kx509_ca = [4mfile[0m Specifies the PEM credentials for the kx509 certi- fication authority. - require_initial_kca_tickets = _b_o_o_l_e_a_n + require_initial_kca_tickets = [4mboolean[0m Specified whether to require that tickets for the kca_service service principal be INITIAL. This may be set on a per-realm basis as well as globally. Defaults to true for the global setting. - kx509_include_pkinit_san = _b_o_o_l_e_a_n + kx509_include_pkinit_san = [4mboolean[0m If true then the kx509 client principal's name and realm will be included in an id-pkinit-san certifi- - cate extension. This can be set on a per-realm - basis as well as globally. Defaults to true for - the global setting. + cate extension. This can be set on a per-realm ba- + sis as well as globally. Defaults to true for the + global setting. - kx509_template = _f_i_l_e + kx509_template = [4mfile[0m Specifies the PEM file with a template for the cer- tificates to be issued. The following variables can be interpolated in the subject name using @@ -707,49 +727,49 @@ DDEESSCCRRIIPPTTIIOONN [kadmin] - password_lifetime = _t_i_m_e + password_lifetime = [4mtime[0m If a principal already have its password set for expiration, this is the time it will be valid for after a change. - default_keys = _k_e_y_t_y_p_e_s_._._. - For each entry in _d_e_f_a_u_l_t___k_e_y_s try to parse it as a - sequence of _e_t_y_p_e_:_s_a_l_t_t_y_p_e_:_s_a_l_t syntax of this if + default_keys = [4mkeytypes...[0m + For each entry in [4mdefault_keys[24m try to parse it as a + sequence of [4metype:salttype:salt[24m syntax of this if something like: [(des|des3|etype):](pw-salt|afs3-salt)[:string] - If _e_t_y_p_e is omitted it means everything, and if + If [4metype[24m is omitted it means everything, and if string is omitted it means the default salt string (for that principal and encryption type). Addi- tional special values of keytypes are: - v5 The Kerberos 5 salt _p_w_-_s_a_l_t + v5 The Kerberos 5 salt [4mpw-salt[0m - default_key_rules = _{ + default_key_rules = [4m{[0m - _g_l_o_b_i_n_g_-_r_u_l_e = _k_e_y_t_y_p_e_s_._._. + [4mglobing-rule[24m = [4mkeytypes...[0m a globbing rule to matching a principal, and when true, use the keytypes as spec- - ified the same format as [kad- - min]default_keys . + ified the same format as [kadmin]de- + fault_keys . } - prune-key-history = _B_O_O_L + prune-key-history = [4mBOOL[0m When adding keys to the key history, drop keys that are too old to match unexpired tickets (based on the principal's maximum ticket lifetime). If the KDC keystore is later compromised traffic protected with the discarded older keys may remain protected. This also keeps the HDB records for principals with - key history from growing without bound. The - default (backwards compatible) value is "false". + key history from growing without bound. The de- + fault (backwards compatible) value is "false". - use_v4_salt = _B_O_O_L + use_v4_salt = [4mBOOL[0m When true, this is the same as - _d_e_f_a_u_l_t___k_e_y_s _= _d_e_s_3_:_p_w_-_s_a_l_t _v_4 + [4mdefault_keys[24m [4m=[24m [4mdes3:pw-salt[24m [4mv4[0m and is only left for backwards compatibility. @@ -757,31 +777,31 @@ DDEESSCCRRIIPPTTIIOONN Check the Password quality assurance in the info documentation for more information. - check_library = _l_i_b_r_a_r_y_-_n_a_m_e + check_library = [4mlibrary-name[0m Library name that contains the password check_function - check_function = _f_u_n_c_t_i_o_n_-_n_a_m_e + check_function = [4mfunction-name[0m Function name for checking passwords in check_library - policy_libraries = _l_i_b_r_a_r_y_1 _._._. _l_i_b_r_a_r_y_N + policy_libraries = [4mlibrary1[24m [4m...[24m [4mlibraryN[0m List of libraries that can do password policy checks - policies = _p_o_l_i_c_y_1 _._._. _p_o_l_i_c_y_N + policies = [4mpolicy1[24m [4m...[24m [4mpolicyN[0m List of policy names to apply to the password. Builtin policies are among other minimum-length, character-class, external-check. -EENNVVIIRROONNMMEENNTT +[1mENVIRONMENT[0m KRB5_CONFIG points to the configuration file to read. -FFIILLEESS +[1mFILES[0m /etc/krb5.conf configuration file for Kerberos 5. -EEXXAAMMPPLLEESS +[1mEXAMPLES[0m [libdefaults] default_realm = FOO.SE name_canon_rules = as-is:realm=FOO.SE @@ -805,16 +825,16 @@ EEXXAAMMPPLLEESS */ppp@* = arcfour-hmac-md5:pw-salt } -DDIIAAGGNNOOSSTTIICCSS - Since kkrrbb55..ccoonnff is read and parsed by the krb5 library, there is not a +[1mDIAGNOSTICS[0m + Since [1mkrb5.conf [22mis read and parsed by the krb5 library, there is not a lot of opportunities for programs to report parsing errors in any useful format. To help overcome this problem, there is a program - vveerriiffyy__kkrrbb55__ccoonnff that reads kkrrbb55..ccoonnff and tries to emit useful diagnos- + [1mverify_krb5_conf [22mthat reads [1mkrb5.conf [22mand tries to emit useful diagnos- tics from parsing errors. Note that this program does not have any way - of knowing what options are actually used and thus cannot warn about - unknown or misspelled ones. + of knowing what options are actually used and thus cannot warn about un- + known or misspelled ones. -SSEEEE AALLSSOO +[1mSEE ALSO[0m kinit(1), krb5_openlog(3), strftime(3), verify_krb5_conf(8) HEIMDAL May 4, 2005 HEIMDAL diff --git a/lib/krb5/krb5.h b/lib/krb5/krb5.h index b6745a5b7758..c37af35933b2 100644 --- a/lib/krb5/krb5.h +++ b/lib/krb5/krb5.h @@ -117,55 +117,52 @@ typedef struct krb5_enc_data { } krb5_enc_data; /* alternative names */ -enum { - ENCTYPE_NULL = KRB5_ENCTYPE_NULL, - ENCTYPE_DES_CBC_CRC = KRB5_ENCTYPE_DES_CBC_CRC, - ENCTYPE_DES_CBC_MD4 = KRB5_ENCTYPE_DES_CBC_MD4, - ENCTYPE_DES_CBC_MD5 = KRB5_ENCTYPE_DES_CBC_MD5, - ENCTYPE_DES3_CBC_MD5 = KRB5_ENCTYPE_DES3_CBC_MD5, - ENCTYPE_OLD_DES3_CBC_SHA1 = KRB5_ENCTYPE_OLD_DES3_CBC_SHA1, - ENCTYPE_SIGN_DSA_GENERATE = KRB5_ENCTYPE_SIGN_DSA_GENERATE, - ENCTYPE_ENCRYPT_RSA_PRIV = KRB5_ENCTYPE_ENCRYPT_RSA_PRIV, - ENCTYPE_ENCRYPT_RSA_PUB = KRB5_ENCTYPE_ENCRYPT_RSA_PUB, - ENCTYPE_DES3_CBC_SHA1 = KRB5_ENCTYPE_DES3_CBC_SHA1, - ENCTYPE_AES128_CTS_HMAC_SHA1_96 = KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96, - ENCTYPE_AES256_CTS_HMAC_SHA1_96 = KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96, - ENCTYPE_ARCFOUR_HMAC = KRB5_ENCTYPE_ARCFOUR_HMAC_MD5, - ENCTYPE_ARCFOUR_HMAC_MD5 = KRB5_ENCTYPE_ARCFOUR_HMAC_MD5, - ENCTYPE_ARCFOUR_HMAC_MD5_56 = KRB5_ENCTYPE_ARCFOUR_HMAC_MD5_56, - ENCTYPE_ENCTYPE_PK_CROSS = KRB5_ENCTYPE_ENCTYPE_PK_CROSS, - ENCTYPE_DES_CBC_NONE = KRB5_ENCTYPE_DES_CBC_NONE, - ENCTYPE_DES3_CBC_NONE = KRB5_ENCTYPE_DES3_CBC_NONE, - ENCTYPE_DES_CFB64_NONE = KRB5_ENCTYPE_DES_CFB64_NONE, - ENCTYPE_DES_PCBC_NONE = KRB5_ENCTYPE_DES_PCBC_NONE, - ETYPE_NULL = KRB5_ENCTYPE_NULL, - ETYPE_DES_CBC_CRC = KRB5_ENCTYPE_DES_CBC_CRC, - ETYPE_DES_CBC_MD4 = KRB5_ENCTYPE_DES_CBC_MD4, - ETYPE_DES_CBC_MD5 = KRB5_ENCTYPE_DES_CBC_MD5, - ETYPE_DES3_CBC_MD5 = KRB5_ENCTYPE_DES3_CBC_MD5, - ETYPE_OLD_DES3_CBC_SHA1 = KRB5_ENCTYPE_OLD_DES3_CBC_SHA1, - ETYPE_SIGN_DSA_GENERATE = KRB5_ENCTYPE_SIGN_DSA_GENERATE, - ETYPE_ENCRYPT_RSA_PRIV = KRB5_ENCTYPE_ENCRYPT_RSA_PRIV, - ETYPE_ENCRYPT_RSA_PUB = KRB5_ENCTYPE_ENCRYPT_RSA_PUB, - ETYPE_DES3_CBC_SHA1 = KRB5_ENCTYPE_DES3_CBC_SHA1, - ETYPE_AES128_CTS_HMAC_SHA1_96 = KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96, - ETYPE_AES256_CTS_HMAC_SHA1_96 = KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96, - ETYPE_AES128_CTS_HMAC_SHA256_128 = KRB5_ENCTYPE_AES128_CTS_HMAC_SHA256_128, - ETYPE_AES256_CTS_HMAC_SHA384_192 = KRB5_ENCTYPE_AES256_CTS_HMAC_SHA384_192, - ETYPE_ARCFOUR_HMAC_MD5 = KRB5_ENCTYPE_ARCFOUR_HMAC_MD5, - ETYPE_ARCFOUR_HMAC_MD5_56 = KRB5_ENCTYPE_ARCFOUR_HMAC_MD5_56, - ETYPE_ENCTYPE_PK_CROSS = KRB5_ENCTYPE_ENCTYPE_PK_CROSS, - ETYPE_ARCFOUR_MD4 = KRB5_ENCTYPE_ARCFOUR_MD4, - ETYPE_ARCFOUR_HMAC_OLD = KRB5_ENCTYPE_ARCFOUR_HMAC_OLD, - ETYPE_ARCFOUR_HMAC_OLD_EXP = KRB5_ENCTYPE_ARCFOUR_HMAC_OLD_EXP, - ETYPE_DES_CBC_NONE = KRB5_ENCTYPE_DES_CBC_NONE, - ETYPE_DES3_CBC_NONE = KRB5_ENCTYPE_DES3_CBC_NONE, - ETYPE_DES_CFB64_NONE = KRB5_ENCTYPE_DES_CFB64_NONE, - ETYPE_DES_PCBC_NONE = KRB5_ENCTYPE_DES_PCBC_NONE, - ETYPE_DIGEST_MD5_NONE = KRB5_ENCTYPE_DIGEST_MD5_NONE, - ETYPE_CRAM_MD5_NONE = KRB5_ENCTYPE_CRAM_MD5_NONE - -}; +#define ENCTYPE_NULL KRB5_ENCTYPE_NULL +#define ENCTYPE_DES_CBC_CRC KRB5_ENCTYPE_DES_CBC_CRC +#define ENCTYPE_DES_CBC_MD4 KRB5_ENCTYPE_DES_CBC_MD4 +#define ENCTYPE_DES_CBC_MD5 KRB5_ENCTYPE_DES_CBC_MD5 +#define ENCTYPE_DES3_CBC_MD5 KRB5_ENCTYPE_DES3_CBC_MD5 +#define ENCTYPE_OLD_DES3_CBC_SHA1 KRB5_ENCTYPE_OLD_DES3_CBC_SHA1 +#define ENCTYPE_SIGN_DSA_GENERATE KRB5_ENCTYPE_SIGN_DSA_GENERATE +#define ENCTYPE_ENCRYPT_RSA_PRIV KRB5_ENCTYPE_ENCRYPT_RSA_PRIV +#define ENCTYPE_ENCRYPT_RSA_PUB KRB5_ENCTYPE_ENCRYPT_RSA_PUB +#define ENCTYPE_DES3_CBC_SHA1 KRB5_ENCTYPE_DES3_CBC_SHA1 +#define ENCTYPE_AES128_CTS_HMAC_SHA1_96 KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 +#define ENCTYPE_AES256_CTS_HMAC_SHA1_96 KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 +#define ENCTYPE_ARCFOUR_HMAC KRB5_ENCTYPE_ARCFOUR_HMAC_MD5 +#define ENCTYPE_ARCFOUR_HMAC_MD5 KRB5_ENCTYPE_ARCFOUR_HMAC_MD5 +#define ENCTYPE_ARCFOUR_HMAC_MD5_56 KRB5_ENCTYPE_ARCFOUR_HMAC_MD5_56 +#define ENCTYPE_ENCTYPE_PK_CROSS KRB5_ENCTYPE_ENCTYPE_PK_CROSS +#define ENCTYPE_DES_CBC_NONE KRB5_ENCTYPE_DES_CBC_NONE +#define ENCTYPE_DES3_CBC_NONE KRB5_ENCTYPE_DES3_CBC_NONE +#define ENCTYPE_DES_CFB64_NONE KRB5_ENCTYPE_DES_CFB64_NONE +#define ENCTYPE_DES_PCBC_NONE KRB5_ENCTYPE_DES_PCBC_NONE +#define ETYPE_NULL KRB5_ENCTYPE_NULL +#define ETYPE_DES_CBC_CRC KRB5_ENCTYPE_DES_CBC_CRC +#define ETYPE_DES_CBC_MD4 KRB5_ENCTYPE_DES_CBC_MD4 +#define ETYPE_DES_CBC_MD5 KRB5_ENCTYPE_DES_CBC_MD5 +#define ETYPE_DES3_CBC_MD5 KRB5_ENCTYPE_DES3_CBC_MD5 +#define ETYPE_OLD_DES3_CBC_SHA1 KRB5_ENCTYPE_OLD_DES3_CBC_SHA1 +#define ETYPE_SIGN_DSA_GENERATE KRB5_ENCTYPE_SIGN_DSA_GENERATE +#define ETYPE_ENCRYPT_RSA_PRIV KRB5_ENCTYPE_ENCRYPT_RSA_PRIV +#define ETYPE_ENCRYPT_RSA_PUB KRB5_ENCTYPE_ENCRYPT_RSA_PUB +#define ETYPE_DES3_CBC_SHA1 KRB5_ENCTYPE_DES3_CBC_SHA1 +#define ETYPE_AES128_CTS_HMAC_SHA1_96 KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 +#define ETYPE_AES256_CTS_HMAC_SHA1_96 KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 +#define ETYPE_AES128_CTS_HMAC_SHA256_128 KRB5_ENCTYPE_AES128_CTS_HMAC_SHA256_128 +#define ETYPE_AES256_CTS_HMAC_SHA384_192 KRB5_ENCTYPE_AES256_CTS_HMAC_SHA384_192 +#define ETYPE_ARCFOUR_HMAC_MD5 KRB5_ENCTYPE_ARCFOUR_HMAC_MD5 +#define ETYPE_ARCFOUR_HMAC_MD5_56 KRB5_ENCTYPE_ARCFOUR_HMAC_MD5_56 +#define ETYPE_ENCTYPE_PK_CROSS KRB5_ENCTYPE_ENCTYPE_PK_CROSS +#define ETYPE_ARCFOUR_MD4 KRB5_ENCTYPE_ARCFOUR_MD4 +#define ETYPE_ARCFOUR_HMAC_OLD KRB5_ENCTYPE_ARCFOUR_HMAC_OLD +#define ETYPE_ARCFOUR_HMAC_OLD_EXP KRB5_ENCTYPE_ARCFOUR_HMAC_OLD_EXP +#define ETYPE_DES_CBC_NONE KRB5_ENCTYPE_DES_CBC_NONE +#define ETYPE_DES3_CBC_NONE KRB5_ENCTYPE_DES3_CBC_NONE +#define ETYPE_DES_CFB64_NONE KRB5_ENCTYPE_DES_CFB64_NONE +#define ETYPE_DES_PCBC_NONE KRB5_ENCTYPE_DES_PCBC_NONE +#define ETYPE_DIGEST_MD5_NONE KRB5_ENCTYPE_DIGEST_MD5_NONE +#define ETYPE_CRAM_MD5_NONE KRB5_ENCTYPE_CRAM_MD5_NONE /* PDU types */ typedef enum krb5_pdu { @@ -955,8 +952,11 @@ typedef struct krb5_name_canon_iterator_data *krb5_name_canon_iterator; */ #define KRB5_ANON_MATCH_AUTHENTICATED 1 /* authenticated with anon flag */ #define KRB5_ANON_MATCH_UNAUTHENTICATED 2 /* anonymous PKINIT */ -#define KRB5_ANON_MATCH_ANY ( KRB5_ANON_MATCH_AUTHENTICATED | KRB5_ANON_MATCH_UNAUTHENTICATED ) - +#define KRB5_ANON_IGNORE_NAME_TYPE 4 /* don't check the name type */ +#define KRB5_ANON_MATCH_ANY ( KRB5_ANON_MATCH_AUTHENTICATED | \ + KRB5_ANON_MATCH_UNAUTHENTICATED ) +#define KRB5_ANON_MATCH_ANY_NONT ( KRB5_ANON_MATCH_ANY | \ + KRB5_ANON_IGNORE_NAME_TYPE ) /* * @@ -994,5 +994,24 @@ extern KRB5_LIB_VARIABLE const char *krb5_cc_type_kcm; extern KRB5_LIB_VARIABLE const char *krb5_cc_type_scc; extern KRB5_LIB_VARIABLE const char *krb5_cc_type_dcc; +/* clang analyzer workarounds */ + +#ifdef __clang_analyzer__ +/* + * The clang analyzer (lint) can't know that krb5_enomem() always returns + * non-zero, so code like: + * + * if ((x = malloc(...)) == NULL) + * ret = krb5_enomem(context) + * if (ret == 0) + * *x = ...; + * + * causes false positives. + * + * The fix is to make krb5_enomem() a macro that always evaluates to ENOMEM. + */ +#define krb5_enomem(c) (krb5_enomem(c), ENOMEM) +#endif + #endif /* __KRB5_H__ */ diff --git a/lib/krb5/krb524_convert_creds_kdc.cat3 b/lib/krb5/krb524_convert_creds_kdc.cat3 index 84d48c34489f..b6992ec07f53 100644 --- a/lib/krb5/krb524_convert_creds_kdc.cat3 +++ b/lib/krb5/krb524_convert_creds_kdc.cat3 @@ -1,35 +1,34 @@ - KRB524_CONVERT_CREDS_... BSD Library Functions Manual KRB524_CONVERT_CREDS_... -NNAAMMEE - kkrrbb552244__ccoonnvveerrtt__ccrreeddss__kkddcc, kkrrbb552244__ccoonnvveerrtt__ccrreeddss__kkddcc__ccccaacchhee -- converts +[1mNAME[0m + [1mkrb524_convert_creds_kdc[22m, [1mkrb524_convert_creds_kdc_ccache [22m-- converts Kerberos 5 credentials to Kerberos 4 credentials -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb552244__ccoonnvveerrtt__ccrreeddss__kkddcc(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_e_d_s _*_i_n___c_r_e_d, - _s_t_r_u_c_t _c_r_e_d_e_n_t_i_a_l_s _*_v_4_c_r_e_d_s); + [4mkrb5_error_code[0m + [1mkrb524_convert_creds_kdc[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_creds[24m [4m*in_cred[24m, + [4mstruct[24m [4mcredentials[24m [4m*v4creds[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb552244__ccoonnvveerrtt__ccrreeddss__kkddcc__ccccaacchhee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_c_a_c_h_e _c_c_a_c_h_e, - _k_r_b_5___c_r_e_d_s _*_i_n___c_r_e_d, _s_t_r_u_c_t _c_r_e_d_e_n_t_i_a_l_s _*_v_4_c_r_e_d_s); + [4mkrb5_error_code[0m + [1mkrb524_convert_creds_kdc_ccache[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_ccache[24m [4mccache[24m, + [4mkrb5_creds[24m [4m*in_cred[24m, [4mstruct[24m [4mcredentials[24m [4m*v4creds[24m); -DDEESSCCRRIIPPTTIIOONN +[1mDESCRIPTION[0m Convert the Kerberos 5 credential to Kerberos 4 credential. This is done by sending them to the 524 service in the KDC. - kkrrbb552244__ccoonnvveerrtt__ccrreeddss__kkddcc() converts the Kerberos 5 credential in _i_n___c_r_e_d - to Kerberos 4 credential that is stored in _c_r_e_d_e_n_t_i_a_l_s. + [1mkrb524_convert_creds_kdc[22m() converts the Kerberos 5 credential in [4min_cred[0m + to Kerberos 4 credential that is stored in [4mcredentials[24m. - kkrrbb552244__ccoonnvveerrtt__ccrreeddss__kkddcc__ccccaacchhee() is different from - kkrrbb552244__ccoonnvveerrtt__ccrreeddss__kkddcc() in that way that if _i_n___c_r_e_d doesn't contain a + [1mkrb524_convert_creds_kdc_ccache[22m() is different from + [1mkrb524_convert_creds_kdc[22m() in that way that if [4min_cred[24m doesn't contain a DES session key, then a new one is fetched from the KDC and stored in the - cred cache _c_c_a_c_h_e, and then the KDC is queried to convert the credential. + cred cache [4mccache[24m, and then the KDC is queried to convert the credential. This interfaces are used to make the migration to Kerberos 5 from Ker- beros 4 easier. There are few services that still need Kerberos 4, and @@ -37,7 +36,7 @@ DDEESSCCRRIIPPTTIIOONN AFS, really have Kerberos 5 supports, but still uses the 524 interface to make the migration easier. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3), krb5.conf(5) HEIMDAL March 20, 2004 HEIMDAL diff --git a/lib/krb5/krb5_425_conv_principal.cat3 b/lib/krb5/krb5_425_conv_principal.cat3 index abef9b0db8ff..3845106ca656 100644 --- a/lib/krb5/krb5_425_conv_principal.cat3 +++ b/lib/krb5/krb5_425_conv_principal.cat3 @@ -1,63 +1,62 @@ - KRB5_425_CONV_PRINCIP... BSD Library Functions Manual KRB5_425_CONV_PRINCIP... -NNAAMMEE - kkrrbb55__442255__ccoonnvv__pprriinncciippaall, kkrrbb55__442255__ccoonnvv__pprriinncciippaall__eexxtt, - kkrrbb55__552244__ccoonnvv__pprriinncciippaall -- converts to and from version 4 principals +[1mNAME[0m + [1mkrb5_425_conv_principal[22m, [1mkrb5_425_conv_principal_ext[22m, + [1mkrb5_524_conv_principal [22m-- converts to and from version 4 principals -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__442255__ccoonnvv__pprriinncciippaall(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _c_h_a_r _*_n_a_m_e, - _c_o_n_s_t _c_h_a_r _*_i_n_s_t_a_n_c_e, _c_o_n_s_t _c_h_a_r _*_r_e_a_l_m, _k_r_b_5___p_r_i_n_c_i_p_a_l _*_p_r_i_n_c_i_p_a_l); + [4mkrb5_error_code[0m + [1mkrb5_425_conv_principal[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mchar[24m [4m*name[24m, + [4mconst[24m [4mchar[24m [4m*instance[24m, [4mconst[24m [4mchar[24m [4m*realm[24m, [4mkrb5_principal[24m [4m*principal[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__442255__ccoonnvv__pprriinncciippaall__eexxtt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _c_h_a_r _*_n_a_m_e, - _c_o_n_s_t _c_h_a_r _*_i_n_s_t_a_n_c_e, _c_o_n_s_t _c_h_a_r _*_r_e_a_l_m, - _k_r_b_5___b_o_o_l_e_a_n _(_*_f_u_n_c_)_(_k_r_b_5___c_o_n_t_e_x_t_, _k_r_b_5___p_r_i_n_c_i_p_a_l_), - _k_r_b_5___b_o_o_l_e_a_n _r_e_s_o_l_v_e, _k_r_b_5___p_r_i_n_c_i_p_a_l _*_p_r_i_n_c_i_p_a_l); + [4mkrb5_error_code[0m + [1mkrb5_425_conv_principal_ext[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mchar[24m [4m*name[24m, + [4mconst[24m [4mchar[24m [4m*instance[24m, [4mconst[24m [4mchar[24m [4m*realm[24m, + [4mkrb5_boolean[24m [4m(*func)(krb5_context,[24m [4mkrb5_principal)[24m, + [4mkrb5_boolean[24m [4mresolve[24m, [4mkrb5_principal[24m [4m*principal[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__552244__ccoonnvv__pprriinncciippaall(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _c_o_n_s_t _k_r_b_5___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l, _c_h_a_r _*_n_a_m_e, _c_h_a_r _*_i_n_s_t_a_n_c_e, - _c_h_a_r _*_r_e_a_l_m); + [4mkrb5_error_code[0m + [1mkrb5_524_conv_principal[22m([4mkrb5_context[24m [4mcontext[24m, + [4mconst[24m [4mkrb5_principal[24m [4mprincipal[24m, [4mchar[24m [4m*name[24m, [4mchar[24m [4m*instance[24m, + [4mchar[24m [4m*realm[24m); -DDEESSCCRRIIPPTTIIOONN - Converting between version 4 and version 5 principals can at best be - described as a mess. +[1mDESCRIPTION[0m + Converting between version 4 and version 5 principals can at best be de- + scribed as a mess. A version 4 principal consists of a name, an instance, and a realm. A version 5 principal consists of one or more components, and a realm. In some cases also the first component/name will differ between version 4 and version 5. Furthermore the second component of a host principal will - be the fully qualified domain name of the host in question, while the - instance of a version 4 principal will only contain the first part (short + be the fully qualified domain name of the host in question, while the in- + stance of a version 4 principal will only contain the first part (short hostname). Because of these problems the conversion between principals will have to be site customized. - kkrrbb55__442255__ccoonnvv__pprriinncciippaall__eexxtt() will try to convert a version 4 principal, - given by _n_a_m_e, _i_n_s_t_a_n_c_e, and _r_e_a_l_m, to a version 5 principal. This can - result in several possible principals, and if _f_u_n_c is non-NULL, it will - be called for each candidate principal. _f_u_n_c should return true if the - principal was ``good''. To accomplish this, - kkrrbb55__442255__ccoonnvv__pprriinncciippaall__eexxtt() will look up the name in _k_r_b_5_._c_o_n_f. It - first looks in the v4_name_convert/host subsection, which should contain - a list of version 4 names whose instance should be treated as a hostname. - This list can be specified for each realm (in the realms section), or in - the libdefaults section. If the name is found the resulting name of the - principal will be the value of this binding. The instance is then first - looked up in v4_instance_convert for the specified realm. If found the - resulting value will be used as instance (this can be used for special - cases), no further attempts will be made to find a conversion if this - fails (with _f_u_n_c). If the _r_e_s_o_l_v_e parameter is true, the instance will - be looked up with ggeetthhoossttbbyynnaammee(). This can be a time consuming, error - prone, and unsafe operation. Next a list of hostnames will be created - from the instance and the v4_domains variable, which should contain a - list of possible domains for the specific realm. + [1mkrb5_425_conv_principal_ext[22m() will try to convert a version 4 principal, + given by [4mname[24m, [4minstance[24m, and [4mrealm[24m, to a version 5 principal. This can + result in several possible principals, and if [4mfunc[24m is non-NULL, it will + be called for each candidate principal. [4mfunc[24m should return true if the + principal was "good". To accomplish this, [1mkrb5_425_conv_principal_ext[22m() + will look up the name in [4mkrb5.conf[24m. It first looks in the + v4_name_convert/host subsection, which should contain a list of version 4 + names whose instance should be treated as a hostname. This list can be + specified for each realm (in the realms section), or in the libdefaults + section. If the name is found the resulting name of the principal will + be the value of this binding. The instance is then first looked up in + v4_instance_convert for the specified realm. If found the resulting value + will be used as instance (this can be used for special cases), no further + attempts will be made to find a conversion if this fails (with [4mfunc[24m). If + the [4mresolve[24m parameter is true, the instance will be looked up with + [1mgethostbyname[22m(). This can be a time consuming, error prone, and unsafe + operation. Next a list of hostnames will be created from the instance + and the v4_domains variable, which should contain a list of possible do- + mains for the specific realm. On the other hand, if the name is not found in a host section, it is looked up in a v4_name_convert/plain binding. If found here the name will @@ -79,27 +78,27 @@ DDEESSCCRRIIPPTTIIOONN It will only be used if there isn't an entry for these names in the con- fig file, so you can override these defaults. - kkrrbb55__442255__ccoonnvv__pprriinncciippaall() will call kkrrbb55__442255__ccoonnvv__pprriinncciippaall__eexxtt() with - NULL as _f_u_n_c, and the value of v4_instance_resolve (from the libdefaults - section) as _r_e_s_o_l_v_e. + [1mkrb5_425_conv_principal[22m() will call [1mkrb5_425_conv_principal_ext[22m() with + NULL as [4mfunc[24m, and the value of v4_instance_resolve (from the libdefaults + section) as [4mresolve[24m. - kkrrbb55__552244__ccoonnvv__pprriinncciippaall() basically does the opposite of - kkrrbb55__442255__ccoonnvv__pprriinncciippaall(), it just doesn't have to look up any names, but + [1mkrb5_524_conv_principal[22m() basically does the opposite of + [1mkrb5_425_conv_principal[22m(), it just doesn't have to look up any names, but will instead truncate instances found to belong to a host principal. The - _n_a_m_e, _i_n_s_t_a_n_c_e, and _r_e_a_l_m should be at least 40 characters long. + [4mname[24m, [4minstance[24m, and [4mrealm[24m should be at least 40 characters long. -EEXXAAMMPPLLEESS +[1mEXAMPLES[0m Since this is confusing an example is in place. - Assume that we have the ``foo.com'', and ``bar.com'' domains that have - shared a single version 4 realm, FOO.COM. The version 4 _k_r_b_._r_e_a_l_m_s file - looked like: + Assume that we have the "foo.com", and "bar.com" domains that have shared + a single version 4 realm, FOO.COM. The version 4 [4mkrb.realms[24m file looked + like: foo.com FOO.COM .foo.com FOO.COM .bar.com FOO.COM - A _k_r_b_5_._c_o_n_f file that covers this case might look like: + A [4mkrb5.conf[24m file that covers this case might look like: [libdefaults] v4_instance_resolve = yes @@ -125,16 +124,15 @@ EEXXAAMMPPLLEESS ftp.other -> ftp/other.foo.com other.a-host -> other/a-host - The first three are what you expect. If you remove the ``v4_domains'', - the fourth entry will result in an error (since the host ``other'' can't - be found). Even if ``a-host'' is a valid host name, the last entry will - not be converted, since the ``other'' name is not known to represent a - host-type principal. If you turn off ``v4_instance_resolve'' the second - example will result in ``ftp/b-host.foo.com'' (because of the default - domain). And all of this is of course only valid if you have working name - resolving. + The first three are what you expect. If you remove the "v4_domains", the + fourth entry will result in an error (since the host "other" can't be + found). Even if "a-host" is a valid host name, the last entry will not be + converted, since the "other" name is not known to represent a host-type + principal. If you turn off "v4_instance_resolve" the second example will + result in "ftp/b-host.foo.com" (because of the default domain). And all + of this is of course only valid if you have working name resolving. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5_build_principal(3), krb5_free_principal(3), krb5_parse_name(3), krb5_sname_to_principal(3), krb5_unparse_name(3), krb5.conf(5) diff --git a/lib/krb5/krb5_acl_match_file.cat3 b/lib/krb5/krb5_acl_match_file.cat3 index 8aebb87a949e..40b09c1f16f2 100644 --- a/lib/krb5/krb5_acl_match_file.cat3 +++ b/lib/krb5/krb5_acl_match_file.cat3 @@ -1,26 +1,25 @@ - KRB5_ACL_MATCH_FILE(3) BSD Library Functions Manual KRB5_ACL_MATCH_FILE(3) -NNAAMMEE - kkrrbb55__aaccll__mmaattcchh__ffiillee, kkrrbb55__aaccll__mmaattcchh__ssttrriinngg -- ACL matching functions +[1mNAME[0m + [1mkrb5_acl_match_file[22m, [1mkrb5_acl_match_string [22m-- ACL matching functions -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aaccll__mmaattcchh__ffiillee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _c_h_a_r _*_f_i_l_e, - _c_o_n_s_t _c_h_a_r _*_f_o_r_m_a_t, _._._.); +[1mSYNOPSIS[0m + [4mkrb5_error_code[0m + [1mkrb5_acl_match_file[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mchar[24m [4m*file[24m, + [4mconst[24m [4mchar[24m [4m*format[24m, [4m...[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aaccll__mmaattcchh__ssttrriinngg(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _c_h_a_r _*_s_t_r_i_n_g, - _c_o_n_s_t _c_h_a_r _*_f_o_r_m_a_t, _._._.); + [4mkrb5_error_code[0m + [1mkrb5_acl_match_string[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mchar[24m [4m*string[24m, + [4mconst[24m [4mchar[24m [4m*format[24m, [4m...[24m); -DDEESSCCRRIIPPTTIIOONN - kkrrbb55__aaccll__mmaattcchh__ffiillee matches ACL format against each line in a file. +[1mDESCRIPTION[0m + [1mkrb5_acl_match_file [22mmatches ACL format against each line in a file. Lines starting with # are treated like comments and ignored. - kkrrbb55__aaccll__mmaattcchh__ssttrriinngg matches ACL format against a string. + [1mkrb5_acl_match_string [22mmatches ACL format against a string. The ACL format has three format specifiers: s, f, and r. Each specifier will retrieve one argument from the variable arguments for either match- @@ -30,7 +29,7 @@ DDEESSCCRRIIPPTTIIOONN s Matches a string using strcmp(3) (case sensitive). - f Matches the string with fnmatch(3). The _f_l_a_g_s argument (the + f Matches the string with fnmatch(3). The [4mflags[24m argument (the last argument) passed to the fnmatch function is 0. r Returns a copy of the string in the char ** passed in; the @@ -40,7 +39,7 @@ DDEESSCCRRIIPPTTIIOONN All unknown format specifiers cause an error. -EEXXAAMMPPLLEESS +[1mEXAMPLES[0m char *s; ret = krb5_acl_match_string(context, "foo", "s", "foo"); @@ -55,7 +54,7 @@ EEXXAAMMPPLLEESS } free(s); -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3) HEIMDAL May 12, 2006 HEIMDAL diff --git a/lib/krb5/krb5_aname_to_localname.cat3 b/lib/krb5/krb5_aname_to_localname.cat3 index 03565c1eaafe..6c134bc3995e 100644 --- a/lib/krb5/krb5_aname_to_localname.cat3 +++ b/lib/krb5/krb5_aname_to_localname.cat3 @@ -1,39 +1,38 @@ - KRB5_ANAME_TO_LOCALNA... BSD Library Functions Manual KRB5_ANAME_TO_LOCALNA... -NNAAMMEE - kkrrbb55__aannaammee__ttoo__llooccaallnnaammee -- converts a principal to a system local name +[1mNAME[0m + [1mkrb5_aname_to_localname [22m-- converts a principal to a system local name -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___b_o_o_l_e_a_n - kkrrbb55__aannaammee__ttoo__llooccaallnnaammee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _n_a_m_e, - _s_i_z_e___t _l_n_s_i_z_e, _c_h_a_r _*_l_n_a_m_e); + [4mkrb5_boolean[0m + [1mkrb5_aname_to_localname[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_const_principal[24m [4mname[24m, + [4msize_t[24m [4mlnsize[24m, [4mchar[24m [4m*lname[24m); -DDEESSCCRRIIPPTTIIOONN - This function takes a principal _n_a_m_e, verifies that it is in the local - realm (using kkrrbb55__ggeett__ddeeffaauulltt__rreeaallmmss()) and then returns the local name +[1mDESCRIPTION[0m + This function takes a principal [4mname[24m, verifies that it is in the local + realm (using [1mkrb5_get_default_realms[22m()) and then returns the local name of the principal. - If _n_a_m_e isn't in one of the local realms an error is returned. + If [4mname[24m isn't in one of the local realms an error is returned. - If the size (_l_n_s_i_z_e) of the local name (_l_n_a_m_e) is too small, an error is + If the size ([4mlnsize[24m) of the local name ([4mlname[24m) is too small, an error is returned. - kkrrbb55__aannaammee__ttoo__llooccaallnnaammee() should only be use by an application that - implements protocols that don't transport the login name and thus needs - to convert a principal to a local name. + [1mkrb5_aname_to_localname[22m() should only be use by an application that im- + plements protocols that don't transport the login name and thus needs to + convert a principal to a local name. Protocols should be designed so that they authenticate using Kerberos, send over the login name and then verify the principal that is authenti- cated is allowed to login and the login name. A way to check if a user - is allowed to login is using the function kkrrbb55__kkuusseerrookk(). + is allowed to login is using the function [1mkrb5_kuserok[22m(). -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5_get_default_realms(3), krb5_kuserok(3) HEIMDAL February 18, 2006 HEIMDAL diff --git a/lib/krb5/krb5_appdefault.cat3 b/lib/krb5/krb5_appdefault.cat3 index 5000115c20a3..41674112d170 100644 --- a/lib/krb5/krb5_appdefault.cat3 +++ b/lib/krb5/krb5_appdefault.cat3 @@ -1,32 +1,31 @@ - KRB5_APPDEFAULT(3) BSD Library Functions Manual KRB5_APPDEFAULT(3) -NNAAMMEE - kkrrbb55__aappppddeeffaauulltt__bboooolleeaann, kkrrbb55__aappppddeeffaauulltt__ssttrriinngg, kkrrbb55__aappppddeeffaauulltt__ttiimmee -- +[1mNAME[0m + [1mkrb5_appdefault_boolean[22m, [1mkrb5_appdefault_string[22m, [1mkrb5_appdefault_time [22m-- get application configuration value -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _v_o_i_d - kkrrbb55__aappppddeeffaauulltt__bboooolleeaann(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _c_h_a_r _*_a_p_p_n_a_m_e, - _k_r_b_5___r_e_a_l_m _r_e_a_l_m, _c_o_n_s_t _c_h_a_r _*_o_p_t_i_o_n, _k_r_b_5___b_o_o_l_e_a_n _d_e_f___v_a_l, - _k_r_b_5___b_o_o_l_e_a_n _*_r_e_t___v_a_l); + [4mvoid[0m + [1mkrb5_appdefault_boolean[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mchar[24m [4m*appname[24m, + [4mkrb5_realm[24m [4mrealm[24m, [4mconst[24m [4mchar[24m [4m*option[24m, [4mkrb5_boolean[24m [4mdef_val[24m, + [4mkrb5_boolean[24m [4m*ret_val[24m); - _v_o_i_d - kkrrbb55__aappppddeeffaauulltt__ssttrriinngg(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _c_h_a_r _*_a_p_p_n_a_m_e, - _k_r_b_5___r_e_a_l_m _r_e_a_l_m, _c_o_n_s_t _c_h_a_r _*_o_p_t_i_o_n, _c_o_n_s_t _c_h_a_r _*_d_e_f___v_a_l, - _c_h_a_r _*_*_r_e_t___v_a_l); + [4mvoid[0m + [1mkrb5_appdefault_string[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mchar[24m [4m*appname[24m, + [4mkrb5_realm[24m [4mrealm[24m, [4mconst[24m [4mchar[24m [4m*option[24m, [4mconst[24m [4mchar[24m [4m*def_val[24m, + [4mchar[24m [4m**ret_val[24m); - _v_o_i_d - kkrrbb55__aappppddeeffaauulltt__ttiimmee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _c_h_a_r _*_a_p_p_n_a_m_e, - _k_r_b_5___r_e_a_l_m _r_e_a_l_m, _c_o_n_s_t _c_h_a_r _*_o_p_t_i_o_n, _t_i_m_e___t _d_e_f___v_a_l, - _t_i_m_e___t _*_r_e_t___v_a_l); + [4mvoid[0m + [1mkrb5_appdefault_time[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mchar[24m [4m*appname[24m, + [4mkrb5_realm[24m [4mrealm[24m, [4mconst[24m [4mchar[24m [4m*option[24m, [4mtime_t[24m [4mdef_val[24m, + [4mtime_t[24m [4m*ret_val[24m); -DDEESSCCRRIIPPTTIIOONN +[1mDESCRIPTION[0m These functions get application defaults from the appdefaults section of the krb5.conf(5) configuration file. These defaults can be specified per application, and/or per realm. @@ -47,11 +46,11 @@ DDEESSCCRRIIPPTTIIOONN option = value } option = value - _a_p_p_n_a_m_e is the name of the application, and _r_e_a_l_m is the realm name. If - the realm is omitted it will not be used for resolving values. _d_e_f___v_a_l + [4mappname[24m is the name of the application, and [4mrealm[24m is the realm name. If + the realm is omitted it will not be used for resolving values. [4mdef_val[0m is the value to return if no value is found in krb5.conf(5). -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5_config(3), krb5.conf(5) HEIMDAL July 25, 2000 HEIMDAL diff --git a/lib/krb5/krb5_auth_context.cat3 b/lib/krb5/krb5_auth_context.cat3 index 85458a8f287f..7b0366e42777 100644 --- a/lib/krb5/krb5_auth_context.cat3 +++ b/lib/krb5/krb5_auth_context.cat3 @@ -1,116 +1,115 @@ - KRB5_AUTH_CONTEXT(3) BSD Library Functions Manual KRB5_AUTH_CONTEXT(3) -NNAAMMEE - kkrrbb55__aauutthh__ccoonn__aaddddffllaaggss, kkrrbb55__aauutthh__ccoonn__ffrreeee, kkrrbb55__aauutthh__ccoonn__ggeennaaddddrrss, - kkrrbb55__aauutthh__ccoonn__ggeenneerraatteellooccaallssuubbkkeeyy, kkrrbb55__aauutthh__ccoonn__ggeettaaddddrrss, - kkrrbb55__aauutthh__ccoonn__ggeettaauutthheennttiiccaattoorr, kkrrbb55__aauutthh__ccoonn__ggeettffllaaggss, - kkrrbb55__aauutthh__ccoonn__ggeettkkeeyy, kkrrbb55__aauutthh__ccoonn__ggeettllooccaallssuubbkkeeyy, - kkrrbb55__aauutthh__ccoonn__ggeettrrccaacchhee, kkrrbb55__aauutthh__ccoonn__ggeettrreemmootteessuubbkkeeyy, - kkrrbb55__aauutthh__ccoonn__ggeettuusseerrkkeeyy, kkrrbb55__aauutthh__ccoonn__iinniitt, kkrrbb55__aauutthh__ccoonn__iinniittiivveeccttoorr, - kkrrbb55__aauutthh__ccoonn__rreemmoovveeffllaaggss, kkrrbb55__aauutthh__ccoonn__sseettaaddddrrss, - kkrrbb55__aauutthh__ccoonn__sseettaaddddrrss__ffrroomm__ffdd, kkrrbb55__aauutthh__ccoonn__sseettffllaaggss, - kkrrbb55__aauutthh__ccoonn__sseettiivveeccttoorr, kkrrbb55__aauutthh__ccoonn__sseettkkeeyy, - kkrrbb55__aauutthh__ccoonn__sseettllooccaallssuubbkkeeyy, kkrrbb55__aauutthh__ccoonn__sseettrrccaacchhee, - kkrrbb55__aauutthh__ccoonn__sseettrreemmootteessuubbkkeeyy, kkrrbb55__aauutthh__ccoonn__sseettuusseerrkkeeyy, - kkrrbb55__aauutthh__ccoonntteexxtt, kkrrbb55__aauutthh__ggeettcckkssuummttyyppee, kkrrbb55__aauutthh__ggeettkkeeyyttyyppee, - kkrrbb55__aauutthh__ggeettllooccaallsseeqqnnuummbbeerr, kkrrbb55__aauutthh__ggeettrreemmootteesseeqqnnuummbbeerr, - kkrrbb55__aauutthh__sseettcckkssuummttyyppee, kkrrbb55__aauutthh__sseettkkeeyyttyyppee, - kkrrbb55__aauutthh__sseettllooccaallsseeqqnnuummbbeerr, kkrrbb55__aauutthh__sseettrreemmootteesseeqqnnuummbbeerr, - kkrrbb55__ffrreeee__aauutthheennttiiccaattoorr -- manage authentication on connection level - -LLIIBBRRAARRYY +[1mNAME[0m + [1mkrb5_auth_con_addflags[22m, [1mkrb5_auth_con_free[22m, [1mkrb5_auth_con_genaddrs[22m, + [1mkrb5_auth_con_generatelocalsubkey[22m, [1mkrb5_auth_con_getaddrs[22m, + [1mkrb5_auth_con_getauthenticator[22m, [1mkrb5_auth_con_getflags[22m, + [1mkrb5_auth_con_getkey[22m, [1mkrb5_auth_con_getlocalsubkey[22m, + [1mkrb5_auth_con_getrcache[22m, [1mkrb5_auth_con_getremotesubkey[22m, + [1mkrb5_auth_con_getuserkey[22m, [1mkrb5_auth_con_init[22m, [1mkrb5_auth_con_initivector[22m, + [1mkrb5_auth_con_removeflags[22m, [1mkrb5_auth_con_setaddrs[22m, + [1mkrb5_auth_con_setaddrs_from_fd[22m, [1mkrb5_auth_con_setflags[22m, + [1mkrb5_auth_con_setivector[22m, [1mkrb5_auth_con_setkey[22m, + [1mkrb5_auth_con_setlocalsubkey[22m, [1mkrb5_auth_con_setrcache[22m, + [1mkrb5_auth_con_setremotesubkey[22m, [1mkrb5_auth_con_setuserkey[22m, + [1mkrb5_auth_context[22m, [1mkrb5_auth_getcksumtype[22m, [1mkrb5_auth_getkeytype[22m, + [1mkrb5_auth_getlocalseqnumber[22m, [1mkrb5_auth_getremoteseqnumber[22m, + [1mkrb5_auth_setcksumtype[22m, [1mkrb5_auth_setkeytype[22m, + [1mkrb5_auth_setlocalseqnumber[22m, [1mkrb5_auth_setremoteseqnumber[22m, + [1mkrb5_free_authenticator [22m-- manage authentication on connection level + +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aauutthh__ccoonn__iinniitt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _*_a_u_t_h___c_o_n_t_e_x_t); + [4mkrb5_error_code[0m + [1mkrb5_auth_con_init[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_auth_context[24m [4m*auth_context[24m); - _v_o_i_d - kkrrbb55__aauutthh__ccoonn__ffrreeee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _a_u_t_h___c_o_n_t_e_x_t); + [4mvoid[0m + [1mkrb5_auth_con_free[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_auth_context[24m [4mauth_context[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aauutthh__ccoonn__sseettffllaaggss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _a_u_t_h___c_o_n_t_e_x_t, _i_n_t_3_2___t _f_l_a_g_s); + [4mkrb5_error_code[0m + [1mkrb5_auth_con_setflags[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_auth_context[24m [4mauth_context[24m, [4mint32_t[24m [4mflags[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aauutthh__ccoonn__ggeettffllaaggss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _a_u_t_h___c_o_n_t_e_x_t, _i_n_t_3_2___t _*_f_l_a_g_s); + [4mkrb5_error_code[0m + [1mkrb5_auth_con_getflags[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_auth_context[24m [4mauth_context[24m, [4mint32_t[24m [4m*flags[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aauutthh__ccoonn__aaddddffllaaggss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _a_u_t_h___c_o_n_t_e_x_t, _i_n_t_3_2___t _a_d_d_f_l_a_g_s, _i_n_t_3_2___t _*_f_l_a_g_s); + [4mkrb5_error_code[0m + [1mkrb5_auth_con_addflags[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_auth_context[24m [4mauth_context[24m, [4mint32_t[24m [4maddflags[24m, [4mint32_t[24m [4m*flags[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aauutthh__ccoonn__rreemmoovveeffllaaggss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _a_u_t_h___c_o_n_t_e_x_t, _i_n_t_3_2___t _r_e_m_o_v_e_l_a_g_s, _i_n_t_3_2___t _*_f_l_a_g_s); + [4mkrb5_error_code[0m + [1mkrb5_auth_con_removeflags[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_auth_context[24m [4mauth_context[24m, [4mint32_t[24m [4mremovelags[24m, [4mint32_t[24m [4m*flags[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aauutthh__ccoonn__sseettaaddddrrss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _a_u_t_h___c_o_n_t_e_x_t, _k_r_b_5___a_d_d_r_e_s_s _*_l_o_c_a_l___a_d_d_r, - _k_r_b_5___a_d_d_r_e_s_s _*_r_e_m_o_t_e___a_d_d_r); + [4mkrb5_error_code[0m + [1mkrb5_auth_con_setaddrs[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_auth_context[24m [4mauth_context[24m, [4mkrb5_address[24m [4m*local_addr[24m, + [4mkrb5_address[24m [4m*remote_addr[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aauutthh__ccoonn__ggeettaaddddrrss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _a_u_t_h___c_o_n_t_e_x_t, _k_r_b_5___a_d_d_r_e_s_s _*_*_l_o_c_a_l___a_d_d_r, - _k_r_b_5___a_d_d_r_e_s_s _*_*_r_e_m_o_t_e___a_d_d_r); + [4mkrb5_error_code[0m + [1mkrb5_auth_con_getaddrs[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_auth_context[24m [4mauth_context[24m, [4mkrb5_address[24m [4m**local_addr[24m, + [4mkrb5_address[24m [4m**remote_addr[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aauutthh__ccoonn__ggeennaaddddrrss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _a_u_t_h___c_o_n_t_e_x_t, _i_n_t _f_d, _i_n_t _f_l_a_g_s); + [4mkrb5_error_code[0m + [1mkrb5_auth_con_genaddrs[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_auth_context[24m [4mauth_context[24m, [4mint[24m [4mfd[24m, [4mint[24m [4mflags[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aauutthh__ccoonn__sseettaaddddrrss__ffrroomm__ffdd(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _a_u_t_h___c_o_n_t_e_x_t, _v_o_i_d _*_p___f_d); + [4mkrb5_error_code[0m + [1mkrb5_auth_con_setaddrs_from_fd[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_auth_context[24m [4mauth_context[24m, [4mvoid[24m [4m*p_fd[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aauutthh__ccoonn__ggeettkkeeyy(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _a_u_t_h___c_o_n_t_e_x_t, _k_r_b_5___k_e_y_b_l_o_c_k _*_*_k_e_y_b_l_o_c_k); + [4mkrb5_error_code[0m + [1mkrb5_auth_con_getkey[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_auth_context[24m [4mauth_context[24m, [4mkrb5_keyblock[24m [4m**keyblock[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aauutthh__ccoonn__ggeettllooccaallssuubbkkeeyy(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _a_u_t_h___c_o_n_t_e_x_t, _k_r_b_5___k_e_y_b_l_o_c_k _*_*_k_e_y_b_l_o_c_k); + [4mkrb5_error_code[0m + [1mkrb5_auth_con_getlocalsubkey[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_auth_context[24m [4mauth_context[24m, [4mkrb5_keyblock[24m [4m**keyblock[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aauutthh__ccoonn__ggeettrreemmootteessuubbkkeeyy(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _a_u_t_h___c_o_n_t_e_x_t, _k_r_b_5___k_e_y_b_l_o_c_k _*_*_k_e_y_b_l_o_c_k); + [4mkrb5_error_code[0m + [1mkrb5_auth_con_getremotesubkey[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_auth_context[24m [4mauth_context[24m, [4mkrb5_keyblock[24m [4m**keyblock[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aauutthh__ccoonn__ggeenneerraatteellooccaallssuubbkkeeyy(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _a_u_t_h___c_o_n_t_e_x_t, _k_r_b_5___k_e_y_b_l_o_c_k, _*_k_e_y_"); + [4mkrb5_error_code[0m + [1mkrb5_auth_con_generatelocalsubkey[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_auth_context[24m [4mauth_context[24m, [4mkrb5_keyblock[24m, [4m*key"[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aauutthh__ccoonn__iinniittiivveeccttoorr(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _a_u_t_h___c_o_n_t_e_x_t); + [4mkrb5_error_code[0m + [1mkrb5_auth_con_initivector[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_auth_context[24m [4mauth_context[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aauutthh__ccoonn__sseettiivveeccttoorr(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _*_a_u_t_h___c_o_n_t_e_x_t, _k_r_b_5___p_o_i_n_t_e_r _i_v_e_c_t_o_r); + [4mkrb5_error_code[0m + [1mkrb5_auth_con_setivector[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_auth_context[24m [4m*auth_context[24m, [4mkrb5_pointer[24m [4mivector[24m); - _v_o_i_d - kkrrbb55__ffrreeee__aauutthheennttiiccaattoorr(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_u_t_h_e_n_t_i_c_a_t_o_r _*_a_u_t_h_e_n_t_i_c_a_t_o_r); + [4mvoid[0m + [1mkrb5_free_authenticator[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_authenticator[24m [4m*authenticator[24m); -DDEESSCCRRIIPPTTIIOONN - The kkrrbb55__aauutthh__ccoonntteexxtt structure holds all context related to an authenti- - cated connection, in a similar way to kkrrbb55__ccoonntteexxtt that holds the context - for the thread or process. kkrrbb55__aauutthh__ccoonntteexxtt is used by various func- +[1mDESCRIPTION[0m + The [1mkrb5_auth_context [22mstructure holds all context related to an authenti- + cated connection, in a similar way to [1mkrb5_context [22mthat holds the context + for the thread or process. [1mkrb5_auth_context [22mis used by various func- tions that are directly related to authentication between the server/client. Example of data that this structure contains are various flags, addresses of client and server, port numbers, keyblocks (and sub- keys), sequence numbers, replay cache, and checksum-type. - kkrrbb55__aauutthh__ccoonn__iinniitt() allocates and initializes the kkrrbb55__aauutthh__ccoonntteexxtt + [1mkrb5_auth_con_init[22m() allocates and initializes the [1mkrb5_auth_context[0m structure. Default values can be changed with - kkrrbb55__aauutthh__ccoonn__sseettcckkssuummttyyppee() and kkrrbb55__aauutthh__ccoonn__sseettffllaaggss(). The - aauutthh__ccoonntteexxtt structure must be freed by kkrrbb55__aauutthh__ccoonn__ffrreeee(). + [1mkrb5_auth_con_setcksumtype[22m() and [1mkrb5_auth_con_setflags[22m(). The + [1mauth_context [22mstructure must be freed by [1mkrb5_auth_con_free[22m(). - kkrrbb55__aauutthh__ccoonn__ggeettffllaaggss(), kkrrbb55__aauutthh__ccoonn__sseettffllaaggss(), - kkrrbb55__aauutthh__ccoonn__aaddddffllaaggss() and kkrrbb55__aauutthh__ccoonn__rreemmoovveeffllaaggss() gets and modi- - fies the flags for a kkrrbb55__aauutthh__ccoonntteexxtt structure. Possible flags to set + [1mkrb5_auth_con_getflags[22m(), [1mkrb5_auth_con_setflags[22m(), + [1mkrb5_auth_con_addflags[22m() and [1mkrb5_auth_con_removeflags[22m() gets and modi- + fies the flags for a [1mkrb5_auth_context [22mstructure. Possible flags to set are: KRB5_AUTH_CONTEXT_DO_SEQUENCE @@ -124,7 +123,7 @@ DDEESSCCRRIIPPTTIIOONN ters. KRB5_AUTH_CONTEXT_CLEAR_FORWARDED_CRED - will force kkrrbb55__ggeett__ffoorrwwaarrddeedd__ccrreeddss() and kkrrbb55__ffwwdd__ttggtt__ccrreeddss() to + will force [1mkrb5_get_forwarded_creds[22m() and [1mkrb5_fwd_tgt_creds[22m() to create unencrypted ) KRB5_ENCTYPE_NULL) credentials. This is for use with old MIT server and JAVA based servers as they can't han- dle encrypted KRB-CRED. Note that sending such KRB-CRED is clear @@ -135,7 +134,7 @@ DDEESSCCRRIIPPTTIIOONN passed to these functions. The flags KRB5_AUTH_CONTEXT_DO_TIME also modifies the behavior - the function kkrrbb55__ggeett__ffoorrwwaarrddeedd__ccrreeddss() by removing the timestamp + the function [1mkrb5_get_forwarded_creds[22m() by removing the timestamp in the forward credential message, this have backward compatibil- ity problems since not all versions of the heimdal supports time- less credentional messages. Is very useful since it always the @@ -144,78 +143,78 @@ DDEESSCCRRIIPPTTIIOONN The same functionality can be obtained by using address-less tickets. - kkrrbb55__aauutthh__ccoonn__sseettaaddddrrss(), kkrrbb55__aauutthh__ccoonn__sseettaaddddrrss__ffrroomm__ffdd() and - kkrrbb55__aauutthh__ccoonn__ggeettaaddddrrss() gets and sets the addresses that are checked - when a packet is received. It is mandatory to set an address for the - remote host. If the local address is not set, it iss deduced from the - underlaying operating system. kkrrbb55__aauutthh__ccoonn__ggeettaaddddrrss() will call - kkrrbb55__ffrreeee__aaddddrreessss() on any address that is passed in _l_o_c_a_l___a_d_d_r or - _r_e_m_o_t_e___a_d_d_r. kkrrbb55__aauutthh__ccoonn__sseettaaddddrr() allows passing in a NULL pointer as - _l_o_c_a_l___a_d_d_r and _r_e_m_o_t_e___a_d_d_r, in that case it will just not set that - address. + [1mkrb5_auth_con_setaddrs[22m(), [1mkrb5_auth_con_setaddrs_from_fd[22m() and + [1mkrb5_auth_con_getaddrs[22m() gets and sets the addresses that are checked + when a packet is received. It is mandatory to set an address for the re- + mote host. If the local address is not set, it iss deduced from the un- + derlaying operating system. [1mkrb5_auth_con_getaddrs[22m() will call + [1mkrb5_free_address[22m() on any address that is passed in [4mlocal_addr[24m or + [4mremote_addr[24m. [1mkrb5_auth_con_setaddr[22m() allows passing in a NULL pointer as + [4mlocal_addr[24m and [4mremote_addr[24m, in that case it will just not set that ad- + dress. - kkrrbb55__aauutthh__ccoonn__sseettaaddddrrss__ffrroomm__ffdd() fetches the addresses from a file - descriptor. + [1mkrb5_auth_con_setaddrs_from_fd[22m() fetches the addresses from a file de- + scriptor. - kkrrbb55__aauutthh__ccoonn__ggeennaaddddrrss() fetches the address information from the given - file descriptor _f_d depending on the bitmap argument _f_l_a_g_s. + [1mkrb5_auth_con_genaddrs[22m() fetches the address information from the given + file descriptor [4mfd[24m depending on the bitmap argument [4mflags[24m. - Possible values on _f_l_a_g_s are: + Possible values on [4mflags[24m are: - _K_R_B_5___A_U_T_H___C_O_N_T_E_X_T___G_E_N_E_R_A_T_E___L_O_C_A_L___A_D_D_R - fetches the local address from _f_d. + [4mKRB5_AUTH_CONTEXT_GENERATE_LOCAL_ADDR[0m + fetches the local address from [4mfd[24m. - _K_R_B_5___A_U_T_H___C_O_N_T_E_X_T___G_E_N_E_R_A_T_E___R_E_M_O_T_E___A_D_D_R - fetches the remote address from _f_d. + [4mKRB5_AUTH_CONTEXT_GENERATE_REMOTE_ADDR[0m + fetches the remote address from [4mfd[24m. - kkrrbb55__aauutthh__ccoonn__sseettkkeeyy(), kkrrbb55__aauutthh__ccoonn__sseettuusseerrkkeeyy() and - kkrrbb55__aauutthh__ccoonn__ggeettkkeeyy() gets and sets the key used for this auth context. - The keyblock returned by kkrrbb55__aauutthh__ccoonn__ggeettkkeeyy() should be freed with - kkrrbb55__ffrreeee__kkeeyybblloocckk(). The keyblock send into kkrrbb55__aauutthh__ccoonn__sseettkkeeyy() is - copied into the kkrrbb55__aauutthh__ccoonntteexxtt, and thus no special handling is - needed. NULL is not a valid keyblock to kkrrbb55__aauutthh__ccoonn__sseettkkeeyy(). + [1mkrb5_auth_con_setkey[22m(), [1mkrb5_auth_con_setuserkey[22m() and + [1mkrb5_auth_con_getkey[22m() gets and sets the key used for this auth context. + The keyblock returned by [1mkrb5_auth_con_getkey[22m() should be freed with + [1mkrb5_free_keyblock[22m(). The keyblock send into [1mkrb5_auth_con_setkey[22m() is + copied into the [1mkrb5_auth_context[22m, and thus no special handling is + needed. NULL is not a valid keyblock to [1mkrb5_auth_con_setkey[22m(). - kkrrbb55__aauutthh__ccoonn__sseettuusseerrkkeeyy() is only useful when doing user to user authen- - tication. kkrrbb55__aauutthh__ccoonn__sseettkkeeyy() is equivalent to - kkrrbb55__aauutthh__ccoonn__sseettuusseerrkkeeyy(). + [1mkrb5_auth_con_setuserkey[22m() is only useful when doing user to user authen- + tication. [1mkrb5_auth_con_setkey[22m() is equivalent to + [1mkrb5_auth_con_setuserkey[22m(). - kkrrbb55__aauutthh__ccoonn__ggeettllooccaallssuubbkkeeyy(), kkrrbb55__aauutthh__ccoonn__sseettllooccaallssuubbkkeeyy(), - kkrrbb55__aauutthh__ccoonn__ggeettrreemmootteessuubbkkeeyy() and kkrrbb55__aauutthh__ccoonn__sseettrreemmootteessuubbkkeeyy() gets - and sets the keyblock for the local and remote subkey. The keyblock - returned by kkrrbb55__aauutthh__ccoonn__ggeettllooccaallssuubbkkeeyy() and - kkrrbb55__aauutthh__ccoonn__ggeettrreemmootteessuubbkkeeyy() must be freed with kkrrbb55__ffrreeee__kkeeyybblloocckk(). + [1mkrb5_auth_con_getlocalsubkey[22m(), [1mkrb5_auth_con_setlocalsubkey[22m(), + [1mkrb5_auth_con_getremotesubkey[22m() and [1mkrb5_auth_con_setremotesubkey[22m() gets + and sets the keyblock for the local and remote subkey. The keyblock re- + turned by [1mkrb5_auth_con_getlocalsubkey[22m() and + [1mkrb5_auth_con_getremotesubkey[22m() must be freed with [1mkrb5_free_keyblock[22m(). - kkrrbb55__aauutthh__sseettcckkssuummttyyppee() and kkrrbb55__aauutthh__ggeettcckkssuummttyyppee() sets and gets the + [1mkrb5_auth_setcksumtype[22m() and [1mkrb5_auth_getcksumtype[22m() sets and gets the checksum type that should be used for this connection. - kkrrbb55__aauutthh__ccoonn__ggeenneerraatteellooccaallssuubbkkeeyy() generates a local subkey that have - the same encryption type as _k_e_y. + [1mkrb5_auth_con_generatelocalsubkey[22m() generates a local subkey that have + the same encryption type as [4mkey[24m. - kkrrbb55__aauutthh__ggeettrreemmootteesseeqqnnuummbbeerr() kkrrbb55__aauutthh__sseettrreemmootteesseeqqnnuummbbeerr(), - kkrrbb55__aauutthh__ggeettllooccaallsseeqqnnuummbbeerr() and kkrrbb55__aauutthh__sseettllooccaallsseeqqnnuummbbeerr() gets and + [1mkrb5_auth_getremoteseqnumber[22m() [1mkrb5_auth_setremoteseqnumber[22m(), + [1mkrb5_auth_getlocalseqnumber[22m() and [1mkrb5_auth_setlocalseqnumber[22m() gets and sets the sequence-number for the local and remote sequence-number counter. - kkrrbb55__aauutthh__sseettkkeeyyttyyppee() and kkrrbb55__aauutthh__ggeettkkeeyyttyyppee() gets and gets the key- - type of the keyblock in kkrrbb55__aauutthh__ccoonntteexxtt. + [1mkrb5_auth_setkeytype[22m() and [1mkrb5_auth_getkeytype[22m() gets and gets the key- + type of the keyblock in [1mkrb5_auth_context[22m. - kkrrbb55__aauutthh__ccoonn__ggeettaauutthheennttiiccaattoorr() Retrieves the authenticator that was + [1mkrb5_auth_con_getauthenticator[22m() Retrieves the authenticator that was used during mutual authentication. The authenticator returned should be - freed by calling kkrrbb55__ffrreeee__aauutthheennttiiccaattoorr(). + freed by calling [1mkrb5_free_authenticator[22m(). - kkrrbb55__aauutthh__ccoonn__ggeettrrccaacchhee() and kkrrbb55__aauutthh__ccoonn__sseettrrccaacchhee() gets and sets the + [1mkrb5_auth_con_getrcache[22m() and [1mkrb5_auth_con_setrcache[22m() gets and sets the replay-cache. - kkrrbb55__aauutthh__ccoonn__iinniittiivveeccttoorr() allocates memory for and zeros the initial - vector in the _a_u_t_h___c_o_n_t_e_x_t keyblock. + [1mkrb5_auth_con_initivector[22m() allocates memory for and zeros the initial + vector in the [4mauth_context[24m keyblock. - kkrrbb55__aauutthh__ccoonn__sseettiivveeccttoorr() sets the i_vector portion of _a_u_t_h___c_o_n_t_e_x_t to - _i_v_e_c_t_o_r. + [1mkrb5_auth_con_setivector[22m() sets the i_vector portion of [4mauth_context[24m to + [4mivector[24m. - kkrrbb55__ffrreeee__aauutthheennttiiccaattoorr() free the content of _a_u_t_h_e_n_t_i_c_a_t_o_r and - _a_u_t_h_e_n_t_i_c_a_t_o_r itself. + [1mkrb5_free_authenticator[22m() free the content of [4mauthenticator[24m and + [4mauthenticator[24m itself. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5_context(3), kerberos(8) HEIMDAL May 17, 2005 HEIMDAL diff --git a/lib/krb5/krb5_c_make_checksum.cat3 b/lib/krb5/krb5_c_make_checksum.cat3 index 4d6c31a58973..b83c0e29065a 100644 --- a/lib/krb5/krb5_c_make_checksum.cat3 +++ b/lib/krb5/krb5_c_make_checksum.cat3 @@ -1,142 +1,141 @@ - KRB5_C_MAKE_CHECKSUM(3) BSD Library Functions Manual KRB5_C_MAKE_CHECKSUM(3) -NNAAMMEE - kkrrbb55__cc__bblloocckk__ssiizzee, kkrrbb55__cc__ddeeccrryypptt, kkrrbb55__cc__eennccrryypptt, kkrrbb55__cc__eennccrryypptt__lleennggtthh, - kkrrbb55__cc__eennccttyyppee__ccoommppaarree, kkrrbb55__cc__ggeett__cchheecckkssuumm, kkrrbb55__cc__iiss__ccoollll__pprrooooff__cckkssuumm, - kkrrbb55__cc__iiss__kkeeyyeedd__cckkssuumm, kkrrbb55__cc__kkeeyylleennggtthh, kkrrbb55__cc__mmaakkee__cchheecckkssuumm, - kkrrbb55__cc__mmaakkee__rraannddoomm__kkeeyy, kkrrbb55__cc__sseett__cchheecckkssuumm, kkrrbb55__cc__vvaalliidd__cckkssuummttyyppee, - kkrrbb55__cc__vvaalliidd__eennccttyyppee, kkrrbb55__cc__vveerriiffyy__cchheecckkssuumm, kkrrbb55__cc__cchheecckkssuumm__lleennggtthh -- +[1mNAME[0m + [1mkrb5_c_block_size[22m, [1mkrb5_c_decrypt[22m, [1mkrb5_c_encrypt[22m, [1mkrb5_c_encrypt_length[22m, + [1mkrb5_c_enctype_compare[22m, [1mkrb5_c_get_checksum[22m, [1mkrb5_c_is_coll_proof_cksum[22m, + [1mkrb5_c_is_keyed_cksum[22m, [1mkrb5_c_keylength[22m, [1mkrb5_c_make_checksum[22m, + [1mkrb5_c_make_random_key[22m, [1mkrb5_c_set_checksum[22m, [1mkrb5_c_valid_cksumtype[22m, + [1mkrb5_c_valid_enctype[22m, [1mkrb5_c_verify_checksum[22m, [1mkrb5_c_checksum_length [22m-- Kerberos 5 crypto API -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__cc__bblloocckk__ssiizzee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___e_n_c_t_y_p_e _e_n_c_t_y_p_e, - _s_i_z_e___t _*_b_l_o_c_k_s_i_z_e); + [4mkrb5_error_code[0m + [1mkrb5_c_block_size[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_enctype[24m [4menctype[24m, + [4msize_t[24m [4m*blocksize[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__cc__ddeeccrryypptt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _k_r_b_5___k_e_y_b_l_o_c_k _k_e_y, - _k_r_b_5___k_e_y_u_s_a_g_e _u_s_a_g_e, _c_o_n_s_t _k_r_b_5___d_a_t_a _*_i_v_e_c, _k_r_b_5___e_n_c___d_a_t_a _*_i_n_p_u_t, - _k_r_b_5___d_a_t_a _*_o_u_t_p_u_t); + [4mkrb5_error_code[0m + [1mkrb5_c_decrypt[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mkrb5_keyblock[24m [4mkey[24m, + [4mkrb5_keyusage[24m [4musage[24m, [4mconst[24m [4mkrb5_data[24m [4m*ivec[24m, [4mkrb5_enc_data[24m [4m*input[24m, + [4mkrb5_data[24m [4m*output[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__cc__eennccrryypptt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _k_r_b_5___k_e_y_b_l_o_c_k _*_k_e_y, - _k_r_b_5___k_e_y_u_s_a_g_e _u_s_a_g_e, _c_o_n_s_t _k_r_b_5___d_a_t_a _*_i_v_e_c, _c_o_n_s_t _k_r_b_5___d_a_t_a _*_i_n_p_u_t, - _k_r_b_5___e_n_c___d_a_t_a _*_o_u_t_p_u_t); + [4mkrb5_error_code[0m + [1mkrb5_c_encrypt[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mkrb5_keyblock[24m [4m*key[24m, + [4mkrb5_keyusage[24m [4musage[24m, [4mconst[24m [4mkrb5_data[24m [4m*ivec[24m, [4mconst[24m [4mkrb5_data[24m [4m*input[24m, + [4mkrb5_enc_data[24m [4m*output[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__cc__eennccrryypptt__lleennggtthh(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___e_n_c_t_y_p_e _e_n_c_t_y_p_e, - _s_i_z_e___t _i_n_p_u_t_l_e_n, _s_i_z_e___t _*_l_e_n_g_t_h); + [4mkrb5_error_code[0m + [1mkrb5_c_encrypt_length[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_enctype[24m [4menctype[24m, + [4msize_t[24m [4minputlen[24m, [4msize_t[24m [4m*length[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__cc__eennccttyyppee__ccoommppaarree(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___e_n_c_t_y_p_e _e_1, - _k_r_b_5___e_n_c_t_y_p_e _e_2, _k_r_b_5___b_o_o_l_e_a_n _*_s_i_m_i_l_a_r); + [4mkrb5_error_code[0m + [1mkrb5_c_enctype_compare[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_enctype[24m [4me1[24m, + [4mkrb5_enctype[24m [4me2[24m, [4mkrb5_boolean[24m [4m*similar[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__cc__mmaakkee__rraannddoomm__kkeeyy(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___e_n_c_t_y_p_e _e_n_c_t_y_p_e, - _k_r_b_5___k_e_y_b_l_o_c_k _*_r_a_n_d_o_m___k_e_y); + [4mkrb5_error_code[0m + [1mkrb5_c_make_random_key[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_enctype[24m [4menctype[24m, + [4mkrb5_keyblock[24m [4m*random_key[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__cc__mmaakkee__cchheecckkssuumm(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_k_s_u_m_t_y_p_e _c_k_s_u_m_t_y_p_e, - _c_o_n_s_t _k_r_b_5___k_e_y_b_l_o_c_k _*_k_e_y, _k_r_b_5___k_e_y_u_s_a_g_e _u_s_a_g_e, - _c_o_n_s_t _k_r_b_5___d_a_t_a _*_i_n_p_u_t, _k_r_b_5___c_h_e_c_k_s_u_m _*_c_k_s_u_m); + [4mkrb5_error_code[0m + [1mkrb5_c_make_checksum[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_cksumtype[24m [4mcksumtype[24m, + [4mconst[24m [4mkrb5_keyblock[24m [4m*key[24m, [4mkrb5_keyusage[24m [4musage[24m, + [4mconst[24m [4mkrb5_data[24m [4m*input[24m, [4mkrb5_checksum[24m [4m*cksum[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__cc__vveerriiffyy__cchheecckkssuumm(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _k_r_b_5___k_e_y_b_l_o_c_k _*_k_e_y, - _k_r_b_5___k_e_y_u_s_a_g_e _u_s_a_g_e, _c_o_n_s_t _k_r_b_5___d_a_t_a _*_d_a_t_a, - _c_o_n_s_t _k_r_b_5___c_h_e_c_k_s_u_m _*_c_k_s_u_m, _k_r_b_5___b_o_o_l_e_a_n _*_v_a_l_i_d); + [4mkrb5_error_code[0m + [1mkrb5_c_verify_checksum[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mkrb5_keyblock[24m [4m*key[24m, + [4mkrb5_keyusage[24m [4musage[24m, [4mconst[24m [4mkrb5_data[24m [4m*data[24m, + [4mconst[24m [4mkrb5_checksum[24m [4m*cksum[24m, [4mkrb5_boolean[24m [4m*valid[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__cc__cchheecckkssuumm__lleennggtthh(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_k_s_u_m_t_y_p_e _c_k_s_u_m_t_y_p_e, - _s_i_z_e___t _*_l_e_n_g_t_h); + [4mkrb5_error_code[0m + [1mkrb5_c_checksum_length[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_cksumtype[24m [4mcksumtype[24m, + [4msize_t[24m [4m*length[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__cc__ggeett__cchheecckkssuumm(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _k_r_b_5___c_h_e_c_k_s_u_m _*_c_k_s_u_m, - _k_r_b_5___c_k_s_u_m_t_y_p_e _*_t_y_p_e, _k_r_b_5___d_a_t_a _*_*_d_a_t_a); + [4mkrb5_error_code[0m + [1mkrb5_c_get_checksum[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mkrb5_checksum[24m [4m*cksum[24m, + [4mkrb5_cksumtype[24m [4m*type[24m, [4mkrb5_data[24m [4m**data[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__cc__sseett__cchheecckkssuumm(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_h_e_c_k_s_u_m _*_c_k_s_u_m, - _k_r_b_5___c_k_s_u_m_t_y_p_e _t_y_p_e, _c_o_n_s_t _k_r_b_5___d_a_t_a _*_d_a_t_a); + [4mkrb5_error_code[0m + [1mkrb5_c_set_checksum[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_checksum[24m [4m*cksum[24m, + [4mkrb5_cksumtype[24m [4mtype[24m, [4mconst[24m [4mkrb5_data[24m [4m*data[24m); - _k_r_b_5___b_o_o_l_e_a_n - kkrrbb55__cc__vvaalliidd__eennccttyyppee(_k_r_b_5___e_n_c_t_y_p_e, _e_t_y_p_e_"); + [4mkrb5_boolean[0m + [1mkrb5_c_valid_enctype[22m([4mkrb5_enctype[24m, [4metype"[24m); - _k_r_b_5___b_o_o_l_e_a_n - kkrrbb55__cc__vvaalliidd__cckkssuummttyyppee(_k_r_b_5___c_k_s_u_m_t_y_p_e _c_t_y_p_e); + [4mkrb5_boolean[0m + [1mkrb5_c_valid_cksumtype[22m([4mkrb5_cksumtype[24m [4mctype[24m); - _k_r_b_5___b_o_o_l_e_a_n - kkrrbb55__cc__iiss__ccoollll__pprrooooff__cckkssuumm(_k_r_b_5___c_k_s_u_m_t_y_p_e _c_t_y_p_e); + [4mkrb5_boolean[0m + [1mkrb5_c_is_coll_proof_cksum[22m([4mkrb5_cksumtype[24m [4mctype[24m); - _k_r_b_5___b_o_o_l_e_a_n - kkrrbb55__cc__iiss__kkeeyyeedd__cckkssuumm(_k_r_b_5___c_k_s_u_m_t_y_p_e _c_t_y_p_e); + [4mkrb5_boolean[0m + [1mkrb5_c_is_keyed_cksum[22m([4mkrb5_cksumtype[24m [4mctype[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__cc__kkeeyylleennggtthhss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___e_n_c_t_y_p_e _e_n_c_t_y_p_e, - _s_i_z_e___t _*_i_n_l_e_n_g_t_h, _s_i_z_e___t _*_k_e_y_l_e_n_g_t_h); + [4mkrb5_error_code[0m + [1mkrb5_c_keylengths[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_enctype[24m [4menctype[24m, + [4msize_t[24m [4m*inlength[24m, [4msize_t[24m [4m*keylength[24m); -DDEESSCCRRIIPPTTIIOONN +[1mDESCRIPTION[0m The functions starting with krb5_c are compat functions with MIT ker- beros. The krb5_enc_data structure holds and encrypted data. There are two pub- lic accessible members of krb5_enc_data. enctype that holds the encryp- - tion type of the data encrypted and ciphertext that is a _k_r_b_5___d_a_t_a that + tion type of the data encrypted and ciphertext that is a [4mkrb5_data[24m that might contain the encrypted data. - kkrrbb55__cc__bblloocckk__ssiizzee() returns the blocksize of the encryption type. + [1mkrb5_c_block_size[22m() returns the blocksize of the encryption type. - kkrrbb55__cc__ddeeccrryypptt() decrypts _i_n_p_u_t and store the data in _o_u_t_p_u_t_. If _i_v_e_c is + [1mkrb5_c_decrypt[22m() decrypts [4minput[24m and store the data in [4moutput.[24m If [4mivec[24m is NULL the default initialization vector for that encryption type will be used. - kkrrbb55__cc__eennccrryypptt() encrypts the plaintext in _i_n_p_u_t and store the ciphertext - in _o_u_t_p_u_t. + [1mkrb5_c_encrypt[22m() encrypts the plaintext in [4minput[24m and store the ciphertext + in [4moutput[24m. - kkrrbb55__cc__eennccrryypptt__lleennggtthh() returns the length the encrypted data given the + [1mkrb5_c_encrypt_length[22m() returns the length the encrypted data given the plaintext length. - kkrrbb55__cc__eennccttyyppee__ccoommppaarree() compares to encryption types and returns if they + [1mkrb5_c_enctype_compare[22m() compares to encryption types and returns if they use compatible encryption key types. - kkrrbb55__cc__mmaakkee__cchheecckkssuumm() creates a checksum _c_k_s_u_m with the checksum type - _c_k_s_u_m_t_y_p_e of the data in _d_a_t_a. _k_e_y and _u_s_a_g_e are used if the checksum is + [1mkrb5_c_make_checksum[22m() creates a checksum [4mcksum[24m with the checksum type + [4mcksumtype[24m of the data in [4mdata[24m. [4mkey[24m and [4musage[24m are used if the checksum is a keyed checksum type. Returns 0 or an error code. - kkrrbb55__cc__vveerriiffyy__cchheecckkssuumm() verifies the checksum of _d_a_t_a in _c_k_s_u_m that was - created with _k_e_y using the key usage _u_s_a_g_e. _v_e_r_i_f_y is set to non-zero if + [1mkrb5_c_verify_checksum[22m() verifies the checksum of [4mdata[24m in [4mcksum[24m that was + created with [4mkey[24m using the key usage [4musage[24m. [4mverify[24m is set to non-zero if the checksum verifies correctly and zero if not. Returns 0 or an error code. - kkrrbb55__cc__cchheecckkssuumm__lleennggtthh() returns the length of the checksum. + [1mkrb5_c_checksum_length[22m() returns the length of the checksum. - kkrrbb55__cc__sseett__cchheecckkssuumm() sets the krb5_checksum structure given _t_y_p_e and - _d_a_t_a. The content of _c_k_s_u_m should be freeed with - kkrrbb55__cc__ffrreeee__cchheecckkssuumm__ccoonntteennttss(). + [1mkrb5_c_set_checksum[22m() sets the krb5_checksum structure given [4mtype[24m and + [4mdata[24m. The content of [4mcksum[24m should be freeed with + [1mkrb5_c_free_checksum_contents[22m(). - kkrrbb55__cc__ggeett__cchheecckkssuumm() retrieves the components of the krb5_checksum. - structure. _d_a_t_a should be free with kkrrbb55__ffrreeee__ddaattaa(). If some either of - _d_a_t_a or _c_h_e_c_k_s_u_m is not needed for the application, NULL can be passed + [1mkrb5_c_get_checksum[22m() retrieves the components of the krb5_checksum. + structure. [4mdata[24m should be free with [1mkrb5_free_data[22m(). If some either of + [4mdata[24m or [4mchecksum[24m is not needed for the application, NULL can be passed in. - kkrrbb55__cc__vvaalliidd__eennccttyyppee() returns true if _e_t_y_p_e is a valid encryption type. + [1mkrb5_c_valid_enctype[22m() returns true if [4metype[24m is a valid encryption type. - kkrrbb55__cc__vvaalliidd__cckkssuummttyyppee() returns true if _c_t_y_p_e is a valid checksum type. + [1mkrb5_c_valid_cksumtype[22m() returns true if [4mctype[24m is a valid checksum type. - kkrrbb55__cc__iiss__kkeeyyeedd__cckkssuumm() return true if _c_t_y_p_e is a keyed checksum type. + [1mkrb5_c_is_keyed_cksum[22m() return true if [4mctype[24m is a keyed checksum type. - kkrrbb55__cc__iiss__ccoollll__pprrooooff__cckkssuumm() returns true if _c_t_y_p_e is a collision proof + [1mkrb5_c_is_coll_proof_cksum[22m() returns true if [4mctype[24m is a collision proof checksum type. - kkrrbb55__cc__kkeeyylleennggtthhss() return the minimum length (_i_n_l_e_n_g_t_h) bytes needed to - create a key and the length (_k_e_y_l_e_n_g_t_h) of the resulting key for the - _e_n_c_t_y_p_e. + [1mkrb5_c_keylengths[22m() return the minimum length ([4minlength[24m) bytes needed to + create a key and the length ([4mkeylength[24m) of the resulting key for the + [4menctype[24m. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3), krb5_create_checksum(3), krb5_free_data(3), kerberos(8) HEIMDAL Nov 17, 2006 HEIMDAL diff --git a/lib/krb5/krb5_ccapi.h b/lib/krb5/krb5_ccapi.h index 5a7fe6a41334..06d8886145af 100644 --- a/lib/krb5/krb5_ccapi.h +++ b/lib/krb5/krb5_ccapi.h @@ -38,7 +38,7 @@ #include <krb5-types.h> - #ifdef __APPLE__ +#ifdef __APPLE__ #pragma pack(push,2) #endif @@ -231,7 +231,7 @@ struct cc_context_t { typedef cc_int32 (*cc_initialize_func)(cc_context_t*, cc_int32, cc_int32 *, char const **); -#ifdef __APPLE__ +#if defined(__APPLE__) #pragma pack(pop) #endif diff --git a/lib/krb5/krb5_check_transited.cat3 b/lib/krb5/krb5_check_transited.cat3 index 97a97e72b6bf..9907d6cc27c1 100644 --- a/lib/krb5/krb5_check_transited.cat3 +++ b/lib/krb5/krb5_check_transited.cat3 @@ -1,49 +1,48 @@ - KRB5_CHECK_TRANSITED(3) BSD Library Functions Manual KRB5_CHECK_TRANSITED(3) -NNAAMMEE - kkrrbb55__cchheecckk__ttrraannssiitteedd, kkrrbb55__cchheecckk__ttrraannssiitteedd__rreeaallmmss, - kkrrbb55__ddoommaaiinn__xx550000__ddeeccooddee, kkrrbb55__ddoommaaiinn__xx550000__eennccooddee -- realm transit verifi- +[1mNAME[0m + [1mkrb5_check_transited[22m, [1mkrb5_check_transited_realms[22m, + [1mkrb5_domain_x500_decode[22m, [1mkrb5_domain_x500_encode [22m-- realm transit verifi- cation and encoding/decoding functions -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__cchheecckk__ttrraannssiitteedd(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_o_n_s_t___r_e_a_l_m _c_l_i_e_n_t___r_e_a_l_m, - _k_r_b_5___c_o_n_s_t___r_e_a_l_m _s_e_r_v_e_r___r_e_a_l_m, _k_r_b_5___r_e_a_l_m _*_r_e_a_l_m_s, _i_n_t _n_u_m___r_e_a_l_m_s, - _i_n_t _*_b_a_d___r_e_a_l_m); + [4mkrb5_error_code[0m + [1mkrb5_check_transited[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_const_realm[24m [4mclient_realm[24m, + [4mkrb5_const_realm[24m [4mserver_realm[24m, [4mkrb5_realm[24m [4m*realms[24m, [4mint[24m [4mnum_realms[24m, + [4mint[24m [4m*bad_realm[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__cchheecckk__ttrraannssiitteedd__rreeaallmmss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _c_o_n_s_t _c_h_a_r _*_c_o_n_s_t _*_r_e_a_l_m_s, _i_n_t _n_u_m___r_e_a_l_m_s, _i_n_t _*_b_a_d___r_e_a_l_m); + [4mkrb5_error_code[0m + [1mkrb5_check_transited_realms[22m([4mkrb5_context[24m [4mcontext[24m, + [4mconst[24m [4mchar[24m [4m*const[24m [4m*realms[24m, [4mint[24m [4mnum_realms[24m, [4mint[24m [4m*bad_realm[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddoommaaiinn__xx550000__ddeeccooddee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_a_t_a _t_r, - _c_h_a_r _*_*_*_r_e_a_l_m_s, _i_n_t _*_n_u_m___r_e_a_l_m_s, _c_o_n_s_t _c_h_a_r _*_c_l_i_e_n_t___r_e_a_l_m, - _c_o_n_s_t _c_h_a_r _*_s_e_r_v_e_r___r_e_a_l_m); + [4mkrb5_error_code[0m + [1mkrb5_domain_x500_decode[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_data[24m [4mtr[24m, + [4mchar[24m [4m***realms[24m, [4mint[24m [4m*num_realms[24m, [4mconst[24m [4mchar[24m [4m*client_realm[24m, + [4mconst[24m [4mchar[24m [4m*server_realm[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddoommaaiinn__xx550000__eennccooddee(_c_h_a_r _*_*_r_e_a_l_m_s, _i_n_t _n_u_m___r_e_a_l_m_s, - _k_r_b_5___d_a_t_a _*_e_n_c_o_d_i_n_g); + [4mkrb5_error_code[0m + [1mkrb5_domain_x500_encode[22m([4mchar[24m [4m**realms[24m, [4mint[24m [4mnum_realms[24m, + [4mkrb5_data[24m [4m*encoding[24m); -DDEESSCCRRIIPPTTIIOONN - kkrrbb55__cchheecckk__ttrraannssiitteedd() checks the path from _c_l_i_e_n_t___r_e_a_l_m to _s_e_r_v_e_r___r_e_a_l_m - where _r_e_a_l_m_s and _n_u_m___r_e_a_l_m_s is the realms between them. If the function - returns an error value, _b_a_d___r_e_a_l_m will be set to the realm in the list - causing the error. kkrrbb55__cchheecckk__ttrraannssiitteedd() is used internally by the KDC +[1mDESCRIPTION[0m + [1mkrb5_check_transited[22m() checks the path from [4mclient_realm[24m to [4mserver_realm[0m + where [4mrealms[24m and [4mnum_realms[24m is the realms between them. If the function + returns an error value, [4mbad_realm[24m will be set to the realm in the list + causing the error. [1mkrb5_check_transited[22m() is used internally by the KDC and libkrb5 and should not be called by client applications. - kkrrbb55__cchheecckk__ttrraannssiitteedd__rreeaallmmss() is deprecated. + [1mkrb5_check_transited_realms[22m() is deprecated. - kkrrbb55__ddoommaaiinn__xx550000__eennccooddee() and kkrrbb55__ddoommaaiinn__xx550000__ddeeccooddee() encodes and - decodes the realm names in the X500 format that Kerberos uses to describe + [1mkrb5_domain_x500_encode[22m() and [1mkrb5_domain_x500_decode[22m() encodes and de- + codes the realm names in the X500 format that Kerberos uses to describe the transited realms in krbtgts. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3), krb5.conf(5) HEIMDAL May 1, 2006 HEIMDAL diff --git a/lib/krb5/krb5_create_checksum.cat3 b/lib/krb5/krb5_create_checksum.cat3 index e2050b141a4d..673f56d708b6 100644 --- a/lib/krb5/krb5_create_checksum.cat3 +++ b/lib/krb5/krb5_create_checksum.cat3 @@ -1,113 +1,112 @@ - NAME(3) BSD Library Functions Manual NAME(3) -NNAAMMEE - kkrrbb55__cchheecckkssuumm, kkrrbb55__cchheecckkssuumm__ddiissaabbllee, kkrrbb55__cchheecckkssuumm__iiss__ccoolllliissiioonn__pprrooooff, - kkrrbb55__cchheecckkssuumm__iiss__kkeeyyeedd, kkrrbb55__cchheecckkssuummssiizzee, kkrrbb55__cckkssuummttyyppee__vvaalliidd, - kkrrbb55__ccooppyy__cchheecckkssuumm, kkrrbb55__ccrreeaattee__cchheecckkssuumm, kkrrbb55__ccrryyppttoo__ggeett__cchheecckkssuumm__ttyyppee - kkrrbb55__ffrreeee__cchheecckkssuumm, kkrrbb55__ffrreeee__cchheecckkssuumm__ccoonntteennttss, kkrrbb55__hhmmaacc, - kkrrbb55__vveerriiffyy__cchheecckkssuumm -- creates, handles and verifies checksums +[1mNAME[0m + [1mkrb5_checksum[22m, [1mkrb5_checksum_disable[22m, [1mkrb5_checksum_is_collision_proof[22m, + [1mkrb5_checksum_is_keyed[22m, [1mkrb5_checksumsize[22m, [1mkrb5_cksumtype_valid[22m, + [1mkrb5_copy_checksum[22m, [1mkrb5_create_checksum[22m, [1mkrb5_crypto_get_checksum_type[0m + [1mkrb5_free_checksum[22m, [1mkrb5_free_checksum_contents[22m, [1mkrb5_hmac[22m, + [1mkrb5_verify_checksum [22m-- creates, handles and verifies checksums -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m typedef Checksum krb5_checksum; - _v_o_i_d - kkrrbb55__cchheecckkssuumm__ddiissaabbllee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_k_s_u_m_t_y_p_e _t_y_p_e); + [4mvoid[0m + [1mkrb5_checksum_disable[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_cksumtype[24m [4mtype[24m); - _k_r_b_5___b_o_o_l_e_a_n - kkrrbb55__cchheecckkssuumm__iiss__ccoolllliissiioonn__pprrooooff(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___c_k_s_u_m_t_y_p_e _t_y_p_e); + [4mkrb5_boolean[0m + [1mkrb5_checksum_is_collision_proof[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_cksumtype[24m [4mtype[24m); - _k_r_b_5___b_o_o_l_e_a_n - kkrrbb55__cchheecckkssuumm__iiss__kkeeyyeedd(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_k_s_u_m_t_y_p_e _t_y_p_e); + [4mkrb5_boolean[0m + [1mkrb5_checksum_is_keyed[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_cksumtype[24m [4mtype[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__cckkssuummttyyppee__vvaalliidd(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_k_s_u_m_t_y_p_e _c_t_y_p_e); + [4mkrb5_error_code[0m + [1mkrb5_cksumtype_valid[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_cksumtype[24m [4mctype[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__cchheecckkssuummssiizzee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_k_s_u_m_t_y_p_e _t_y_p_e, - _s_i_z_e___t _*_s_i_z_e); + [4mkrb5_error_code[0m + [1mkrb5_checksumsize[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_cksumtype[24m [4mtype[24m, + [4msize_t[24m [4m*size[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ccrreeaattee__cchheecckkssuumm(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_y_p_t_o _c_r_y_p_t_o, - _k_r_b_5___k_e_y___u_s_a_g_e _u_s_a_g_e, _i_n_t _t_y_p_e, _v_o_i_d _*_d_a_t_a, _s_i_z_e___t _l_e_n, - _C_h_e_c_k_s_u_m _*_r_e_s_u_l_t); + [4mkrb5_error_code[0m + [1mkrb5_create_checksum[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_crypto[24m [4mcrypto[24m, + [4mkrb5_key_usage[24m [4musage[24m, [4mint[24m [4mtype[24m, [4mvoid[24m [4m*data[24m, [4msize_t[24m [4mlen[24m, + [4mChecksum[24m [4m*result[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__vveerriiffyy__cchheecckkssuumm(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_y_p_t_o _c_r_y_p_t_o, - _k_r_b_5___k_e_y___u_s_a_g_e _u_s_a_g_e, _v_o_i_d _*_d_a_t_a, _s_i_z_e___t _l_e_n, _C_h_e_c_k_s_u_m _*_c_k_s_u_m); + [4mkrb5_error_code[0m + [1mkrb5_verify_checksum[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_crypto[24m [4mcrypto[24m, + [4mkrb5_key_usage[24m [4musage[24m, [4mvoid[24m [4m*data[24m, [4msize_t[24m [4mlen[24m, [4mChecksum[24m [4m*cksum[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ccrryyppttoo__ggeett__cchheecckkssuumm__ttyyppee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_y_p_t_o _c_r_y_p_t_o, - _k_r_b_5___c_k_s_u_m_t_y_p_e _*_t_y_p_e); + [4mkrb5_error_code[0m + [1mkrb5_crypto_get_checksum_type[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_crypto[24m [4mcrypto[24m, + [4mkrb5_cksumtype[24m [4m*type[24m); - _v_o_i_d - kkrrbb55__ffrreeee__cchheecckkssuumm(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_h_e_c_k_s_u_m _*_c_k_s_u_m); + [4mvoid[0m + [1mkrb5_free_checksum[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_checksum[24m [4m*cksum[24m); - _v_o_i_d - kkrrbb55__ffrreeee__cchheecckkssuumm__ccoonntteennttss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_h_e_c_k_s_u_m _*_c_k_s_u_m); + [4mvoid[0m + [1mkrb5_free_checksum_contents[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_checksum[24m [4m*cksum[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__hhmmaacc(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_k_s_u_m_t_y_p_e _c_k_t_y_p_e, _c_o_n_s_t _v_o_i_d _*_d_a_t_a, - _s_i_z_e___t _l_e_n, _u_n_s_i_g_n_e_d _u_s_a_g_e, _k_r_b_5___k_e_y_b_l_o_c_k _*_k_e_y, _C_h_e_c_k_s_u_m _*_r_e_s_u_l_t); + [4mkrb5_error_code[0m + [1mkrb5_hmac[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_cksumtype[24m [4mcktype[24m, [4mconst[24m [4mvoid[24m [4m*data[24m, + [4msize_t[24m [4mlen[24m, [4munsigned[24m [4musage[24m, [4mkrb5_keyblock[24m [4m*key[24m, [4mChecksum[24m [4m*result[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ccooppyy__cchheecckkssuumm(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _k_r_b_5___c_h_e_c_k_s_u_m _*_o_l_d, - _k_r_b_5___c_h_e_c_k_s_u_m _*_*_n_e_w); + [4mkrb5_error_code[0m + [1mkrb5_copy_checksum[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mkrb5_checksum[24m [4m*old[24m, + [4mkrb5_checksum[24m [4m**new[24m); -DDEESSCCRRIIPPTTIIOONN +[1mDESCRIPTION[0m The krb5_checksum structure holds a Kerberos checksum. There is no com- ponent inside krb5_checksum that is directly referable. The functions are used to create and verify checksums. - kkrrbb55__ccrreeaattee__cchheecckkssuumm() creates a checksum of the specified data, and puts - it in _r_e_s_u_l_t. If _c_r_y_p_t_o is NULL, _u_s_a_g_e___o_r___t_y_p_e specifies the checksum - type to use; it must not be keyed. Otherwise _c_r_y_p_t_o is an encryption con- - text created by kkrrbb55__ccrryyppttoo__iinniitt(), and _u_s_a_g_e___o_r___t_y_p_e specifies a key- - usage. + [1mkrb5_create_checksum[22m() creates a checksum of the specified data, and puts + it in [4mresult[24m. If [4mcrypto[24m is NULL, [4musage_or_type[24m specifies the checksum + type to use; it must not be keyed. Otherwise [4mcrypto[24m is an encryption con- + text created by [1mkrb5_crypto_init[22m(), and [4musage_or_type[24m specifies a key-us- + age. - kkrrbb55__vveerriiffyy__cchheecckkssuumm() verifies the _c_h_e_c_k_s_u_m against the provided data. + [1mkrb5_verify_checksum[22m() verifies the [4mchecksum[24m against the provided data. - kkrrbb55__cchheecckkssuumm__iiss__ccoolllliissiioonn__pprrooooff() returns true is the specified checksum + [1mkrb5_checksum_is_collision_proof[22m() returns true is the specified checksum is collision proof (that it's very unlikely that two strings has the same hash value, and that it's hard to find two strings that has the same hash). Examples of collision proof checksums are MD5, and SHA1, while CRC32 is not. - kkrrbb55__cchheecckkssuumm__iiss__kkeeyyeedd() returns true if the specified checksum type is + [1mkrb5_checksum_is_keyed[22m() returns true if the specified checksum type is keyed (that the hash value is a function of both the data, and a separate key). Examples of keyed hash algorithms are HMAC-SHA1-DES3, and RSA- - MD5-DES. The ``plain'' hash functions MD5, and SHA1 are not keyed. + MD5-DES. The "plain" hash functions MD5, and SHA1 are not keyed. - kkrrbb55__ccrryyppttoo__ggeett__cchheecckkssuumm__ttyyppee() returns the checksum type that will be - used when creating a checksum for the given _c_r_y_p_t_o context. This func- - tion is useful in combination with kkrrbb55__cchheecckkssuummssiizzee() when you want to + [1mkrb5_crypto_get_checksum_type[22m() returns the checksum type that will be + used when creating a checksum for the given [4mcrypto[24m context. This func- + tion is useful in combination with [1mkrb5_checksumsize[22m() when you want to know the size a checksum will use when you create it. - kkrrbb55__cckkssuummttyyppee__vvaalliidd() returns 0 or an error if the checksumtype is - implemented and not currently disabled in this kerberos library. + [1mkrb5_cksumtype_valid[22m() returns 0 or an error if the checksumtype is im- + plemented and not currently disabled in this kerberos library. - kkrrbb55__cchheecckkssuummssiizzee() returns the size of the outdata of checksum function. + [1mkrb5_checksumsize[22m() returns the size of the outdata of checksum function. - kkrrbb55__ccooppyy__cchheecckkssuumm() returns a copy of the checksum kkrrbb55__ffrreeee__cchheecckkssuumm() - should use used to free the _n_e_w checksum. + [1mkrb5_copy_checksum[22m() returns a copy of the checksum [1mkrb5_free_checksum[22m() + should use used to free the [4mnew[24m checksum. - kkrrbb55__ffrreeee__cchheecckkssuumm() free the checksum and the content of the checksum. + [1mkrb5_free_checksum[22m() free the checksum and the content of the checksum. - kkrrbb55__ffrreeee__cchheecckkssuumm__ccoonntteennttss() frees the content of checksum in _c_k_s_u_m. + [1mkrb5_free_checksum_contents[22m() frees the content of checksum in [4mcksum[24m. - kkrrbb55__hhmmaacc() calculates the HMAC over _d_a_t_a (with length _l_e_n) using the - keyusage _u_s_a_g_e and keyblock _k_e_y. Note that keyusage is not always used + [1mkrb5_hmac[22m() calculates the HMAC over [4mdata[24m (with length [4mlen[24m) using the + keyusage [4musage[24m and keyblock [4mkey[24m. Note that keyusage is not always used in checksums. - kkrrbb55__cchheecckkssuumm__ddiissaabbllee globally disables the checksum type. + [1mkrb5_checksum_disable [22mglobally disables the checksum type. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5_crypto_init(3), krb5_c_encrypt(3), krb5_encrypt(3) HEIMDAL August 12, 2005 HEIMDAL diff --git a/lib/krb5/krb5_creds.cat3 b/lib/krb5/krb5_creds.cat3 index f7b07dd54d20..a7254961e9af 100644 --- a/lib/krb5/krb5_creds.cat3 +++ b/lib/krb5/krb5_creds.cat3 @@ -1,32 +1,31 @@ - KRB5_CREDS(3) BSD Library Functions Manual KRB5_CREDS(3) -NNAAMMEE - kkrrbb55__ccrreeddss, kkrrbb55__ccooppyy__ccrreeddss, kkrrbb55__ccooppyy__ccrreeddss__ccoonntteennttss, kkrrbb55__ffrreeee__ccrreeddss, - kkrrbb55__ffrreeee__ccrreedd__ccoonntteennttss -- Kerberos 5 credential handling functions +[1mNAME[0m + [1mkrb5_creds[22m, [1mkrb5_copy_creds[22m, [1mkrb5_copy_creds_contents[22m, [1mkrb5_free_creds[22m, + [1mkrb5_free_cred_contents [22m-- Kerberos 5 credential handling functions -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ccooppyy__ccrreeddss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _k_r_b_5___c_r_e_d_s _*_i_n_c_r_e_d, - _k_r_b_5___c_r_e_d_s _*_*_o_u_t_c_r_e_d); + [4mkrb5_error_code[0m + [1mkrb5_copy_creds[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mkrb5_creds[24m [4m*incred[24m, + [4mkrb5_creds[24m [4m**outcred[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ccooppyy__ccrreeddss__ccoonntteennttss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _k_r_b_5___c_r_e_d_s _*_i_n_c_r_e_d, - _k_r_b_5___c_r_e_d_s _*_o_u_t_c_r_e_d); + [4mkrb5_error_code[0m + [1mkrb5_copy_creds_contents[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mkrb5_creds[24m [4m*incred[24m, + [4mkrb5_creds[24m [4m*outcred[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ffrreeee__ccrreeddss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_e_d_s _*_o_u_t_c_r_e_d); + [4mkrb5_error_code[0m + [1mkrb5_free_creds[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_creds[24m [4m*outcred[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ffrreeee__ccrreedd__ccoonntteennttss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_e_d_s _*_c_r_e_d); + [4mkrb5_error_code[0m + [1mkrb5_free_cred_contents[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_creds[24m [4m*cred[24m); -DDEESSCCRRIIPPTTIIOONN - _k_r_b_5___c_r_e_d_s holds Kerberos credentials: +[1mDESCRIPTION[0m + [4mkrb5_creds[24m holds Kerberos credentials: typedef struct krb5_creds { krb5_principal client; @@ -40,19 +39,19 @@ DDEESSCCRRIIPPTTIIOONN krb5_ticket_flags flags; } krb5_creds; - kkrrbb55__ccooppyy__ccrreeddss() makes a copy of _i_n_c_r_e_d to _o_u_t_c_r_e_d. _o_u_t_c_r_e_d should be - freed with kkrrbb55__ffrreeee__ccrreeddss() by the caller. + [1mkrb5_copy_creds[22m() makes a copy of [4mincred[24m to [4moutcred[24m. [4moutcred[24m should be + freed with [1mkrb5_free_creds[22m() by the caller. - kkrrbb55__ccooppyy__ccrreeddss__ccoonntteennttss() makes a copy of the content of _i_n_c_r_e_d to - _o_u_t_c_r_e_d_s. _o_u_t_c_r_e_d_s should be freed by the called with - kkrrbb55__ffrreeee__ccrreeddss__ccoonntteennttss(). + [1mkrb5_copy_creds_contents[22m() makes a copy of the content of [4mincred[24m to + [4moutcreds[24m. [4moutcreds[24m should be freed by the called with + [1mkrb5_free_creds_contents[22m(). - kkrrbb55__ffrreeee__ccrreeddss() frees the content of the _c_r_e_d structure and the struc- + [1mkrb5_free_creds[22m() frees the content of the [4mcred[24m structure and the struc- ture itself. - kkrrbb55__ffrreeee__ccrreedd__ccoonntteennttss() frees the content of the _c_r_e_d structure. + [1mkrb5_free_cred_contents[22m() frees the content of the [4mcred[24m structure. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3), krb5_compare_creds(3), krb5_get_init_creds(3), kerberos(8) HEIMDAL May 1, 2006 HEIMDAL diff --git a/lib/krb5/krb5_digest.cat3 b/lib/krb5/krb5_digest.cat3 index 3d3c53b528b3..ac69a1305b86 100644 --- a/lib/krb5/krb5_digest.cat3 +++ b/lib/krb5/krb5_digest.cat3 @@ -1,146 +1,145 @@ - KRB5_DIGEST(3) BSD Library Functions Manual KRB5_DIGEST(3) -NNAAMMEE - kkrrbb55__ddiiggeesstt, kkrrbb55__ddiiggeesstt__aalllloocc, kkrrbb55__ddiiggeesstt__ffrreeee, - kkrrbb55__ddiiggeesstt__sseett__sseerrvveerr__ccbb, kkrrbb55__ddiiggeesstt__sseett__ttyyppee, - kkrrbb55__ddiiggeesstt__sseett__hhoossttnnaammee, kkrrbb55__ddiiggeesstt__ggeett__sseerrvveerr__nnoonnccee, - kkrrbb55__ddiiggeesstt__sseett__sseerrvveerr__nnoonnccee, kkrrbb55__ddiiggeesstt__ggeett__ooppaaqquuee, - kkrrbb55__ddiiggeesstt__sseett__ooppaaqquuee, kkrrbb55__ddiiggeesstt__ggeett__iiddeennttiiffiieerr, - kkrrbb55__ddiiggeesstt__sseett__iiddeennttiiffiieerr, kkrrbb55__ddiiggeesstt__iinniitt__rreeqquueesstt, - kkrrbb55__ddiiggeesstt__sseett__cclliieenntt__nnoonnccee, kkrrbb55__ddiiggeesstt__sseett__ddiiggeesstt, - kkrrbb55__ddiiggeesstt__sseett__uusseerrnnaammee, kkrrbb55__ddiiggeesstt__sseett__aauutthhiidd, - kkrrbb55__ddiiggeesstt__sseett__aauutthheennttiiccaattiioonn__uusseerr, kkrrbb55__ddiiggeesstt__sseett__rreeaallmm, - kkrrbb55__ddiiggeesstt__sseett__mmeetthhoodd, kkrrbb55__ddiiggeesstt__sseett__uurrii, kkrrbb55__ddiiggeesstt__sseett__nnoonncceeCCoouunntt, - kkrrbb55__ddiiggeesstt__sseett__qqoopp, kkrrbb55__ddiiggeesstt__rreeqquueesstt, kkrrbb55__ddiiggeesstt__ggeett__rreessppoonnsseeDDaattaa, - kkrrbb55__ddiiggeesstt__ggeett__rrsspp, kkrrbb55__ddiiggeesstt__ggeett__ttiicckkeettss, - kkrrbb55__ddiiggeesstt__ggeett__cclliieenntt__bbiinnddiinngg, kkrrbb55__ddiiggeesstt__ggeett__aa11__hhaasshh -- remote digest +[1mNAME[0m + [1mkrb5_digest[22m, [1mkrb5_digest_alloc[22m, [1mkrb5_digest_free[22m, + [1mkrb5_digest_set_server_cb[22m, [1mkrb5_digest_set_type[22m, + [1mkrb5_digest_set_hostname[22m, [1mkrb5_digest_get_server_nonce[22m, + [1mkrb5_digest_set_server_nonce[22m, [1mkrb5_digest_get_opaque[22m, + [1mkrb5_digest_set_opaque[22m, [1mkrb5_digest_get_identifier[22m, + [1mkrb5_digest_set_identifier[22m, [1mkrb5_digest_init_request[22m, + [1mkrb5_digest_set_client_nonce[22m, [1mkrb5_digest_set_digest[22m, + [1mkrb5_digest_set_username[22m, [1mkrb5_digest_set_authid[22m, + [1mkrb5_digest_set_authentication_user[22m, [1mkrb5_digest_set_realm[22m, + [1mkrb5_digest_set_method[22m, [1mkrb5_digest_set_uri[22m, [1mkrb5_digest_set_nonceCount[22m, + [1mkrb5_digest_set_qop[22m, [1mkrb5_digest_request[22m, [1mkrb5_digest_get_responseData[22m, + [1mkrb5_digest_get_rsp[22m, [1mkrb5_digest_get_tickets[22m, + [1mkrb5_digest_get_client_binding[22m, [1mkrb5_digest_get_a1_hash [22m-- remote digest (HTTP-DIGEST, SASL, CHAP) support -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m typedef struct krb5_digest *krb5_digest; - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__aalllloocc(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _*_d_i_g_e_s_t); + [4mkrb5_error_code[0m + [1mkrb5_digest_alloc[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4m*digest[24m); - _v_o_i_d - kkrrbb55__ddiiggeesstt__ffrreeee(_k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t); + [4mvoid[0m + [1mkrb5_digest_free[22m([4mkrb5_digest[24m [4mdigest[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__sseett__ttyyppee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, - _c_o_n_s_t _c_h_a_r _*_t_y_p_e); + [4mkrb5_error_code[0m + [1mkrb5_digest_set_type[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m, + [4mconst[24m [4mchar[24m [4m*type[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__sseett__sseerrvveerr__ccbb(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, - _c_o_n_s_t _c_h_a_r _*_t_y_p_e, _c_o_n_s_t _c_h_a_r _*_b_i_n_d_i_n_g); + [4mkrb5_error_code[0m + [1mkrb5_digest_set_server_cb[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m, + [4mconst[24m [4mchar[24m [4m*type[24m, [4mconst[24m [4mchar[24m [4m*binding[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__sseett__hhoossttnnaammee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, - _c_o_n_s_t _c_h_a_r _*_h_o_s_t_n_a_m_e); + [4mkrb5_error_code[0m + [1mkrb5_digest_set_hostname[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m, + [4mconst[24m [4mchar[24m [4m*hostname[24m); - _c_o_n_s_t _c_h_a_r _* - kkrrbb55__ddiiggeesstt__ggeett__sseerrvveerr__nnoonnccee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t); + [4mconst[24m [4mchar[24m [4m*[0m + [1mkrb5_digest_get_server_nonce[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__sseett__sseerrvveerr__nnoonnccee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, - _c_o_n_s_t _c_h_a_r _*_n_o_n_c_e); + [4mkrb5_error_code[0m + [1mkrb5_digest_set_server_nonce[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m, + [4mconst[24m [4mchar[24m [4m*nonce[24m); - _c_o_n_s_t _c_h_a_r _* - kkrrbb55__ddiiggeesstt__ggeett__ooppaaqquuee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t); + [4mconst[24m [4mchar[24m [4m*[0m + [1mkrb5_digest_get_opaque[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__sseett__ooppaaqquuee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, - _c_o_n_s_t _c_h_a_r _*_o_p_a_q_u_e); + [4mkrb5_error_code[0m + [1mkrb5_digest_set_opaque[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m, + [4mconst[24m [4mchar[24m [4m*opaque[24m); - _c_o_n_s_t _c_h_a_r _* - kkrrbb55__ddiiggeesstt__ggeett__iiddeennttiiffiieerr(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t); + [4mconst[24m [4mchar[24m [4m*[0m + [1mkrb5_digest_get_identifier[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__sseett__iiddeennttiiffiieerr(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, - _c_o_n_s_t _c_h_a_r _*_i_d); + [4mkrb5_error_code[0m + [1mkrb5_digest_set_identifier[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m, + [4mconst[24m [4mchar[24m [4m*id[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__iinniitt__rreeqquueesstt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, - _k_r_b_5___r_e_a_l_m _r_e_a_l_m, _k_r_b_5___c_c_a_c_h_e _c_c_a_c_h_e); + [4mkrb5_error_code[0m + [1mkrb5_digest_init_request[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m, + [4mkrb5_realm[24m [4mrealm[24m, [4mkrb5_ccache[24m [4mccache[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__sseett__cclliieenntt__nnoonnccee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, - _c_o_n_s_t _c_h_a_r _*_n_o_n_c_e); + [4mkrb5_error_code[0m + [1mkrb5_digest_set_client_nonce[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m, + [4mconst[24m [4mchar[24m [4m*nonce[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__sseett__ddiiggeesstt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, - _c_o_n_s_t _c_h_a_r _*_d_g_s_t); + [4mkrb5_error_code[0m + [1mkrb5_digest_set_digest[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m, + [4mconst[24m [4mchar[24m [4m*dgst[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__sseett__uusseerrnnaammee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, - _c_o_n_s_t _c_h_a_r _*_u_s_e_r_n_a_m_e); + [4mkrb5_error_code[0m + [1mkrb5_digest_set_username[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m, + [4mconst[24m [4mchar[24m [4m*username[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__sseett__aauutthhiidd(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, - _c_o_n_s_t _c_h_a_r _*_a_u_t_h_i_d); + [4mkrb5_error_code[0m + [1mkrb5_digest_set_authid[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m, + [4mconst[24m [4mchar[24m [4m*authid[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__sseett__aauutthheennttiiccaattiioonn__uusseerr(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, _k_r_b_5___p_r_i_n_c_i_p_a_l _a_u_t_h_e_n_t_i_c_a_t_i_o_n___u_s_e_r); + [4mkrb5_error_code[0m + [1mkrb5_digest_set_authentication_user[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_digest[24m [4mdigest[24m, [4mkrb5_principal[24m [4mauthentication_user[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__sseett__rreeaallmm(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, - _c_o_n_s_t _c_h_a_r _*_r_e_a_l_m); + [4mkrb5_error_code[0m + [1mkrb5_digest_set_realm[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m, + [4mconst[24m [4mchar[24m [4m*realm[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__sseett__mmeetthhoodd(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, - _c_o_n_s_t _c_h_a_r _*_m_e_t_h_o_d); + [4mkrb5_error_code[0m + [1mkrb5_digest_set_method[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m, + [4mconst[24m [4mchar[24m [4m*method[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__sseett__uurrii(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, - _c_o_n_s_t _c_h_a_r _*_u_r_i); + [4mkrb5_error_code[0m + [1mkrb5_digest_set_uri[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m, + [4mconst[24m [4mchar[24m [4m*uri[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__sseett__nnoonncceeCCoouunntt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, - _c_o_n_s_t _c_h_a_r _*_n_o_n_c_e___c_o_u_n_t); + [4mkrb5_error_code[0m + [1mkrb5_digest_set_nonceCount[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m, + [4mconst[24m [4mchar[24m [4m*nonce_count[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__sseett__qqoopp(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, - _c_o_n_s_t _c_h_a_r _*_q_o_p); + [4mkrb5_error_code[0m + [1mkrb5_digest_set_qop[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m, + [4mconst[24m [4mchar[24m [4m*qop[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__rreeqquueesstt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, - _k_r_b_5___r_e_a_l_m _r_e_a_l_m, _k_r_b_5___c_c_a_c_h_e _c_c_a_c_h_e); + [4mkrb5_error_code[0m + [1mkrb5_digest_request[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m, + [4mkrb5_realm[24m [4mrealm[24m, [4mkrb5_ccache[24m [4mccache[24m); - _c_o_n_s_t _c_h_a_r _* - kkrrbb55__ddiiggeesstt__ggeett__rreessppoonnsseeDDaattaa(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t); + [4mconst[24m [4mchar[24m [4m*[0m + [1mkrb5_digest_get_responseData[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m); - _c_o_n_s_t _c_h_a_r _* - kkrrbb55__ddiiggeesstt__ggeett__rrsspp(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t); + [4mconst[24m [4mchar[24m [4m*[0m + [1mkrb5_digest_get_rsp[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__ggeett__ttiicckkeettss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, - _T_i_c_k_e_t _*_*_t_i_c_k_e_t_s); + [4mkrb5_error_code[0m + [1mkrb5_digest_get_tickets[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m, + [4mTicket[24m [4m**tickets[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__ggeett__cclliieenntt__bbiinnddiinngg(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, - _c_h_a_r _*_*_t_y_p_e, _c_h_a_r _*_*_b_i_n_d_i_n_g); + [4mkrb5_error_code[0m + [1mkrb5_digest_get_client_binding[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m, + [4mchar[24m [4m**type[24m, [4mchar[24m [4m**binding[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddiiggeesstt__ggeett__aa11__hhaasshh(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___d_i_g_e_s_t _d_i_g_e_s_t, - _k_r_b_5___d_a_t_a _*_d_a_t_a); + [4mkrb5_error_code[0m + [1mkrb5_digest_get_a1_hash[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_digest[24m [4mdigest[24m, + [4mkrb5_data[24m [4m*data[24m); -DDEESSCCRRIIPPTTIIOONN - The kkrrbb55__ddiiggeesstt__aalllloocc() function allocatates the _d_i_g_e_s_t structure. The - structure should be freed with kkrrbb55__ddiiggeesstt__ffrreeee() when it is no longer +[1mDESCRIPTION[0m + The [1mkrb5_digest_alloc[22m() function allocatates the [4mdigest[24m structure. The + structure should be freed with [1mkrb5_digest_free[22m() when it is no longer being used. - kkrrbb55__ddiiggeesstt__aalllloocc() returns 0 to indicate success. Otherwise an kerberos - code is returned and the pointer that _d_i_g_e_s_t points to is set to NULL. + [1mkrb5_digest_alloc[22m() returns 0 to indicate success. Otherwise an kerberos + code is returned and the pointer that [4mdigest[24m points to is set to NULL. - kkrrbb55__ddiiggeesstt__ffrreeee() free the structure _d_i_g_e_s_t. + [1mkrb5_digest_free[22m() free the structure [4mdigest[24m. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3), kerberos(8) HEIMDAL February 18, 2007 HEIMDAL diff --git a/lib/krb5/krb5_eai_to_heim_errno.cat3 b/lib/krb5/krb5_eai_to_heim_errno.cat3 index a71698b49fe6..721914050761 100644 --- a/lib/krb5/krb5_eai_to_heim_errno.cat3 +++ b/lib/krb5/krb5_eai_to_heim_errno.cat3 @@ -1,29 +1,28 @@ - KRB5_EAI_TO_HEIM_ERRN... BSD Library Functions Manual KRB5_EAI_TO_HEIM_ERRN... -NNAAMMEE - kkrrbb55__eeaaii__ttoo__hheeiimm__eerrrrnnoo, kkrrbb55__hh__eerrrrnnoo__ttoo__hheeiimm__eerrrrnnoo -- convert resolver +[1mNAME[0m + [1mkrb5_eai_to_heim_errno[22m, [1mkrb5_h_errno_to_heim_errno [22m-- convert resolver error code to com_err error codes -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__eeaaii__ttoo__hheeiimm__eerrrrnnoo(_i_n_t _e_a_i___e_r_r_n_o, _i_n_t _s_y_s_t_e_m___e_r_r_o_r); + [4mkrb5_error_code[0m + [1mkrb5_eai_to_heim_errno[22m([4mint[24m [4meai_errno[24m, [4mint[24m [4msystem_error[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__hh__eerrrrnnoo__ttoo__hheeiimm__eerrrrnnoo(_i_n_t _e_a_i___e_r_r_n_o); + [4mkrb5_error_code[0m + [1mkrb5_h_errno_to_heim_errno[22m([4mint[24m [4meai_errno[24m); -DDEESSCCRRIIPPTTIIOONN - kkrrbb55__eeaaii__ttoo__hheeiimm__eerrrrnnoo() and kkrrbb55__hh__eerrrrnnoo__ttoo__hheeiimm__eerrrrnnoo() convert +[1mDESCRIPTION[0m + [1mkrb5_eai_to_heim_errno[22m() and [1mkrb5_h_errno_to_heim_errno[22m() convert getaddrinfo(3), getnameinfo(3), and h_errno(3) to com_err error code that are used by Heimdal, this is useful for for function returning kerberos errors and needs to communicate failures from resolver function. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3), kerberos(8) HEIMDAL April 13, 2004 HEIMDAL diff --git a/lib/krb5/krb5_encrypt.cat3 b/lib/krb5/krb5_encrypt.cat3 index 052af50d99ad..dd0c0c04e002 100644 --- a/lib/krb5/krb5_encrypt.cat3 +++ b/lib/krb5/krb5_encrypt.cat3 @@ -1,138 +1,137 @@ - KRB5_ENCRYPT(3) BSD Library Functions Manual KRB5_ENCRYPT(3) -NNAAMMEE - kkrrbb55__ccrryyppttoo__ggeettbblloocckkssiizzee, kkrrbb55__ccrryyppttoo__ggeettccoonnffoouunnddeerrssiizzee - kkrrbb55__ccrryyppttoo__ggeetteennccttyyppee, kkrrbb55__ccrryyppttoo__ggeettppaaddssiizzee, kkrrbb55__ccrryyppttoo__oovveerrhheeaadd, - kkrrbb55__ddeeccrryypptt, kkrrbb55__ddeeccrryypptt__EEnnccrryypptteeddDDaattaa, kkrrbb55__ddeeccrryypptt__iivveecc, - kkrrbb55__ddeeccrryypptt__ttiicckkeett, kkrrbb55__eennccrryypptt, kkrrbb55__eennccrryypptt__EEnnccrryypptteeddDDaattaa, - kkrrbb55__eennccrryypptt__iivveecc, kkrrbb55__eennccttyyppee__ddiissaabbllee, kkrrbb55__eennccttyyppee__kkeeyyssiizzee, - kkrrbb55__eennccttyyppee__ttoo__ssttrriinngg, kkrrbb55__eennccttyyppee__vvaalliidd, kkrrbb55__ggeett__wwrraappppeedd__lleennggtthh, - kkrrbb55__ssttrriinngg__ttoo__eennccttyyppee -- encrypt and decrypt data, set and get encryp- +[1mNAME[0m + [1mkrb5_crypto_getblocksize[22m, [1mkrb5_crypto_getconfoundersize[0m + [1mkrb5_crypto_getenctype[22m, [1mkrb5_crypto_getpadsize[22m, [1mkrb5_crypto_overhead[22m, + [1mkrb5_decrypt[22m, [1mkrb5_decrypt_EncryptedData[22m, [1mkrb5_decrypt_ivec[22m, + [1mkrb5_decrypt_ticket[22m, [1mkrb5_encrypt[22m, [1mkrb5_encrypt_EncryptedData[22m, + [1mkrb5_encrypt_ivec[22m, [1mkrb5_enctype_disable[22m, [1mkrb5_enctype_keysize[22m, + [1mkrb5_enctype_to_string[22m, [1mkrb5_enctype_valid[22m, [1mkrb5_get_wrapped_length[22m, + [1mkrb5_string_to_enctype [22m-- encrypt and decrypt data, set and get encryp- tion type parameters -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__eennccrryypptt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_y_p_t_o _c_r_y_p_t_o, _u_n_s_i_g_n_e_d _u_s_a_g_e, - _v_o_i_d _*_d_a_t_a, _s_i_z_e___t _l_e_n, _k_r_b_5___d_a_t_a _*_r_e_s_u_l_t); + [4mkrb5_error_code[0m + [1mkrb5_encrypt[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_crypto[24m [4mcrypto[24m, [4munsigned[24m [4musage[24m, + [4mvoid[24m [4m*data[24m, [4msize_t[24m [4mlen[24m, [4mkrb5_data[24m [4m*result[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__eennccrryypptt__EEnnccrryypptteeddDDaattaa(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_y_p_t_o _c_r_y_p_t_o, - _u_n_s_i_g_n_e_d _u_s_a_g_e, _v_o_i_d _*_d_a_t_a, _s_i_z_e___t _l_e_n, _i_n_t _k_v_n_o, - _E_n_c_r_y_p_t_e_d_D_a_t_a _*_r_e_s_u_l_t); + [4mkrb5_error_code[0m + [1mkrb5_encrypt_EncryptedData[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_crypto[24m [4mcrypto[24m, + [4munsigned[24m [4musage[24m, [4mvoid[24m [4m*data[24m, [4msize_t[24m [4mlen[24m, [4mint[24m [4mkvno[24m, + [4mEncryptedData[24m [4m*result[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__eennccrryypptt__iivveecc(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_y_p_t_o _c_r_y_p_t_o, - _u_n_s_i_g_n_e_d _u_s_a_g_e, _v_o_i_d _*_d_a_t_a, _s_i_z_e___t _l_e_n, _k_r_b_5___d_a_t_a _*_r_e_s_u_l_t, - _v_o_i_d _*_i_v_e_c); + [4mkrb5_error_code[0m + [1mkrb5_encrypt_ivec[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_crypto[24m [4mcrypto[24m, + [4munsigned[24m [4musage[24m, [4mvoid[24m [4m*data[24m, [4msize_t[24m [4mlen[24m, [4mkrb5_data[24m [4m*result[24m, + [4mvoid[24m [4m*ivec[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddeeccrryypptt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_y_p_t_o _c_r_y_p_t_o, _u_n_s_i_g_n_e_d _u_s_a_g_e, - _v_o_i_d _*_d_a_t_a, _s_i_z_e___t _l_e_n, _k_r_b_5___d_a_t_a _*_r_e_s_u_l_t); + [4mkrb5_error_code[0m + [1mkrb5_decrypt[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_crypto[24m [4mcrypto[24m, [4munsigned[24m [4musage[24m, + [4mvoid[24m [4m*data[24m, [4msize_t[24m [4mlen[24m, [4mkrb5_data[24m [4m*result[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddeeccrryypptt__EEnnccrryypptteeddDDaattaa(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_y_p_t_o _c_r_y_p_t_o, - _u_n_s_i_g_n_e_d _u_s_a_g_e, _E_n_c_r_y_p_t_e_d_D_a_t_a _*_e, _k_r_b_5___d_a_t_a _*_r_e_s_u_l_t); + [4mkrb5_error_code[0m + [1mkrb5_decrypt_EncryptedData[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_crypto[24m [4mcrypto[24m, + [4munsigned[24m [4musage[24m, [4mEncryptedData[24m [4m*e[24m, [4mkrb5_data[24m [4m*result[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddeeccrryypptt__iivveecc(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_y_p_t_o _c_r_y_p_t_o, - _u_n_s_i_g_n_e_d _u_s_a_g_e, _v_o_i_d _*_d_a_t_a, _s_i_z_e___t _l_e_n, _k_r_b_5___d_a_t_a _*_r_e_s_u_l_t, - _v_o_i_d _*_i_v_e_c); + [4mkrb5_error_code[0m + [1mkrb5_decrypt_ivec[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_crypto[24m [4mcrypto[24m, + [4munsigned[24m [4musage[24m, [4mvoid[24m [4m*data[24m, [4msize_t[24m [4mlen[24m, [4mkrb5_data[24m [4m*result[24m, + [4mvoid[24m [4m*ivec[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ddeeccrryypptt__ttiicckkeett(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _T_i_c_k_e_t _*_t_i_c_k_e_t, - _k_r_b_5___k_e_y_b_l_o_c_k _*_k_e_y, _E_n_c_T_i_c_k_e_t_P_a_r_t _*_o_u_t, _k_r_b_5___f_l_a_g_s _f_l_a_g_s); + [4mkrb5_error_code[0m + [1mkrb5_decrypt_ticket[22m([4mkrb5_context[24m [4mcontext[24m, [4mTicket[24m [4m*ticket[24m, + [4mkrb5_keyblock[24m [4m*key[24m, [4mEncTicketPart[24m [4m*out[24m, [4mkrb5_flags[24m [4mflags[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ccrryyppttoo__ggeettbblloocckkssiizzee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _s_i_z_e___t _*_b_l_o_c_k_s_i_z_e); + [4mkrb5_error_code[0m + [1mkrb5_crypto_getblocksize[22m([4mkrb5_context[24m [4mcontext[24m, [4msize_t[24m [4m*blocksize[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ccrryyppttoo__ggeetteennccttyyppee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_y_p_t_o _c_r_y_p_t_o, - _k_r_b_5___e_n_c_t_y_p_e _*_e_n_c_t_y_p_e); + [4mkrb5_error_code[0m + [1mkrb5_crypto_getenctype[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_crypto[24m [4mcrypto[24m, + [4mkrb5_enctype[24m [4m*enctype[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ccrryyppttoo__ggeettppaaddssiizzee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _s_i_z_e___t, _*_p_a_d_s_i_z_e_"); + [4mkrb5_error_code[0m + [1mkrb5_crypto_getpadsize[22m([4mkrb5_context[24m [4mcontext[24m, [4msize_t[24m, [4m*padsize"[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ccrryyppttoo__ggeettccoonnffoouunnddeerrssiizzee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_y_p_t_o _c_r_y_p_t_o, - _s_i_z_e___t, _*_c_o_n_f_o_u_n_d_e_r_s_i_z_e_"); + [4mkrb5_error_code[0m + [1mkrb5_crypto_getconfoundersize[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_crypto[24m [4mcrypto[24m, + [4msize_t[24m, [4m*confoundersize"[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__eennccttyyppee__kkeeyyssiizzee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___e_n_c_t_y_p_e _t_y_p_e, - _s_i_z_e___t _*_k_e_y_s_i_z_e); + [4mkrb5_error_code[0m + [1mkrb5_enctype_keysize[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_enctype[24m [4mtype[24m, + [4msize_t[24m [4m*keysize[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ccrryyppttoo__oovveerrhheeaadd(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _s_i_z_e___t, _*_p_a_d_s_i_z_e_"); + [4mkrb5_error_code[0m + [1mkrb5_crypto_overhead[22m([4mkrb5_context[24m [4mcontext[24m, [4msize_t[24m, [4m*padsize"[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ssttrriinngg__ttoo__eennccttyyppee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _c_h_a_r _*_s_t_r_i_n_g, - _k_r_b_5___e_n_c_t_y_p_e _*_e_t_y_p_e); + [4mkrb5_error_code[0m + [1mkrb5_string_to_enctype[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mchar[24m [4m*string[24m, + [4mkrb5_enctype[24m [4m*etype[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__eennccttyyppee__ttoo__ssttrriinngg(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___e_n_c_t_y_p_e _e_t_y_p_e, - _c_h_a_r _*_*_s_t_r_i_n_g); + [4mkrb5_error_code[0m + [1mkrb5_enctype_to_string[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_enctype[24m [4metype[24m, + [4mchar[24m [4m**string[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__eennccttyyppee__vvaalliidd(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___e_n_c_t_y_p_e _e_t_y_p_e); + [4mkrb5_error_code[0m + [1mkrb5_enctype_valid[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_enctype[24m [4metype[24m); - _v_o_i_d - kkrrbb55__eennccttyyppee__ddiissaabbllee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___e_n_c_t_y_p_e _e_t_y_p_e); + [4mvoid[0m + [1mkrb5_enctype_disable[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_enctype[24m [4metype[24m); - _s_i_z_e___t - kkrrbb55__ggeett__wwrraappppeedd__lleennggtthh(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_y_p_t_o _c_r_y_p_t_o, - _s_i_z_e___t _d_a_t_a___l_e_n); + [4msize_t[0m + [1mkrb5_get_wrapped_length[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_crypto[24m [4mcrypto[24m, + [4msize_t[24m [4mdata_len[24m); -DDEESSCCRRIIPPTTIIOONN +[1mDESCRIPTION[0m These functions are used to encrypt and decrypt data. - kkrrbb55__eennccrryypptt__iivveecc() puts the encrypted version of _d_a_t_a (of size _l_e_n) in - _r_e_s_u_l_t. If the encryption type supports using derived keys, _u_s_a_g_e should - be the appropriate key-usage. _i_v_e_c is a pointer to a initial IV, it is + [1mkrb5_encrypt_ivec[22m() puts the encrypted version of [4mdata[24m (of size [4mlen[24m) in + [4mresult[24m. If the encryption type supports using derived keys, [4musage[24m should + be the appropriate key-usage. [4mivec[24m is a pointer to a initial IV, it is modified to the end IV at the end of the round. Ivec should be the size - of If NULL is passed in, the default IV is used. kkrrbb55__eennccrryypptt() does the - same as kkrrbb55__eennccrryypptt__iivveecc() but with _i_v_e_c being NULL. - kkrrbb55__eennccrryypptt__EEnnccrryypptteeddDDaattaa() does the same as kkrrbb55__eennccrryypptt(), but it puts - the encrypted data in a _E_n_c_r_y_p_t_e_d_D_a_t_a structure instead. If _k_v_n_o is not - zero, it will be put in the (optional) _k_v_n_o field in the _E_n_c_r_y_p_t_e_d_D_a_t_a. + of If NULL is passed in, the default IV is used. [1mkrb5_encrypt[22m() does the + same as [1mkrb5_encrypt_ivec[22m() but with [4mivec[24m being NULL. + [1mkrb5_encrypt_EncryptedData[22m() does the same as [1mkrb5_encrypt[22m(), but it puts + the encrypted data in a [4mEncryptedData[24m structure instead. If [4mkvno[24m is not + zero, it will be put in the (optional) [4mkvno[24m field in the [4mEncryptedData[24m. - kkrrbb55__ddeeccrryypptt__iivveecc(), kkrrbb55__ddeeccrryypptt(), and kkrrbb55__ddeeccrryypptt__EEnnccrryypptteeddDDaattaa() + [1mkrb5_decrypt_ivec[22m(), [1mkrb5_decrypt[22m(), and [1mkrb5_decrypt_EncryptedData[22m() works similarly. - kkrrbb55__ddeeccrryypptt__ttiicckkeett() decrypts the encrypted part of _t_i_c_k_e_t with _k_e_y. - kkrrbb55__ddeeccrryypptt__ttiicckkeett() also verifies the timestamp in the ticket, invalid + [1mkrb5_decrypt_ticket[22m() decrypts the encrypted part of [4mticket[24m with [4mkey[24m. + [1mkrb5_decrypt_ticket[22m() also verifies the timestamp in the ticket, invalid flag and if the KDC haven't verified the transited path, the transit path. - kkrrbb55__eennccttyyppee__kkeeyyssiizzee(), kkrrbb55__ccrryyppttoo__ggeettccoonnffoouunnddeerrssiizzee(), - kkrrbb55__ccrryyppttoo__ggeettbblloocckkssiizzee(), kkrrbb55__ccrryyppttoo__ggeetteennccttyyppee(), - kkrrbb55__ccrryyppttoo__ggeettppaaddssiizzee(), kkrrbb55__ccrryyppttoo__oovveerrhheeaadd() all returns various + [1mkrb5_enctype_keysize[22m(), [1mkrb5_crypto_getconfoundersize[22m(), + [1mkrb5_crypto_getblocksize[22m(), [1mkrb5_crypto_getenctype[22m(), + [1mkrb5_crypto_getpadsize[22m(), [1mkrb5_crypto_overhead[22m() all returns various (sometimes) useful information from a crypto context. - kkrrbb55__ccrryyppttoo__oovveerrhheeaadd() is the combination of krb5_crypto_getconfounder- + [1mkrb5_crypto_overhead[22m() is the combination of krb5_crypto_getconfounder- size, krb5_crypto_getblocksize and krb5_crypto_getpadsize and return the maximum overhead size. - kkrrbb55__eennccttyyppee__ttoo__ssttrriinngg() converts a encryption type number to a string + [1mkrb5_enctype_to_string[22m() converts a encryption type number to a string that can be printable and stored. The strings returned should be freed with free(3). - kkrrbb55__ssttrriinngg__ttoo__eennccttyyppee() converts a encryption type strings to a encryp- + [1mkrb5_string_to_enctype[22m() converts a encryption type strings to a encryp- tion type number that can use used for other Kerberos crypto functions. - kkrrbb55__eennccttyyppee__vvaalliidd() returns 0 if the encrypt is supported and not dis- + [1mkrb5_enctype_valid[22m() returns 0 if the encrypt is supported and not dis- abled, otherwise and error code is returned. - kkrrbb55__eennccttyyppee__ddiissaabbllee() (globally, for all contextes) disables the - _e_n_c_t_y_p_e. + [1mkrb5_enctype_disable[22m() (globally, for all contextes) disables the + [4menctype[24m. - kkrrbb55__ggeett__wwrraappppeedd__lleennggtthh() returns the size of an encrypted packet by - _c_r_y_p_t_o of length _d_a_t_a___l_e_n. + [1mkrb5_get_wrapped_length[22m() returns the size of an encrypted packet by + [4mcrypto[24m of length [4mdata_len[24m. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5_create_checksum(3), krb5_crypto_init(3) HEIMDAL March 20, 2004 HEIMDAL diff --git a/lib/krb5/krb5_find_padata.cat3 b/lib/krb5/krb5_find_padata.cat3 index 9d8c8393fb61..2b7f5f288d54 100644 --- a/lib/krb5/krb5_find_padata.cat3 +++ b/lib/krb5/krb5_find_padata.cat3 @@ -1,33 +1,32 @@ - KRB5_FIND_PADATA(3) BSD Library Functions Manual KRB5_FIND_PADATA(3) -NNAAMMEE - kkrrbb55__ffiinndd__ppaaddaattaa, kkrrbb55__ppaaddaattaa__aadddd -- Kerberos 5 pre-authentication data +[1mNAME[0m + [1mkrb5_find_padata[22m, [1mkrb5_padata_add [22m-- Kerberos 5 pre-authentication data handling functions -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _P_A___D_A_T_A _* - kkrrbb55__ffiinndd__ppaaddaattaa(_P_A___D_A_T_A _*_v_a_l, _u_n_s_i_g_n_e_d _l_e_n, _i_n_t _t_y_p_e, _i_n_t _*_i_n_d_e_x); + [4mPA_DATA[24m [4m*[0m + [1mkrb5_find_padata[22m([4mPA_DATA[24m [4m*val[24m, [4munsigned[24m [4mlen[24m, [4mint[24m [4mtype[24m, [4mint[24m [4m*index[24m); - _i_n_t - kkrrbb55__ppaaddaattaa__aadddd(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _M_E_T_H_O_D___D_A_T_A _*_m_d, _i_n_t _t_y_p_e, - _v_o_i_d _*_b_u_f, _s_i_z_e___t _l_e_n); + [4mint[0m + [1mkrb5_padata_add[22m([4mkrb5_context[24m [4mcontext[24m, [4mMETHOD_DATA[24m [4m*md[24m, [4mint[24m [4mtype[24m, + [4mvoid[24m [4m*buf[24m, [4msize_t[24m [4mlen[24m); -DDEESSCCRRIIPPTTIIOONN - kkrrbb55__ffiinndd__ppaaddaattaa() tries to find the pre-authentication data entry of - type _t_y_p_e in the array _v_a_l of length _l_e_n. The search is started at entry - pointed out by _*_i_n_d_e_x (zero based indexing). If the type isn't found, +[1mDESCRIPTION[0m + [1mkrb5_find_padata[22m() tries to find the pre-authentication data entry of + type [4mtype[24m in the array [4mval[24m of length [4mlen[24m. The search is started at entry + pointed out by [4m*index[24m (zero based indexing). If the type isn't found, NULL is returned. - kkrrbb55__ppaaddaattaa__aadddd() adds a pre-authentication data entry of type _t_y_p_e - pointed out by _b_u_f and _l_e_n to _m_d. + [1mkrb5_padata_add[22m() adds a pre-authentication data entry of type [4mtype[0m + pointed out by [4mbuf[24m and [4mlen[24m to [4mmd[24m. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3), kerberos(8) HEIMDAL March 21, 2004 HEIMDAL diff --git a/lib/krb5/krb5_generate_random_block.cat3 b/lib/krb5/krb5_generate_random_block.cat3 index 10c33b359dcc..ca4848d1d654 100644 --- a/lib/krb5/krb5_generate_random_block.cat3 +++ b/lib/krb5/krb5_generate_random_block.cat3 @@ -1,23 +1,22 @@ - KRB5_GENERATE_RANDOM_... BSD Library Functions Manual KRB5_GENERATE_RANDOM_... -NNAAMMEE - kkrrbb55__ggeenneerraattee__rraannddoomm__bblloocckk -- Kerberos 5 random functions +[1mNAME[0m + [1mkrb5_generate_random_block [22m-- Kerberos 5 random functions -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _v_o_i_d - kkrrbb55__ggeenneerraattee__rraannddoomm__bblloocckk(_v_o_i_d _*_b_u_f, _s_i_z_e___t _l_e_n); + [4mvoid[0m + [1mkrb5_generate_random_block[22m([4mvoid[24m [4m*buf[24m, [4msize_t[24m [4mlen[24m); -DDEESSCCRRIIPPTTIIOONN - kkrrbb55__ggeenneerraattee__rraannddoomm__bblloocckk() generates a cryptographically strong pseudo- - random block into the buffer _b_u_f of length _l_e_n. +[1mDESCRIPTION[0m + [1mkrb5_generate_random_block[22m() generates a cryptographically strong pseudo- + random block into the buffer [4mbuf[24m of length [4mlen[24m. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3), krb5.conf(5) HEIMDAL March 21, 2004 HEIMDAL diff --git a/lib/krb5/krb5_get_all_client_addrs.cat3 b/lib/krb5/krb5_get_all_client_addrs.cat3 index ba33859fa4bb..8538a6d6c619 100644 --- a/lib/krb5/krb5_get_all_client_addrs.cat3 +++ b/lib/krb5/krb5_get_all_client_addrs.cat3 @@ -1,24 +1,23 @@ - KRB5_GET_ADDRS(3) BSD Library Functions Manual KRB5_GET_ADDRS(3) -NNAAMMEE - kkrrbb55__ggeett__aallll__cclliieenntt__aaddddrrss, kkrrbb55__ggeett__aallll__sseerrvveerr__aaddddrrss -- return local - addresses +[1mNAME[0m + [1mkrb5_get_all_client_addrs[22m, [1mkrb5_get_all_server_addrs [22m-- return local ad- + dresses -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__aallll__cclliieenntt__aaddddrrss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___a_d_d_r_e_s_s_e_s _*_a_d_d_r_s); + [4mkrb5_error_code[0m + [1mkrb5_get_all_client_addrs[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_addresses[24m [4m*addrs[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__aallll__sseerrvveerr__aaddddrrss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___a_d_d_r_e_s_s_e_s _*_a_d_d_r_s); + [4mkrb5_error_code[0m + [1mkrb5_get_all_server_addrs[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_addresses[24m [4m*addrs[24m); -DDEESSCCRRIIPPTTIIOONN - These functions return in _a_d_d_r_s a list of addresses associated with the +[1mDESCRIPTION[0m + These functions return in [4maddrs[24m a list of addresses associated with the local host. The server variant returns all configured interface addresses (if possi- @@ -26,14 +25,14 @@ DDEESSCCRRIIPPTTIIOONN sockets to listen to. The client version will also scan local interfaces (can be turned off by - setting libdefaults/scan_interfaces to false in _k_r_b_5_._c_o_n_f), but will not + setting libdefaults/scan_interfaces to false in [4mkrb5.conf[24m), but will not include loop-back addresses, unless there are no other addresses found. It will remove all addresses included in libdefaults/ignore_addresses but will unconditionally include addresses in libdefaults/extra_addresses. - The returned addresses should be freed by calling kkrrbb55__ffrreeee__aaddddrreesssseess(). + The returned addresses should be freed by calling [1mkrb5_free_addresses[22m(). -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5_free_addresses(3) HEIMDAL July 1, 2001 HEIMDAL diff --git a/lib/krb5/krb5_get_credentials.cat3 b/lib/krb5/krb5_get_credentials.cat3 index 57ad184a7c06..595484d72397 100644 --- a/lib/krb5/krb5_get_credentials.cat3 +++ b/lib/krb5/krb5_get_credentials.cat3 @@ -1,70 +1,69 @@ - KRB5_GET_CREDENTIALS(3) BSD Library Functions Manual KRB5_GET_CREDENTIALS(3) -NNAAMMEE - kkrrbb55__ggeett__ccrreeddeennttiiaallss, kkrrbb55__ggeett__ccrreeddeennttiiaallss__wwiitthh__ffllaaggss, kkrrbb55__ggeett__kkddcc__ccrreedd, - kkrrbb55__ggeett__rreenneewweedd__ccrreeddss -- get credentials from the KDC using krbtgt +[1mNAME[0m + [1mkrb5_get_credentials[22m, [1mkrb5_get_credentials_with_flags[22m, [1mkrb5_get_kdc_cred[22m, + [1mkrb5_get_renewed_creds [22m-- get credentials from the KDC using krbtgt -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__ccrreeddeennttiiaallss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___f_l_a_g_s _o_p_t_i_o_n_s, - _k_r_b_5___c_c_a_c_h_e _c_c_a_c_h_e, _k_r_b_5___c_r_e_d_s _*_i_n___c_r_e_d_s, _k_r_b_5___c_r_e_d_s _*_*_o_u_t___c_r_e_d_s); + [4mkrb5_error_code[0m + [1mkrb5_get_credentials[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_flags[24m [4moptions[24m, + [4mkrb5_ccache[24m [4mccache[24m, [4mkrb5_creds[24m [4m*in_creds[24m, [4mkrb5_creds[24m [4m**out_creds[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__ccrreeddeennttiiaallss__wwiitthh__ffllaaggss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___f_l_a_g_s _o_p_t_i_o_n_s, - _k_r_b_5___k_d_c___f_l_a_g_s _f_l_a_g_s, _k_r_b_5___c_c_a_c_h_e _c_c_a_c_h_e, _k_r_b_5___c_r_e_d_s _*_i_n___c_r_e_d_s, - _k_r_b_5___c_r_e_d_s _*_*_o_u_t___c_r_e_d_s); + [4mkrb5_error_code[0m + [1mkrb5_get_credentials_with_flags[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_flags[24m [4moptions[24m, + [4mkrb5_kdc_flags[24m [4mflags[24m, [4mkrb5_ccache[24m [4mccache[24m, [4mkrb5_creds[24m [4m*in_creds[24m, + [4mkrb5_creds[24m [4m**out_creds[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__kkddcc__ccrreedd(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_c_a_c_h_e _i_d, - _k_r_b_5___k_d_c___f_l_a_g_s _f_l_a_g_s, _k_r_b_5___a_d_d_r_e_s_s_e_s _*_a_d_d_r_e_s_s_e_s, - _T_i_c_k_e_t _*_s_e_c_o_n_d___t_i_c_k_e_t, _k_r_b_5___c_r_e_d_s _*_i_n___c_r_e_d_s, _k_r_b_5___c_r_e_d_s _*_*_o_u_t___c_r_e_d_s); + [4mkrb5_error_code[0m + [1mkrb5_get_kdc_cred[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_ccache[24m [4mid[24m, + [4mkrb5_kdc_flags[24m [4mflags[24m, [4mkrb5_addresses[24m [4m*addresses[24m, + [4mTicket[24m [4m*second_ticket[24m, [4mkrb5_creds[24m [4m*in_creds[24m, [4mkrb5_creds[24m [4m**out_creds[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__rreenneewweedd__ccrreeddss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_e_d_s _*_c_r_e_d_s, - _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _c_l_i_e_n_t, _k_r_b_5___c_c_a_c_h_e _c_c_a_c_h_e, - _c_o_n_s_t _c_h_a_r _*_i_n___t_k_t___s_e_r_v_i_c_e); + [4mkrb5_error_code[0m + [1mkrb5_get_renewed_creds[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_creds[24m [4m*creds[24m, + [4mkrb5_const_principal[24m [4mclient[24m, [4mkrb5_ccache[24m [4mccache[24m, + [4mconst[24m [4mchar[24m [4m*in_tkt_service[24m); -DDEESSCCRRIIPPTTIIOONN - kkrrbb55__ggeett__ccrreeddeennttiiaallss__wwiitthh__ffllaaggss() get credentials specified by - _i_n___c_r_e_d_s_-_>_s_e_r_v_e_r and _i_n___c_r_e_d_s_-_>_c_l_i_e_n_t (the rest of the _i_n___c_r_e_d_s structure - is ignored) by first looking in the _c_c_a_c_h_e and if doesn't exists or is - expired, fetch the credential from the KDC using the krbtgt in _c_c_a_c_h_e. - The credential is returned in _o_u_t___c_r_e_d_s and should be freed using the - function kkrrbb55__ffrreeee__ccrreeddss(). +[1mDESCRIPTION[0m + [1mkrb5_get_credentials_with_flags[22m() get credentials specified by + [4min_creds->server[24m and [4min_creds->client[24m (the rest of the [4min_creds[24m structure + is ignored) by first looking in the [4mccache[24m and if doesn't exists or is + expired, fetch the credential from the KDC using the krbtgt in [4mccache[24m. + The credential is returned in [4mout_creds[24m and should be freed using the + function [1mkrb5_free_creds[22m(). - Valid flags to pass into _o_p_t_i_o_n_s argument are: + Valid flags to pass into [4moptions[24m argument are: - KRB5_GC_CACHED Only check the _c_c_a_c_h_e, don't got out on network to + KRB5_GC_CACHED Only check the [4mccache[24m, don't got out on network to fetch credential. KRB5_GC_USER_USER Request a user to user ticket. This option doesn't store the resulting user to user credential in the - _c_c_a_c_h_e. + [4mccache[24m. KRB5_GC_EXPIRED_OK returns the credential even if it is expired, default behavior is trying to refetch the credential from the KDC. - _F_l_a_g_s are KDCOptions, note the caller must fill in the bit-field and not + [4mFlags[24m are KDCOptions, note the caller must fill in the bit-field and not use the integer associated structure. - kkrrbb55__ggeett__ccrreeddeennttiiaallss() works the same way as - kkrrbb55__ggeett__ccrreeddeennttiiaallss__wwiitthh__ffllaaggss() except that the _f_l_a_g_s field is missing. + [1mkrb5_get_credentials[22m() works the same way as + [1mkrb5_get_credentials_with_flags[22m() except that the [4mflags[24m field is missing. - kkrrbb55__ggeett__kkddcc__ccrreedd() does the same as the functions above, but the caller + [1mkrb5_get_kdc_cred[22m() does the same as the functions above, but the caller must fill in all the information andits closer to the wire protocol. - kkrrbb55__ggeett__rreenneewweedd__ccrreeddss() renews a credential given by _i_n___t_k_t___s_e_r_v_i_c_e (if - NULL the default krbtgt) using the credential cache _c_c_a_c_h_e. The result - is stored in _c_r_e_d_s and should be freed using _k_r_b_5___f_r_e_e___c_r_e_d_s. + [1mkrb5_get_renewed_creds[22m() renews a credential given by [4min_tkt_service[24m (if + NULL the default krbtgt) using the credential cache [4mccache[24m. The result + is stored in [4mcreds[24m and should be freed using [4mkrb5_free_creds[24m. -EEXXAAMMPPLLEESS +[1mEXAMPLES[0m Here is a example function that get a credential from a credential cache - _i_d or the KDC and returns it to the caller. + [4mid[24m or the KDC and returns it to the caller. #include <krb5.h> @@ -91,7 +90,7 @@ EEXXAAMMPPLLEESS return 0; } -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3), krb5_get_forwarded_creds(3), krb5.conf(5) HEIMDAL July 26, 2004 HEIMDAL diff --git a/lib/krb5/krb5_get_creds.cat3 b/lib/krb5/krb5_get_creds.cat3 index 7e9f2683a556..88f4aa2d16ca 100644 --- a/lib/krb5/krb5_get_creds.cat3 +++ b/lib/krb5/krb5_get_creds.cat3 @@ -1,93 +1,92 @@ - KRB5_GET_CREDS(3) BSD Library Functions Manual KRB5_GET_CREDS(3) -NNAAMMEE - kkrrbb55__ggeett__ccrreeddss, kkrrbb55__ggeett__ccrreeddss__oopptt__aadddd__ooppttiioonnss, kkrrbb55__ggeett__ccrreeddss__oopptt__aalllloocc, - kkrrbb55__ggeett__ccrreeddss__oopptt__ffrreeee, kkrrbb55__ggeett__ccrreeddss__oopptt__sseett__eennccttyyppee, - kkrrbb55__ggeett__ccrreeddss__oopptt__sseett__iimmppeerrssoonnaattee, kkrrbb55__ggeett__ccrreeddss__oopptt__sseett__ooppttiioonnss, - kkrrbb55__ggeett__ccrreeddss__oopptt__sseett__ttiicckkeett -- get credentials from the KDC +[1mNAME[0m + [1mkrb5_get_creds[22m, [1mkrb5_get_creds_opt_add_options[22m, [1mkrb5_get_creds_opt_alloc[22m, + [1mkrb5_get_creds_opt_free[22m, [1mkrb5_get_creds_opt_set_enctype[22m, + [1mkrb5_get_creds_opt_set_impersonate[22m, [1mkrb5_get_creds_opt_set_options[22m, + [1mkrb5_get_creds_opt_set_ticket [22m-- get credentials from the KDC -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__ccrreeddss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___g_e_t___c_r_e_d_s___o_p_t _o_p_t, - _k_r_b_5___c_c_a_c_h_e _c_c_a_c_h_e, _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _i_n_p_r_i_n_c, - _k_r_b_5___c_r_e_d_s _*_*_o_u_t___c_r_e_d_s); + [4mkrb5_error_code[0m + [1mkrb5_get_creds[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_get_creds_opt[24m [4mopt[24m, + [4mkrb5_ccache[24m [4mccache[24m, [4mkrb5_const_principal[24m [4minprinc[24m, + [4mkrb5_creds[24m [4m**out_creds[24m); - _v_o_i_d - kkrrbb55__ggeett__ccrreeddss__oopptt__aadddd__ooppttiioonnss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___g_e_t___c_r_e_d_s___o_p_t _o_p_t, _k_r_b_5___f_l_a_g_s _o_p_t_i_o_n_s); + [4mvoid[0m + [1mkrb5_get_creds_opt_add_options[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_get_creds_opt[24m [4mopt[24m, [4mkrb5_flags[24m [4moptions[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__ccrreeddss__oopptt__aalllloocc(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___g_e_t___c_r_e_d_s___o_p_t _*_o_p_t); + [4mkrb5_error_code[0m + [1mkrb5_get_creds_opt_alloc[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_get_creds_opt[24m [4m*opt[24m); - _v_o_i_d - kkrrbb55__ggeett__ccrreeddss__oopptt__ffrreeee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___g_e_t___c_r_e_d_s___o_p_t _o_p_t); + [4mvoid[0m + [1mkrb5_get_creds_opt_free[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_get_creds_opt[24m [4mopt[24m); - _v_o_i_d - kkrrbb55__ggeett__ccrreeddss__oopptt__sseett__eennccttyyppee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___g_e_t___c_r_e_d_s___o_p_t _o_p_t, _k_r_b_5___e_n_c_t_y_p_e _e_n_c_t_y_p_e); + [4mvoid[0m + [1mkrb5_get_creds_opt_set_enctype[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_get_creds_opt[24m [4mopt[24m, [4mkrb5_enctype[24m [4menctype[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__ccrreeddss__oopptt__sseett__iimmppeerrssoonnaattee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___g_e_t___c_r_e_d_s___o_p_t _o_p_t, _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _s_e_l_f); + [4mkrb5_error_code[0m + [1mkrb5_get_creds_opt_set_impersonate[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_get_creds_opt[24m [4mopt[24m, [4mkrb5_const_principal[24m [4mself[24m); - _v_o_i_d - kkrrbb55__ggeett__ccrreeddss__oopptt__sseett__ooppttiioonnss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___g_e_t___c_r_e_d_s___o_p_t _o_p_t, _k_r_b_5___f_l_a_g_s _o_p_t_i_o_n_s); + [4mvoid[0m + [1mkrb5_get_creds_opt_set_options[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_get_creds_opt[24m [4mopt[24m, [4mkrb5_flags[24m [4moptions[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__ccrreeddss__oopptt__sseett__ttiicckkeett(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___g_e_t___c_r_e_d_s___o_p_t _o_p_t, _c_o_n_s_t _T_i_c_k_e_t _*_t_i_c_k_e_t); + [4mkrb5_error_code[0m + [1mkrb5_get_creds_opt_set_ticket[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_get_creds_opt[24m [4mopt[24m, [4mconst[24m [4mTicket[24m [4m*ticket[24m); -DDEESSCCRRIIPPTTIIOONN - kkrrbb55__ggeett__ccrreeddss() fetches credentials specified by _o_p_t by first looking in - the _c_c_a_c_h_e, and then it doesn't exists, fetch the credential from the KDC - using the krbtgts in _c_c_a_c_h_e. The credential is returned in _o_u_t___c_r_e_d_s and - should be freed using the function kkrrbb55__ffrreeee__ccrreeddss(). +[1mDESCRIPTION[0m + [1mkrb5_get_creds[22m() fetches credentials specified by [4mopt[24m by first looking in + the [4mccache[24m, and then it doesn't exists, fetch the credential from the KDC + using the krbtgts in [4mccache[24m. The credential is returned in [4mout_creds[24m and + should be freed using the function [1mkrb5_free_creds[22m(). The structure krb5_get_creds_opt controls the behavior of - kkrrbb55__ggeett__ccrreeddss(). The structure is opaque to consumers that can set the + [1mkrb5_get_creds[22m(). The structure is opaque to consumers that can set the content of the structure with accessors functions. All accessor functions make copies of the data that is passed into accessor functions, so exter- - nal consumers free the memory before calling kkrrbb55__ggeett__ccrreeddss(). + nal consumers free the memory before calling [1mkrb5_get_creds[22m(). The structure krb5_get_creds_opt is allocated with - kkrrbb55__ggeett__ccrreeddss__oopptt__aalllloocc() and freed with kkrrbb55__ggeett__ccrreeddss__oopptt__ffrreeee(). The + [1mkrb5_get_creds_opt_alloc[22m() and freed with [1mkrb5_get_creds_opt_free[22m(). The free function also frees the content of the structure set by the accessor functions. - kkrrbb55__ggeett__ccrreeddss__oopptt__aadddd__ooppttiioonnss() and kkrrbb55__ggeett__ccrreeddss__oopptt__sseett__ooppttiioonnss() + [1mkrb5_get_creds_opt_add_options[22m() and [1mkrb5_get_creds_opt_set_options[22m() adds and sets options to the krb5_get_creds_opt structure . The possible options to set are - KRB5_GC_CACHED Only check the _c_c_a_c_h_e, don't got out on network to + KRB5_GC_CACHED Only check the [4mccache[24m, don't got out on network to fetch credential. KRB5_GC_USER_USER request a user to user ticket. This options doesn't store the resulting user to user credential in the - _c_c_a_c_h_e. + [4mccache[24m. KRB5_GC_EXPIRED_OK returns the credential even if it is expired, default behavior is trying to refetch the credential from the KDC. - KRB5_GC_NO_STORE Do not store the resulting credentials in the _c_c_a_c_h_e. + KRB5_GC_NO_STORE Do not store the resulting credentials in the [4mccache[24m. - kkrrbb55__ggeett__ccrreeddss__oopptt__sseett__eennccttyyppee() sets the preferred encryption type of + [1mkrb5_get_creds_opt_set_enctype[22m() sets the preferred encryption type of the application. Don't set this unless you have to since if there is no match in the KDC, the function call will fail. - kkrrbb55__ggeett__ccrreeddss__oopptt__sseett__iimmppeerrssoonnaattee() sets the principal to impersonate., + [1mkrb5_get_creds_opt_set_impersonate[22m() sets the principal to impersonate., Returns a ticket that have the impersonation principal as a client and the requestor as the service. Note that the requested principal have to be the same as the client principal in the krbtgt. - kkrrbb55__ggeett__ccrreeddss__oopptt__sseett__ttiicckkeett() sets the extra ticket used in user-to- + [1mkrb5_get_creds_opt_set_ticket[22m() sets the extra ticket used in user-to- user or contrained delegation use case. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3), krb5_get_credentials(3), krb5.conf(5) HEIMDAL June 15, 2006 HEIMDAL diff --git a/lib/krb5/krb5_get_forwarded_creds.cat3 b/lib/krb5/krb5_get_forwarded_creds.cat3 index 659006d77042..0cf9282437a7 100644 --- a/lib/krb5/krb5_get_forwarded_creds.cat3 +++ b/lib/krb5/krb5_get_forwarded_creds.cat3 @@ -1,33 +1,32 @@ - KRB5_GET_FORWARDED_CR... BSD Library Functions Manual KRB5_GET_FORWARDED_CR... -NNAAMMEE - kkrrbb55__ggeett__ffoorrwwaarrddeedd__ccrreeddss, kkrrbb55__ffwwdd__ttggtt__ccrreeddss -- get forwarded credentials +[1mNAME[0m + [1mkrb5_get_forwarded_creds[22m, [1mkrb5_fwd_tgt_creds [22m-- get forwarded credentials from the KDC -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__ffoorrwwaarrddeedd__ccrreeddss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _a_u_t_h___c_o_n_t_e_x_t, _k_r_b_5___c_c_a_c_h_e _c_c_a_c_h_e, _k_r_b_5___f_l_a_g_s _f_l_a_g_s, - _c_o_n_s_t _c_h_a_r _*_h_o_s_t_n_a_m_e, _k_r_b_5___c_r_e_d_s _*_i_n___c_r_e_d_s, _k_r_b_5___d_a_t_a _*_o_u_t___d_a_t_a); + [4mkrb5_error_code[0m + [1mkrb5_get_forwarded_creds[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_auth_context[24m [4mauth_context[24m, [4mkrb5_ccache[24m [4mccache[24m, [4mkrb5_flags[24m [4mflags[24m, + [4mconst[24m [4mchar[24m [4m*hostname[24m, [4mkrb5_creds[24m [4m*in_creds[24m, [4mkrb5_data[24m [4m*out_data[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ffwwdd__ttggtt__ccrreeddss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _a_u_t_h___c_o_n_t_e_x_t, - _c_o_n_s_t _c_h_a_r _*_h_o_s_t_n_a_m_e, _k_r_b_5___p_r_i_n_c_i_p_a_l _c_l_i_e_n_t, _k_r_b_5___p_r_i_n_c_i_p_a_l _s_e_r_v_e_r, - _k_r_b_5___c_c_a_c_h_e _c_c_a_c_h_e, _i_n_t _f_o_r_w_a_r_d_a_b_l_e, _k_r_b_5___d_a_t_a _*_o_u_t___d_a_t_a); + [4mkrb5_error_code[0m + [1mkrb5_fwd_tgt_creds[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_auth_context[24m [4mauth_context[24m, + [4mconst[24m [4mchar[24m [4m*hostname[24m, [4mkrb5_principal[24m [4mclient[24m, [4mkrb5_principal[24m [4mserver[24m, + [4mkrb5_ccache[24m [4mccache[24m, [4mint[24m [4mforwardable[24m, [4mkrb5_data[24m [4m*out_data[24m); -DDEESSCCRRIIPPTTIIOONN - kkrrbb55__ggeett__ffoorrwwaarrddeedd__ccrreeddss() and kkrrbb55__ffwwdd__ttggtt__ccrreeddss() get tickets forwarded - to _h_o_s_t_n_a_m_e_. If the tickets that are forwarded are address-less, the for- - warded tickets will also be address-less, otherwise _h_o_s_t_n_a_m_e will be used +[1mDESCRIPTION[0m + [1mkrb5_get_forwarded_creds[22m() and [1mkrb5_fwd_tgt_creds[22m() get tickets forwarded + to [4mhostname.[24m If the tickets that are forwarded are address-less, the for- + warded tickets will also be address-less, otherwise [4mhostname[24m will be used for figure out the address to forward the ticket too. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3), krb5_get_credentials(3), krb5.conf(5) HEIMDAL July 26, 2004 HEIMDAL diff --git a/lib/krb5/krb5_get_in_cred.cat3 b/lib/krb5/krb5_get_in_cred.cat3 index 6506c18f46fe..e0f0fcea0c93 100644 --- a/lib/krb5/krb5_get_in_cred.cat3 +++ b/lib/krb5/krb5_get_in_cred.cat3 @@ -1,64 +1,63 @@ - KRB5_GET_IN_TKT(3) BSD Library Functions Manual KRB5_GET_IN_TKT(3) -NNAAMMEE - kkrrbb55__ggeett__iinn__ttkktt, kkrrbb55__ggeett__iinn__ccrreedd, kkrrbb55__ggeett__iinn__ttkktt__wwiitthh__ppaasssswwoorrdd, - kkrrbb55__ggeett__iinn__ttkktt__wwiitthh__kkeeyyttaabb, kkrrbb55__ggeett__iinn__ttkktt__wwiitthh__sskkeeyy, - kkrrbb55__ffrreeee__kkddcc__rreepp, kkrrbb55__ppaasssswwoorrdd__kkeeyy__pprroocc -- deprecated initial authenti- +[1mNAME[0m + [1mkrb5_get_in_tkt[22m, [1mkrb5_get_in_cred[22m, [1mkrb5_get_in_tkt_with_password[22m, + [1mkrb5_get_in_tkt_with_keytab[22m, [1mkrb5_get_in_tkt_with_skey[22m, + [1mkrb5_free_kdc_rep[22m, [1mkrb5_password_key_proc [22m-- deprecated initial authenti- cation functions -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__iinn__ttkktt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___f_l_a_g_s _o_p_t_i_o_n_s, - _c_o_n_s_t _k_r_b_5___a_d_d_r_e_s_s_e_s _*_a_d_d_r_s, _c_o_n_s_t _k_r_b_5___e_n_c_t_y_p_e _*_e_t_y_p_e_s, - _c_o_n_s_t _k_r_b_5___p_r_e_a_u_t_h_t_y_p_e _*_p_t_y_p_e_s, _k_r_b_5___k_e_y___p_r_o_c _k_e_y___p_r_o_c, - _k_r_b_5___c_o_n_s_t___p_o_i_n_t_e_r _k_e_y_s_e_e_d, _k_r_b_5___d_e_c_r_y_p_t___p_r_o_c _d_e_c_r_y_p_t___p_r_o_c, - _k_r_b_5___c_o_n_s_t___p_o_i_n_t_e_r _d_e_c_r_y_p_t_a_r_g, _k_r_b_5___c_r_e_d_s _*_c_r_e_d_s, _k_r_b_5___c_c_a_c_h_e _c_c_a_c_h_e, - _k_r_b_5___k_d_c___r_e_p _*_r_e_t___a_s___r_e_p_l_y); - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__iinn__ccrreedd(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___f_l_a_g_s _o_p_t_i_o_n_s, - _c_o_n_s_t _k_r_b_5___a_d_d_r_e_s_s_e_s _*_a_d_d_r_s, _c_o_n_s_t _k_r_b_5___e_n_c_t_y_p_e _*_e_t_y_p_e_s, - _c_o_n_s_t _k_r_b_5___p_r_e_a_u_t_h_t_y_p_e _*_p_t_y_p_e_s, _c_o_n_s_t _k_r_b_5___p_r_e_a_u_t_h_d_a_t_a _*_p_r_e_a_u_t_h, - _k_r_b_5___k_e_y___p_r_o_c _k_e_y___p_r_o_c, _k_r_b_5___c_o_n_s_t___p_o_i_n_t_e_r _k_e_y_s_e_e_d, - _k_r_b_5___d_e_c_r_y_p_t___p_r_o_c _d_e_c_r_y_p_t___p_r_o_c, _k_r_b_5___c_o_n_s_t___p_o_i_n_t_e_r _d_e_c_r_y_p_t_a_r_g, - _k_r_b_5___c_r_e_d_s _*_c_r_e_d_s, _k_r_b_5___k_d_c___r_e_p _*_r_e_t___a_s___r_e_p_l_y); - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__iinn__ttkktt__wwiitthh__ppaasssswwoorrdd(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___f_l_a_g_s _o_p_t_i_o_n_s, - _k_r_b_5___a_d_d_r_e_s_s_e_s _*_a_d_d_r_s, _c_o_n_s_t _k_r_b_5___e_n_c_t_y_p_e _*_e_t_y_p_e_s, - _c_o_n_s_t _k_r_b_5___p_r_e_a_u_t_h_t_y_p_e _*_p_r_e___a_u_t_h___t_y_p_e_s, _c_o_n_s_t _c_h_a_r _*_p_a_s_s_w_o_r_d, - _k_r_b_5___c_c_a_c_h_e _c_c_a_c_h_e, _k_r_b_5___c_r_e_d_s _*_c_r_e_d_s, _k_r_b_5___k_d_c___r_e_p _*_r_e_t___a_s___r_e_p_l_y); - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__iinn__ttkktt__wwiitthh__kkeeyyttaabb(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___f_l_a_g_s _o_p_t_i_o_n_s, - _k_r_b_5___a_d_d_r_e_s_s_e_s _*_a_d_d_r_s, _c_o_n_s_t _k_r_b_5___e_n_c_t_y_p_e _*_e_t_y_p_e_s, - _c_o_n_s_t _k_r_b_5___p_r_e_a_u_t_h_t_y_p_e _*_p_r_e___a_u_t_h___t_y_p_e_s, _k_r_b_5___k_e_y_t_a_b _k_e_y_t_a_b, - _k_r_b_5___c_c_a_c_h_e _c_c_a_c_h_e, _k_r_b_5___c_r_e_d_s _*_c_r_e_d_s, _k_r_b_5___k_d_c___r_e_p _*_r_e_t___a_s___r_e_p_l_y); - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__iinn__ttkktt__wwiitthh__sskkeeyy(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___f_l_a_g_s _o_p_t_i_o_n_s, - _k_r_b_5___a_d_d_r_e_s_s_e_s _*_a_d_d_r_s, _c_o_n_s_t _k_r_b_5___e_n_c_t_y_p_e _*_e_t_y_p_e_s, - _c_o_n_s_t _k_r_b_5___p_r_e_a_u_t_h_t_y_p_e _*_p_r_e___a_u_t_h___t_y_p_e_s, _c_o_n_s_t _k_r_b_5___k_e_y_b_l_o_c_k _*_k_e_y, - _k_r_b_5___c_c_a_c_h_e _c_c_a_c_h_e, _k_r_b_5___c_r_e_d_s _*_c_r_e_d_s, _k_r_b_5___k_d_c___r_e_p _*_r_e_t___a_s___r_e_p_l_y); - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ffrreeee__kkddcc__rreepp(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___k_d_c___r_e_p _*_r_e_p); - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ppaasssswwoorrdd__kkeeyy__pprroocc(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___e_n_c_t_y_p_e _t_y_p_e, - _k_r_b_5___s_a_l_t _s_a_l_t, _k_r_b_5___c_o_n_s_t___p_o_i_n_t_e_r _k_e_y_s_e_e_d, _k_r_b_5___k_e_y_b_l_o_c_k _*_*_k_e_y); - -DDEESSCCRRIIPPTTIIOONN - _A_l_l _t_h_e _f_u_n_c_t_i_o_n_s _i_n _t_h_i_s _m_a_n_u_a_l _p_a_g_e _a_r_e _d_e_p_r_e_c_a_t_e_d _i_n _t_h_e _M_I_T _i_m_p_l_e_m_e_n_- - _t_a_t_i_o_n_, _a_n_d _w_i_l_l _s_o_o_n _b_e _d_e_p_r_e_c_a_t_e_d _i_n _H_e_i_m_d_a_l _t_o_o_, _d_o_n_'_t _u_s_e _t_h_e_m_. - - Getting initial credential ticket for a principal. kkrrbb55__ggeett__iinn__ccrreedd is +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m + + [4mkrb5_error_code[0m + [1mkrb5_get_in_tkt[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_flags[24m [4moptions[24m, + [4mconst[24m [4mkrb5_addresses[24m [4m*addrs[24m, [4mconst[24m [4mkrb5_enctype[24m [4m*etypes[24m, + [4mconst[24m [4mkrb5_preauthtype[24m [4m*ptypes[24m, [4mkrb5_key_proc[24m [4mkey_proc[24m, + [4mkrb5_const_pointer[24m [4mkeyseed[24m, [4mkrb5_decrypt_proc[24m [4mdecrypt_proc[24m, + [4mkrb5_const_pointer[24m [4mdecryptarg[24m, [4mkrb5_creds[24m [4m*creds[24m, [4mkrb5_ccache[24m [4mccache[24m, + [4mkrb5_kdc_rep[24m [4m*ret_as_reply[24m); + + [4mkrb5_error_code[0m + [1mkrb5_get_in_cred[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_flags[24m [4moptions[24m, + [4mconst[24m [4mkrb5_addresses[24m [4m*addrs[24m, [4mconst[24m [4mkrb5_enctype[24m [4m*etypes[24m, + [4mconst[24m [4mkrb5_preauthtype[24m [4m*ptypes[24m, [4mconst[24m [4mkrb5_preauthdata[24m [4m*preauth[24m, + [4mkrb5_key_proc[24m [4mkey_proc[24m, [4mkrb5_const_pointer[24m [4mkeyseed[24m, + [4mkrb5_decrypt_proc[24m [4mdecrypt_proc[24m, [4mkrb5_const_pointer[24m [4mdecryptarg[24m, + [4mkrb5_creds[24m [4m*creds[24m, [4mkrb5_kdc_rep[24m [4m*ret_as_reply[24m); + + [4mkrb5_error_code[0m + [1mkrb5_get_in_tkt_with_password[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_flags[24m [4moptions[24m, + [4mkrb5_addresses[24m [4m*addrs[24m, [4mconst[24m [4mkrb5_enctype[24m [4m*etypes[24m, + [4mconst[24m [4mkrb5_preauthtype[24m [4m*pre_auth_types[24m, [4mconst[24m [4mchar[24m [4m*password[24m, + [4mkrb5_ccache[24m [4mccache[24m, [4mkrb5_creds[24m [4m*creds[24m, [4mkrb5_kdc_rep[24m [4m*ret_as_reply[24m); + + [4mkrb5_error_code[0m + [1mkrb5_get_in_tkt_with_keytab[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_flags[24m [4moptions[24m, + [4mkrb5_addresses[24m [4m*addrs[24m, [4mconst[24m [4mkrb5_enctype[24m [4m*etypes[24m, + [4mconst[24m [4mkrb5_preauthtype[24m [4m*pre_auth_types[24m, [4mkrb5_keytab[24m [4mkeytab[24m, + [4mkrb5_ccache[24m [4mccache[24m, [4mkrb5_creds[24m [4m*creds[24m, [4mkrb5_kdc_rep[24m [4m*ret_as_reply[24m); + + [4mkrb5_error_code[0m + [1mkrb5_get_in_tkt_with_skey[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_flags[24m [4moptions[24m, + [4mkrb5_addresses[24m [4m*addrs[24m, [4mconst[24m [4mkrb5_enctype[24m [4m*etypes[24m, + [4mconst[24m [4mkrb5_preauthtype[24m [4m*pre_auth_types[24m, [4mconst[24m [4mkrb5_keyblock[24m [4m*key[24m, + [4mkrb5_ccache[24m [4mccache[24m, [4mkrb5_creds[24m [4m*creds[24m, [4mkrb5_kdc_rep[24m [4m*ret_as_reply[24m); + + [4mkrb5_error_code[0m + [1mkrb5_free_kdc_rep[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_kdc_rep[24m [4m*rep[24m); + + [4mkrb5_error_code[0m + [1mkrb5_password_key_proc[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_enctype[24m [4mtype[24m, + [4mkrb5_salt[24m [4msalt[24m, [4mkrb5_const_pointer[24m [4mkeyseed[24m, [4mkrb5_keyblock[24m [4m**key[24m); + +[1mDESCRIPTION[0m + [4mAll[24m [4mthe[24m [4mfunctions[24m [4min[24m [4mthis[24m [4mmanual[24m [4mpage[24m [4mare[24m [4mdeprecated[24m [4min[24m [4mthe[24m [4mMIT[24m [4mimplemen-[0m + [4mtation,[24m [4mand[24m [4mwill[24m [4msoon[24m [4mbe[24m [4mdeprecated[24m [4min[24m [4mHeimdal[24m [4mtoo,[24m [4mdon't[24m [4muse[24m [4mthem.[0m + + Getting initial credential ticket for a principal. [1mkrb5_get_in_cred [22mis the function all other krb5_get_in function uses to fetch tickets. The other krb5_get_in function are more specialized and therefor somewhat easier to use. @@ -66,67 +65,67 @@ DDEESSCCRRIIPPTTIIOONN If your need is only to verify a user and password, consider using krb5_verify_user(3) instead, it have a much simpler interface. - kkrrbb55__ggeett__iinn__ttkktt and kkrrbb55__ggeett__iinn__ccrreedd fetches initial credential, queries - after key using the _k_e_y___p_r_o_c argument. The differences between the two - function is that kkrrbb55__ggeett__iinn__ttkktt stores the credential in a krb5_creds - while kkrrbb55__ggeett__iinn__ccrreedd stores the credential in a krb5_ccache. + [1mkrb5_get_in_tkt [22mand [1mkrb5_get_in_cred [22mfetches initial credential, queries + after key using the [4mkey_proc[24m argument. The differences between the two + function is that [1mkrb5_get_in_tkt [22mstores the credential in a krb5_creds + while [1mkrb5_get_in_cred [22mstores the credential in a krb5_ccache. - kkrrbb55__ggeett__iinn__ttkktt__wwiitthh__ppaasssswwoorrdd, kkrrbb55__ggeett__iinn__ttkktt__wwiitthh__kkeeyyttaabb, and - kkrrbb55__ggeett__iinn__ttkktt__wwiitthh__sskkeeyy does the same work as kkrrbb55__ggeett__iinn__ccrreedd but are + [1mkrb5_get_in_tkt_with_password[22m, [1mkrb5_get_in_tkt_with_keytab[22m, and + [1mkrb5_get_in_tkt_with_skey [22mdoes the same work as [1mkrb5_get_in_cred [22mbut are more specialized. - kkrrbb55__ggeett__iinn__ttkktt__wwiitthh__ppaasssswwoorrdd uses the clients password to authenticate. + [1mkrb5_get_in_tkt_with_password [22muses the clients password to authenticate. If the password argument is NULL the user user queried with the default password query function. - kkrrbb55__ggeett__iinn__ttkktt__wwiitthh__kkeeyyttaabb searches the given keytab for a service entry + [1mkrb5_get_in_tkt_with_keytab [22msearches the given keytab for a service entry for the client principal. If the keytab is NULL the default keytab is used. - kkrrbb55__ggeett__iinn__ttkktt__wwiitthh__sskkeeyy uses a key to get the initial credential. + [1mkrb5_get_in_tkt_with_skey [22muses a key to get the initial credential. There are some common arguments to the krb5_get_in functions, these are: - _o_p_t_i_o_n_s are the KDC_OPT flags. + [4moptions[24m are the KDC_OPT flags. - _e_t_y_p_e_s is a NULL terminated array of encryption types that the client - approves. + [4metypes[24m is a NULL terminated array of encryption types that the client ap- + proves. - _a_d_d_r_s a list of the addresses that the initial ticket. If it is NULL the + [4maddrs[24m a list of the addresses that the initial ticket. If it is NULL the list will be generated by the library. - _p_r_e___a_u_t_h___t_y_p_e_s a NULL terminated array of pre-authentication types. If - _p_r_e___a_u_t_h___t_y_p_e_s is NULL the function will try without pre-authentication + [4mpre_auth_types[24m a NULL terminated array of pre-authentication types. If + [4mpre_auth_types[24m is NULL the function will try without pre-authentication and return those pre-authentication that the KDC returned. - _r_e_t___a_s___r_e_p_l_y will (if not NULL) be filled in with the response of the KDC - and should be free with kkrrbb55__ffrreeee__kkddcc__rreepp(). + [4mret_as_reply[24m will (if not NULL) be filled in with the response of the KDC + and should be free with [1mkrb5_free_kdc_rep[22m(). - _k_e_y___p_r_o_c is a pointer to a function that should return a key salted - appropriately. Using NULL will use the default password query function. + [4mkey_proc[24m is a pointer to a function that should return a key salted ap- + propriately. Using NULL will use the default password query function. - _d_e_c_r_y_p_t___p_r_o_c Using NULL will use the default decryption function. + [4mdecrypt_proc[24m Using NULL will use the default decryption function. - _d_e_c_r_y_p_t_a_r_g will be passed to the decryption function _d_e_c_r_y_p_t___p_r_o_c. + [4mdecryptarg[24m will be passed to the decryption function [4mdecrypt_proc[24m. - _c_r_e_d_s creds should be filled in with the template for a credential that + [4mcreds[24m creds should be filled in with the template for a credential that should be requested. The client and server elements of the creds struc- ture must be filled in. Upon return of the function it will be contain - the content of the requested credential (_k_r_b_5___g_e_t___i_n___c_r_e_d), or it will be + the content of the requested credential ([4mkrb5_get_in_cred[24m), or it will be freed with krb5_free_creds(3) (all the other krb5_get_in functions). - _c_c_a_c_h_e will store the credential in the credential cache _c_c_a_c_h_e. The + [4mccache[24m will store the credential in the credential cache [4mccache[24m. The credential cache will not be initialized, thats up the the caller. - kkrrbb55__ppaasssswwoorrdd__kkeeyy__pprroocc is a library function that is suitable using as - the _k_r_b_5___k_e_y___p_r_o_c argument to kkrrbb55__ggeett__iinn__ccrreedd or kkrrbb55__ggeett__iinn__ttkktt. - _k_e_y_s_e_e_d should be a pointer to a NUL terminated string or NULL. - kkrrbb55__ppaasssswwoorrdd__kkeeyy__pprroocc will query the user for the pass on the console if - the password isn't given as the argument _k_e_y_s_e_e_d. + [1mkrb5_password_key_proc [22mis a library function that is suitable using as + the [4mkrb5_key_proc[24m argument to [1mkrb5_get_in_cred [22mor [1mkrb5_get_in_tkt[22m. + [4mkeyseed[24m should be a pointer to a NUL terminated string or NULL. + [1mkrb5_password_key_proc [22mwill query the user for the pass on the console if + the password isn't given as the argument [4mkeyseed[24m. - kkrrbb55__ffrreeee__kkddcc__rreepp() frees the content of _r_e_p. + [1mkrb5_free_kdc_rep[22m() frees the content of [4mrep[24m. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3), krb5_verify_user(3), krb5.conf(5), kerberos(8) HEIMDAL May 31, 2003 HEIMDAL diff --git a/lib/krb5/krb5_get_init_creds.cat3 b/lib/krb5/krb5_get_init_creds.cat3 index 52b3468a1852..c92749926ded 100644 --- a/lib/krb5/krb5_get_init_creds.cat3 +++ b/lib/krb5/krb5_get_init_creds.cat3 @@ -1,161 +1,160 @@ - KRB5_GET_INIT_CREDS(3) BSD Library Functions Manual KRB5_GET_INIT_CREDS(3) -NNAAMMEE - kkrrbb55__ggeett__iinniitt__ccrreeddss, kkrrbb55__ggeett__iinniitt__ccrreeddss__kkeeyyttaabb, kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt, - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__aalllloocc, kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__ffrreeee, - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__iinniitt, kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__aaddddrreessss__lliisstt, - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__aaddddrreesssslleessss, - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__aannoonnyymmoouuss, - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ddeeffaauulltt__ffllaaggss, - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__eettyyppee__lliisstt, - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ffoorrwwaarrddaabbllee, - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ppaa__ppaasssswwoorrdd, - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ppaaqq__rreeqquueesstt, - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__pprreeaauutthh__lliisstt, - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__pprrooxxiiaabbllee, - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__rreenneeww__lliiffee, kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ssaalltt, - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ttkktt__lliiffee, - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ccaannoonniiccaalliizzee, - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__wwiinn22kk, kkrrbb55__ggeett__iinniitt__ccrreeddss__ppaasssswwoorrdd, - kkrrbb55__pprroommpptt, kkrrbb55__pprroommpptteerr__ppoossiixx -- Kerberos 5 initial authentication +[1mNAME[0m + [1mkrb5_get_init_creds[22m, [1mkrb5_get_init_creds_keytab[22m, [1mkrb5_get_init_creds_opt[22m, + [1mkrb5_get_init_creds_opt_alloc[22m, [1mkrb5_get_init_creds_opt_free[22m, + [1mkrb5_get_init_creds_opt_init[22m, [1mkrb5_get_init_creds_opt_set_address_list[22m, + [1mkrb5_get_init_creds_opt_set_addressless[22m, + [1mkrb5_get_init_creds_opt_set_anonymous[22m, + [1mkrb5_get_init_creds_opt_set_default_flags[22m, + [1mkrb5_get_init_creds_opt_set_etype_list[22m, + [1mkrb5_get_init_creds_opt_set_forwardable[22m, + [1mkrb5_get_init_creds_opt_set_pa_password[22m, + [1mkrb5_get_init_creds_opt_set_paq_request[22m, + [1mkrb5_get_init_creds_opt_set_preauth_list[22m, + [1mkrb5_get_init_creds_opt_set_proxiable[22m, + [1mkrb5_get_init_creds_opt_set_renew_life[22m, [1mkrb5_get_init_creds_opt_set_salt[22m, + [1mkrb5_get_init_creds_opt_set_tkt_life[22m, + [1mkrb5_get_init_creds_opt_set_canonicalize[22m, + [1mkrb5_get_init_creds_opt_set_win2k[22m, [1mkrb5_get_init_creds_password[22m, + [1mkrb5_prompt[22m, [1mkrb5_prompter_posix [22m-- Kerberos 5 initial authentication functions -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> - - _k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t_; - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__aalllloocc(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_*_o_p_t); - - _v_o_i_d - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__ffrreeee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t); - - _v_o_i_d - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__iinniitt(_k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t); - - _v_o_i_d - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__aaddddrreessss__lliisstt(_k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t, - _k_r_b_5___a_d_d_r_e_s_s_e_s _*_a_d_d_r_e_s_s_e_s); - - _v_o_i_d - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__aaddddrreesssslleessss(_k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t, - _k_r_b_5___b_o_o_l_e_a_n _a_d_d_r_e_s_s_l_e_s_s); - - _v_o_i_d - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__aannoonnyymmoouuss(_k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t, - _i_n_t _a_n_o_n_y_m_o_u_s); - - _v_o_i_d - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__cchhaannggee__ppaasssswwoorrdd__pprroommpptt(_k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t, - _i_n_t _c_h_a_n_g_e___p_a_s_s_w_o_r_d___p_r_o_m_p_t); - - _v_o_i_d - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ddeeffaauulltt__ffllaaggss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _c_o_n_s_t _c_h_a_r _*_a_p_p_n_a_m_e, _k_r_b_5___c_o_n_s_t___r_e_a_l_m _r_e_a_l_m, - _k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t); - - _v_o_i_d - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__eettyyppee__lliisstt(_k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t, - _k_r_b_5___e_n_c_t_y_p_e _*_e_t_y_p_e___l_i_s_t, _i_n_t _e_t_y_p_e___l_i_s_t___l_e_n_g_t_h); - - _v_o_i_d - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ffoorrwwaarrddaabbllee(_k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t, - _i_n_t _f_o_r_w_a_r_d_a_b_l_e); - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ppaa__ppaasssswwoorrdd(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t, _c_o_n_s_t _c_h_a_r _*_p_a_s_s_w_o_r_d, - _k_r_b_5___s_2_k___p_r_o_c _k_e_y___p_r_o_c); - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ppaaqq__rreeqquueesstt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t, _k_r_b_5___b_o_o_l_e_a_n _r_e_q___p_a_c); - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ppkkiinniitt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t, _c_o_n_s_t _c_h_a_r _*_c_e_r_t___f_i_l_e, - _c_o_n_s_t _c_h_a_r _*_k_e_y___f_i_l_e, _c_o_n_s_t _c_h_a_r _*_x_5_0_9___a_n_c_h_o_r_s, _i_n_t _f_l_a_g_s, - _c_h_a_r _*_p_a_s_s_w_o_r_d); - - _v_o_i_d - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__pprreeaauutthh__lliisstt(_k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t, - _k_r_b_5___p_r_e_a_u_t_h_t_y_p_e _*_p_r_e_a_u_t_h___l_i_s_t, _i_n_t _p_r_e_a_u_t_h___l_i_s_t___l_e_n_g_t_h); - - _v_o_i_d - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__pprrooxxiiaabbllee(_k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t, - _i_n_t _p_r_o_x_i_a_b_l_e); - - _v_o_i_d - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__rreenneeww__lliiffee(_k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t, - _k_r_b_5___d_e_l_t_a_t _r_e_n_e_w___l_i_f_e); - - _v_o_i_d - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ssaalltt(_k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t, - _k_r_b_5___d_a_t_a _*_s_a_l_t); - - _v_o_i_d - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ttkktt__lliiffee(_k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t, - _k_r_b_5___d_e_l_t_a_t _t_k_t___l_i_f_e); - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ccaannoonniiccaalliizzee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t, _k_r_b_5___b_o_o_l_e_a_n _r_e_q); - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__wwiinn22kk(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t, _k_r_b_5___b_o_o_l_e_a_n _r_e_q); - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__iinniitt__ccrreeddss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_e_d_s _*_c_r_e_d_s, - _k_r_b_5___p_r_i_n_c_i_p_a_l _c_l_i_e_n_t, _k_r_b_5___p_r_o_m_p_t_e_r___f_c_t _p_r_o_m_p_t_e_r, - _v_o_i_d _*_p_r_o_m_p_t_e_r___d_a_t_a, _k_r_b_5___d_e_l_t_a_t _s_t_a_r_t___t_i_m_e, - _c_o_n_s_t _c_h_a_r _*_i_n___t_k_t___s_e_r_v_i_c_e, _k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t_i_o_n_s); - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__iinniitt__ccrreeddss__ppaasssswwoorrdd(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_e_d_s _*_c_r_e_d_s, - _k_r_b_5___p_r_i_n_c_i_p_a_l _c_l_i_e_n_t, _c_o_n_s_t _c_h_a_r _*_p_a_s_s_w_o_r_d, - _k_r_b_5___p_r_o_m_p_t_e_r___f_c_t _p_r_o_m_p_t_e_r, _v_o_i_d _*_p_r_o_m_p_t_e_r___d_a_t_a, - _k_r_b_5___d_e_l_t_a_t _s_t_a_r_t___t_i_m_e, _c_o_n_s_t _c_h_a_r _*_i_n___t_k_t___s_e_r_v_i_c_e, - _k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_i_n___o_p_t_i_o_n_s); - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__iinniitt__ccrreeddss__kkeeyyttaabb(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_e_d_s _*_c_r_e_d_s, - _k_r_b_5___p_r_i_n_c_i_p_a_l _c_l_i_e_n_t, _k_r_b_5___k_e_y_t_a_b _k_e_y_t_a_b, _k_r_b_5___d_e_l_t_a_t _s_t_a_r_t___t_i_m_e, - _c_o_n_s_t _c_h_a_r _*_i_n___t_k_t___s_e_r_v_i_c_e, _k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t_i_o_n_s); - - _i_n_t - kkrrbb55__pprroommpptteerr__ppoossiixx(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _v_o_i_d _*_d_a_t_a, _c_o_n_s_t _c_h_a_r _*_n_a_m_e, - _c_o_n_s_t _c_h_a_r _*_b_a_n_n_e_r, _i_n_t _n_u_m___p_r_o_m_p_t_s, _k_r_b_5___p_r_o_m_p_t _p_r_o_m_p_t_s_[_]); - -DDEESSCCRRIIPPTTIIOONN +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m + + [4mkrb5_get_init_creds_opt;[0m + + [4mkrb5_error_code[0m + [1mkrb5_get_init_creds_opt_alloc[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_get_init_creds_opt[24m [4m**opt[24m); + + [4mvoid[0m + [1mkrb5_get_init_creds_opt_free[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_get_init_creds_opt[24m [4m*opt[24m); + + [4mvoid[0m + [1mkrb5_get_init_creds_opt_init[22m([4mkrb5_get_init_creds_opt[24m [4m*opt[24m); + + [4mvoid[0m + [1mkrb5_get_init_creds_opt_set_address_list[22m([4mkrb5_get_init_creds_opt[24m [4m*opt[24m, + [4mkrb5_addresses[24m [4m*addresses[24m); + + [4mvoid[0m + [1mkrb5_get_init_creds_opt_set_addressless[22m([4mkrb5_get_init_creds_opt[24m [4m*opt[24m, + [4mkrb5_boolean[24m [4maddressless[24m); + + [4mvoid[0m + [1mkrb5_get_init_creds_opt_set_anonymous[22m([4mkrb5_get_init_creds_opt[24m [4m*opt[24m, + [4mint[24m [4manonymous[24m); + + [4mvoid[0m + [1mkrb5_get_init_creds_opt_set_change_password_prompt[22m([4mkrb5_get_init_creds_opt[24m [4m*opt[24m, + [4mint[24m [4mchange_password_prompt[24m); + + [4mvoid[0m + [1mkrb5_get_init_creds_opt_set_default_flags[22m([4mkrb5_context[24m [4mcontext[24m, + [4mconst[24m [4mchar[24m [4m*appname[24m, [4mkrb5_const_realm[24m [4mrealm[24m, + [4mkrb5_get_init_creds_opt[24m [4m*opt[24m); + + [4mvoid[0m + [1mkrb5_get_init_creds_opt_set_etype_list[22m([4mkrb5_get_init_creds_opt[24m [4m*opt[24m, + [4mkrb5_enctype[24m [4m*etype_list[24m, [4mint[24m [4metype_list_length[24m); + + [4mvoid[0m + [1mkrb5_get_init_creds_opt_set_forwardable[22m([4mkrb5_get_init_creds_opt[24m [4m*opt[24m, + [4mint[24m [4mforwardable[24m); + + [4mkrb5_error_code[0m + [1mkrb5_get_init_creds_opt_set_pa_password[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_get_init_creds_opt[24m [4m*opt[24m, [4mconst[24m [4mchar[24m [4m*password[24m, + [4mkrb5_s2k_proc[24m [4mkey_proc[24m); + + [4mkrb5_error_code[0m + [1mkrb5_get_init_creds_opt_set_paq_request[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_get_init_creds_opt[24m [4m*opt[24m, [4mkrb5_boolean[24m [4mreq_pac[24m); + + [4mkrb5_error_code[0m + [1mkrb5_get_init_creds_opt_set_pkinit[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_get_init_creds_opt[24m [4m*opt[24m, [4mconst[24m [4mchar[24m [4m*cert_file[24m, + [4mconst[24m [4mchar[24m [4m*key_file[24m, [4mconst[24m [4mchar[24m [4m*x509_anchors[24m, [4mint[24m [4mflags[24m, + [4mchar[24m [4m*password[24m); + + [4mvoid[0m + [1mkrb5_get_init_creds_opt_set_preauth_list[22m([4mkrb5_get_init_creds_opt[24m [4m*opt[24m, + [4mkrb5_preauthtype[24m [4m*preauth_list[24m, [4mint[24m [4mpreauth_list_length[24m); + + [4mvoid[0m + [1mkrb5_get_init_creds_opt_set_proxiable[22m([4mkrb5_get_init_creds_opt[24m [4m*opt[24m, + [4mint[24m [4mproxiable[24m); + + [4mvoid[0m + [1mkrb5_get_init_creds_opt_set_renew_life[22m([4mkrb5_get_init_creds_opt[24m [4m*opt[24m, + [4mkrb5_deltat[24m [4mrenew_life[24m); + + [4mvoid[0m + [1mkrb5_get_init_creds_opt_set_salt[22m([4mkrb5_get_init_creds_opt[24m [4m*opt[24m, + [4mkrb5_data[24m [4m*salt[24m); + + [4mvoid[0m + [1mkrb5_get_init_creds_opt_set_tkt_life[22m([4mkrb5_get_init_creds_opt[24m [4m*opt[24m, + [4mkrb5_deltat[24m [4mtkt_life[24m); + + [4mkrb5_error_code[0m + [1mkrb5_get_init_creds_opt_set_canonicalize[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_get_init_creds_opt[24m [4m*opt[24m, [4mkrb5_boolean[24m [4mreq[24m); + + [4mkrb5_error_code[0m + [1mkrb5_get_init_creds_opt_set_win2k[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_get_init_creds_opt[24m [4m*opt[24m, [4mkrb5_boolean[24m [4mreq[24m); + + [4mkrb5_error_code[0m + [1mkrb5_get_init_creds[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_creds[24m [4m*creds[24m, + [4mkrb5_principal[24m [4mclient[24m, [4mkrb5_prompter_fct[24m [4mprompter[24m, + [4mvoid[24m [4m*prompter_data[24m, [4mkrb5_deltat[24m [4mstart_time[24m, + [4mconst[24m [4mchar[24m [4m*in_tkt_service[24m, [4mkrb5_get_init_creds_opt[24m [4m*options[24m); + + [4mkrb5_error_code[0m + [1mkrb5_get_init_creds_password[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_creds[24m [4m*creds[24m, + [4mkrb5_principal[24m [4mclient[24m, [4mconst[24m [4mchar[24m [4m*password[24m, + [4mkrb5_prompter_fct[24m [4mprompter[24m, [4mvoid[24m [4m*prompter_data[24m, + [4mkrb5_deltat[24m [4mstart_time[24m, [4mconst[24m [4mchar[24m [4m*in_tkt_service[24m, + [4mkrb5_get_init_creds_opt[24m [4m*in_options[24m); + + [4mkrb5_error_code[0m + [1mkrb5_get_init_creds_keytab[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_creds[24m [4m*creds[24m, + [4mkrb5_principal[24m [4mclient[24m, [4mkrb5_keytab[24m [4mkeytab[24m, [4mkrb5_deltat[24m [4mstart_time[24m, + [4mconst[24m [4mchar[24m [4m*in_tkt_service[24m, [4mkrb5_get_init_creds_opt[24m [4m*options[24m); + + [4mint[0m + [1mkrb5_prompter_posix[22m([4mkrb5_context[24m [4mcontext[24m, [4mvoid[24m [4m*data[24m, [4mconst[24m [4mchar[24m [4m*name[24m, + [4mconst[24m [4mchar[24m [4m*banner[24m, [4mint[24m [4mnum_prompts[24m, [4mkrb5_prompt[24m [4mprompts[][24m); + +[1mDESCRIPTION[0m Getting initial credential ticket for a principal. That may include changing an expired password, and doing preauthentication. This inter- - face that replaces the deprecated _k_r_b_5___i_n___t_k_t and _k_r_b_5___i_n___c_r_e_d functions. + face that replaces the deprecated [4mkrb5_in_tkt[24m and [4mkrb5_in_cred[24m functions. If you only want to verify a username and password, consider using krb5_verify_user(3) instead, since it also verifies that initial creden- tials with using a keytab to make sure the response was from the KDC. First a krb5_get_init_creds_opt structure is initialized with - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__aalllloocc() or kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__iinniitt(). - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__aalllloocc() allocates a extendible structures that - needs to be freed with kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__ffrreeee(). The structure may - be modified by any of the kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett() functions to + [1mkrb5_get_init_creds_opt_alloc[22m() or [1mkrb5_get_init_creds_opt_init[22m(). + [1mkrb5_get_init_creds_opt_alloc[22m() allocates a extendible structures that + needs to be freed with [1mkrb5_get_init_creds_opt_free[22m(). The structure may + be modified by any of the [1mkrb5_get_init_creds_opt_set[22m() functions to change request parameters and authentication information. - If the caller want to use the default options, NULL can be passed - instead. + If the caller want to use the default options, NULL can be passed in- + stead. The the actual request to the KDC is done by any of the - kkrrbb55__ggeett__iinniitt__ccrreeddss(), kkrrbb55__ggeett__iinniitt__ccrreeddss__ppaasssswwoorrdd(), or - kkrrbb55__ggeett__iinniitt__ccrreeddss__kkeeyyttaabb() functions. kkrrbb55__ggeett__iinniitt__ccrreeddss() is the + [1mkrb5_get_init_creds[22m(), [1mkrb5_get_init_creds_password[22m(), or + [1mkrb5_get_init_creds_keytab[22m() functions. [1mkrb5_get_init_creds[22m() is the least specialized function and can, with the right in data, behave like the latter two. The latter two are there for compatibility with older releases and they are slightly easier to use. @@ -169,10 +168,10 @@ DDEESSCCRRIIPPTTIIOONN krb5_prompt_type type } krb5_prompt; - _p_r_o_m_p_t is the prompt that should shown to the user If _h_i_d_d_e_n is set, the - prompter function shouldn't echo the output to the display device. _r_e_p_l_y + [4mprompt[24m is the prompt that should shown to the user If [4mhidden[24m is set, the + prompter function shouldn't echo the output to the display device. [4mreply[0m must be preallocated; it will not be allocated by the prompter function. - Possible values for the _t_y_p_e element are: + Possible values for the [4mtype[24m element are: KRB5_PROMPT_TYPE_PASSWORD KRB5_PROMPT_TYPE_NEW_PASSWORD @@ -180,16 +179,16 @@ DDEESSCCRRIIPPTTIIOONN KRB5_PROMPT_TYPE_PREAUTH KRB5_PROMPT_TYPE_INFO - kkrrbb55__pprroommpptteerr__ppoossiixx() is the default prompter function in a POSIX envi- - ronment. It matches the _k_r_b_5___p_r_o_m_p_t_e_r___f_c_t and can be used in the - _k_r_b_5___g_e_t___i_n_i_t___c_r_e_d_s functions. kkrrbb55__pprroommpptteerr__ppoossiixx() doesn't require - _p_r_o_m_p_t_e_r___d_a_t_a_. + [1mkrb5_prompter_posix[22m() is the default prompter function in a POSIX envi- + ronment. It matches the [4mkrb5_prompter_fct[24m and can be used in the + [4mkrb5_get_init_creds[24m functions. [1mkrb5_prompter_posix[22m() doesn't require + [4mprompter_data.[0m - If the _s_t_a_r_t___t_i_m_e is zero, then the requested ticket will be valid begin- - ning immediately. Otherwise, the _s_t_a_r_t___t_i_m_e indicates how far in the - future the ticket should be postdated. + If the [4mstart_time[24m is zero, then the requested ticket will be valid begin- + ning immediately. Otherwise, the [4mstart_time[24m indicates how far in the fu- + ture the ticket should be postdated. - If the _i_n___t_k_t___s_e_r_v_i_c_e name is non-NULL, that principal name will be used + If the [4min_tkt_service[24m name is non-NULL, that principal name will be used as the server name for the initial ticket request. The realm of the name specified will be ignored and will be set to the realm of the client name. If no in_tkt_service name is specified, krbtgt/CLIENT- @@ -198,52 +197,52 @@ DDEESSCCRRIIPPTTIIOONN For the rest of arguments, a configuration or library default will be used if no value is specified in the options structure. - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__aaddddrreessss__lliisstt() sets the list of _a_d_d_r_e_s_s_e_s + [1mkrb5_get_init_creds_opt_set_address_list[22m() sets the list of [4maddresses[0m that is should be stored in the ticket. - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__aaddddrreesssslleessss() controls if the ticket is - requested with addresses or not, - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__aaddddrreessss__lliisstt() overrides this option. + [1mkrb5_get_init_creds_opt_set_addressless[22m() controls if the ticket is re- + quested with addresses or not, [1mkrb5_get_init_creds_opt_set_address_list[22m() + overrides this option. - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__aannoonnyymmoouuss() make the request anonymous if the - _a_n_o_n_y_m_o_u_s parameter is non-zero. + [1mkrb5_get_init_creds_opt_set_anonymous[22m() make the request anonymous if the + [4manonymous[24m parameter is non-zero. - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ddeeffaauulltt__ffllaaggss() sets the default flags using + [1mkrb5_get_init_creds_opt_set_default_flags[22m() sets the default flags using the configuration file. - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__eettyyppee__lliisstt() set a list of enctypes that the + [1mkrb5_get_init_creds_opt_set_etype_list[22m() set a list of enctypes that the client is willing to support in the request. - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ffoorrwwaarrddaabbllee() request a forwardable ticket. + [1mkrb5_get_init_creds_opt_set_forwardable[22m() request a forwardable ticket. - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ppaa__ppaasssswwoorrdd() set the _p_a_s_s_w_o_r_d and _k_e_y___p_r_o_c - that is going to be used to get a new ticket. _p_a_s_s_w_o_r_d or _k_e_y___p_r_o_c can - be NULL if the caller wants to use the default values. If the _p_a_s_s_w_o_r_d + [1mkrb5_get_init_creds_opt_set_pa_password[22m() set the [4mpassword[24m and [4mkey_proc[0m + that is going to be used to get a new ticket. [4mpassword[24m or [4mkey_proc[24m can + be NULL if the caller wants to use the default values. If the [4mpassword[0m is unset and needed, the user will be prompted for it. - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ppaaqq__rreeqquueesstt() sets the password that is going + [1mkrb5_get_init_creds_opt_set_paq_request[22m() sets the password that is going to be used to get a new ticket. - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__pprreeaauutthh__lliisstt() sets the list of client-sup- + [1mkrb5_get_init_creds_opt_set_preauth_list[22m() sets the list of client-sup- ported preauth types. - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__pprrooxxiiaabbllee() makes the request proxiable. + [1mkrb5_get_init_creds_opt_set_proxiable[22m() makes the request proxiable. - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__rreenneeww__lliiffee() sets the requested renewable + [1mkrb5_get_init_creds_opt_set_renew_life[22m() sets the requested renewable lifetime. - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ssaalltt() sets the salt that is going to be used + [1mkrb5_get_init_creds_opt_set_salt[22m() sets the salt that is going to be used in the request. - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ttkktt__lliiffee() sets requested ticket lifetime. + [1mkrb5_get_init_creds_opt_set_tkt_life[22m() sets requested ticket lifetime. - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__ccaannoonniiccaalliizzee() requests that the KDC canoni- + [1mkrb5_get_init_creds_opt_set_canonicalize[22m() requests that the KDC canoni- calize the client principal if possible. - kkrrbb55__ggeett__iinniitt__ccrreeddss__oopptt__sseett__wwiinn22kk() turns on compatibility with Windows + [1mkrb5_get_init_creds_opt_set_win2k[22m() turns on compatibility with Windows 2000. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3), krb5_creds(3), krb5_verify_user(3), krb5.conf(5), kerberos(8) HEIMDAL Sep 16, 2006 HEIMDAL diff --git a/lib/krb5/krb5_get_krbhst.cat3 b/lib/krb5/krb5_get_krbhst.cat3 index bb538993f476..27d544807e73 100644 --- a/lib/krb5/krb5_get_krbhst.cat3 +++ b/lib/krb5/krb5_get_krbhst.cat3 @@ -1,48 +1,47 @@ - KRB5_GET_KRBHST(3) BSD Library Functions Manual KRB5_GET_KRBHST(3) -NNAAMMEE - kkrrbb55__ggeett__kkrrbbhhsstt, kkrrbb55__ggeett__kkrrbb__aaddmmiinn__hhsstt, kkrrbb55__ggeett__kkrrbb__cchhaannggeeppww__hhsstt, - kkrrbb55__ggeett__kkrrbb552244hhsstt, kkrrbb55__ffrreeee__kkrrbbhhsstt -- lookup Kerberos KDC hosts +[1mNAME[0m + [1mkrb5_get_krbhst[22m, [1mkrb5_get_krb_admin_hst[22m, [1mkrb5_get_krb_changepw_hst[22m, + [1mkrb5_get_krb524hst[22m, [1mkrb5_free_krbhst [22m-- lookup Kerberos KDC hosts -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__kkrrbbhhsstt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _k_r_b_5___r_e_a_l_m _*_r_e_a_l_m, - _c_h_a_r _*_*_*_h_o_s_t_l_i_s_t); + [4mkrb5_error_code[0m + [1mkrb5_get_krbhst[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mkrb5_realm[24m [4m*realm[24m, + [4mchar[24m [4m***hostlist[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__kkrrbb__aaddmmiinn__hhsstt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _k_r_b_5___r_e_a_l_m _*_r_e_a_l_m, - _c_h_a_r _*_*_*_h_o_s_t_l_i_s_t); + [4mkrb5_error_code[0m + [1mkrb5_get_krb_admin_hst[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mkrb5_realm[24m [4m*realm[24m, + [4mchar[24m [4m***hostlist[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__kkrrbb__cchhaannggeeppww__hhsstt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _k_r_b_5___r_e_a_l_m _*_r_e_a_l_m, - _c_h_a_r _*_*_*_h_o_s_t_l_i_s_t); + [4mkrb5_error_code[0m + [1mkrb5_get_krb_changepw_hst[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mkrb5_realm[24m [4m*realm[24m, + [4mchar[24m [4m***hostlist[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__kkrrbb552244hhsstt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _k_r_b_5___r_e_a_l_m _*_r_e_a_l_m, - _c_h_a_r _*_*_*_h_o_s_t_l_i_s_t); + [4mkrb5_error_code[0m + [1mkrb5_get_krb524hst[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mkrb5_realm[24m [4m*realm[24m, + [4mchar[24m [4m***hostlist[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ffrreeee__kkrrbbhhsstt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_h_a_r _*_*_h_o_s_t_l_i_s_t); + [4mkrb5_error_code[0m + [1mkrb5_free_krbhst[22m([4mkrb5_context[24m [4mcontext[24m, [4mchar[24m [4m**hostlist[24m); -DDEESSCCRRIIPPTTIIOONN +[1mDESCRIPTION[0m These functions implement the old API to get a list of Kerberos hosts, - and are thus similar to the kkrrbb55__kkrrbbhhsstt__iinniitt() functions. However, since - these functions returns _a_l_l hosts in one go, they potentially have to do + and are thus similar to the [1mkrb5_krbhst_init[22m() functions. However, since + these functions returns [4mall[24m hosts in one go, they potentially have to do more lookups than necessary. These functions remain for compatibility reasons. - After a call to one of these functions, _h_o_s_t_l_i_s_t is a NULL terminated + After a call to one of these functions, [4mhostlist[24m is a NULL terminated list of strings, pointing to the requested Kerberos hosts. These should - be freed with kkrrbb55__ffrreeee__kkrrbbhhsstt() when done with. + be freed with [1mkrb5_free_krbhst[22m() when done with. -EEXXAAMMPPLLEESS - The following code will print the KDCs of the realm ``MY.REALM''. +[1mEXAMPLES[0m + The following code will print the KDCs of the realm "MY.REALM". char **hosts, **p; krb5_get_krbhst(context, "MY.REALM", &hosts); @@ -50,7 +49,7 @@ EEXXAAMMPPLLEESS printf("%s\n", *p); krb5_free_krbhst(context, hosts); -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5_krbhst_init(3) HEIMDAL April 24, 2005 HEIMDAL diff --git a/lib/krb5/krb5_getportbyname.cat3 b/lib/krb5/krb5_getportbyname.cat3 index 80124f36cc00..106177186413 100644 --- a/lib/krb5/krb5_getportbyname.cat3 +++ b/lib/krb5/krb5_getportbyname.cat3 @@ -1,29 +1,28 @@ - NAME(3) BSD Library Functions Manual NAME(3) -NNAAMMEE - kkrrbb55__ggeettppoorrttbbyynnaammee -- get port number by name +[1mNAME[0m + [1mkrb5_getportbyname [22m-- get port number by name -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _i_n_t - kkrrbb55__ggeettppoorrttbbyynnaammee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _c_h_a_r _*_s_e_r_v_i_c_e, - _c_o_n_s_t _c_h_a_r _*_p_r_o_t_o, _i_n_t _d_e_f_a_u_l_t___p_o_r_t); + [4mint[0m + [1mkrb5_getportbyname[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mchar[24m [4m*service[24m, + [4mconst[24m [4mchar[24m [4m*proto[24m, [4mint[24m [4mdefault_port[24m); -DDEESSCCRRIIPPTTIIOONN - kkrrbb55__ggeettppoorrttbbyynnaammee() gets the port number for _s_e_r_v_i_c_e _/ _p_r_o_t_o pair from +[1mDESCRIPTION[0m + [1mkrb5_getportbyname[22m() gets the port number for [4mservice[24m [4m/[24m [4mproto[24m pair from the global service table for and returns it in network order. If it - isn't found in the global table, the _d_e_f_a_u_l_t___p_o_r_t (given in host order) + isn't found in the global table, the [4mdefault_port[24m (given in host order) is returned. -EEXXAAMMPPLLEE +[1mEXAMPLE[0m int port = krb5_getportbyname(context, "kerberos", "tcp", 88); -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3) HEIMDAL August 15, 2004 HEIMDAL diff --git a/lib/krb5/krb5_init_context.cat3 b/lib/krb5/krb5_init_context.cat3 index d5676b31422c..6bc70e974423 100644 --- a/lib/krb5/krb5_init_context.cat3 +++ b/lib/krb5/krb5_init_context.cat3 @@ -1,185 +1,184 @@ - KRB5_CONTEXT(3) BSD Library Functions Manual KRB5_CONTEXT(3) -NNAAMMEE - kkrrbb55__aadddd__eett__lliisstt, kkrrbb55__aadddd__eexxttrraa__aaddddrreesssseess, kkrrbb55__aadddd__iiggnnoorree__aaddddrreesssseess, - kkrrbb55__ccoonntteexxtt, kkrrbb55__ffrreeee__ccoonnffiigg__ffiilleess, kkrrbb55__ffrreeee__ccoonntteexxtt, - kkrrbb55__ggeett__ddeeffaauulltt__ccoonnffiigg__ffiilleess, kkrrbb55__ggeett__ddnnss__ccaannoonniizzee__hhoossttnnaammee, - kkrrbb55__ggeett__eexxttrraa__aaddddrreesssseess, kkrrbb55__ggeett__ffccaacchhee__vveerrssiioonn, - kkrrbb55__ggeett__iiggnnoorree__aaddddrreesssseess, kkrrbb55__ggeett__kkddcc__sseecc__ooffffsseett, - kkrrbb55__ggeett__mmaaxx__ttiimmee__sskkeeww, kkrrbb55__ggeett__uussee__aaddmmiinn__kkddcc kkrrbb55__iinniitt__ccoonntteexxtt, - kkrrbb55__iinniitt__eettss, kkrrbb55__pprreeppeenndd__ccoonnffiigg__ffiilleess, - kkrrbb55__pprreeppeenndd__ccoonnffiigg__ffiilleess__ddeeffaauulltt, kkrrbb55__sseett__ccoonnffiigg__ffiilleess, - kkrrbb55__sseett__ddnnss__ccaannoonniizzee__hhoossttnnaammee, kkrrbb55__sseett__eexxttrraa__aaddddrreesssseess, - kkrrbb55__sseett__ffccaacchhee__vveerrssiioonn, kkrrbb55__sseett__iiggnnoorree__aaddddrreesssseess, - kkrrbb55__sseett__mmaaxx__ttiimmee__sskkeeww, kkrrbb55__sseett__uussee__aaddmmiinn__kkddcc, -- create, modify and +[1mNAME[0m + [1mkrb5_add_et_list[22m, [1mkrb5_add_extra_addresses[22m, [1mkrb5_add_ignore_addresses[22m, + [1mkrb5_context[22m, [1mkrb5_free_config_files[22m, [1mkrb5_free_context[22m, + [1mkrb5_get_default_config_files[22m, [1mkrb5_get_dns_canonize_hostname[22m, + [1mkrb5_get_extra_addresses[22m, [1mkrb5_get_fcache_version[22m, + [1mkrb5_get_ignore_addresses[22m, [1mkrb5_get_kdc_sec_offset[22m, + [1mkrb5_get_max_time_skew[22m, [1mkrb5_get_use_admin_kdc krb5_init_context[22m, + [1mkrb5_init_ets[22m, [1mkrb5_prepend_config_files[22m, + [1mkrb5_prepend_config_files_default[22m, [1mkrb5_set_config_files[22m, + [1mkrb5_set_dns_canonize_hostname[22m, [1mkrb5_set_extra_addresses[22m, + [1mkrb5_set_fcache_version[22m, [1mkrb5_set_ignore_addresses[22m, + [1mkrb5_set_max_time_skew[22m, [1mkrb5_set_use_admin_kdc[22m, -- create, modify and delete krb5_context structures -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m struct krb5_context; - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__iinniitt__ccoonntteexxtt(_k_r_b_5___c_o_n_t_e_x_t _*_c_o_n_t_e_x_t); + [4mkrb5_error_code[0m + [1mkrb5_init_context[22m([4mkrb5_context[24m [4m*context[24m); - _v_o_i_d - kkrrbb55__ffrreeee__ccoonntteexxtt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t); + [4mvoid[0m + [1mkrb5_free_context[22m([4mkrb5_context[24m [4mcontext[24m); - _v_o_i_d - kkrrbb55__iinniitt__eettss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t); + [4mvoid[0m + [1mkrb5_init_ets[22m([4mkrb5_context[24m [4mcontext[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aadddd__eett__lliisstt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _v_o_i_d _(_*_f_u_n_c_)_(_s_t_r_u_c_t _e_t___l_i_s_t _*_*_)); + [4mkrb5_error_code[0m + [1mkrb5_add_et_list[22m([4mkrb5_context[24m [4mcontext[24m, [4mvoid[24m [4m(*func)(struct[24m [4met_list[24m [4m**)[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aadddd__eexxttrraa__aaddddrreesssseess(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_d_d_r_e_s_s_e_s _*_a_d_d_r_e_s_s_e_s); + [4mkrb5_error_code[0m + [1mkrb5_add_extra_addresses[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_addresses[24m [4m*addresses[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__sseett__eexxttrraa__aaddddrreesssseess(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _c_o_n_s_t _k_r_b_5___a_d_d_r_e_s_s_e_s _*_a_d_d_r_e_s_s_e_s); + [4mkrb5_error_code[0m + [1mkrb5_set_extra_addresses[22m([4mkrb5_context[24m [4mcontext[24m, + [4mconst[24m [4mkrb5_addresses[24m [4m*addresses[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__eexxttrraa__aaddddrreesssseess(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_d_d_r_e_s_s_e_s _*_a_d_d_r_e_s_s_e_s); + [4mkrb5_error_code[0m + [1mkrb5_get_extra_addresses[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_addresses[24m [4m*addresses[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aadddd__iiggnnoorree__aaddddrreesssseess(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_d_d_r_e_s_s_e_s _*_a_d_d_r_e_s_s_e_s); + [4mkrb5_error_code[0m + [1mkrb5_add_ignore_addresses[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_addresses[24m [4m*addresses[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__sseett__iiggnnoorree__aaddddrreesssseess(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _c_o_n_s_t _k_r_b_5___a_d_d_r_e_s_s_e_s _*_a_d_d_r_e_s_s_e_s); + [4mkrb5_error_code[0m + [1mkrb5_set_ignore_addresses[22m([4mkrb5_context[24m [4mcontext[24m, + [4mconst[24m [4mkrb5_addresses[24m [4m*addresses[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__iiggnnoorree__aaddddrreesssseess(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_d_d_r_e_s_s_e_s _*_a_d_d_r_e_s_s_e_s); + [4mkrb5_error_code[0m + [1mkrb5_get_ignore_addresses[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_addresses[24m [4m*addresses[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__sseett__ffccaacchhee__vveerrssiioonn(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _i_n_t _v_e_r_s_i_o_n); + [4mkrb5_error_code[0m + [1mkrb5_set_fcache_version[22m([4mkrb5_context[24m [4mcontext[24m, [4mint[24m [4mversion[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__ffccaacchhee__vveerrssiioonn(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _i_n_t _*_v_e_r_s_i_o_n); + [4mkrb5_error_code[0m + [1mkrb5_get_fcache_version[22m([4mkrb5_context[24m [4mcontext[24m, [4mint[24m [4m*version[24m); - _v_o_i_d - kkrrbb55__sseett__ddnnss__ccaannoonniizzee__hhoossttnnaammee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___b_o_o_l_e_a_n _f_l_a_g); + [4mvoid[0m + [1mkrb5_set_dns_canonize_hostname[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_boolean[24m [4mflag[24m); - _k_r_b_5___b_o_o_l_e_a_n - kkrrbb55__ggeett__ddnnss__ccaannoonniizzee__hhoossttnnaammee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t); + [4mkrb5_boolean[0m + [1mkrb5_get_dns_canonize_hostname[22m([4mkrb5_context[24m [4mcontext[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__kkddcc__sseecc__ooffffsseett(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _i_n_t_3_2___t _*_s_e_c, - _i_n_t_3_2___t _*_u_s_e_c); + [4mkrb5_error_code[0m + [1mkrb5_get_kdc_sec_offset[22m([4mkrb5_context[24m [4mcontext[24m, [4mint32_t[24m [4m*sec[24m, + [4mint32_t[24m [4m*usec[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__sseett__ccoonnffiigg__ffiilleess(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_h_a_r _*_*_f_i_l_e_n_a_m_e_s); + [4mkrb5_error_code[0m + [1mkrb5_set_config_files[22m([4mkrb5_context[24m [4mcontext[24m, [4mchar[24m [4m**filenames[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__pprreeppeenndd__ccoonnffiigg__ffiilleess(_c_o_n_s_t _c_h_a_r _*_f_i_l_e_l_i_s_t, _c_h_a_r _*_*_p_q, - _c_h_a_r _*_*_*_r_e_t___p_p); + [4mkrb5_error_code[0m + [1mkrb5_prepend_config_files[22m([4mconst[24m [4mchar[24m [4m*filelist[24m, [4mchar[24m [4m**pq[24m, + [4mchar[24m [4m***ret_pp[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__pprreeppeenndd__ccoonnffiigg__ffiilleess__ddeeffaauulltt(_c_o_n_s_t _c_h_a_r _*_f_i_l_e_l_i_s_t, - _c_h_a_r _*_*_*_p_f_i_l_e_n_a_m_e_s); + [4mkrb5_error_code[0m + [1mkrb5_prepend_config_files_default[22m([4mconst[24m [4mchar[24m [4m*filelist[24m, + [4mchar[24m [4m***pfilenames[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__ddeeffaauulltt__ccoonnffiigg__ffiilleess(_c_h_a_r _*_*_*_p_f_i_l_e_n_a_m_e_s); + [4mkrb5_error_code[0m + [1mkrb5_get_default_config_files[22m([4mchar[24m [4m***pfilenames[24m); - _v_o_i_d - kkrrbb55__ffrreeee__ccoonnffiigg__ffiilleess(_c_h_a_r _*_*_f_i_l_e_n_a_m_e_s); + [4mvoid[0m + [1mkrb5_free_config_files[22m([4mchar[24m [4m**filenames[24m); - _v_o_i_d - kkrrbb55__sseett__uussee__aaddmmiinn__kkddcc(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___b_o_o_l_e_a_n _f_l_a_g); + [4mvoid[0m + [1mkrb5_set_use_admin_kdc[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_boolean[24m [4mflag[24m); - _k_r_b_5___b_o_o_l_e_a_n - kkrrbb55__ggeett__uussee__aaddmmiinn__kkddcc(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t); + [4mkrb5_boolean[0m + [1mkrb5_get_use_admin_kdc[22m([4mkrb5_context[24m [4mcontext[24m); - _t_i_m_e___t - kkrrbb55__ggeett__mmaaxx__ttiimmee__sskkeeww(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t); + [4mtime_t[0m + [1mkrb5_get_max_time_skew[22m([4mkrb5_context[24m [4mcontext[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__sseett__mmaaxx__ttiimmee__sskkeeww(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _t_i_m_e___t _t_i_m_e); + [4mkrb5_error_code[0m + [1mkrb5_set_max_time_skew[22m([4mkrb5_context[24m [4mcontext[24m, [4mtime_t[24m [4mtime[24m); -DDEESSCCRRIIPPTTIIOONN - The kkrrbb55__iinniitt__ccoonntteexxtt() function initializes the _c_o_n_t_e_x_t structure and - reads the configuration file _/_e_t_c_/_k_r_b_5_._c_o_n_f. +[1mDESCRIPTION[0m + The [1mkrb5_init_context[22m() function initializes the [4mcontext[24m structure and + reads the configuration file [4m/etc/krb5.conf[24m. - The structure should be freed by calling kkrrbb55__ffrreeee__ccoonntteexxtt() when it is + The structure should be freed by calling [1mkrb5_free_context[22m() when it is no longer being used. - kkrrbb55__iinniitt__ccoonntteexxtt() returns 0 to indicate success. Otherwise an errno + [1mkrb5_init_context[22m() returns 0 to indicate success. Otherwise an errno code is returned. Failure means either that something bad happened dur- ing initialization (typically [ENOMEM]) or that Kerberos should not be used [ENXIO]. - kkrrbb55__iinniitt__eettss() adds all com_err(3) libs to _c_o_n_t_e_x_t. This is done by - kkrrbb55__iinniitt__ccoonntteexxtt(). + [1mkrb5_init_ets[22m() adds all com_err(3) libs to [4mcontext[24m. This is done by + [1mkrb5_init_context[22m(). - kkrrbb55__aadddd__eett__lliisstt() adds a com_err(3) error-code handler _f_u_n_c to the spec- - ified _c_o_n_t_e_x_t. The error handler must generated by the the re-rentrant - version of the compile_et(1) program. kkrrbb55__aadddd__eexxttrraa__aaddddrreesssseess() add a + [1mkrb5_add_et_list[22m() adds a com_err(3) error-code handler [4mfunc[24m to the spec- + ified [4mcontext[24m. The error handler must generated by the the re-rentrant + version of the compile_et(1) program. [1mkrb5_add_extra_addresses[22m() add a list of addresses that should be added when requesting tickets. - kkrrbb55__aadddd__iiggnnoorree__aaddddrreesssseess() add a list of addresses that should be - ignored when requesting tickets. + [1mkrb5_add_ignore_addresses[22m() add a list of addresses that should be ig- + nored when requesting tickets. - kkrrbb55__ggeett__eexxttrraa__aaddddrreesssseess() get the list of addresses that should be added + [1mkrb5_get_extra_addresses[22m() get the list of addresses that should be added when requesting tickets. - kkrrbb55__ggeett__iiggnnoorree__aaddddrreesssseess() get the list of addresses that should be - ignored when requesting tickets. + [1mkrb5_get_ignore_addresses[22m() get the list of addresses that should be ig- + nored when requesting tickets. - kkrrbb55__sseett__iiggnnoorree__aaddddrreesssseess() set the list of addresses that should be - ignored when requesting tickets. + [1mkrb5_set_ignore_addresses[22m() set the list of addresses that should be ig- + nored when requesting tickets. - kkrrbb55__sseett__eexxttrraa__aaddddrreesssseess() set the list of addresses that should be added + [1mkrb5_set_extra_addresses[22m() set the list of addresses that should be added when requesting tickets. - kkrrbb55__sseett__ffccaacchhee__vveerrssiioonn() sets the version of file credentials caches + [1mkrb5_set_fcache_version[22m() sets the version of file credentials caches that should be used. - kkrrbb55__ggeett__ffccaacchhee__vveerrssiioonn() gets the version of file credentials caches + [1mkrb5_get_fcache_version[22m() gets the version of file credentials caches that should be used. - kkrrbb55__sseett__ddnnss__ccaannoonniizzee__hhoossttnnaammee() sets if the context is configured to + [1mkrb5_set_dns_canonize_hostname[22m() sets if the context is configured to canonicalize hostnames using DNS. - kkrrbb55__ggeett__ddnnss__ccaannoonniizzee__hhoossttnnaammee() returns if the context is configured to + [1mkrb5_get_dns_canonize_hostname[22m() returns if the context is configured to canonicalize hostnames using DNS. - kkrrbb55__ggeett__kkddcc__sseecc__ooffffsseett() returns the offset between the localtime and - the KDC's time. _s_e_c and _u_s_e_c are both optional argument and NULL can be + [1mkrb5_get_kdc_sec_offset[22m() returns the offset between the localtime and + the KDC's time. [4msec[24m and [4musec[24m are both optional argument and NULL can be passed in. - kkrrbb55__sseett__ccoonnffiigg__ffiilleess() set the list of configuration files to use and + [1mkrb5_set_config_files[22m() set the list of configuration files to use and re-initialize the configuration from the files. - kkrrbb55__pprreeppeenndd__ccoonnffiigg__ffiilleess() parse the _f_i_l_e_l_i_s_t and prepend the result to - the already existing list _p_q The result is returned in _r_e_t___p_p and should - be freed with kkrrbb55__ffrreeee__ccoonnffiigg__ffiilleess(). + [1mkrb5_prepend_config_files[22m() parse the [4mfilelist[24m and prepend the result to + the already existing list [4mpq[24m The result is returned in [4mret_pp[24m and should + be freed with [1mkrb5_free_config_files[22m(). - kkrrbb55__pprreeppeenndd__ccoonnffiigg__ffiilleess__ddeeffaauulltt() parse the _f_i_l_e_l_i_s_t and append that to + [1mkrb5_prepend_config_files_default[22m() parse the [4mfilelist[24m and append that to the default list of configuration files. - kkrrbb55__ggeett__ddeeffaauulltt__ccoonnffiigg__ffiilleess() get a list of default configuration + [1mkrb5_get_default_config_files[22m() get a list of default configuration files. - kkrrbb55__ffrreeee__ccoonnffiigg__ffiilleess() free a list of configuration files returned by - kkrrbb55__ggeett__ddeeffaauulltt__ccoonnffiigg__ffiilleess(), kkrrbb55__pprreeppeenndd__ccoonnffiigg__ffiilleess__ddeeffaauulltt(), or - kkrrbb55__pprreeppeenndd__ccoonnffiigg__ffiilleess(). + [1mkrb5_free_config_files[22m() free a list of configuration files returned by + [1mkrb5_get_default_config_files[22m(), [1mkrb5_prepend_config_files_default[22m(), or + [1mkrb5_prepend_config_files[22m(). - kkrrbb55__sseett__uussee__aaddmmiinn__kkddcc() sets if all KDC requests should go admin KDC. + [1mkrb5_set_use_admin_kdc[22m() sets if all KDC requests should go admin KDC. - kkrrbb55__ggeett__uussee__aaddmmiinn__kkddcc() gets if all KDC requests should go admin KDC. + [1mkrb5_get_use_admin_kdc[22m() gets if all KDC requests should go admin KDC. - kkrrbb55__ggeett__mmaaxx__ttiimmee__sskkeeww() and kkrrbb55__sseett__mmaaxx__ttiimmee__sskkeeww() get and sets the + [1mkrb5_get_max_time_skew[22m() and [1mkrb5_set_max_time_skew[22m() get and sets the maximum allowed time skew between client and server. -SSEEEE AALLSSOO +[1mSEE ALSO[0m errno(2), krb5(3), krb5_config(3), krb5_context(3), kerberos(8) HEIMDAL December 8, 2004 HEIMDAL diff --git a/lib/krb5/krb5_is_thread_safe.cat3 b/lib/krb5/krb5_is_thread_safe.cat3 index 37383c8d35bf..bd9b37940c9f 100644 --- a/lib/krb5/krb5_is_thread_safe.cat3 +++ b/lib/krb5/krb5_is_thread_safe.cat3 @@ -1,26 +1,25 @@ - KRB5_IS_THREAD_SAFE(3) BSD Library Functions Manual KRB5_IS_THREAD_SAFE(3) -NNAAMMEE - kkrrbb55__iiss__tthhrreeaadd__ssaaffee -- is the Kerberos library compiled with multithread +[1mNAME[0m + [1mkrb5_is_thread_safe [22m-- is the Kerberos library compiled with multithread support -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___b_o_o_l_e_a_n - kkrrbb55__iiss__tthhrreeaadd__ssaaffee(_v_o_i_d); + [4mkrb5_boolean[0m + [1mkrb5_is_thread_safe[22m([4mvoid[24m); -DDEESSCCRRIIPPTTIIOONN - kkrrbb55__iiss__tthhrreeaadd__ssaaffee returns TRUE if the library was compiled with with +[1mDESCRIPTION[0m + [1mkrb5_is_thread_safe [22mreturns TRUE if the library was compiled with with multithread support. If the library isn't compiled, the consumer have to use a global lock to make sure Kerboros functions are not called at the same time by different threads. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5_create_checksum(3), krb5_encrypt(3) HEIMDAL May 5, 2006 HEIMDAL diff --git a/lib/krb5/krb5_krbhst_init.cat3 b/lib/krb5/krb5_krbhst_init.cat3 index 22bf5b250778..44ddb4d2c8f2 100644 --- a/lib/krb5/krb5_krbhst_init.cat3 +++ b/lib/krb5/krb5_krbhst_init.cat3 @@ -1,77 +1,75 @@ - KRB5_KRBHST_INIT(3) BSD Library Functions Manual KRB5_KRBHST_INIT(3) -NNAAMMEE - kkrrbb55__kkrrbbhhsstt__iinniitt, kkrrbb55__kkrrbbhhsstt__iinniitt__ffllaaggss, kkrrbb55__kkrrbbhhsstt__nneexxtt, - kkrrbb55__kkrrbbhhsstt__nneexxtt__aass__ssttrriinngg, kkrrbb55__kkrrbbhhsstt__rreesseett, kkrrbb55__kkrrbbhhsstt__ffrreeee, - kkrrbb55__kkrrbbhhsstt__ffoorrmmaatt__ssttrriinngg, kkrrbb55__kkrrbbhhsstt__ggeett__aaddddrriinnffoo -- lookup Kerberos +[1mNAME[0m + [1mkrb5_krbhst_init[22m, [1mkrb5_krbhst_init_flags[22m, [1mkrb5_krbhst_next[22m, + [1mkrb5_krbhst_next_as_string[22m, [1mkrb5_krbhst_reset[22m, [1mkrb5_krbhst_free[22m, + [1mkrb5_krbhst_format_string[22m, [1mkrb5_krbhst_get_addrinfo [22m-- lookup Kerberos KDC hosts -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__kkrrbbhhsstt__iinniitt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _c_h_a_r _*_r_e_a_l_m, - _u_n_s_i_g_n_e_d _i_n_t _t_y_p_e, _k_r_b_5___k_r_b_h_s_t___h_a_n_d_l_e _*_h_a_n_d_l_e); + [4mkrb5_error_code[0m + [1mkrb5_krbhst_init[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mchar[24m [4m*realm[24m, + [4munsigned[24m [4mint[24m [4mtype[24m, [4mkrb5_krbhst_handle[24m [4m*handle[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__kkrrbbhhsstt__iinniitt__ffllaaggss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _c_h_a_r _*_r_e_a_l_m, - _u_n_s_i_g_n_e_d _i_n_t _t_y_p_e, _i_n_t _f_l_a_g_s, _k_r_b_5___k_r_b_h_s_t___h_a_n_d_l_e _*_h_a_n_d_l_e); + [4mkrb5_error_code[0m + [1mkrb5_krbhst_init_flags[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mchar[24m [4m*realm[24m, + [4munsigned[24m [4mint[24m [4mtype[24m, [4mint[24m [4mflags[24m, [4mkrb5_krbhst_handle[24m [4m*handle[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__kkrrbbhhsstt__nneexxtt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___k_r_b_h_s_t___h_a_n_d_l_e _h_a_n_d_l_e, - _k_r_b_5___k_r_b_h_s_t___i_n_f_o _*_*_h_o_s_t); + [4mkrb5_error_code[0m + [1mkrb5_krbhst_next[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_krbhst_handle[24m [4mhandle[24m, + [4mkrb5_krbhst_info[24m [4m**host[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__kkrrbbhhsstt__nneexxtt__aass__ssttrriinngg(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___k_r_b_h_s_t___h_a_n_d_l_e _h_a_n_d_l_e, _c_h_a_r _*_h_o_s_t_n_a_m_e, _s_i_z_e___t _h_o_s_t_l_e_n); + [4mkrb5_error_code[0m + [1mkrb5_krbhst_next_as_string[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_krbhst_handle[24m [4mhandle[24m, [4mchar[24m [4m*hostname[24m, [4msize_t[24m [4mhostlen[24m); - _v_o_i_d - kkrrbb55__kkrrbbhhsstt__rreesseett(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___k_r_b_h_s_t___h_a_n_d_l_e _h_a_n_d_l_e); + [4mvoid[0m + [1mkrb5_krbhst_reset[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_krbhst_handle[24m [4mhandle[24m); - _v_o_i_d - kkrrbb55__kkrrbbhhsstt__ffrreeee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___k_r_b_h_s_t___h_a_n_d_l_e _h_a_n_d_l_e); + [4mvoid[0m + [1mkrb5_krbhst_free[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_krbhst_handle[24m [4mhandle[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__kkrrbbhhsstt__ffoorrmmaatt__ssttrriinngg(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _c_o_n_s_t _k_r_b_5___k_r_b_h_s_t___i_n_f_o _*_h_o_s_t, _c_h_a_r _*_h_o_s_t_n_a_m_e, _s_i_z_e___t _h_o_s_t_l_e_n); + [4mkrb5_error_code[0m + [1mkrb5_krbhst_format_string[22m([4mkrb5_context[24m [4mcontext[24m, + [4mconst[24m [4mkrb5_krbhst_info[24m [4m*host[24m, [4mchar[24m [4m*hostname[24m, [4msize_t[24m [4mhostlen[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__kkrrbbhhsstt__ggeett__aaddddrriinnffoo(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___k_r_b_h_s_t___i_n_f_o _*_h_o_s_t, - _s_t_r_u_c_t _a_d_d_r_i_n_f_o _*_*_a_i); + [4mkrb5_error_code[0m + [1mkrb5_krbhst_get_addrinfo[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_krbhst_info[24m [4m*host[24m, + [4mstruct[24m [4maddrinfo[24m [4m**ai[24m); -DDEESSCCRRIIPPTTIIOONN +[1mDESCRIPTION[0m These functions are used to sequence through all Kerberos hosts of a par- ticular realm and service. The service type can be the KDCs, the adminis- trative servers, the password changing servers, or the servers for Ker- beros 4 ticket conversion. First a handle to a particular service is obtained by calling - kkrrbb55__kkrrbbhhsstt__iinniitt() (or kkrrbb55__kkrrbbhhsstt__iinniitt__ffllaaggss()) with the _r_e_a_l_m of inter- - est and the type of service to lookup. The _t_y_p_e can be one of: + [1mkrb5_krbhst_init[22m() (or [1mkrb5_krbhst_init_flags[22m()) with the [4mrealm[24m of inter- + est and the type of service to lookup. The [4mtype[24m can be one of: KRB5_KRBHST_KDC KRB5_KRBHST_ADMIN KRB5_KRBHST_CHANGEPW KRB5_KRBHST_KRB524 - The _h_a_n_d_l_e is returned to the caller, and should be passed to the other + The [4mhandle[24m is returned to the caller, and should be passed to the other functions. - The _f_l_a_g argument to kkrrbb55__kkrrbbhhsstt__iinniitt__ffllaaggss is the same flags as - kkrrbb55__sseenndd__ttoo__kkddcc__ffllaaggss() uses. Possible values are: + The [4mflag[24m argument to [1mkrb5_krbhst_init_flags [22mis the same flags as + [1mkrb5_send_to_kdc_flags[22m() uses. Possible values are: KRB5_KRBHST_FLAGS_MASTER only talk to master (readwrite) KDC KRB5_KRBHST_FLAGS_LARGE_MSG this is a large message, so use trans- port that can handle that. - For each call to kkrrbb55__kkrrbbhhsstt__nneexxtt() information on a new host is - returned. The former function returns in _h_o_s_t a pointer to a structure - containing information about the host, such as protocol, hostname, and - port: + For each call to [1mkrb5_krbhst_next[22m() information on a new host is re- + turned. The former function returns in [4mhost[24m a pointer to a structure con- + taining information about the host, such as protocol, hostname, and port: typedef struct krb5_krbhst_info { enum { KRB5_KRBHST_UDP, @@ -83,24 +81,24 @@ DDEESSCCRRIIPPTTIIOONN char hostname[1]; } krb5_krbhst_info; - The related function, kkrrbb55__kkrrbbhhsstt__nneexxtt__aass__ssttrriinngg(), return the same - information as a URL-like string. + The related function, [1mkrb5_krbhst_next_as_string[22m(), return the same in- + formation as a URL-like string. When there are no more hosts, these functions return KRB5_KDC_UNREACH. - To re-iterate over all hosts, call kkrrbb55__kkrrbbhhsstt__rreesseett() and the next call - to kkrrbb55__kkrrbbhhsstt__nneexxtt() will return the first host. + To re-iterate over all hosts, call [1mkrb5_krbhst_reset[22m() and the next call + to [1mkrb5_krbhst_next[22m() will return the first host. - When done with the handle, kkrrbb55__kkrrbbhhsstt__ffrreeee() should be called. + When done with the handle, [1mkrb5_krbhst_free[22m() should be called. - To use a _k_r_b_5___k_r_b_h_s_t___i_n_f_o, there are two functions: - kkrrbb55__kkrrbbhhsstt__ffoorrmmaatt__ssttrriinngg() that will return a printable representation - of that struct and kkrrbb55__kkrrbbhhsstt__ggeett__aaddddrriinnffoo() that will return a _s_t_r_u_c_t - _a_d_d_r_i_n_f_o that can then be used for communicating with the server men- + To use a [4mkrb5_krbhst_info[24m, there are two functions: + [1mkrb5_krbhst_format_string[22m() that will return a printable representation + of that struct and [1mkrb5_krbhst_get_addrinfo[22m() that will return a [4mstruct[0m + [4maddrinfo[24m that can then be used for communicating with the server men- tioned. -EEXXAAMMPPLLEESS - The following code will print the KDCs of the realm ``MY.REALM'': +[1mEXAMPLES[0m + The following code will print the KDCs of the realm "MY.REALM": krb5_krbhst_handle handle; char host[MAXHOSTNAMELEN]; @@ -110,10 +108,10 @@ EEXXAAMMPPLLEESS printf("%s\n", host); krb5_krbhst_free(context, handle); -SSEEEE AALLSSOO +[1mSEE ALSO[0m getaddrinfo(3), krb5_get_krbhst(3), krb5_send_to_kdc_flags(3) -HHIISSTTOORRYY +[1mHISTORY[0m These functions first appeared in Heimdal 0.3g. HEIMDAL May 10, 2005 HEIMDAL diff --git a/lib/krb5/krb5_mk_req.cat3 b/lib/krb5/krb5_mk_req.cat3 index 9d36e6a2bb82..266f1a052e9a 100644 --- a/lib/krb5/krb5_mk_req.cat3 +++ b/lib/krb5/krb5_mk_req.cat3 @@ -1,89 +1,88 @@ - KRB5_MK_REQ(3) BSD Library Functions Manual KRB5_MK_REQ(3) -NNAAMMEE - kkrrbb55__mmkk__rreeqq, kkrrbb55__mmkk__rreeqq__eexxaacctt, kkrrbb55__mmkk__rreeqq__eexxtteennddeedd, kkrrbb55__rrdd__rreeqq, - kkrrbb55__rrdd__rreeqq__wwiitthh__kkeeyybblloocckk, kkrrbb55__mmkk__rreepp, kkrrbb55__mmkk__rreepp__eexxaacctt, - kkrrbb55__mmkk__rreepp__eexxtteennddeedd, kkrrbb55__rrdd__rreepp, kkrrbb55__bbuuiilldd__aapp__rreeqq, kkrrbb55__vveerriiffyy__aapp__rreeqq +[1mNAME[0m + [1mkrb5_mk_req[22m, [1mkrb5_mk_req_exact[22m, [1mkrb5_mk_req_extended[22m, [1mkrb5_rd_req[22m, + [1mkrb5_rd_req_with_keyblock[22m, [1mkrb5_mk_rep[22m, [1mkrb5_mk_rep_exact[22m, + [1mkrb5_mk_rep_extended[22m, [1mkrb5_rd_rep[22m, [1mkrb5_build_ap_req[22m, [1mkrb5_verify_ap_req[0m -- create and read application authentication request -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__mmkk__rreeqq(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _*_a_u_t_h___c_o_n_t_e_x_t, - _c_o_n_s_t _k_r_b_5___f_l_a_g_s _a_p___r_e_q___o_p_t_i_o_n_s, _c_o_n_s_t _c_h_a_r _*_s_e_r_v_i_c_e, - _c_o_n_s_t _c_h_a_r _*_h_o_s_t_n_a_m_e, _k_r_b_5___d_a_t_a _*_i_n___d_a_t_a, _k_r_b_5___c_c_a_c_h_e _c_c_a_c_h_e, - _k_r_b_5___d_a_t_a _*_o_u_t_b_u_f); - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__mmkk__rreeqq__eexxtteennddeedd(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _*_a_u_t_h___c_o_n_t_e_x_t, _c_o_n_s_t _k_r_b_5___f_l_a_g_s _a_p___r_e_q___o_p_t_i_o_n_s, - _k_r_b_5___d_a_t_a _*_i_n___d_a_t_a, _k_r_b_5___c_r_e_d_s _*_i_n___c_r_e_d_s, _k_r_b_5___d_a_t_a _*_o_u_t_b_u_f); - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__rrdd__rreeqq(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _*_a_u_t_h___c_o_n_t_e_x_t, - _c_o_n_s_t _k_r_b_5___d_a_t_a _*_i_n_b_u_f, _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _s_e_r_v_e_r, - _k_r_b_5___k_e_y_t_a_b _k_e_y_t_a_b, _k_r_b_5___f_l_a_g_s _*_a_p___r_e_q___o_p_t_i_o_n_s, - _k_r_b_5___t_i_c_k_e_t _*_*_t_i_c_k_e_t); - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__bbuuiilldd__aapp__rreeqq(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___e_n_c_t_y_p_e _e_n_c_t_y_p_e, - _k_r_b_5___c_r_e_d_s _*_c_r_e_d, _k_r_b_5___f_l_a_g_s _a_p___o_p_t_i_o_n_s, _k_r_b_5___d_a_t_a _a_u_t_h_e_n_t_i_c_a_t_o_r, - _k_r_b_5___d_a_t_a _*_r_e_t_d_a_t_a); - - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__vveerriiffyy__aapp__rreeqq(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _*_a_u_t_h___c_o_n_t_e_x_t, - _k_r_b_5___a_p___r_e_q _*_a_p___r_e_q, _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _s_e_r_v_e_r, - _k_r_b_5___k_e_y_b_l_o_c_k _*_k_e_y_b_l_o_c_k, _k_r_b_5___f_l_a_g_s _f_l_a_g_s, - _k_r_b_5___f_l_a_g_s _*_a_p___r_e_q___o_p_t_i_o_n_s, _k_r_b_5___t_i_c_k_e_t _*_*_t_i_c_k_e_t); - -DDEESSCCRRIIPPTTIIOONN +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m + + [4mkrb5_error_code[0m + [1mkrb5_mk_req[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_auth_context[24m [4m*auth_context[24m, + [4mconst[24m [4mkrb5_flags[24m [4map_req_options[24m, [4mconst[24m [4mchar[24m [4m*service[24m, + [4mconst[24m [4mchar[24m [4m*hostname[24m, [4mkrb5_data[24m [4m*in_data[24m, [4mkrb5_ccache[24m [4mccache[24m, + [4mkrb5_data[24m [4m*outbuf[24m); + + [4mkrb5_error_code[0m + [1mkrb5_mk_req_extended[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_auth_context[24m [4m*auth_context[24m, [4mconst[24m [4mkrb5_flags[24m [4map_req_options[24m, + [4mkrb5_data[24m [4m*in_data[24m, [4mkrb5_creds[24m [4m*in_creds[24m, [4mkrb5_data[24m [4m*outbuf[24m); + + [4mkrb5_error_code[0m + [1mkrb5_rd_req[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_auth_context[24m [4m*auth_context[24m, + [4mconst[24m [4mkrb5_data[24m [4m*inbuf[24m, [4mkrb5_const_principal[24m [4mserver[24m, + [4mkrb5_keytab[24m [4mkeytab[24m, [4mkrb5_flags[24m [4m*ap_req_options[24m, + [4mkrb5_ticket[24m [4m**ticket[24m); + + [4mkrb5_error_code[0m + [1mkrb5_build_ap_req[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_enctype[24m [4menctype[24m, + [4mkrb5_creds[24m [4m*cred[24m, [4mkrb5_flags[24m [4map_options[24m, [4mkrb5_data[24m [4mauthenticator[24m, + [4mkrb5_data[24m [4m*retdata[24m); + + [4mkrb5_error_code[0m + [1mkrb5_verify_ap_req[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_auth_context[24m [4m*auth_context[24m, + [4mkrb5_ap_req[24m [4m*ap_req[24m, [4mkrb5_const_principal[24m [4mserver[24m, + [4mkrb5_keyblock[24m [4m*keyblock[24m, [4mkrb5_flags[24m [4mflags[24m, + [4mkrb5_flags[24m [4m*ap_req_options[24m, [4mkrb5_ticket[24m [4m**ticket[24m); + +[1mDESCRIPTION[0m The functions documented in this manual page document the functions that facilitates the exchange between a Kerberos client and server. They are the core functions used in the authentication exchange between the client and the server. - The kkrrbb55__mmkk__rreeqq and kkrrbb55__mmkk__rreeqq__eexxtteennddeedd creates the Kerberos message + The [1mkrb5_mk_req [22mand [1mkrb5_mk_req_extended [22mcreates the Kerberos message KRB_AP_REQ that is sent from the client to the server as the first packet in a client/server exchange. The result that should be sent to server is - stored in _o_u_t_b_u_f. + stored in [4moutbuf[24m. - _a_u_t_h___c_o_n_t_e_x_t should be allocated with kkrrbb55__aauutthh__ccoonn__iinniitt() or NULL passed + [4mauth_context[24m should be allocated with [1mkrb5_auth_con_init[22m() or NULL passed in, in that case, it will be allocated and freed internally. - The input data _i_n___d_a_t_a will have a checksum calculated over it and check- + The input data [4min_data[24m will have a checksum calculated over it and check- sum will be transported in the message to the server. - _a_p___r_e_q___o_p_t_i_o_n_s can be set to one or more of the following flags: + [4map_req_options[24m can be set to one or more of the following flags: AP_OPTS_USE_SESSION_KEY Use the session key when creating the request, used for user to user authentication. AP_OPTS_MUTUAL_REQUIRED - Mark the request as mutual authenticate required so that the - receiver returns a mutual authentication packet. + Mark the request as mutual authenticate required so that the re- + ceiver returns a mutual authentication packet. - The kkrrbb55__rrdd__rreeqq read the AP_REQ in _i_n_b_u_f and verify and extract the con- - tent. If _s_e_r_v_e_r is specified, that server will be fetched from the - _k_e_y_t_a_b and used unconditionally. If _s_e_r_v_e_r is NULL, the _k_e_y_t_a_b will be + The [1mkrb5_rd_req [22mread the AP_REQ in [4minbuf[24m and verify and extract the con- + tent. If [4mserver[24m is specified, that server will be fetched from the + [4mkeytab[24m and used unconditionally. If [4mserver[24m is NULL, the [4mkeytab[24m will be search for a matching principal. - The _k_e_y_t_a_b argument specifies what keytab to search for receiving princi- - pals. The arguments _a_p___r_e_q___o_p_t_i_o_n_s and _t_i_c_k_e_t returns the content. + The [4mkeytab[24m argument specifies what keytab to search for receiving princi- + pals. The arguments [4map_req_options[24m and [4mticket[24m returns the content. - When the AS-REQ is a user to user request, neither of _k_e_y_t_a_b or _p_r_i_n_c_i_p_a_l - are used, instead kkrrbb55__rrdd__rreeqq() expects the session key to be set in - _a_u_t_h___c_o_n_t_e_x_t. + When the AS-REQ is a user to user request, neither of [4mkeytab[24m or [4mprincipal[0m + are used, instead [1mkrb5_rd_req[22m() expects the session key to be set in + [4mauth_context[24m. - The kkrrbb55__vveerriiffyy__aapp__rreeqq and kkrrbb55__bbuuiilldd__aapp__rreeqq both constructs and verify + The [1mkrb5_verify_ap_req [22mand [1mkrb5_build_ap_req [22mboth constructs and verify the AP_REQ message, should not be used by external code. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3), krb5.conf(5) HEIMDAL August 27, 2005 HEIMDAL diff --git a/lib/krb5/krb5_mk_safe.cat3 b/lib/krb5/krb5_mk_safe.cat3 index 5a26fd72d041..a517fefd8412 100644 --- a/lib/krb5/krb5_mk_safe.cat3 +++ b/lib/krb5/krb5_mk_safe.cat3 @@ -1,36 +1,35 @@ - KRB5_MK_SAFE(3) BSD Library Functions Manual KRB5_MK_SAFE(3) -NNAAMMEE - kkrrbb55__mmkk__ssaaffee, kkrrbb55__mmkk__pprriivv -- generates integrity protected and/or - encrypted messages +[1mNAME[0m + [1mkrb5_mk_safe[22m, [1mkrb5_mk_priv [22m-- generates integrity protected and/or en- + crypted messages -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__mmkk__pprriivv(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _a_u_t_h___c_o_n_t_e_x_t, - _c_o_n_s_t _k_r_b_5___d_a_t_a _*_u_s_e_r_d_a_t_a, _k_r_b_5___d_a_t_a _*_o_u_t_b_u_f, - _k_r_b_5___r_e_p_l_a_y___d_a_t_a _*_o_u_t_d_a_t_a); + [4mkrb5_error_code[0m + [1mkrb5_mk_priv[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_auth_context[24m [4mauth_context[24m, + [4mconst[24m [4mkrb5_data[24m [4m*userdata[24m, [4mkrb5_data[24m [4m*outbuf[24m, + [4mkrb5_replay_data[24m [4m*outdata[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__mmkk__ssaaffee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _a_u_t_h___c_o_n_t_e_x_t, - _c_o_n_s_t _k_r_b_5___d_a_t_a _*_u_s_e_r_d_a_t_a, _k_r_b_5___d_a_t_a _*_o_u_t_b_u_f, - _k_r_b_5___r_e_p_l_a_y___d_a_t_a _*_o_u_t_d_a_t_a); + [4mkrb5_error_code[0m + [1mkrb5_mk_safe[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_auth_context[24m [4mauth_context[24m, + [4mconst[24m [4mkrb5_data[24m [4m*userdata[24m, [4mkrb5_data[24m [4m*outbuf[24m, + [4mkrb5_replay_data[24m [4m*outdata[24m); -DDEESSCCRRIIPPTTIIOONN - kkrrbb55__mmkk__ssaaffee() and kkrrbb55__mmkk__pprriivv() formats KRB-SAFE (integrity protected) - and KRB-PRIV (also encrypted) messages into _o_u_t_b_u_f. The actual message - data is taken from _u_s_e_r_d_a_t_a. If the KRB5_AUTH_CONTEXT_DO_SEQUENCE or - KRB5_AUTH_CONTEXT_DO_TIME flags are set in the _a_u_t_h___c_o_n_t_e_x_t, sequence +[1mDESCRIPTION[0m + [1mkrb5_mk_safe[22m() and [1mkrb5_mk_priv[22m() formats KRB-SAFE (integrity protected) + and KRB-PRIV (also encrypted) messages into [4moutbuf[24m. The actual message + data is taken from [4muserdata[24m. If the KRB5_AUTH_CONTEXT_DO_SEQUENCE or + KRB5_AUTH_CONTEXT_DO_TIME flags are set in the [4mauth_context[24m, sequence numbers and time stamps are generated. If the KRB5_AUTH_CONTEXT_RET_SEQUENCE or KRB5_AUTH_CONTEXT_RET_TIME flags are - set they are also returned in the _o_u_t_d_a_t_a parameter. + set they are also returned in the [4moutdata[24m parameter. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5_auth_con_init(3), krb5_rd_priv(3), krb5_rd_safe(3) HEIMDAL May 1, 2006 HEIMDAL diff --git a/lib/krb5/krb5_openlog.cat3 b/lib/krb5/krb5_openlog.cat3 index 2b53b3b8d74b..e976a1174fa5 100644 --- a/lib/krb5/krb5_openlog.cat3 +++ b/lib/krb5/krb5_openlog.cat3 @@ -1,106 +1,105 @@ - KRB5_OPENLOG(3) BSD Library Functions Manual KRB5_OPENLOG(3) -NNAAMMEE - kkrrbb55__iinniittlloogg, kkrrbb55__ooppeennlloogg, kkrrbb55__cclloosseelloogg, kkrrbb55__aaddddlloogg__ddeesstt, - kkrrbb55__aaddddlloogg__ffuunncc, kkrrbb55__lloogg, kkrrbb55__vvlloogg, kkrrbb55__lloogg__mmssgg, kkrrbb55__vvlloogg__mmssgg -- +[1mNAME[0m + [1mkrb5_initlog[22m, [1mkrb5_openlog[22m, [1mkrb5_closelog[22m, [1mkrb5_addlog_dest[22m, + [1mkrb5_addlog_func[22m, [1mkrb5_log[22m, [1mkrb5_vlog[22m, [1mkrb5_log_msg[22m, [1mkrb5_vlog_msg [22m-- Heimdal logging functions -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _t_y_p_e_d_e_f _v_o_i_d - (**kkrrbb55__lloogg__lloogg__ffuunncc__tt)(_c_o_n_s_t _c_h_a_r _*_t_i_m_e, _c_o_n_s_t _c_h_a_r _*_m_e_s_s_a_g_e, - _v_o_i_d _*_d_a_t_a); + [4mtypedef[24m [4mvoid[0m + ([1m*krb5_log_log_func_t[22m)([4mconst[24m [4mchar[24m [4m*time[24m, [4mconst[24m [4mchar[24m [4m*message[24m, + [4mvoid[24m [4m*data[24m); - _t_y_p_e_d_e_f _v_o_i_d - (**kkrrbb55__lloogg__cclloossee__ffuunncc__tt)(_v_o_i_d _*_d_a_t_a); + [4mtypedef[24m [4mvoid[0m + ([1m*krb5_log_close_func_t[22m)([4mvoid[24m [4m*data[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aaddddlloogg__ddeesstt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___l_o_g___f_a_c_i_l_i_t_y _*_f_a_c_i_l_i_t_y, - _c_o_n_s_t _c_h_a_r _*_d_e_s_t_i_n_a_t_i_o_n); + [4mkrb5_error_code[0m + [1mkrb5_addlog_dest[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_log_facility[24m [4m*facility[24m, + [4mconst[24m [4mchar[24m [4m*destination[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__aaddddlloogg__ffuunncc(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___l_o_g___f_a_c_i_l_i_t_y _*_f_a_c_i_l_i_t_y, - _i_n_t _m_i_n, _i_n_t _m_a_x, _k_r_b_5___l_o_g___l_o_g___f_u_n_c___t _l_o_g, - _k_r_b_5___l_o_g___c_l_o_s_e___f_u_n_c___t _c_l_o_s_e, _v_o_i_d _*_d_a_t_a); + [4mkrb5_error_code[0m + [1mkrb5_addlog_func[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_log_facility[24m [4m*facility[24m, + [4mint[24m [4mmin[24m, [4mint[24m [4mmax[24m, [4mkrb5_log_log_func_t[24m [4mlog[24m, + [4mkrb5_log_close_func_t[24m [4mclose[24m, [4mvoid[24m [4m*data[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__cclloosseelloogg(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___l_o_g___f_a_c_i_l_i_t_y _*_f_a_c_i_l_i_t_y); + [4mkrb5_error_code[0m + [1mkrb5_closelog[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_log_facility[24m [4m*facility[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__iinniittlloogg(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _c_h_a_r _*_p_r_o_g_r_a_m, - _k_r_b_5___l_o_g___f_a_c_i_l_i_t_y _*_*_f_a_c_i_l_i_t_y); + [4mkrb5_error_code[0m + [1mkrb5_initlog[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mchar[24m [4m*program[24m, + [4mkrb5_log_facility[24m [4m**facility[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__lloogg(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___l_o_g___f_a_c_i_l_i_t_y _*_f_a_c_i_l_i_t_y, _i_n_t _l_e_v_e_l, - _c_o_n_s_t _c_h_a_r _*_f_o_r_m_a_t, _._._.); + [4mkrb5_error_code[0m + [1mkrb5_log[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_log_facility[24m [4m*facility[24m, [4mint[24m [4mlevel[24m, + [4mconst[24m [4mchar[24m [4m*format[24m, [4m...[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__lloogg__mmssgg(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___l_o_g___f_a_c_i_l_i_t_y _*_f_a_c_i_l_i_t_y, - _c_h_a_r _*_*_r_e_p_l_y, _i_n_t _l_e_v_e_l, _c_o_n_s_t _c_h_a_r _*_f_o_r_m_a_t, _._._.); + [4mkrb5_error_code[0m + [1mkrb5_log_msg[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_log_facility[24m [4m*facility[24m, + [4mchar[24m [4m**reply[24m, [4mint[24m [4mlevel[24m, [4mconst[24m [4mchar[24m [4m*format[24m, [4m...[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ooppeennlloogg(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _c_h_a_r _*_p_r_o_g_r_a_m, - _k_r_b_5___l_o_g___f_a_c_i_l_i_t_y _*_*_f_a_c_i_l_i_t_y); + [4mkrb5_error_code[0m + [1mkrb5_openlog[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mchar[24m [4m*program[24m, + [4mkrb5_log_facility[24m [4m**facility[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__vvlloogg(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___l_o_g___f_a_c_i_l_i_t_y _*_f_a_c_i_l_i_t_y, _i_n_t _l_e_v_e_l, - _c_o_n_s_t _c_h_a_r _*_f_o_r_m_a_t, _v_a___l_i_s_t _a_r_g_l_i_s_t); + [4mkrb5_error_code[0m + [1mkrb5_vlog[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_log_facility[24m [4m*facility[24m, [4mint[24m [4mlevel[24m, + [4mconst[24m [4mchar[24m [4m*format[24m, [4mva_list[24m [4marglist[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__vvlloogg__mmssgg(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___l_o_g___f_a_c_i_l_i_t_y _*_f_a_c_i_l_i_t_y, - _c_h_a_r _*_*_r_e_p_l_y, _i_n_t _l_e_v_e_l, _c_o_n_s_t _c_h_a_r _*_f_o_r_m_a_t, _v_a___l_i_s_t _a_r_g_l_i_s_t); + [4mkrb5_error_code[0m + [1mkrb5_vlog_msg[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_log_facility[24m [4m*facility[24m, + [4mchar[24m [4m**reply[24m, [4mint[24m [4mlevel[24m, [4mconst[24m [4mchar[24m [4m*format[24m, [4mva_list[24m [4marglist[24m); -DDEESSCCRRIIPPTTIIOONN +[1mDESCRIPTION[0m These functions logs messages to one or more destinations. - The kkrrbb55__ooppeennlloogg() function creates a logging _f_a_c_i_l_i_t_y, that is used to + The [1mkrb5_openlog[22m() function creates a logging [4mfacility[24m, that is used to log messages. A facility consists of one or more destinations (which can - be files or syslog or some other device). The _p_r_o_g_r_a_m parameter should be + be files or syslog or some other device). The [4mprogram[24m parameter should be the generic name of the program that is doing the logging. This name is used to lookup which destinations to use. This information is contained - in the logging section of the _k_r_b_5_._c_o_n_f configuration file. If no entry - is found for _p_r_o_g_r_a_m, the entry for default is used, or if that is miss- + in the logging section of the [4mkrb5.conf[24m configuration file. If no entry + is found for [4mprogram[24m, the entry for default is used, or if that is miss- ing too, SYSLOG will be used as destination. - To close a logging facility, use the kkrrbb55__cclloosseelloogg() function. + To close a logging facility, use the [1mkrb5_closelog[22m() function. - To log a message to a facility use one of the functions kkrrbb55__lloogg(), - kkrrbb55__lloogg__mmssgg(), kkrrbb55__vvlloogg(), or kkrrbb55__vvlloogg__mmssgg(). The functions ending in - _msg return in _r_e_p_l_y a pointer to the message that just got logged. This - string is allocated, and should be freed with ffrreeee(). The _f_o_r_m_a_t is a - standard pprriinnttff() style format string (but see the BUGS section). + To log a message to a facility use one of the functions [1mkrb5_log[22m(), + [1mkrb5_log_msg[22m(), [1mkrb5_vlog[22m(), or [1mkrb5_vlog_msg[22m(). The functions ending in + _msg return in [4mreply[24m a pointer to the message that just got logged. This + string is allocated, and should be freed with [1mfree[22m(). The [4mformat[24m is a + standard [1mprintf[22m() style format string (but see the BUGS section). If you want better control of where things gets logged, you can instead - of using kkrrbb55__ooppeennlloogg() call kkrrbb55__iinniittlloogg(), which just initializes a - facility, but doesn't define any actual logging destinations. You can - then add destinations with the kkrrbb55__aaddddlloogg__ddeesstt() and kkrrbb55__aaddddlloogg__ffuunncc() - functions. The first of these takes a string specifying a logging desti- - nation, and adds this to the facility. If you want to do some non-stan- - dard logging you can use the kkrrbb55__aaddddlloogg__ffuunncc() function, which takes a - function to use when logging. The _l_o_g function is called for each mes- - sage with _t_i_m_e being a string specifying the current time, and _m_e_s_s_a_g_e - the message to log. _c_l_o_s_e is called when the facility is closed. You can - pass application specific data in the _d_a_t_a parameter. The _m_i_n and _m_a_x - parameter are the same as in a destination (defined below). To specify a + of using [1mkrb5_openlog[22m() call [1mkrb5_initlog[22m(), which just initializes a fa- + cility, but doesn't define any actual logging destinations. You can then + add destinations with the [1mkrb5_addlog_dest[22m() and [1mkrb5_addlog_func[22m() func- + tions. The first of these takes a string specifying a logging destina- + tion, and adds this to the facility. If you want to do some non-standard + logging you can use the [1mkrb5_addlog_func[22m() function, which takes a func- + tion to use when logging. The [4mlog[24m function is called for each message + with [4mtime[24m being a string specifying the current time, and [4mmessage[24m the + message to log. [4mclose[24m is called when the facility is closed. You can + pass application specific data in the [4mdata[24m parameter. The [4mmin[24m and [4mmax[24m pa- + rameter are the same as in a destination (defined below). To specify a max of infinity, pass -1. - kkrrbb55__ooppeennlloogg() calls kkrrbb55__iinniittlloogg() and then calls kkrrbb55__aaddddlloogg__ddeesstt() for + [1mkrb5_openlog[22m() calls [1mkrb5_initlog[22m() and then calls [1mkrb5_addlog_dest[22m() for each destination found. - DDeessttiinnaattiioonnss - The defined destinations (as specified in _k_r_b_5_._c_o_n_f) follows: + [1mDestinations[0m + The defined destinations (as specified in [4mkrb5.conf[24m) follows: STDERR This logs to the program's stderr. - FILE:_/_f_i_l_e + FILE:[4m/file[0m - FILE=_/_f_i_l_e + FILE=[4m/file[0m Log to the specified file. The form using a colon appends to the file, the form with an equal truncates the file. The trun- cating form keeps the file open, while the appending form @@ -108,7 +107,7 @@ DDEESSCCRRIIPPTTIIOONN rotate logs). The truncating form is mainly for compatibility with the MIT libkrb5. - DEVICE=_/_d_e_v_i_c_e + DEVICE=[4m/device[0m This logs to the specified device, at present this is the same as FILE:/device. @@ -121,39 +120,39 @@ DDEESSCCRRIIPPTTIIOONN the macro passed to syslog(3), and remove the leading LOG_ (LOG_NOTICE becomes NOTICE). The default values (as well as the values used for unrecognised values), are ERR, and AUTH, - respectively. See syslog(3) for a list of priorities and - facilities. + respectively. See syslog(3) for a list of priorities and fa- + cilities. Each destination may optionally be prepended with a range of logging lev- - els, specified as min-max/. If the _l_e_v_e_l parameter to kkrrbb55__lloogg() is + els, specified as min-max/. If the [4mlevel[24m parameter to [1mkrb5_log[22m() is within this range (inclusive) the message gets logged to this destina- tion, otherwise not. Either of the min and max valued may be omitted, in this case min is assumed to be zero, and max is assumed to be infinity. If you don't include a dash, both min and max gets set to the specified value. If no range is specified, all messages gets logged. -EEXXAAMMPPLLEESS +[1mEXAMPLES[0m [logging] kdc = 0/FILE:/var/log/kdc.log kdc = 1-/SYSLOG:INFO:USER default = STDERR - This will log all messages from the kkddcc program with level 0 to - _/_v_a_r_/_l_o_g_/_k_d_c_._l_o_g, other messages will be logged to syslog with priority + This will log all messages from the [1mkdc [22mprogram with level 0 to + [4m/var/log/kdc.log[24m, other messages will be logged to syslog with priority LOG_INFO, and facility LOG_USER. All other programs will log all mes- sages to their stderr. -SSEEEE AALLSSOO +[1mSEE ALSO[0m syslog(3), krb5.conf(5) -BBUUGGSS - These functions use aasspprriinnttff() to format the message. If your operating - system does not have a working aasspprriinnttff(), a replacement will be used. At +[1mBUGS[0m + These functions use [1masprintf[22m() to format the message. If your operating + system does not have a working [1masprintf[22m(), a replacement will be used. At present this replacement does not handle some correct conversion specifi- cations (like floating point numbers). Until this is fixed, the use of these conversions should be avoided. If logging is done to the syslog facility, these functions might not be - thread-safe, depending on the implementation of ooppeennlloogg(), and ssyysslloogg(). + thread-safe, depending on the implementation of [1mopenlog[22m(), and [1msyslog[22m(). HEIMDAL August 6, 1997 HEIMDAL diff --git a/lib/krb5/krb5_parse_name.cat3 b/lib/krb5/krb5_parse_name.cat3 index f142b9e1f824..5799ef31bfee 100644 --- a/lib/krb5/krb5_parse_name.cat3 +++ b/lib/krb5/krb5_parse_name.cat3 @@ -1,30 +1,29 @@ - KRB5_PARSE_NAME(3) BSD Library Functions Manual KRB5_PARSE_NAME(3) -NNAAMMEE - kkrrbb55__ppaarrssee__nnaammee -- string to principal conversion +[1mNAME[0m + [1mkrb5_parse_name [22m-- string to principal conversion -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ppaarrssee__nnaammee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _c_h_a_r _*_n_a_m_e, - _k_r_b_5___p_r_i_n_c_i_p_a_l _*_p_r_i_n_c_i_p_a_l); + [4mkrb5_error_code[0m + [1mkrb5_parse_name[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mchar[24m [4m*name[24m, + [4mkrb5_principal[24m [4m*principal[24m); -DDEESSCCRRIIPPTTIIOONN - kkrrbb55__ppaarrssee__nnaammee() converts a string representation of a principal name to - kkrrbb55__pprriinncciippaall. The _p_r_i_n_c_i_p_a_l will point to allocated data that should - be freed with kkrrbb55__ffrreeee__pprriinncciippaall(). +[1mDESCRIPTION[0m + [1mkrb5_parse_name[22m() converts a string representation of a principal name to + [1mkrb5_principal[22m. The [4mprincipal[24m will point to allocated data that should + be freed with [1mkrb5_free_principal[22m(). The string should consist of one or more name components separated with - slashes (``/''), optionally followed with an ``@'' and a realm name. A - slash or @ may be contained in a name component by quoting it with a - backslash (``\''). A realm should not contain slashes or colons. + slashes ("/"), optionally followed with an "@" and a realm name. A slash + or @ may be contained in a name component by quoting it with a backslash + ("\"). A realm should not contain slashes or colons. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5_build_principal(3), krb5_free_principal(3), krb5_sname_to_principal(3), krb5_unparse_name(3) diff --git a/lib/krb5/krb5_principal.cat3 b/lib/krb5/krb5_principal.cat3 index 98f7aa30f849..5488ad9dfb83 100644 --- a/lib/krb5/krb5_principal.cat3 +++ b/lib/krb5/krb5_principal.cat3 @@ -1,140 +1,139 @@ - KRB5_PRINCIPAL(3) BSD Library Functions Manual KRB5_PRINCIPAL(3) -NNAAMMEE - kkrrbb55__ggeett__ddeeffaauulltt__pprriinncciippaall, kkrrbb55__pprriinncciippaall, kkrrbb55__bbuuiilldd__pprriinncciippaall, - kkrrbb55__bbuuiilldd__pprriinncciippaall__eexxtt, kkrrbb55__bbuuiilldd__pprriinncciippaall__vvaa, - kkrrbb55__bbuuiilldd__pprriinncciippaall__vvaa__eexxtt, kkrrbb55__ccooppyy__pprriinncciippaall, kkrrbb55__ffrreeee__pprriinncciippaall, - kkrrbb55__mmaakkee__pprriinncciippaall, kkrrbb55__ppaarrssee__nnaammee, kkrrbb55__ppaarrssee__nnaammee__ffllaaggss, - kkrrbb55__ppaarrssee__nnaammeettyyppee, kkrrbb55__pprriinncc__sseett__rreeaallmm, kkrrbb55__pprriinncciippaall__ccoommppaarree, - kkrrbb55__pprriinncciippaall__ccoommppaarree__aannyy__rreeaallmm, kkrrbb55__pprriinncciippaall__ggeett__ccoommpp__ssttrriinngg, - kkrrbb55__pprriinncciippaall__ggeett__rreeaallmm, kkrrbb55__pprriinncciippaall__ggeett__ttyyppee, kkrrbb55__pprriinncciippaall__mmaattcchh, - kkrrbb55__pprriinncciippaall__sseett__ttyyppee, kkrrbb55__rreeaallmm__ccoommppaarree, kkrrbb55__ssnnaammee__ttoo__pprriinncciippaall, - kkrrbb55__ssoocckk__ttoo__pprriinncciippaall, kkrrbb55__uunnppaarrssee__nnaammee, kkrrbb55__uunnppaarrssee__nnaammee__ffllaaggss, - kkrrbb55__uunnppaarrssee__nnaammee__ffiixxeedd, kkrrbb55__uunnppaarrssee__nnaammee__ffiixxeedd__ffllaaggss, - kkrrbb55__uunnppaarrssee__nnaammee__ffiixxeedd__sshhoorrtt, kkrrbb55__uunnppaarrssee__nnaammee__sshhoorrtt -- Kerberos 5 +[1mNAME[0m + [1mkrb5_get_default_principal[22m, [1mkrb5_principal[22m, [1mkrb5_build_principal[22m, + [1mkrb5_build_principal_ext[22m, [1mkrb5_build_principal_va[22m, + [1mkrb5_build_principal_va_ext[22m, [1mkrb5_copy_principal[22m, [1mkrb5_free_principal[22m, + [1mkrb5_make_principal[22m, [1mkrb5_parse_name[22m, [1mkrb5_parse_name_flags[22m, + [1mkrb5_parse_nametype[22m, [1mkrb5_princ_set_realm[22m, [1mkrb5_principal_compare[22m, + [1mkrb5_principal_compare_any_realm[22m, [1mkrb5_principal_get_comp_string[22m, + [1mkrb5_principal_get_realm[22m, [1mkrb5_principal_get_type[22m, [1mkrb5_principal_match[22m, + [1mkrb5_principal_set_type[22m, [1mkrb5_realm_compare[22m, [1mkrb5_sname_to_principal[22m, + [1mkrb5_sock_to_principal[22m, [1mkrb5_unparse_name[22m, [1mkrb5_unparse_name_flags[22m, + [1mkrb5_unparse_name_fixed[22m, [1mkrb5_unparse_name_fixed_flags[22m, + [1mkrb5_unparse_name_fixed_short[22m, [1mkrb5_unparse_name_short [22m-- Kerberos 5 principal handling functions -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m krb5_principal; - _v_o_i_d - kkrrbb55__ffrreeee__pprriinncciippaall(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l); + [4mvoid[0m + [1mkrb5_free_principal[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_principal[24m [4mprincipal[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ppaarrssee__nnaammee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _c_h_a_r _*_n_a_m_e, - _k_r_b_5___p_r_i_n_c_i_p_a_l _*_p_r_i_n_c_i_p_a_l); + [4mkrb5_error_code[0m + [1mkrb5_parse_name[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mchar[24m [4m*name[24m, + [4mkrb5_principal[24m [4m*principal[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ppaarrssee__nnaammee__ffllaaggss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _c_h_a_r _*_n_a_m_e, _i_n_t _f_l_a_g_s, - _k_r_b_5___p_r_i_n_c_i_p_a_l _*_p_r_i_n_c_i_p_a_l); + [4mkrb5_error_code[0m + [1mkrb5_parse_name_flags[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mchar[24m [4m*name[24m, [4mint[24m [4mflags[24m, + [4mkrb5_principal[24m [4m*principal[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__uunnppaarrssee__nnaammee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l, - _c_h_a_r _*_*_n_a_m_e); + [4mkrb5_error_code[0m + [1mkrb5_unparse_name[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_const_principal[24m [4mprincipal[24m, + [4mchar[24m [4m**name[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__uunnppaarrssee__nnaammee__ffllaaggss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l, _i_n_t _f_l_a_g_s, _c_h_a_r _*_*_n_a_m_e); + [4mkrb5_error_code[0m + [1mkrb5_unparse_name_flags[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_const_principal[24m [4mprincipal[24m, [4mint[24m [4mflags[24m, [4mchar[24m [4m**name[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__uunnppaarrssee__nnaammee__ffiixxeedd(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l, _c_h_a_r _*_n_a_m_e, _s_i_z_e___t _l_e_n); + [4mkrb5_error_code[0m + [1mkrb5_unparse_name_fixed[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_const_principal[24m [4mprincipal[24m, [4mchar[24m [4m*name[24m, [4msize_t[24m [4mlen[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__uunnppaarrssee__nnaammee__ffiixxeedd__ffllaaggss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l, _i_n_t _f_l_a_g_s, _c_h_a_r _*_n_a_m_e, _s_i_z_e___t _l_e_n); + [4mkrb5_error_code[0m + [1mkrb5_unparse_name_fixed_flags[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_const_principal[24m [4mprincipal[24m, [4mint[24m [4mflags[24m, [4mchar[24m [4m*name[24m, [4msize_t[24m [4mlen[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__uunnppaarrssee__nnaammee__sshhoorrtt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l, _c_h_a_r _*_*_n_a_m_e); + [4mkrb5_error_code[0m + [1mkrb5_unparse_name_short[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_const_principal[24m [4mprincipal[24m, [4mchar[24m [4m**name[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__uunnppaarrssee__nnaammee__ffiixxeedd__sshhoorrtt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l, _c_h_a_r _*_n_a_m_e, _s_i_z_e___t _l_e_n); + [4mkrb5_error_code[0m + [1mkrb5_unparse_name_fixed_short[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_const_principal[24m [4mprincipal[24m, [4mchar[24m [4m*name[24m, [4msize_t[24m [4mlen[24m); - _v_o_i_d - kkrrbb55__pprriinncc__sseett__rreeaallmm(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l, - _k_r_b_5___r_e_a_l_m _*_r_e_a_l_m); + [4mvoid[0m + [1mkrb5_princ_set_realm[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_principal[24m [4mprincipal[24m, + [4mkrb5_realm[24m [4m*realm[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__bbuuiilldd__pprriinncciippaall(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___p_r_i_n_c_i_p_a_l _*_p_r_i_n_c_i_p_a_l, - _i_n_t _r_l_e_n, _k_r_b_5___c_o_n_s_t___r_e_a_l_m _r_e_a_l_m, _._._.); + [4mkrb5_error_code[0m + [1mkrb5_build_principal[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_principal[24m [4m*principal[24m, + [4mint[24m [4mrlen[24m, [4mkrb5_const_realm[24m [4mrealm[24m, [4m...[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__bbuuiilldd__pprriinncciippaall__vvaa(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___p_r_i_n_c_i_p_a_l _*_p_r_i_n_c_i_p_a_l, - _i_n_t _r_l_e_n, _k_r_b_5___c_o_n_s_t___r_e_a_l_m _r_e_a_l_m, _v_a___l_i_s_t _a_p); + [4mkrb5_error_code[0m + [1mkrb5_build_principal_va[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_principal[24m [4m*principal[24m, + [4mint[24m [4mrlen[24m, [4mkrb5_const_realm[24m [4mrealm[24m, [4mva_list[24m [4map[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__bbuuiilldd__pprriinncciippaall__eexxtt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___p_r_i_n_c_i_p_a_l _*_p_r_i_n_c_i_p_a_l, - _i_n_t _r_l_e_n, _k_r_b_5___c_o_n_s_t___r_e_a_l_m _r_e_a_l_m, _._._.); + [4mkrb5_error_code[0m + [1mkrb5_build_principal_ext[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_principal[24m [4m*principal[24m, + [4mint[24m [4mrlen[24m, [4mkrb5_const_realm[24m [4mrealm[24m, [4m...[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__bbuuiilldd__pprriinncciippaall__vvaa__eexxtt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___p_r_i_n_c_i_p_a_l _*_p_r_i_n_c_i_p_a_l, _i_n_t _r_l_e_n, _k_r_b_5___c_o_n_s_t___r_e_a_l_m _r_e_a_l_m, - _v_a___l_i_s_t _a_p); + [4mkrb5_error_code[0m + [1mkrb5_build_principal_va_ext[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_principal[24m [4m*principal[24m, [4mint[24m [4mrlen[24m, [4mkrb5_const_realm[24m [4mrealm[24m, + [4mva_list[24m [4map[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__mmaakkee__pprriinncciippaall(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___p_r_i_n_c_i_p_a_l _*_p_r_i_n_c_i_p_a_l, - _k_r_b_5___c_o_n_s_t___r_e_a_l_m _r_e_a_l_m, _._._.); + [4mkrb5_error_code[0m + [1mkrb5_make_principal[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_principal[24m [4m*principal[24m, + [4mkrb5_const_realm[24m [4mrealm[24m, [4m...[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ccooppyy__pprriinncciippaall(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _i_n_p_r_i_n_c, - _k_r_b_5___p_r_i_n_c_i_p_a_l _*_o_u_t_p_r_i_n_c); + [4mkrb5_error_code[0m + [1mkrb5_copy_principal[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_const_principal[24m [4minprinc[24m, + [4mkrb5_principal[24m [4m*outprinc[24m); - _k_r_b_5___b_o_o_l_e_a_n - kkrrbb55__pprriinncciippaall__ccoommppaarree(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _p_r_i_n_c_1, - _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _p_r_i_n_c_2); + [4mkrb5_boolean[0m + [1mkrb5_principal_compare[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_const_principal[24m [4mprinc1[24m, + [4mkrb5_const_principal[24m [4mprinc2[24m); - _k_r_b_5___b_o_o_l_e_a_n - kkrrbb55__pprriinncciippaall__ccoommppaarree__aannyy__rreeaallmm(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _p_r_i_n_c_1, _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _p_r_i_n_c_2); + [4mkrb5_boolean[0m + [1mkrb5_principal_compare_any_realm[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_const_principal[24m [4mprinc1[24m, [4mkrb5_const_principal[24m [4mprinc2[24m); - _c_o_n_s_t _c_h_a_r _* - kkrrbb55__pprriinncciippaall__ggeett__ccoommpp__ssttrriinngg(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l, _u_n_s_i_g_n_e_d _i_n_t _c_o_m_p_o_n_e_n_t); + [4mconst[24m [4mchar[24m [4m*[0m + [1mkrb5_principal_get_comp_string[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_const_principal[24m [4mprincipal[24m, [4munsigned[24m [4mint[24m [4mcomponent[24m); - _c_o_n_s_t _c_h_a_r _* - kkrrbb55__pprriinncciippaall__ggeett__rreeaallmm(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l); + [4mconst[24m [4mchar[24m [4m*[0m + [1mkrb5_principal_get_realm[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_const_principal[24m [4mprincipal[24m); - _i_n_t - kkrrbb55__pprriinncciippaall__ggeett__ttyyppee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l); + [4mint[0m + [1mkrb5_principal_get_type[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_const_principal[24m [4mprincipal[24m); - _k_r_b_5___b_o_o_l_e_a_n - kkrrbb55__pprriinncciippaall__mmaattcchh(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l, _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _p_a_t_t_e_r_n); + [4mkrb5_boolean[0m + [1mkrb5_principal_match[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_const_principal[24m [4mprincipal[24m, [4mkrb5_const_principal[24m [4mpattern[24m); - _v_o_i_d - kkrrbb55__pprriinncciippaall__sseett__ttyyppee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l, - _i_n_t _t_y_p_e); + [4mvoid[0m + [1mkrb5_principal_set_type[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_principal[24m [4mprincipal[24m, + [4mint[24m [4mtype[24m); - _k_r_b_5___b_o_o_l_e_a_n - kkrrbb55__rreeaallmm__ccoommppaarree(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _p_r_i_n_c_1, - _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _p_r_i_n_c_2); + [4mkrb5_boolean[0m + [1mkrb5_realm_compare[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_const_principal[24m [4mprinc1[24m, + [4mkrb5_const_principal[24m [4mprinc2[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ssnnaammee__ttoo__pprriinncciippaall(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _c_h_a_r _*_h_o_s_t_n_a_m_e, - _c_o_n_s_t _c_h_a_r _*_s_n_a_m_e, _i_n_t_3_2___t _t_y_p_e, _k_r_b_5___p_r_i_n_c_i_p_a_l _*_r_e_t___p_r_i_n_c); + [4mkrb5_error_code[0m + [1mkrb5_sname_to_principal[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mchar[24m [4m*hostname[24m, + [4mconst[24m [4mchar[24m [4m*sname[24m, [4mint32_t[24m [4mtype[24m, [4mkrb5_principal[24m [4m*ret_princ[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ssoocckk__ttoo__pprriinncciippaall(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _i_n_t _s_o_c_k_e_t, - _c_o_n_s_t _c_h_a_r _*_s_n_a_m_e, _i_n_t_3_2___t _t_y_p_e, _k_r_b_5___p_r_i_n_c_i_p_a_l _*_p_r_i_n_c_i_p_a_l); + [4mkrb5_error_code[0m + [1mkrb5_sock_to_principal[22m([4mkrb5_context[24m [4mcontext[24m, [4mint[24m [4msocket[24m, + [4mconst[24m [4mchar[24m [4m*sname[24m, [4mint32_t[24m [4mtype[24m, [4mkrb5_principal[24m [4m*principal[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__ddeeffaauulltt__pprriinncciippaall(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___p_r_i_n_c_i_p_a_l _*_p_r_i_n_c); + [4mkrb5_error_code[0m + [1mkrb5_get_default_principal[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_principal[24m [4m*princ[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ppaarrssee__nnaammeettyyppee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _c_h_a_r _*_s_t_r, - _i_n_t_3_2___t _*_t_y_p_e); + [4mkrb5_error_code[0m + [1mkrb5_parse_nametype[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mchar[24m [4m*str[24m, + [4mint32_t[24m [4m*type[24m); -DDEESSCCRRIIPPTTIIOONN +[1mDESCRIPTION[0m krb5_principal holds the name of a user or service in Kerberos. A principal has two parts, a PrincipalName and a realm. The Principal- @@ -142,21 +141,21 @@ DDEESSCCRRIIPPTTIIOONN are separated by /. The PrincipalName also has a name-type. Examples of a principal are nisse/root@EXAMPLE.COM and - host/datan.kth.se@KTH.SE. kkrrbb55__ppaarrssee__nnaammee() and kkrrbb55__ppaarrssee__nnaammee__ffllaaggss() - passes a principal name in _n_a_m_e to the kerberos principal structure. - kkrrbb55__ppaarrssee__nnaammee__ffllaaggss() takes an extra _f_l_a_g_s argument the following flags + host/datan.kth.se@KTH.SE. [1mkrb5_parse_name[22m() and [1mkrb5_parse_name_flags[22m() + passes a principal name in [4mname[24m to the kerberos principal structure. + [1mkrb5_parse_name_flags[22m() takes an extra [4mflags[24m argument the following flags can be passed in KRB5_PRINCIPAL_PARSE_NO_REALM requires the input string to be without a realm, and no realm is - stored in the _p_r_i_n_c_i_p_a_l return argument. + stored in the [4mprincipal[24m return argument. KRB5_PRINCIPAL_PARSE_REQUIRE_REALM requires the input string to with a realm. - kkrrbb55__uunnppaarrssee__nnaammee() and kkrrbb55__uunnppaarrssee__nnaammee__ffllaaggss() prints the principal - _p_r_i_n_c to the string _n_a_m_e. _n_a_m_e should be freed with free(3). To the - _f_l_a_g_s argument the following flags can be passed in + [1mkrb5_unparse_name[22m() and [1mkrb5_unparse_name_flags[22m() prints the principal + [4mprinc[24m to the string [4mname[24m. [4mname[24m should be freed with free(3). To the + [4mflags[24m argument the following flags can be passed in KRB5_PRINCIPAL_UNPARSE_SHORT no realm if the realm is one of the local realms. @@ -166,55 +165,55 @@ DDEESSCCRRIIPPTTIIOONN KRB5_PRINCIPAL_UNPARSE_DISPLAY don't quote - On failure _n_a_m_e is set to NULL. kkrrbb55__uunnppaarrssee__nnaammee__ffiixxeedd() and - kkrrbb55__uunnppaarrssee__nnaammee__ffiixxeedd__ffllaaggss() behaves just like kkrrbb55__uunnppaarrssee(), but - instead unparses the principal into a fixed size buffer. + On failure [4mname[24m is set to NULL. [1mkrb5_unparse_name_fixed[22m() and + [1mkrb5_unparse_name_fixed_flags[22m() behaves just like [1mkrb5_unparse[22m(), but in- + stead unparses the principal into a fixed size buffer. - kkrrbb55__uunnppaarrssee__nnaammee__sshhoorrtt() just returns the principal without the realm if + [1mkrb5_unparse_name_short[22m() just returns the principal without the realm if the principal is in the default realm. If the principal isn't, the full - name is returned. kkrrbb55__uunnppaarrssee__nnaammee__ffiixxeedd__sshhoorrtt() works just like - kkrrbb55__uunnppaarrssee__nnaammee__sshhoorrtt() but on a fixed size buffer. + name is returned. [1mkrb5_unparse_name_fixed_short[22m() works just like + [1mkrb5_unparse_name_short[22m() but on a fixed size buffer. - kkrrbb55__bbuuiilldd__pprriinncciippaall() builds a principal from the realm _r_e_a_l_m that has - the length _r_l_e_n. The following arguments form the components of the + [1mkrb5_build_principal[22m() builds a principal from the realm [4mrealm[24m that has + the length [4mrlen[24m. The following arguments form the components of the principal. The list of components is terminated with NULL. - kkrrbb55__bbuuiilldd__pprriinncciippaall__vvaa() works like kkrrbb55__bbuuiilldd__pprriinncciippaall() using vargs. + [1mkrb5_build_principal_va[22m() works like [1mkrb5_build_principal[22m() using vargs. - kkrrbb55__bbuuiilldd__pprriinncciippaall__eexxtt() and kkrrbb55__bbuuiilldd__pprriinncciippaall__vvaa__eexxtt() take a list + [1mkrb5_build_principal_ext[22m() and [1mkrb5_build_principal_va_ext[22m() take a list of length-value pairs, the list is terminated with a zero length. - kkrrbb55__mmaakkee__pprriinncciippaall() works the same way as kkrrbb55__bbuuiilldd__pprriinncciippaall(), - except it figures out the length of the realm itself. + [1mkrb5_make_principal[22m() works the same way as [1mkrb5_build_principal[22m(), ex- + cept it figures out the length of the realm itself. - kkrrbb55__ccooppyy__pprriinncciippaall() makes a copy of a principal. The copy needs to be - freed with kkrrbb55__ffrreeee__pprriinncciippaall(). + [1mkrb5_copy_principal[22m() makes a copy of a principal. The copy needs to be + freed with [1mkrb5_free_principal[22m(). - kkrrbb55__pprriinncciippaall__ccoommppaarree() compares the two principals, including realm of + [1mkrb5_principal_compare[22m() compares the two principals, including realm of the principals and returns TRUE if they are the same and FALSE if not. - kkrrbb55__pprriinncciippaall__ccoommppaarree__aannyy__rreeaallmm() works the same way as - kkrrbb55__pprriinncciippaall__ccoommppaarree() but doesn't compare the realm component of the + [1mkrb5_principal_compare_any_realm[22m() works the same way as + [1mkrb5_principal_compare[22m() but doesn't compare the realm component of the principal. - kkrrbb55__rreeaallmm__ccoommppaarree() compares the realms of the two principals and - returns TRUE is they are the same, and FALSE if not. + [1mkrb5_realm_compare[22m() compares the realms of the two principals and re- + turns TRUE is they are the same, and FALSE if not. - kkrrbb55__pprriinncciippaall__mmaattcchh() matches a _p_r_i_n_c_i_p_a_l against a _p_a_t_t_e_r_n. The pat- + [1mkrb5_principal_match[22m() matches a [4mprincipal[24m against a [4mpattern[24m. The pat- tern is a globbing expression, where each component (separated by /) is matched against the corresponding component of the principal. - The kkrrbb55__pprriinncciippaall__ggeett__rreeaallmm() and kkrrbb55__pprriinncciippaall__ggeett__ccoommpp__ssttrriinngg() func- - tions return parts of the _p_r_i_n_c_i_p_a_l, either the realm or a specific com- + The [1mkrb5_principal_get_realm[22m() and [1mkrb5_principal_get_comp_string[22m() func- + tions return parts of the [4mprincipal[24m, either the realm or a specific com- ponent. Both functions return string pointers to data inside the princi- pal, so they are valid only as long as the principal exists. - The _c_o_m_p_o_n_e_n_t argument to kkrrbb55__pprriinncciippaall__ggeett__ccoommpp__ssttrriinngg() is the index + The [4mcomponent[24m argument to [1mkrb5_principal_get_comp_string[22m() is the index of the component to return, from zero to the total number of components minus one. If the index is out of range NULL is returned. - kkrrbb55__pprriinncciippaall__ggeett__rreeaallmm() and kkrrbb55__pprriinncciippaall__ggeett__ccoommpp__ssttrriinngg() are - replacements for kkrrbb55__pprriinncc__ccoommppoonneenntt() and related macros, described as + [1mkrb5_principal_get_realm[22m() and [1mkrb5_principal_get_comp_string[22m() are re- + placements for [1mkrb5_princ_component[22m() and related macros, described as internal in the MIT API specification. Unlike the macros, these func- tions return strings, not krb5_data. A reason to return krb5_data was that it was believed that principal components could contain binary data, @@ -223,36 +222,36 @@ DDEESSCCRRIIPPTTIIOONN It's generally not necessary to look at the components of a principal. - kkrrbb55__pprriinncciippaall__ggeett__ttyyppee() and kkrrbb55__pprriinncciippaall__sseett__ttyyppee() get and sets the + [1mkrb5_principal_get_type[22m() and [1mkrb5_principal_set_type[22m() get and sets the name type for a principal. Name type handling is tricky and not often needed, don't use this unless you know what you do. - kkrrbb55__ssnnaammee__ttoo__pprriinncciippaall() and kkrrbb55__ssoocckk__ttoo__pprriinncciippaall() are for easy cre- - ation of ``service'' principals that can, for instance, be used to lookup - a key in a keytab. For both functions the _s_n_a_m_e parameter will be used - for the first component of the created principal. If _s_n_a_m_e is NULL, - ``host'' will be used instead. + [1mkrb5_sname_to_principal[22m() and [1mkrb5_sock_to_principal[22m() are for easy cre- + ation of "service" principals that can, for instance, be used to lookup a + key in a keytab. For both functions the [4msname[24m parameter will be used for + the first component of the created principal. If [4msname[24m is NULL, "host" + will be used instead. - kkrrbb55__ssnnaammee__ttoo__pprriinncciippaall() will use the passed _h_o_s_t_n_a_m_e for the second - component. If _t_y_p_e is KRB5_NT_SRV_HST this name will be looked up with - ggeetthhoossttbbyynnaammee(). If _h_o_s_t_n_a_m_e is NULL, the local hostname will be used. + [1mkrb5_sname_to_principal[22m() will use the passed [4mhostname[24m for the second + component. If [4mtype[24m is KRB5_NT_SRV_HST this name will be looked up with + [1mgethostbyname[22m(). If [4mhostname[24m is NULL, the local hostname will be used. - kkrrbb55__ssoocckk__ttoo__pprriinncciippaall() will use the ``sockname'' of the passed _s_o_c_k_e_t, + [1mkrb5_sock_to_principal[22m() will use the "sockname" of the passed [4msocket[24m, which should be a bound AF_INET or AF_INET6 socket. There must be a map- - ping between the address and ``sockname''. The function may try to - resolve the name in DNS. + ping between the address and "sockname". The function may try to resolve + the name in DNS. - kkrrbb55__ggeett__ddeeffaauulltt__pprriinncciippaall() tries to find out what's a reasonable - default principal by looking at the environment it is running in. + [1mkrb5_get_default_principal[22m() tries to find out what's a reasonable de- + fault principal by looking at the environment it is running in. - kkrrbb55__ppaarrssee__nnaammeettyyppee() parses and returns the name type integer value in - _t_y_p_e. On failure the function returns an error code and set the error + [1mkrb5_parse_nametype[22m() parses and returns the name type integer value in + [4mtype[24m. On failure the function returns an error code and set the error string. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5_config(3), krb5.conf(5) -BBUUGGSS +[1mBUGS[0m You can not have a NUL in a component in some of the variable argument functions above. Until someone can give a good example of where it would be a good idea to have NUL's in a component, this will not be fixed. diff --git a/lib/krb5/krb5_rcache.cat3 b/lib/krb5/krb5_rcache.cat3 index 84631967a1fa..e16ad25e6b45 100644 --- a/lib/krb5/krb5_rcache.cat3 +++ b/lib/krb5/krb5_rcache.cat3 @@ -1,84 +1,83 @@ - KRB5_RCACHE(3) BSD Library Functions Manual KRB5_RCACHE(3) -NNAAMMEE - kkrrbb55__rrccaacchhee, kkrrbb55__rrcc__cclloossee, kkrrbb55__rrcc__ddeeffaauulltt, kkrrbb55__rrcc__ddeeffaauulltt__nnaammee, - kkrrbb55__rrcc__ddeeffaauulltt__ttyyppee, kkrrbb55__rrcc__ddeessttrrooyy, kkrrbb55__rrcc__eexxppuunnggee, - kkrrbb55__rrcc__ggeett__lliiffeessppaann, kkrrbb55__rrcc__ggeett__nnaammee, kkrrbb55__rrcc__ggeett__ttyyppee, - kkrrbb55__rrcc__iinniittiiaalliizzee, kkrrbb55__rrcc__rreeccoovveerr, kkrrbb55__rrcc__rreessoollvvee, - kkrrbb55__rrcc__rreessoollvvee__ffuullll, kkrrbb55__rrcc__rreessoollvvee__ttyyppee, kkrrbb55__rrcc__ssttoorree, - kkrrbb55__ggeett__sseerrvveerr__rrccaacchhee -- Kerberos 5 replay cache +[1mNAME[0m + [1mkrb5_rcache[22m, [1mkrb5_rc_close[22m, [1mkrb5_rc_default[22m, [1mkrb5_rc_default_name[22m, + [1mkrb5_rc_default_type[22m, [1mkrb5_rc_destroy[22m, [1mkrb5_rc_expunge[22m, + [1mkrb5_rc_get_lifespan[22m, [1mkrb5_rc_get_name[22m, [1mkrb5_rc_get_type[22m, + [1mkrb5_rc_initialize[22m, [1mkrb5_rc_recover[22m, [1mkrb5_rc_resolve[22m, + [1mkrb5_rc_resolve_full[22m, [1mkrb5_rc_resolve_type[22m, [1mkrb5_rc_store[22m, + [1mkrb5_get_server_rcache [22m-- Kerberos 5 replay cache -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m struct krb5_rcache; - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__rrcc__cclloossee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___r_c_a_c_h_e _i_d); + [4mkrb5_error_code[0m + [1mkrb5_rc_close[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_rcache[24m [4mid[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__rrcc__ddeeffaauulltt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___r_c_a_c_h_e _*_i_d); + [4mkrb5_error_code[0m + [1mkrb5_rc_default[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_rcache[24m [4m*id[24m); - _c_o_n_s_t _c_h_a_r _* - kkrrbb55__rrcc__ddeeffaauulltt__nnaammee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t); + [4mconst[24m [4mchar[24m [4m*[0m + [1mkrb5_rc_default_name[22m([4mkrb5_context[24m [4mcontext[24m); - _c_o_n_s_t _c_h_a_r _* - kkrrbb55__rrcc__ddeeffaauulltt__ttyyppee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t); + [4mconst[24m [4mchar[24m [4m*[0m + [1mkrb5_rc_default_type[22m([4mkrb5_context[24m [4mcontext[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__rrcc__ddeessttrrooyy(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___r_c_a_c_h_e _i_d); + [4mkrb5_error_code[0m + [1mkrb5_rc_destroy[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_rcache[24m [4mid[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__rrcc__eexxppuunnggee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___r_c_a_c_h_e _i_d); + [4mkrb5_error_code[0m + [1mkrb5_rc_expunge[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_rcache[24m [4mid[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__rrcc__ggeett__lliiffeessppaann(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___r_c_a_c_h_e _i_d, - _k_r_b_5___d_e_l_t_a_t _*_a_u_t_h___l_i_f_e_s_p_a_n); + [4mkrb5_error_code[0m + [1mkrb5_rc_get_lifespan[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_rcache[24m [4mid[24m, + [4mkrb5_deltat[24m [4m*auth_lifespan[24m); - _c_o_n_s_t _c_h_a_r_* - kkrrbb55__rrcc__ggeett__nnaammee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___r_c_a_c_h_e _i_d); + [4mconst[24m [4mchar*[0m + [1mkrb5_rc_get_name[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_rcache[24m [4mid[24m); - _c_o_n_s_t _c_h_a_r_* - kkrrbb55__rrcc__ggeett__ttyyppee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___r_c_a_c_h_e _i_d); + [4mconst[24m [4mchar*[0m + [1mkrb5_rc_get_type[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_rcache[24m [4mid[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__rrcc__iinniittiiaalliizzee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___r_c_a_c_h_e _i_d, - _k_r_b_5___d_e_l_t_a_t _a_u_t_h___l_i_f_e_s_p_a_n); + [4mkrb5_error_code[0m + [1mkrb5_rc_initialize[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_rcache[24m [4mid[24m, + [4mkrb5_deltat[24m [4mauth_lifespan[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__rrcc__rreeccoovveerr(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___r_c_a_c_h_e _i_d); + [4mkrb5_error_code[0m + [1mkrb5_rc_recover[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_rcache[24m [4mid[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__rrcc__rreessoollvvee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___r_c_a_c_h_e _i_d, _c_o_n_s_t _c_h_a_r _*_n_a_m_e); + [4mkrb5_error_code[0m + [1mkrb5_rc_resolve[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_rcache[24m [4mid[24m, [4mconst[24m [4mchar[24m [4m*name[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__rrcc__rreessoollvvee__ffuullll(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___r_c_a_c_h_e _*_i_d, - _c_o_n_s_t _c_h_a_r _*_s_t_r_i_n_g___n_a_m_e); + [4mkrb5_error_code[0m + [1mkrb5_rc_resolve_full[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_rcache[24m [4m*id[24m, + [4mconst[24m [4mchar[24m [4m*string_name[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__rrcc__rreessoollvvee__ttyyppee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___r_c_a_c_h_e _*_i_d, - _c_o_n_s_t _c_h_a_r _*_t_y_p_e); + [4mkrb5_error_code[0m + [1mkrb5_rc_resolve_type[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_rcache[24m [4m*id[24m, + [4mconst[24m [4mchar[24m [4m*type[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__rrcc__ssttoorree(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___r_c_a_c_h_e _i_d, - _k_r_b_5___d_o_n_o_t___r_e_p_l_a_y _*_r_e_p); + [4mkrb5_error_code[0m + [1mkrb5_rc_store[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_rcache[24m [4mid[24m, + [4mkrb5_donot_replay[24m [4m*rep[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__sseerrvveerr__rrccaacchhee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _k_r_b_5___d_a_t_a _*_p_i_e_c_e, - _k_r_b_5___r_c_a_c_h_e _*_i_d); + [4mkrb5_error_code[0m + [1mkrb5_get_server_rcache[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mkrb5_data[24m [4m*piece[24m, + [4mkrb5_rcache[24m [4m*id[24m); -DDEESSCCRRIIPPTTIIOONN +[1mDESCRIPTION[0m The krb5_rcache structure holds a storage element that is used for data manipulation. The structure contains no public accessible elements. - kkrrbb55__rrcc__iinniittiiaalliizzee() Creates the reply cache _i_d and sets it lifespan to - _a_u_t_h___l_i_f_e_s_p_a_n. If the cache already exists, the content is destroyed. + [1mkrb5_rc_initialize[22m() Creates the reply cache [4mid[24m and sets it lifespan to + [4mauth_lifespan[24m. If the cache already exists, the content is destroyed. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3), krb5_data(3), kerberos(8) HEIMDAL May 1, 2006 HEIMDAL diff --git a/lib/krb5/krb5_rd_error.cat3 b/lib/krb5/krb5_rd_error.cat3 index 5b64c3daf2b5..a64ad0a172ef 100644 --- a/lib/krb5/krb5_rd_error.cat3 +++ b/lib/krb5/krb5_rd_error.cat3 @@ -1,52 +1,51 @@ - KRB5_RD_ERROR(3) BSD Library Functions Manual KRB5_RD_ERROR(3) -NNAAMMEE - kkrrbb55__rrdd__eerrrroorr, kkrrbb55__ffrreeee__eerrrroorr, kkrrbb55__ffrreeee__eerrrroorr__ccoonntteennttss, - kkrrbb55__eerrrroorr__ffrroomm__rrdd__eerrrroorr -- parse, free and read error from KRB-ERROR +[1mNAME[0m + [1mkrb5_rd_error[22m, [1mkrb5_free_error[22m, [1mkrb5_free_error_contents[22m, + [1mkrb5_error_from_rd_error [22m-- parse, free and read error from KRB-ERROR message -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__rrdd__eerrrroorr(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _k_r_b_5___d_a_t_a _*_m_s_g, - _K_R_B___E_R_R_O_R _*_r_e_s_u_l_t); + [4mkrb5_error_code[0m + [1mkrb5_rd_error[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mkrb5_data[24m [4m*msg[24m, + [4mKRB_ERROR[24m [4m*result[24m); - _v_o_i_d - kkrrbb55__ffrreeee__eerrrroorr(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___e_r_r_o_r _*_e_r_r_o_r); + [4mvoid[0m + [1mkrb5_free_error[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_error[24m [4m*error[24m); - _v_o_i_d - kkrrbb55__ffrreeee__eerrrroorr__ccoonntteennttss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___e_r_r_o_r _*_e_r_r_o_r); + [4mvoid[0m + [1mkrb5_free_error_contents[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_error[24m [4m*error[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__eerrrroorr__ffrroomm__rrdd__eerrrroorr(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _k_r_b_5___e_r_r_o_r _*_e_r_r_o_r, - _c_o_n_s_t _k_r_b_5___c_r_e_d_s _*_c_r_e_d_s); + [4mkrb5_error_code[0m + [1mkrb5_error_from_rd_error[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mkrb5_error[24m [4m*error[24m, + [4mconst[24m [4mkrb5_creds[24m [4m*creds[24m); -DDEESSCCRRIIPPTTIIOONN +[1mDESCRIPTION[0m Usually applications never needs to parse and understand Kerberos error messages since higher level functions will parse and push up the error in the krb5_context. These functions are described for completeness. - kkrrbb55__rrdd__eerrrroorr() parses and returns the kerboeros error message, the - structure should be freed with kkrrbb55__ffrreeee__eerrrroorr__ccoonntteennttss() when the caller + [1mkrb5_rd_error[22m() parses and returns the kerboeros error message, the + structure should be freed with [1mkrb5_free_error_contents[22m() when the caller is done with the structure. - kkrrbb55__ffrreeee__eerrrroorr() frees the content and the memory region holding the + [1mkrb5_free_error[22m() frees the content and the memory region holding the structure iself. - kkrrbb55__ffrreeee__eerrrroorr__ccoonntteennttss() free the content of the KRB-ERROR message. + [1mkrb5_free_error_contents[22m() free the content of the KRB-ERROR message. - kkrrbb55__eerrrroorr__ffrroomm__rrdd__eerrrroorr() will parse the error message and set the error + [1mkrb5_error_from_rd_error[22m() will parse the error message and set the error buffer in krb5_context to the error string passed back or the matching error code in the KRB-ERROR message. Caller should pick up the message - with kkrrbb55__ggeett__eerrrroorr__ssttrriinngg(_3) (don't forget to free the returned string - with kkrrbb55__ffrreeee__eerrrroorr__ssttrriinngg()). + with [1mkrb5_get_error_string[22m([4m3[24m) (don't forget to free the returned string + with [1mkrb5_free_error_string[22m()). -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3), krb5_set_error_string(3), krb5_get_error_string(3), krb5.conf(5) HEIMDAL July 26, 2004 HEIMDAL diff --git a/lib/krb5/krb5_rd_safe.cat3 b/lib/krb5/krb5_rd_safe.cat3 index 9eb55c83fe2f..0f4fd9fe9ea5 100644 --- a/lib/krb5/krb5_rd_safe.cat3 +++ b/lib/krb5/krb5_rd_safe.cat3 @@ -1,35 +1,34 @@ - KRB5_RD_SAFE(3) BSD Library Functions Manual KRB5_RD_SAFE(3) -NNAAMMEE - kkrrbb55__rrdd__ssaaffee, kkrrbb55__rrdd__pprriivv -- verifies authenticity of messages +[1mNAME[0m + [1mkrb5_rd_safe[22m, [1mkrb5_rd_priv [22m-- verifies authenticity of messages -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__rrdd__pprriivv(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _a_u_t_h___c_o_n_t_e_x_t, - _c_o_n_s_t _k_r_b_5___d_a_t_a _*_i_n_b_u_f, _k_r_b_5___d_a_t_a _*_o_u_t_b_u_f, - _k_r_b_5___r_e_p_l_a_y___d_a_t_a _*_o_u_t_d_a_t_a); + [4mkrb5_error_code[0m + [1mkrb5_rd_priv[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_auth_context[24m [4mauth_context[24m, + [4mconst[24m [4mkrb5_data[24m [4m*inbuf[24m, [4mkrb5_data[24m [4m*outbuf[24m, + [4mkrb5_replay_data[24m [4m*outdata[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__rrdd__ssaaffee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___a_u_t_h___c_o_n_t_e_x_t _a_u_t_h___c_o_n_t_e_x_t, - _c_o_n_s_t _k_r_b_5___d_a_t_a _*_i_n_b_u_f, _k_r_b_5___d_a_t_a _*_o_u_t_b_u_f, - _k_r_b_5___r_e_p_l_a_y___d_a_t_a _*_o_u_t_d_a_t_a); + [4mkrb5_error_code[0m + [1mkrb5_rd_safe[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_auth_context[24m [4mauth_context[24m, + [4mconst[24m [4mkrb5_data[24m [4m*inbuf[24m, [4mkrb5_data[24m [4m*outbuf[24m, + [4mkrb5_replay_data[24m [4m*outdata[24m); -DDEESSCCRRIIPPTTIIOONN - kkrrbb55__rrdd__ssaaffee() and kkrrbb55__rrdd__pprriivv() parses KRB-SAFE and KRB-PRIV messages - (as generated by krb5_mk_safe(3) and krb5_mk_priv(3)) from _i_n_b_u_f and ver- - ifies its integrity. The user data part of the message in put in _o_u_t_b_u_f. +[1mDESCRIPTION[0m + [1mkrb5_rd_safe[22m() and [1mkrb5_rd_priv[22m() parses KRB-SAFE and KRB-PRIV messages + (as generated by krb5_mk_safe(3) and krb5_mk_priv(3)) from [4minbuf[24m and ver- + ifies its integrity. The user data part of the message in put in [4moutbuf[24m. The encryption state, including keyblocks and addresses, is taken from - _a_u_t_h___c_o_n_t_e_x_t. If the KRB5_AUTH_CONTEXT_RET_SEQUENCE or - KRB5_AUTH_CONTEXT_RET_TIME flags are set in the _a_u_t_h___c_o_n_t_e_x_t the sequence - number and time are returned in the _o_u_t_d_a_t_a parameter. + [4mauth_context[24m. If the KRB5_AUTH_CONTEXT_RET_SEQUENCE or + KRB5_AUTH_CONTEXT_RET_TIME flags are set in the [4mauth_context[24m the sequence + number and time are returned in the [4moutdata[24m parameter. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5_auth_con_init(3), krb5_mk_priv(3), krb5_mk_safe(3) HEIMDAL May 1, 2006 HEIMDAL diff --git a/lib/krb5/krb5_set_default_realm.cat3 b/lib/krb5/krb5_set_default_realm.cat3 index ff645cc106f0..2bf0a5b825b8 100644 --- a/lib/krb5/krb5_set_default_realm.cat3 +++ b/lib/krb5/krb5_set_default_realm.cat3 @@ -1,70 +1,69 @@ - KRB5_SET_DEFAULT_REAL... BSD Library Functions Manual KRB5_SET_DEFAULT_REAL... -NNAAMMEE - kkrrbb55__ccooppyy__hhoosstt__rreeaallmm, kkrrbb55__ffrreeee__hhoosstt__rreeaallmm, kkrrbb55__ggeett__ddeeffaauulltt__rreeaallmm, - kkrrbb55__ggeett__ddeeffaauulltt__rreeaallmmss, kkrrbb55__ggeett__hhoosstt__rreeaallmm, kkrrbb55__sseett__ddeeffaauulltt__rreeaallmm -- +[1mNAME[0m + [1mkrb5_copy_host_realm[22m, [1mkrb5_free_host_realm[22m, [1mkrb5_get_default_realm[22m, + [1mkrb5_get_default_realms[22m, [1mkrb5_get_host_realm[22m, [1mkrb5_set_default_realm [22m-- default and host realm read and manipulation routines -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ccooppyy__hhoosstt__rreeaallmm(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _k_r_b_5___r_e_a_l_m _*_f_r_o_m, - _k_r_b_5___r_e_a_l_m _*_*_t_o); + [4mkrb5_error_code[0m + [1mkrb5_copy_host_realm[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mkrb5_realm[24m [4m*from[24m, + [4mkrb5_realm[24m [4m**to[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ffrreeee__hhoosstt__rreeaallmm(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___r_e_a_l_m _*_r_e_a_l_m_l_i_s_t); + [4mkrb5_error_code[0m + [1mkrb5_free_host_realm[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_realm[24m [4m*realmlist[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__ddeeffaauulltt__rreeaallmm(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___r_e_a_l_m _*_r_e_a_l_m); + [4mkrb5_error_code[0m + [1mkrb5_get_default_realm[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_realm[24m [4m*realm[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__ddeeffaauulltt__rreeaallmmss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___r_e_a_l_m _*_*_r_e_a_l_m); + [4mkrb5_error_code[0m + [1mkrb5_get_default_realms[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_realm[24m [4m**realm[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__hhoosstt__rreeaallmm(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _c_h_a_r _*_h_o_s_t, - _k_r_b_5___r_e_a_l_m _*_*_r_e_a_l_m_s); + [4mkrb5_error_code[0m + [1mkrb5_get_host_realm[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mchar[24m [4m*host[24m, + [4mkrb5_realm[24m [4m**realms[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__sseett__ddeeffaauulltt__rreeaallmm(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _c_o_n_s_t _c_h_a_r _*_r_e_a_l_m); + [4mkrb5_error_code[0m + [1mkrb5_set_default_realm[22m([4mkrb5_context[24m [4mcontext[24m, [4mconst[24m [4mchar[24m [4m*realm[24m); -DDEESSCCRRIIPPTTIIOONN - kkrrbb55__ccooppyy__hhoosstt__rreeaallmm() copies the list of realms from _f_r_o_m to _t_o. _t_o - should be freed by the caller using _k_r_b_5___f_r_e_e___h_o_s_t___r_e_a_l_m. +[1mDESCRIPTION[0m + [1mkrb5_copy_host_realm[22m() copies the list of realms from [4mfrom[24m to [4mto[24m. [4mto[0m + should be freed by the caller using [4mkrb5_free_host_realm[24m. - kkrrbb55__ffrreeee__hhoosstt__rreeaallmm() frees all memory allocated by _r_e_a_l_m_l_i_s_t. + [1mkrb5_free_host_realm[22m() frees all memory allocated by [4mrealmlist[24m. - kkrrbb55__ggeett__ddeeffaauulltt__rreeaallmm() returns the first default realm for this host. - The realm returned should be freed with kkrrbb55__xxffrreeee(). + [1mkrb5_get_default_realm[22m() returns the first default realm for this host. + The realm returned should be freed with [1mkrb5_xfree[22m(). - kkrrbb55__ggeett__ddeeffaauulltt__rreeaallmmss() returns a NULL terminated list of default - realms for this context. Realms returned by kkrrbb55__ggeett__ddeeffaauulltt__rreeaallmmss() - should be freed with kkrrbb55__ffrreeee__hhoosstt__rreeaallmm(). + [1mkrb5_get_default_realms[22m() returns a NULL terminated list of default + realms for this context. Realms returned by [1mkrb5_get_default_realms[22m() + should be freed with [1mkrb5_free_host_realm[22m(). - kkrrbb55__ggeett__hhoosstt__rreeaallmm() returns a NULL terminated list of realms for _h_o_s_t - by looking up the information in the [domain_realm] in _k_r_b_5_._c_o_n_f or in + [1mkrb5_get_host_realm[22m() returns a NULL terminated list of realms for [4mhost[0m + by looking up the information in the [domain_realm] in [4mkrb5.conf[24m or in DNS. If the mapping in [domain_realm] results in the string dns_locate, DNS is used to lookup the realm. When using DNS to a resolve the domain for the host a.b.c, - kkrrbb55__ggeett__hhoosstt__rreeaallmm() looks for a TXT resource record named + [1mkrb5_get_host_realm[22m() looks for a TXT resource record named _kerberos.a.b.c, and if not found, it strips off the first component and tries a again (_kerberos.b.c) until it reaches the root. If there is no configuration or DNS information found, - kkrrbb55__ggeett__hhoosstt__rreeaallmm() assumes it can use the domain part of the _h_o_s_t to - form a realm. Caller must free _r_e_a_l_m_l_i_s_t with kkrrbb55__ffrreeee__hhoosstt__rreeaallmm(). + [1mkrb5_get_host_realm[22m() assumes it can use the domain part of the [4mhost[24m to + form a realm. Caller must free [4mrealmlist[24m with [1mkrb5_free_host_realm[22m(). - kkrrbb55__sseett__ddeeffaauulltt__rreeaallmm() sets the default realm for the _c_o_n_t_e_x_t. If NULL - is used as a _r_e_a_l_m, the [libdefaults]default_realm stanza in _k_r_b_5_._c_o_n_f is + [1mkrb5_set_default_realm[22m() sets the default realm for the [4mcontext[24m. If NULL + is used as a [4mrealm[24m, the [libdefaults]default_realm stanza in [4mkrb5.conf[24m is used. If there is no such stanza in the configuration file, the - kkrrbb55__ggeett__hhoosstt__rreeaallmm() function is used to form a default realm. + [1mkrb5_get_host_realm[22m() function is used to form a default realm. -SSEEEE AALLSSOO +[1mSEE ALSO[0m free(3), krb5.conf(5) HEIMDAL April 24, 2005 HEIMDAL diff --git a/lib/krb5/krb5_set_password.cat3 b/lib/krb5/krb5_set_password.cat3 index 447c229c5cf8..f6b7f387487f 100644 --- a/lib/krb5/krb5_set_password.cat3 +++ b/lib/krb5/krb5_set_password.cat3 @@ -1,66 +1,65 @@ - KRB5_SET_PASSWORD(3) BSD Library Functions Manual KRB5_SET_PASSWORD(3) -NNAAMMEE - kkrrbb55__cchhaannggee__ppaasssswwoorrdd, kkrrbb55__sseett__ppaasssswwoorrdd, kkrrbb55__sseett__ppaasssswwoorrdd__uussiinngg__ccccaacchhee, - kkrrbb55__ppaasssswwdd__rreessuulltt__ttoo__ssttrriinngg -- change password functions +[1mNAME[0m + [1mkrb5_change_password[22m, [1mkrb5_set_password[22m, [1mkrb5_set_password_using_ccache[22m, + [1mkrb5_passwd_result_to_string [22m-- change password functions -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__cchhaannggee__ppaasssswwoorrdd(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_e_d_s _*_c_r_e_d_s, - _c_h_a_r _*_n_e_w_p_w, _i_n_t _*_r_e_s_u_l_t___c_o_d_e, _k_r_b_5___d_a_t_a _*_r_e_s_u_l_t___c_o_d_e___s_t_r_i_n_g, - _k_r_b_5___d_a_t_a _*_r_e_s_u_l_t___s_t_r_i_n_g); + [4mkrb5_error_code[0m + [1mkrb5_change_password[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_creds[24m [4m*creds[24m, + [4mchar[24m [4m*newpw[24m, [4mint[24m [4m*result_code[24m, [4mkrb5_data[24m [4m*result_code_string[24m, + [4mkrb5_data[24m [4m*result_string[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__sseett__ppaasssswwoorrdd(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_e_d_s _*_c_r_e_d_s, _c_h_a_r _*_n_e_w_p_w, - _k_r_b_5___p_r_i_n_c_i_p_a_l _t_a_r_g_p_r_i_n_c, _i_n_t _*_r_e_s_u_l_t___c_o_d_e, - _k_r_b_5___d_a_t_a _*_r_e_s_u_l_t___c_o_d_e___s_t_r_i_n_g, _k_r_b_5___d_a_t_a _*_r_e_s_u_l_t___s_t_r_i_n_g); + [4mkrb5_error_code[0m + [1mkrb5_set_password[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_creds[24m [4m*creds[24m, [4mchar[24m [4m*newpw[24m, + [4mkrb5_principal[24m [4mtargprinc[24m, [4mint[24m [4m*result_code[24m, + [4mkrb5_data[24m [4m*result_code_string[24m, [4mkrb5_data[24m [4m*result_string[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__sseett__ppaasssswwoorrdd__uussiinngg__ccccaacchhee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_c_a_c_h_e _c_c_a_c_h_e, - _c_h_a_r _*_n_e_w_p_w, _k_r_b_5___p_r_i_n_c_i_p_a_l _t_a_r_g_p_r_i_n_c, _i_n_t _*_r_e_s_u_l_t___c_o_d_e, - _k_r_b_5___d_a_t_a _*_r_e_s_u_l_t___c_o_d_e___s_t_r_i_n_g, _k_r_b_5___d_a_t_a _*_r_e_s_u_l_t___s_t_r_i_n_g); + [4mkrb5_error_code[0m + [1mkrb5_set_password_using_ccache[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_ccache[24m [4mccache[24m, + [4mchar[24m [4m*newpw[24m, [4mkrb5_principal[24m [4mtargprinc[24m, [4mint[24m [4m*result_code[24m, + [4mkrb5_data[24m [4m*result_code_string[24m, [4mkrb5_data[24m [4m*result_string[24m); - _c_o_n_s_t _c_h_a_r _* - kkrrbb55__ppaasssswwdd__rreessuulltt__ttoo__ssttrriinngg(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _i_n_t _r_e_s_u_l_t); + [4mconst[24m [4mchar[24m [4m*[0m + [1mkrb5_passwd_result_to_string[22m([4mkrb5_context[24m [4mcontext[24m, [4mint[24m [4mresult[24m); -DDEESSCCRRIIPPTTIIOONN +[1mDESCRIPTION[0m These functions change the password for a given principal. - kkrrbb55__sseett__ppaasssswwoorrdd() and kkrrbb55__sseett__ppaasssswwoorrdd__uussiinngg__ccccaacchhee() are the newer of + [1mkrb5_set_password[22m() and [1mkrb5_set_password_using_ccache[22m() are the newer of the three functions, and use a newer version of the protocol (and also fall back to the older set-password protocol if the newer protocol doesn't work). - kkrrbb55__cchhaannggee__ppaasssswwoorrdd() sets the password _n_e_w_p_a_s_s_w_d for the client princi- - pal in _c_r_e_d_s. The server principal of creds must be kadmin/changepw. + [1mkrb5_change_password[22m() sets the password [4mnewpasswd[24m for the client princi- + pal in [4mcreds[24m. The server principal of creds must be kadmin/changepw. - kkrrbb55__sseett__ppaasssswwoorrdd() and kkrrbb55__sseett__ppaasssswwoorrdd__uussiinngg__ccccaacchhee() change the pass- - word for the principal _t_a_r_g_p_r_i_n_c. + [1mkrb5_set_password[22m() and [1mkrb5_set_password_using_ccache[22m() change the pass- + word for the principal [4mtargprinc[24m. - kkrrbb55__sseett__ppaasssswwoorrdd() requires that the credential for - kadmin/changepw@REALM is in _c_r_e_d_s. If the user caller isn't an adminis- + [1mkrb5_set_password[22m() requires that the credential for + kadmin/changepw@REALM is in [4mcreds[24m. If the user caller isn't an adminis- trator, this credential needs to be an initial credential, see krb5_get_init_creds(3) how to get such credentials. - kkrrbb55__sseett__ppaasssswwoorrdd__uussiinngg__ccccaacchhee() will get the credential from _c_c_a_c_h_e. + [1mkrb5_set_password_using_ccache[22m() will get the credential from [4mccache[24m. - If _t_a_r_g_p_r_i_n_c is NULL, kkrrbb55__sseett__ppaasssswwoorrdd__uussiinngg__ccccaacchhee() uses the the - default principal in _c_c_a_c_h_e and kkrrbb55__sseett__ppaasssswwoorrdd() uses the global the - default principal. + If [4mtargprinc[24m is NULL, [1mkrb5_set_password_using_ccache[22m() uses the the de- + fault principal in [4mccache[24m and [1mkrb5_set_password[22m() uses the global the de- + fault principal. - All three functions return an error in _r_e_s_u_l_t___c_o_d_e and maybe an error - string to print in _r_e_s_u_l_t___s_t_r_i_n_g. + All three functions return an error in [4mresult_code[24m and maybe an error + string to print in [4mresult_string[24m. - kkrrbb55__ppaasssswwdd__rreessuulltt__ttoo__ssttrriinngg() returns an human readable string describ- - ing the error code in _r_e_s_u_l_t___c_o_d_e from the kkrrbb55__sseett__ppaasssswwoorrdd() functions. + [1mkrb5_passwd_result_to_string[22m() returns an human readable string describ- + ing the error code in [4mresult_code[24m from the [1mkrb5_set_password[22m() functions. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5_ccache(3), krb5_init_context(3) HEIMDAL July 15, 2004 HEIMDAL diff --git a/lib/krb5/krb5_string_to_key.cat3 b/lib/krb5/krb5_string_to_key.cat3 index 3fe0b85b0671..3e3621880185 100644 --- a/lib/krb5/krb5_string_to_key.cat3 +++ b/lib/krb5/krb5_string_to_key.cat3 @@ -1,74 +1,73 @@ - KRB5_STRING_TO_KEY(3) BSD Library Functions Manual KRB5_STRING_TO_KEY(3) -NNAAMMEE - kkrrbb55__ssttrriinngg__ttoo__kkeeyy, kkrrbb55__ssttrriinngg__ttoo__kkeeyy__ddaattaa, - kkrrbb55__ssttrriinngg__ttoo__kkeeyy__ddaattaa__ssaalltt, kkrrbb55__ssttrriinngg__ttoo__kkeeyy__ddaattaa__ssaalltt__ooppaaqquuee, - kkrrbb55__ssttrriinngg__ttoo__kkeeyy__ssaalltt, kkrrbb55__ssttrriinngg__ttoo__kkeeyy__ssaalltt__ooppaaqquuee, - kkrrbb55__ggeett__ppww__ssaalltt, kkrrbb55__ffrreeee__ssaalltt -- turns a string to a Kerberos key +[1mNAME[0m + [1mkrb5_string_to_key[22m, [1mkrb5_string_to_key_data[22m, + [1mkrb5_string_to_key_data_salt[22m, [1mkrb5_string_to_key_data_salt_opaque[22m, + [1mkrb5_string_to_key_salt[22m, [1mkrb5_string_to_key_salt_opaque[22m, + [1mkrb5_get_pw_salt[22m, [1mkrb5_free_salt [22m-- turns a string to a Kerberos key -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ssttrriinngg__ttoo__kkeeyy(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___e_n_c_t_y_p_e _e_n_c_t_y_p_e, - _c_o_n_s_t _c_h_a_r _*_p_a_s_s_w_o_r_d, _k_r_b_5___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l, _k_r_b_5___k_e_y_b_l_o_c_k _*_k_e_y); + [4mkrb5_error_code[0m + [1mkrb5_string_to_key[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_enctype[24m [4menctype[24m, + [4mconst[24m [4mchar[24m [4m*password[24m, [4mkrb5_principal[24m [4mprincipal[24m, [4mkrb5_keyblock[24m [4m*key[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ssttrriinngg__ttoo__kkeeyy__ddaattaa(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___e_n_c_t_y_p_e _e_n_c_t_y_p_e, - _k_r_b_5___d_a_t_a _p_a_s_s_w_o_r_d, _k_r_b_5___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l, _k_r_b_5___k_e_y_b_l_o_c_k _*_k_e_y); + [4mkrb5_error_code[0m + [1mkrb5_string_to_key_data[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_enctype[24m [4menctype[24m, + [4mkrb5_data[24m [4mpassword[24m, [4mkrb5_principal[24m [4mprincipal[24m, [4mkrb5_keyblock[24m [4m*key[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ssttrriinngg__ttoo__kkeeyy__ddaattaa__ssaalltt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___e_n_c_t_y_p_e _e_n_c_t_y_p_e, - _k_r_b_5___d_a_t_a _p_a_s_s_w_o_r_d, _k_r_b_5___s_a_l_t _s_a_l_t, _k_r_b_5___k_e_y_b_l_o_c_k _*_k_e_y); + [4mkrb5_error_code[0m + [1mkrb5_string_to_key_data_salt[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_enctype[24m [4menctype[24m, + [4mkrb5_data[24m [4mpassword[24m, [4mkrb5_salt[24m [4msalt[24m, [4mkrb5_keyblock[24m [4m*key[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ssttrriinngg__ttoo__kkeeyy__ddaattaa__ssaalltt__ooppaaqquuee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___e_n_c_t_y_p_e _e_n_c_t_y_p_e, _k_r_b_5___d_a_t_a _p_a_s_s_w_o_r_d, _k_r_b_5___s_a_l_t _s_a_l_t, - _k_r_b_5___d_a_t_a _o_p_a_q_u_e, _k_r_b_5___k_e_y_b_l_o_c_k _*_k_e_y); + [4mkrb5_error_code[0m + [1mkrb5_string_to_key_data_salt_opaque[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_enctype[24m [4menctype[24m, [4mkrb5_data[24m [4mpassword[24m, [4mkrb5_salt[24m [4msalt[24m, + [4mkrb5_data[24m [4mopaque[24m, [4mkrb5_keyblock[24m [4m*key[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ssttrriinngg__ttoo__kkeeyy__ssaalltt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___e_n_c_t_y_p_e _e_n_c_t_y_p_e, - _c_o_n_s_t _c_h_a_r _*_p_a_s_s_w_o_r_d, _k_r_b_5___s_a_l_t _s_a_l_t, _k_r_b_5___k_e_y_b_l_o_c_k _*_k_e_y); + [4mkrb5_error_code[0m + [1mkrb5_string_to_key_salt[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_enctype[24m [4menctype[24m, + [4mconst[24m [4mchar[24m [4m*password[24m, [4mkrb5_salt[24m [4msalt[24m, [4mkrb5_keyblock[24m [4m*key[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ssttrriinngg__ttoo__kkeeyy__ssaalltt__ooppaaqquuee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, - _k_r_b_5___e_n_c_t_y_p_e _e_n_c_t_y_p_e, _c_o_n_s_t _c_h_a_r _*_p_a_s_s_w_o_r_d, _k_r_b_5___s_a_l_t _s_a_l_t, - _k_r_b_5___d_a_t_a _o_p_a_q_u_e, _k_r_b_5___k_e_y_b_l_o_c_k _*_k_e_y); + [4mkrb5_error_code[0m + [1mkrb5_string_to_key_salt_opaque[22m([4mkrb5_context[24m [4mcontext[24m, + [4mkrb5_enctype[24m [4menctype[24m, [4mconst[24m [4mchar[24m [4m*password[24m, [4mkrb5_salt[24m [4msalt[24m, + [4mkrb5_data[24m [4mopaque[24m, [4mkrb5_keyblock[24m [4m*key[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ggeett__ppww__ssaalltt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_o_n_s_t___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l, - _k_r_b_5___s_a_l_t _*_s_a_l_t); + [4mkrb5_error_code[0m + [1mkrb5_get_pw_salt[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_const_principal[24m [4mprincipal[24m, + [4mkrb5_salt[24m [4m*salt[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ffrreeee__ssaalltt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___s_a_l_t _s_a_l_t); + [4mkrb5_error_code[0m + [1mkrb5_free_salt[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_salt[24m [4msalt[24m); -DDEESSCCRRIIPPTTIIOONN +[1mDESCRIPTION[0m The string to key functions convert a string to a kerberos key. - kkrrbb55__ssttrriinngg__ttoo__kkeeyy__ddaattaa__ssaalltt__ooppaaqquuee() is the function that does all the + [1mkrb5_string_to_key_data_salt_opaque[22m() is the function that does all the work, the rest of the functions are just wrappers around - kkrrbb55__ssttrriinngg__ttoo__kkeeyy__ddaattaa__ssaalltt__ooppaaqquuee() that calls it with default values. + [1mkrb5_string_to_key_data_salt_opaque[22m() that calls it with default values. - kkrrbb55__ssttrriinngg__ttoo__kkeeyy__ddaattaa__ssaalltt__ooppaaqquuee() transforms the _p_a_s_s_w_o_r_d with the - given salt-string _s_a_l_t and the opaque, encryption type specific parameter - _o_p_a_q_u_e to a encryption key _k_e_y according to the string to key function - associated with _e_n_c_t_y_p_e. + [1mkrb5_string_to_key_data_salt_opaque[22m() transforms the [4mpassword[24m with the + given salt-string [4msalt[24m and the opaque, encryption type specific parameter + [4mopaque[24m to a encryption key [4mkey[24m according to the string to key function + associated with [4menctype[24m. - The _k_e_y should be freed with kkrrbb55__ffrreeee__kkeeyybblloocckk__ccoonntteennttss(). + The [4mkey[24m should be freed with [1mkrb5_free_keyblock_contents[22m(). If one of the functions that doesn't take a krb5_salt as it argument - kkrrbb55__ggeett__ppww__ssaalltt() is used to get the salt value. + [1mkrb5_get_pw_salt[22m() is used to get the salt value. - kkrrbb55__ggeett__ppww__ssaalltt() get the default password salt for a principal, use - kkrrbb55__ffrreeee__ssaalltt() to free the salt when done. + [1mkrb5_get_pw_salt[22m() get the default password salt for a principal, use + [1mkrb5_free_salt[22m() to free the salt when done. - kkrrbb55__ffrreeee__ssaalltt() frees the content of _s_a_l_t. + [1mkrb5_free_salt[22m() frees the content of [4msalt[24m. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3), krb5_data(3), krb5_keyblock(3), kerberos(8) HEIMDAL July 10, 2006 HEIMDAL diff --git a/lib/krb5/krb5_timeofday.cat3 b/lib/krb5/krb5_timeofday.cat3 index 7778956aab6c..bec02a410644 100644 --- a/lib/krb5/krb5_timeofday.cat3 +++ b/lib/krb5/krb5_timeofday.cat3 @@ -1,55 +1,54 @@ - KRB5_TIMEOFDAY(3) BSD Library Functions Manual KRB5_TIMEOFDAY(3) -NNAAMMEE - kkrrbb55__ttiimmeeooffddaayy, kkrrbb55__sseett__rreeaall__ttiimmee, kkrrbb55__uuss__ttiimmeeooffddaayy, kkrrbb55__ffoorrmmaatt__ttiimmee, - kkrrbb55__ssttrriinngg__ttoo__ddeellttaatt -- Kerberos 5 time handling functions +[1mNAME[0m + [1mkrb5_timeofday[22m, [1mkrb5_set_real_time[22m, [1mkrb5_us_timeofday[22m, [1mkrb5_format_time[22m, + [1mkrb5_string_to_deltat [22m-- Kerberos 5 time handling functions -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m krb5_timestamp; krb5_deltat; - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__sseett__rreeaall__ttiimmee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___t_i_m_e_s_t_a_m_p _s_e_c, - _i_n_t_3_2___t _u_s_e_c); + [4mkrb5_error_code[0m + [1mkrb5_set_real_time[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_timestamp[24m [4msec[24m, + [4mint32_t[24m [4musec[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ttiimmeeooffddaayy(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___t_i_m_e_s_t_a_m_p _*_t_i_m_e_r_e_t); + [4mkrb5_error_code[0m + [1mkrb5_timeofday[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_timestamp[24m [4m*timeret[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__uuss__ttiimmeeooffddaayy(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___t_i_m_e_s_t_a_m_p _*_s_e_c, - _i_n_t_3_2___t _*_u_s_e_c); + [4mkrb5_error_code[0m + [1mkrb5_us_timeofday[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_timestamp[24m [4m*sec[24m, + [4mint32_t[24m [4m*usec[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ffoorrmmaatt__ttiimmee(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _t_i_m_e___t _t, _c_h_a_r _*_s, _s_i_z_e___t _l_e_n, - _k_r_b_5___b_o_o_l_e_a_n _i_n_c_l_u_d_e___t_i_m_e); + [4mkrb5_error_code[0m + [1mkrb5_format_time[22m([4mkrb5_context[24m [4mcontext[24m, [4mtime_t[24m [4mt[24m, [4mchar[24m [4m*s[24m, [4msize_t[24m [4mlen[24m, + [4mkrb5_boolean[24m [4minclude_time[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__ssttrriinngg__ttoo__ddeellttaatt(_c_o_n_s_t _c_h_a_r _*_s_t_r_i_n_g, _k_r_b_5___d_e_l_t_a_t _*_d_e_l_t_a_t); + [4mkrb5_error_code[0m + [1mkrb5_string_to_deltat[22m([4mconst[24m [4mchar[24m [4m*string[24m, [4mkrb5_deltat[24m [4m*deltat[24m); -DDEESSCCRRIIPPTTIIOONN - kkrrbb55__sseett__rreeaall__ttiimmee sets the absolute time that the caller knows the KDC +[1mDESCRIPTION[0m + [1mkrb5_set_real_time [22msets the absolute time that the caller knows the KDC has. With this the Kerberos library can calculate the relative differ- ence between the KDC time and the local system time and store it in the - _c_o_n_t_e_x_t. With this information the Kerberos library can adjust all time + [4mcontext[24m. With this information the Kerberos library can adjust all time stamps in Kerberos packages. - kkrrbb55__ttiimmeeooffddaayy() returns the current time, but adjusted with the time - difference between the local host and the KDC. kkrrbb55__uuss__ttiimmeeooffddaayy() also + [1mkrb5_timeofday[22m() returns the current time, but adjusted with the time + difference between the local host and the KDC. [1mkrb5_us_timeofday[22m() also returns microseconds. - kkrrbb55__ffoorrmmaatt__ttiimmee formats the time _t into the string _s of length _l_e_n. If - _i_n_c_l_u_d_e___t_i_m_e is set, the time is set include_time. + [1mkrb5_format_time [22mformats the time [4mt[24m into the string [4ms[24m of length [4mlen[24m. If + [4minclude_time[24m is set, the time is set include_time. - kkrrbb55__ssttrriinngg__ttoo__ddeellttaatt parses delta time _s_t_r_i_n_g into _d_e_l_t_a_t. + [1mkrb5_string_to_deltat [22mparses delta time [4mstring[24m into [4mdeltat[24m. -SSEEEE AALLSSOO +[1mSEE ALSO[0m gettimeofday(2), krb5(3) HEIMDAL September 16, 2006 HEIMDAL diff --git a/lib/krb5/krb5_verify_init_creds.cat3 b/lib/krb5/krb5_verify_init_creds.cat3 index bfe8e08b32f6..05dcb76ce6e3 100644 --- a/lib/krb5/krb5_verify_init_creds.cat3 +++ b/lib/krb5/krb5_verify_init_creds.cat3 @@ -1,52 +1,51 @@ - KRB5_VERIFY_INIT_CRED... BSD Library Functions Manual KRB5_VERIFY_INIT_CRED... -NNAAMMEE - kkrrbb55__vveerriiffyy__iinniitt__ccrreeddss__oopptt__iinniitt, - kkrrbb55__vveerriiffyy__iinniitt__ccrreeddss__oopptt__sseett__aapp__rreeqq__nnooffaaiill, kkrrbb55__vveerriiffyy__iinniitt__ccrreeddss -- +[1mNAME[0m + [1mkrb5_verify_init_creds_opt_init[22m, + [1mkrb5_verify_init_creds_opt_set_ap_req_nofail[22m, [1mkrb5_verify_init_creds [22m-- verifies a credential cache is correct by using a local keytab -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m struct krb5_verify_init_creds_opt; - _v_o_i_d - kkrrbb55__vveerriiffyy__iinniitt__ccrreeddss__oopptt__iinniitt(_k_r_b_5___v_e_r_i_f_y___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t_i_o_n_s); + [4mvoid[0m + [1mkrb5_verify_init_creds_opt_init[22m([4mkrb5_verify_init_creds_opt[24m [4m*options[24m); - _v_o_i_d - kkrrbb55__vveerriiffyy__iinniitt__ccrreeddss__oopptt__sseett__aapp__rreeqq__nnooffaaiill(_k_r_b_5___v_e_r_i_f_y___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t_i_o_n_s, - _i_n_t _a_p___r_e_q___n_o_f_a_i_l); + [4mvoid[0m + [1mkrb5_verify_init_creds_opt_set_ap_req_nofail[22m([4mkrb5_verify_init_creds_opt[24m [4m*options[24m, + [4mint[24m [4map_req_nofail[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__vveerriiffyy__iinniitt__ccrreeddss(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___c_r_e_d_s _*_c_r_e_d_s, - _k_r_b_5___p_r_i_n_c_i_p_a_l _a_p___r_e_q___s_e_r_v_e_r, _k_r_b_5___c_c_a_c_h_e _*_c_c_a_c_h_e, - _k_r_b_5___v_e_r_i_f_y___i_n_i_t___c_r_e_d_s___o_p_t _*_o_p_t_i_o_n_s); + [4mkrb5_error_code[0m + [1mkrb5_verify_init_creds[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_creds[24m [4m*creds[24m, + [4mkrb5_principal[24m [4map_req_server[24m, [4mkrb5_ccache[24m [4m*ccache[24m, + [4mkrb5_verify_init_creds_opt[24m [4m*options[24m); -DDEESSCCRRIIPPTTIIOONN - The kkrrbb55__vveerriiffyy__iinniitt__ccrreeddss function verifies the initial tickets with the +[1mDESCRIPTION[0m + The [1mkrb5_verify_init_creds [22mfunction verifies the initial tickets with the local keytab to make sure the response of the KDC was spoof-ed. - kkrrbb55__vveerriiffyy__iinniitt__ccrreeddss will use principal _a_p___r_e_q___s_e_r_v_e_r from the local + [1mkrb5_verify_init_creds [22mwill use principal [4map_req_server[24m from the local keytab, if NULL is passed in, the code will guess the local hostname and - use that to form host/hostname/GUESSED-REALM-FOR-HOSTNAME. _c_r_e_d_s is the - credential that kkrrbb55__vveerriiffyy__iinniitt__ccrreeddss should verify. If _c_c_a_c_h_e is given - kkrrbb55__vveerriiffyy__iinniitt__ccrreeddss() stores all credentials it fetched from the KDC + use that to form host/hostname/GUESSED-REALM-FOR-HOSTNAME. [4mcreds[24m is the + credential that [1mkrb5_verify_init_creds [22mshould verify. If [4mccache[24m is given + [1mkrb5_verify_init_creds[22m() stores all credentials it fetched from the KDC there, otherwise it will use a memory credential cache that is destroyed when done. - kkrrbb55__vveerriiffyy__iinniitt__ccrreeddss__oopptt__iinniitt() cleans the the structure, must be used - before trying to pass it in to kkrrbb55__vveerriiffyy__iinniitt__ccrreeddss(). + [1mkrb5_verify_init_creds_opt_init[22m() cleans the the structure, must be used + before trying to pass it in to [1mkrb5_verify_init_creds[22m(). - kkrrbb55__vveerriiffyy__iinniitt__ccrreeddss__oopptt__sseett__aapp__rreeqq__nnooffaaiill() controls controls the - behavior if _a_p___r_e_q___s_e_r_v_e_r doesn't exists in the local keytab or in the + [1mkrb5_verify_init_creds_opt_set_ap_req_nofail[22m() controls controls the be- + havior if [4map_req_server[24m doesn't exists in the local keytab or in the KDC's database, if it's true, the error will be ignored. Note that this use is possible insecure. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5(3), krb5_get_init_creds(3), krb5_verify_user(3), krb5.conf(5) HEIMDAL May 1, 2006 HEIMDAL diff --git a/lib/krb5/krb5_verify_user.cat3 b/lib/krb5/krb5_verify_user.cat3 index 2d5747bc650f..df5d56d33427 100644 --- a/lib/krb5/krb5_verify_user.cat3 +++ b/lib/krb5/krb5_verify_user.cat3 @@ -1,109 +1,108 @@ - KRB5_VERIFY_USER(3) BSD Library Functions Manual KRB5_VERIFY_USER(3) -NNAAMMEE - kkrrbb55__vveerriiffyy__uusseerr, kkrrbb55__vveerriiffyy__uusseerr__llrreeaallmm, kkrrbb55__vveerriiffyy__uusseerr__oopptt, - kkrrbb55__vveerriiffyy__oopptt__iinniitt, kkrrbb55__vveerriiffyy__oopptt__aalllloocc, kkrrbb55__vveerriiffyy__oopptt__ffrreeee, - kkrrbb55__vveerriiffyy__oopptt__sseett__ccccaacchhee, kkrrbb55__vveerriiffyy__oopptt__sseett__ffllaaggss, - kkrrbb55__vveerriiffyy__oopptt__sseett__sseerrvviiccee, kkrrbb55__vveerriiffyy__oopptt__sseett__sseeccuurree, - kkrrbb55__vveerriiffyy__oopptt__sseett__kkeeyyttaabb -- Heimdal password verifying functions +[1mNAME[0m + [1mkrb5_verify_user[22m, [1mkrb5_verify_user_lrealm[22m, [1mkrb5_verify_user_opt[22m, + [1mkrb5_verify_opt_init[22m, [1mkrb5_verify_opt_alloc[22m, [1mkrb5_verify_opt_free[22m, + [1mkrb5_verify_opt_set_ccache[22m, [1mkrb5_verify_opt_set_flags[22m, + [1mkrb5_verify_opt_set_service[22m, [1mkrb5_verify_opt_set_secure[22m, + [1mkrb5_verify_opt_set_keytab [22m-- Heimdal password verifying functions -LLIIBBRRAARRYY +[1mLIBRARY[0m Kerberos 5 Library (libkrb5, -lkrb5) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<kkrrbb55..hh>> +[1mSYNOPSIS[0m + [1m#include <krb5.h>[0m - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__vveerriiffyy__uusseerr(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l, - _k_r_b_5___c_c_a_c_h_e _c_c_a_c_h_e, _c_o_n_s_t _c_h_a_r _*_p_a_s_s_w_o_r_d, _k_r_b_5___b_o_o_l_e_a_n _s_e_c_u_r_e, - _c_o_n_s_t _c_h_a_r _*_s_e_r_v_i_c_e); + [4mkrb5_error_code[0m + [1mkrb5_verify_user[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_principal[24m [4mprincipal[24m, + [4mkrb5_ccache[24m [4mccache[24m, [4mconst[24m [4mchar[24m [4m*password[24m, [4mkrb5_boolean[24m [4msecure[24m, + [4mconst[24m [4mchar[24m [4m*service[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__vveerriiffyy__uusseerr__llrreeaallmm(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l, - _k_r_b_5___c_c_a_c_h_e _c_c_a_c_h_e, _c_o_n_s_t _c_h_a_r _*_p_a_s_s_w_o_r_d, _k_r_b_5___b_o_o_l_e_a_n _s_e_c_u_r_e, - _c_o_n_s_t _c_h_a_r _*_s_e_r_v_i_c_e); + [4mkrb5_error_code[0m + [1mkrb5_verify_user_lrealm[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_principal[24m [4mprincipal[24m, + [4mkrb5_ccache[24m [4mccache[24m, [4mconst[24m [4mchar[24m [4m*password[24m, [4mkrb5_boolean[24m [4msecure[24m, + [4mconst[24m [4mchar[24m [4m*service[24m); - _v_o_i_d - kkrrbb55__vveerriiffyy__oopptt__iinniitt(_k_r_b_5___v_e_r_i_f_y___o_p_t _*_o_p_t); + [4mvoid[0m + [1mkrb5_verify_opt_init[22m([4mkrb5_verify_opt[24m [4m*opt[24m); - _v_o_i_d - kkrrbb55__vveerriiffyy__oopptt__aalllloocc(_k_r_b_5___v_e_r_i_f_y___o_p_t _*_*_o_p_t); + [4mvoid[0m + [1mkrb5_verify_opt_alloc[22m([4mkrb5_verify_opt[24m [4m**opt[24m); - _v_o_i_d - kkrrbb55__vveerriiffyy__oopptt__ffrreeee(_k_r_b_5___v_e_r_i_f_y___o_p_t _*_o_p_t); + [4mvoid[0m + [1mkrb5_verify_opt_free[22m([4mkrb5_verify_opt[24m [4m*opt[24m); - _v_o_i_d - kkrrbb55__vveerriiffyy__oopptt__sseett__ccccaacchhee(_k_r_b_5___v_e_r_i_f_y___o_p_t _*_o_p_t, _k_r_b_5___c_c_a_c_h_e _c_c_a_c_h_e); + [4mvoid[0m + [1mkrb5_verify_opt_set_ccache[22m([4mkrb5_verify_opt[24m [4m*opt[24m, [4mkrb5_ccache[24m [4mccache[24m); - _v_o_i_d - kkrrbb55__vveerriiffyy__oopptt__sseett__kkeeyyttaabb(_k_r_b_5___v_e_r_i_f_y___o_p_t _*_o_p_t, _k_r_b_5___k_e_y_t_a_b _k_e_y_t_a_b); + [4mvoid[0m + [1mkrb5_verify_opt_set_keytab[22m([4mkrb5_verify_opt[24m [4m*opt[24m, [4mkrb5_keytab[24m [4mkeytab[24m); - _v_o_i_d - kkrrbb55__vveerriiffyy__oopptt__sseett__sseeccuurree(_k_r_b_5___v_e_r_i_f_y___o_p_t _*_o_p_t, _k_r_b_5___b_o_o_l_e_a_n _s_e_c_u_r_e); + [4mvoid[0m + [1mkrb5_verify_opt_set_secure[22m([4mkrb5_verify_opt[24m [4m*opt[24m, [4mkrb5_boolean[24m [4msecure[24m); - _v_o_i_d - kkrrbb55__vveerriiffyy__oopptt__sseett__sseerrvviiccee(_k_r_b_5___v_e_r_i_f_y___o_p_t _*_o_p_t, _c_o_n_s_t _c_h_a_r _*_s_e_r_v_i_c_e); + [4mvoid[0m + [1mkrb5_verify_opt_set_service[22m([4mkrb5_verify_opt[24m [4m*opt[24m, [4mconst[24m [4mchar[24m [4m*service[24m); - _v_o_i_d - kkrrbb55__vveerriiffyy__oopptt__sseett__ffllaaggss(_k_r_b_5___v_e_r_i_f_y___o_p_t _*_o_p_t, _u_n_s_i_g_n_e_d _i_n_t _f_l_a_g_s); + [4mvoid[0m + [1mkrb5_verify_opt_set_flags[22m([4mkrb5_verify_opt[24m [4m*opt[24m, [4munsigned[24m [4mint[24m [4mflags[24m); - _k_r_b_5___e_r_r_o_r___c_o_d_e - kkrrbb55__vveerriiffyy__uusseerr__oopptt(_k_r_b_5___c_o_n_t_e_x_t _c_o_n_t_e_x_t, _k_r_b_5___p_r_i_n_c_i_p_a_l _p_r_i_n_c_i_p_a_l, - _c_o_n_s_t _c_h_a_r _*_p_a_s_s_w_o_r_d, _k_r_b_5___v_e_r_i_f_y___o_p_t _*_o_p_t); + [4mkrb5_error_code[0m + [1mkrb5_verify_user_opt[22m([4mkrb5_context[24m [4mcontext[24m, [4mkrb5_principal[24m [4mprincipal[24m, + [4mconst[24m [4mchar[24m [4m*password[24m, [4mkrb5_verify_opt[24m [4m*opt[24m); -DDEESSCCRRIIPPTTIIOONN - The kkrrbb55__vveerriiffyy__uusseerr function verifies the password supplied by a user. - The principal whose password will be verified is specified in _p_r_i_n_c_i_p_a_l. - New tickets will be obtained as a side-effect and stored in _c_c_a_c_h_e (if - NULL, the default ccache is used). kkrrbb55__vveerriiffyy__uusseerr() will call - kkrrbb55__cccc__iinniittiiaalliizzee() on the given _c_c_a_c_h_e, so _c_c_a_c_h_e must only initialized - with kkrrbb55__cccc__rreessoollvvee() or kkrrbb55__cccc__ggeenn__nneeww(). If the password is not sup- - plied in _p_a_s_s_w_o_r_d (and is given as NULL) the user will be prompted for - it. If _s_e_c_u_r_e the ticket will be verified against the locally stored - service key _s_e_r_v_i_c_e (by default `host' if given as NULL ). +[1mDESCRIPTION[0m + The [1mkrb5_verify_user [22mfunction verifies the password supplied by a user. + The principal whose password will be verified is specified in [4mprincipal[24m. + New tickets will be obtained as a side-effect and stored in [4mccache[24m (if + NULL, the default ccache is used). [1mkrb5_verify_user[22m() will call + [1mkrb5_cc_initialize[22m() on the given [4mccache[24m, so [4mccache[24m must only initialized + with [1mkrb5_cc_resolve[22m() or [1mkrb5_cc_gen_new[22m(). If the password is not sup- + plied in [4mpassword[24m (and is given as NULL) the user will be prompted for + it. If [4msecure[24m the ticket will be verified against the locally stored + service key [4mservice[24m (by default `host' if given as NULL ). - The kkrrbb55__vveerriiffyy__uusseerr__llrreeaallmm() function does the same, except that it - ignores the realm in _p_r_i_n_c_i_p_a_l and tries all the local realms (see + The [1mkrb5_verify_user_lrealm[22m() function does the same, except that it ig- + nores the realm in [4mprincipal[24m and tries all the local realms (see krb5.conf(5)). After a successful return, the principal is set to the authenticated realm. If the call fails, the principal will not be mean- ingful, and should only be freed with krb5_free_principal(3). - kkrrbb55__vveerriiffyy__oopptt__aalllloocc() and kkrrbb55__vveerriiffyy__oopptt__ffrreeee() allocates and frees a + [1mkrb5_verify_opt_alloc[22m() and [1mkrb5_verify_opt_free[22m() allocates and frees a krb5_verify_opt. You should use the the alloc and free function instead of allocation the structure yourself, this is because in a future release the structure wont be exported. - kkrrbb55__vveerriiffyy__oopptt__iinniitt() resets all opt to default values. + [1mkrb5_verify_opt_init[22m() resets all opt to default values. None of the krb5_verify_opt_set function makes a copy of the data struc- ture that they are called with. It's up the caller to free them after the - kkrrbb55__vveerriiffyy__uusseerr__oopptt() is called. + [1mkrb5_verify_user_opt[22m() is called. - kkrrbb55__vveerriiffyy__oopptt__sseett__ccccaacchhee() sets the _c_c_a_c_h_e that user of _o_p_t will use. + [1mkrb5_verify_opt_set_ccache[22m() sets the [4mccache[24m that user of [4mopt[24m will use. If not set, the default credential cache will be used. - kkrrbb55__vveerriiffyy__oopptt__sseett__kkeeyyttaabb() sets the _k_e_y_t_a_b that user of _o_p_t will use. + [1mkrb5_verify_opt_set_keytab[22m() sets the [4mkeytab[24m that user of [4mopt[24m will use. If not set, the default keytab will be used. - kkrrbb55__vveerriiffyy__oopptt__sseett__sseeccuurree() if _s_e_c_u_r_e if true, the password verification + [1mkrb5_verify_opt_set_secure[22m() if [4msecure[24m if true, the password verification will require that the ticket will be verified against the locally stored service key. If not set, default value is true. - kkrrbb55__vveerriiffyy__oopptt__sseett__sseerrvviiccee() sets the _s_e_r_v_i_c_e principal that user of _o_p_t + [1mkrb5_verify_opt_set_service[22m() sets the [4mservice[24m principal that user of [4mopt[0m will use. If not set, the `host' service will be used. - kkrrbb55__vveerriiffyy__oopptt__sseett__ffllaaggss() sets _f_l_a_g_s that user of _o_p_t will use. If the - flag KRB5_VERIFY_LREALMS is used, the _p_r_i_n_c_i_p_a_l will be modified like - kkrrbb55__vveerriiffyy__uusseerr__llrreeaallmm() modifies it. + [1mkrb5_verify_opt_set_flags[22m() sets [4mflags[24m that user of [4mopt[24m will use. If the + flag KRB5_VERIFY_LREALMS is used, the [4mprincipal[24m will be modified like + [1mkrb5_verify_user_lrealm[22m() modifies it. - kkrrbb55__vveerriiffyy__uusseerr__oopptt() function verifies the _p_a_s_s_w_o_r_d supplied by a user. - The principal whose password will be verified is specified in _p_r_i_n_c_i_p_a_l. - Options the to the verification process is pass in in _o_p_t. + [1mkrb5_verify_user_opt[22m() function verifies the [4mpassword[24m supplied by a user. + The principal whose password will be verified is specified in [4mprincipal[24m. + Options the to the verification process is pass in in [4mopt[24m. -EEXXAAMMPPLLEESS +[1mEXAMPLES[0m Here is a example program that verifies a password. it uses the - `host/`hostname`' service principal in _k_r_b_5_._k_e_y_t_a_b. + `host/`hostname`' service principal in [4mkrb5.keytab[24m. #include <krb5.h> @@ -133,7 +132,7 @@ EEXXAAMMPPLLEESS return 0; } -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5_cc_gen_new(3), krb5_cc_initialize(3), krb5_cc_resolve(3), krb5_err(3), krb5_free_principal(3), krb5_init_context(3), krb5_kt_default(3), krb5.conf(5) diff --git a/lib/krb5/krbhst.c b/lib/krb5/krbhst.c index f5351288398c..36da64b0e469 100644 --- a/lib/krb5/krbhst.c +++ b/lib/krb5/krbhst.c @@ -106,6 +106,12 @@ srv_find_realm(krb5_context context, krb5_krbhst_info ***res, int *count, if(rr->type == rk_ns_t_srv) num_srv++; + if (num_srv == 0) { + _krb5_debug(context, 0, + "DNS SRV RR lookup domain nodata: %s", domain); + return KRB5_KDC_UNREACH; + } + *res = malloc(num_srv * sizeof(**res)); if(*res == NULL) { rk_dns_free_data(r); diff --git a/lib/krb5/locate_plugin.h b/lib/krb5/locate_plugin.h index 5a9c7bcb77ee..52ef0f380ee4 100644 --- a/lib/krb5/locate_plugin.h +++ b/lib/krb5/locate_plugin.h @@ -53,7 +53,8 @@ enum locate_service_type { }; typedef krb5_error_code -(*krb5plugin_service_locate_lookup) (void *, unsigned long, enum locate_service_type, +(KRB5_CALLCONV *krb5plugin_service_locate_lookup) + (void *, unsigned long, enum locate_service_type, const char *, int, int, int (*)(void *,int,struct sockaddr *), void *); @@ -61,7 +62,8 @@ typedef krb5_error_code #define KRB5_PLF_ALLOW_HOMEDIR 1 typedef krb5_error_code -(*krb5plugin_service_locate_lookup_old) (void *, enum locate_service_type, +(KRB5_CALLCONV *krb5plugin_service_locate_lookup_old) + (void *, enum locate_service_type, const char *, int, int, int (*)(void *,int,struct sockaddr *), void *); @@ -69,8 +71,8 @@ typedef krb5_error_code typedef struct krb5plugin_service_locate_ftable { int minor_version; - krb5_error_code (*init)(krb5_context, void **); - void (*fini)(void *); + krb5_error_code (KRB5_CALLCONV *init)(krb5_context, void **); + void (KRB5_CALLCONV *fini)(void *); krb5plugin_service_locate_lookup_old old_lookup; krb5plugin_service_locate_lookup lookup; /* version 2 */ } krb5plugin_service_locate_ftable; diff --git a/lib/krb5/mcache.c b/lib/krb5/mcache.c index 474cb3a2bd2e..e45bc1b0a77f 100644 --- a/lib/krb5/mcache.c +++ b/lib/krb5/mcache.c @@ -248,27 +248,28 @@ mcc_destroy(krb5_context context, { krb5_mcache **n, *m = MCACHE(id); + HEIMDAL_MUTEX_lock(&mcc_mutex); HEIMDAL_MUTEX_lock(&(m->mutex)); if (m->refcnt == 0) { HEIMDAL_MUTEX_unlock(&(m->mutex)); + HEIMDAL_MUTEX_unlock(&mcc_mutex); krb5_abortx(context, "mcc_destroy: refcnt already 0"); } if (!MISDEAD(m)) { /* if this is an active mcache, remove it from the linked list, and free all data */ - HEIMDAL_MUTEX_lock(&mcc_mutex); for(n = &mcc_head; n && *n; n = &(*n)->next) { if(m == *n) { *n = m->next; break; } } - HEIMDAL_MUTEX_unlock(&mcc_mutex); mcc_destroy_internal(context, m); } HEIMDAL_MUTEX_unlock(&(m->mutex)); + HEIMDAL_MUTEX_unlock(&mcc_mutex); return 0; } diff --git a/lib/krb5/pac.c b/lib/krb5/pac.c index c26201be9cd7..240845f72e38 100644 --- a/lib/krb5/pac.c +++ b/lib/krb5/pac.c @@ -112,6 +112,56 @@ HMAC_MD5_any_checksum(krb5_context context, } +static krb5_error_code pac_header_size(krb5_context context, + uint32_t num_buffers, + uint32_t *result) +{ + krb5_error_code ret; + uint32_t header_size; + + /* Guard against integer overflow on 32-bit systems. */ + if (num_buffers > UINT32_MAX / PAC_INFO_BUFFER_SIZE) { + ret = EINVAL; + krb5_set_error_message(context, ret, "PAC has too many buffers"); + return ret; + } + header_size = PAC_INFO_BUFFER_SIZE * num_buffers; + + /* Guard against integer overflow on 32-bit systems. */ + if (header_size > UINT32_MAX - PACTYPE_SIZE) { + ret = EINVAL; + krb5_set_error_message(context, ret, "PAC has too many buffers"); + return ret; + } + header_size += PACTYPE_SIZE; + + *result = header_size; + + return 0; +} + +static krb5_error_code pac_aligned_size(krb5_context context, + uint32_t size, + uint32_t *aligned_size) +{ + krb5_error_code ret; + + /* Guard against integer overflow on 32-bit systems. */ + if (size > UINT32_MAX - (PAC_ALIGNMENT - 1)) { + ret = EINVAL; + krb5_set_error_message(context, ret, "integer overrun"); + return ret; + } + size += PAC_ALIGNMENT - 1; + + /* align to PAC_ALIGNMENT */ + size = (size / PAC_ALIGNMENT) * PAC_ALIGNMENT; + + *aligned_size = size; + + return 0; +} + /* * */ @@ -153,8 +203,12 @@ krb5_pac_parse(krb5_context context, const void *ptr, size_t len, goto out; } - p->pac = calloc(1, - sizeof(*p->pac) + (sizeof(p->pac->buffers[0]) * (tmp - 1))); + ret = pac_header_size(context, tmp, &header_end); + if (ret) { + return ret; + } + + p->pac = calloc(1, header_end); if (p->pac == NULL) { ret = krb5_enomem(context); goto out; @@ -163,7 +217,6 @@ krb5_pac_parse(krb5_context context, const void *ptr, size_t len, p->pac->numbuffers = tmp; p->pac->version = tmp2; - header_end = PACTYPE_SIZE + (PAC_INFO_BUFFER_SIZE * p->pac->numbuffers); if (header_end > len) { ret = EINVAL; goto out; @@ -292,37 +345,65 @@ krb5_pac_add_buffer(krb5_context context, krb5_pac p, { krb5_error_code ret; void *ptr; - size_t len, offset, header_end, old_end; + uint32_t unaligned_len, num_buffers, len, offset, header_end, old_end; uint32_t i; - len = p->pac->numbuffers; + if (data->length > UINT32_MAX) { + ret = EINVAL; + krb5_set_error_message(context, ret, "integer overrun"); + return ret; + } + + num_buffers = p->pac->numbuffers; + + if (num_buffers >= UINT32_MAX) { + ret = EINVAL; + krb5_set_error_message(context, ret, "integer overrun"); + return ret; + } + ret = pac_header_size(context, num_buffers + 1, &header_end); + if (ret) { + return ret; + } - ptr = realloc(p->pac, - sizeof(*p->pac) + (sizeof(p->pac->buffers[0]) * len)); + ptr = realloc(p->pac, header_end); if (ptr == NULL) return krb5_enomem(context); p->pac = ptr; - for (i = 0; i < len; i++) + for (i = 0; i < num_buffers; i++) { + if (p->pac->buffers[i].offset_lo > UINT32_MAX - PAC_INFO_BUFFER_SIZE) { + ret = EINVAL; + krb5_set_error_message(context, ret, "integer overrun"); + return ret; + } + p->pac->buffers[i].offset_lo += PAC_INFO_BUFFER_SIZE; + } + if (p->data.length > UINT32_MAX - PAC_INFO_BUFFER_SIZE) { + ret = EINVAL; + krb5_set_error_message(context, ret, "integer overrun"); + return ret; + } offset = p->data.length + PAC_INFO_BUFFER_SIZE; - p->pac->buffers[len].type = type; - p->pac->buffers[len].buffersize = data->length; - p->pac->buffers[len].offset_lo = offset; - p->pac->buffers[len].offset_hi = 0; + p->pac->buffers[num_buffers].type = type; + p->pac->buffers[num_buffers].buffersize = data->length; + p->pac->buffers[num_buffers].offset_lo = offset; + p->pac->buffers[num_buffers].offset_hi = 0; old_end = p->data.length; - len = p->data.length + data->length + PAC_INFO_BUFFER_SIZE; - if (len < p->data.length) { + if (offset > UINT32_MAX - data->length) { krb5_set_error_message(context, EINVAL, "integer overrun"); return EINVAL; } + unaligned_len = offset + data->length; - /* align to PAC_ALIGNMENT */ - len = ((len + PAC_ALIGNMENT - 1) / PAC_ALIGNMENT) * PAC_ALIGNMENT; + ret = pac_aligned_size(context, unaligned_len, &len); + if (ret) + return ret; ret = krb5_data_realloc(&p->data, len); if (ret) { @@ -333,7 +414,7 @@ krb5_pac_add_buffer(krb5_context context, krb5_pac p, /* * make place for new PAC INFO BUFFER header */ - header_end = PACTYPE_SIZE + (PAC_INFO_BUFFER_SIZE * p->pac->numbuffers); + header_end -= PAC_INFO_BUFFER_SIZE; memmove((unsigned char *)p->data.data + header_end + PAC_INFO_BUFFER_SIZE, (unsigned char *)p->data.data + header_end , old_end - header_end); @@ -346,7 +427,7 @@ krb5_pac_add_buffer(krb5_context context, krb5_pac p, memcpy((unsigned char *)p->data.data + offset, data->data, data->length); memset((unsigned char *)p->data.data + offset + data->length, - 0, p->data.length - offset - data->length); + 0, p->data.length - unaligned_len); p->pac->numbuffers += 1; @@ -375,8 +456,8 @@ krb5_pac_get_buffer(krb5_context context, krb5_pac p, uint32_t i; for (i = 0; i < p->pac->numbuffers; i++) { - const size_t len = p->pac->buffers[i].buffersize; - const size_t offset = p->pac->buffers[i].offset_lo; + const uint32_t len = p->pac->buffers[i].buffersize; + const uint32_t offset = p->pac->buffers[i].offset_lo; if (p->pac->buffers[i].type != type) continue; @@ -981,8 +1062,8 @@ _krb5_pac_sign(krb5_context context, size_t server_size, priv_size; uint32_t server_offset = 0, priv_offset = 0; uint32_t server_cksumtype = 0, priv_cksumtype = 0; - int num = 0; - size_t i; + uint32_t num = 0; + uint32_t i; krb5_data logon, d; krb5_data_zero(&logon); @@ -1030,8 +1111,18 @@ _krb5_pac_sign(krb5_context context, if (num) { void *ptr; - - ptr = realloc(p->pac, sizeof(*p->pac) + (sizeof(p->pac->buffers[0]) * (p->pac->numbuffers + num - 1))); + uint32_t len; + + if (p->pac->numbuffers > UINT32_MAX - num) { + ret = EINVAL; + krb5_set_error_message(context, ret, "integer overrun"); + goto out; + } + ret = pac_header_size(context, p->pac->numbuffers + num, &len); + if (ret) + goto out; + + ptr = realloc(p->pac, len); if (ptr == NULL) return krb5_enomem(context); @@ -1084,7 +1175,9 @@ _krb5_pac_sign(krb5_context context, CHECK(ret, krb5_store_uint32(sp, p->pac->numbuffers), out); CHECK(ret, krb5_store_uint32(sp, p->pac->version), out); - end = PACTYPE_SIZE + (PAC_INFO_BUFFER_SIZE * p->pac->numbuffers); + ret = pac_header_size(context, p->pac->numbuffers, &end); + if (ret) + goto out; for (i = 0; i < p->pac->numbuffers; i++) { uint32_t len; @@ -1094,11 +1187,31 @@ _krb5_pac_sign(krb5_context context, /* store data */ if (p->pac->buffers[i].type == PAC_SERVER_CHECKSUM) { + if (server_size > UINT32_MAX - 4) { + ret = EINVAL; + krb5_set_error_message(context, ret, "integer overrun"); + goto out; + } + if (end > UINT32_MAX - 4) { + ret = EINVAL; + krb5_set_error_message(context, ret, "integer overrun"); + goto out; + } len = server_size + 4; server_offset = end + 4; CHECK(ret, krb5_store_uint32(spdata, server_cksumtype), out); CHECK(ret, fill_zeros(context, spdata, server_size), out); } else if (p->pac->buffers[i].type == PAC_PRIVSVR_CHECKSUM) { + if (priv_size > UINT32_MAX - 4) { + ret = EINVAL; + krb5_set_error_message(context, ret, "integer overrun"); + goto out; + } + if (end > UINT32_MAX - 4) { + ret = EINVAL; + krb5_set_error_message(context, ret, "integer overrun"); + goto out; + } len = priv_size + 4; priv_offset = end + 4; CHECK(ret, krb5_store_uint32(spdata, priv_cksumtype), out); @@ -1129,11 +1242,20 @@ _krb5_pac_sign(krb5_context context, /* advance data endpointer and align */ { - int32_t e; + uint32_t e; + if (end > UINT32_MAX - len) { + ret = EINVAL; + krb5_set_error_message(context, ret, "integer overrun"); + goto out; + } end += len; - e = ((end + PAC_ALIGNMENT - 1) / PAC_ALIGNMENT) * PAC_ALIGNMENT; - if ((int32_t)end != e) { + + ret = pac_aligned_size(context, end, &e); + if (ret) + goto out; + + if (end != e) { CHECK(ret, fill_zeros(context, spdata, e - end), out); } end = e; diff --git a/lib/krb5/plugin.c b/lib/krb5/plugin.c index 03f64000f239..f4bf99953ebb 100644 --- a/lib/krb5/plugin.c +++ b/lib/krb5/plugin.c @@ -543,7 +543,7 @@ _krb5_plugin_run_f(krb5_context context, struct krb5_plugin *p; /* Get registered plugins */ - (void) _krb5_plugin_find(context, SYMBOL, name, ®istered_plugins); + (void) _krb5_plugin_find(context, PLUGIN_TYPE_DATA, name, ®istered_plugins); HEIMDAL_MUTEX_lock(&plugin_mutex); diff --git a/lib/krb5/principal.c b/lib/krb5/principal.c index 23c459281e5e..937a9a7d59e4 100644 --- a/lib/krb5/principal.c +++ b/lib/krb5/principal.c @@ -1258,19 +1258,43 @@ krb5_principal_is_anonymous(krb5_context context, krb5_const_principal p, unsigned int flags) { - int anon_realm; + /* + * Heimdal versions 7.5 and below left the name-type at KRB5_NT_PRINCIPAL + * even with anonymous pkinit responses. To retain interoperability with + * legacy KDCs, the name-type is not checked by the client after requesting + * a fully anonymous ticket. + */ + if (!(flags & KRB5_ANON_IGNORE_NAME_TYPE) && + p->name.name_type != KRB5_NT_WELLKNOWN && + p->name.name_type != KRB5_NT_UNKNOWN) + return FALSE; - if ((p->name.name_type != KRB5_NT_WELLKNOWN && - p->name.name_type != KRB5_NT_UNKNOWN) || - p->name.name_string.len != 2 || + if (p->name.name_string.len != 2 || strcmp(p->name.name_string.val[0], KRB5_WELLKNOWN_NAME) != 0 || strcmp(p->name.name_string.val[1], KRB5_ANON_NAME) != 0) return FALSE; - anon_realm = strcmp(p->realm, KRB5_ANON_REALM) == 0; + /* + * While unauthenticated clients SHOULD get "WELLKNOWN:ANONYMOUS" as their + * realm, Heimdal KDCs prior to 7.0 returned the requested realm. While + * such tickets might lead *servers* to unwittingly grant access to fully + * anonymous clients, trusting that the client was authenticated to the + * realm in question, doing it right is the KDC's job, the client should + * not refuse such a ticket. + * + * If we ever do decide to enforce WELLKNOWN:ANONYMOUS for unauthenticated + * clients, it is essential that calls that pass KRB5_ANON_MATCH_ANY still + * ignore the realm, as in that case either case matches one of the two + * possible conditions. + */ + if (flags & KRB5_ANON_MATCH_UNAUTHENTICATED) + return TRUE; - return ((flags & KRB5_ANON_MATCH_AUTHENTICATED) && !anon_realm) || - ((flags & KRB5_ANON_MATCH_UNAUTHENTICATED) && anon_realm); + /* + * Finally, authenticated clients that asked to be only anonymized do + * legitimately expect a non-anon realm. + */ + return strcmp(p->realm, KRB5_ANON_REALM) != 0; } static int diff --git a/lib/krb5/rd_req.c b/lib/krb5/rd_req.c index fbced144e723..3937dc5ab3ac 100644 --- a/lib/krb5/rd_req.c +++ b/lib/krb5/rd_req.c @@ -773,11 +773,10 @@ get_key_from_keytab(krb5_context context, kvno, ap_req->ticket.enc_part.etype, &entry); - if(ret) - goto out; - ret = krb5_copy_keyblock(context, &entry.keyblock, out_key); - krb5_kt_free_entry (context, &entry); -out: + if(ret == 0) { + ret = krb5_copy_keyblock(context, &entry.keyblock, out_key); + krb5_kt_free_entry(context, &entry); + } if(keytab == NULL) krb5_kt_close(context, real_keytab); diff --git a/lib/krb5/salt-aes-sha2.c b/lib/krb5/salt-aes-sha2.c index bfd726c34c19..bc674bd2dab7 100644 --- a/lib/krb5/salt-aes-sha2.c +++ b/lib/krb5/salt-aes-sha2.c @@ -92,8 +92,9 @@ AES_SHA2_string_to_key(krb5_context context, goto cleanup; } memcpy(saltp.data, et->name, enctypesz); - memcpy((unsigned char *)saltp.data + enctypesz, - salt.saltvalue.data, salt.saltvalue.length); + if (salt.saltvalue.length) + memcpy((unsigned char *)saltp.data + enctypesz, + salt.saltvalue.data, salt.saltvalue.length); ret = _krb5_aes_sha2_md_for_enctype(context, enctype, &md); if (ret) diff --git a/lib/krb5/salt-des.c b/lib/krb5/salt-des.c index d898d6c20574..474ba5d591d6 100644 --- a/lib/krb5/salt-des.c +++ b/lib/krb5/salt-des.c @@ -194,7 +194,8 @@ krb5_DES_string_to_key(krb5_context context, if (len > 0 && s == NULL) return krb5_enomem(context); memcpy(s, password.data, password.length); - memcpy(s + password.length, salt.saltvalue.data, salt.saltvalue.length); + if (salt.saltvalue.length) + memcpy(s + password.length, salt.saltvalue.data, salt.saltvalue.length); DES_string_to_key_int(s, len, &tmp); key->keytype = enctype; krb5_data_copy(&key->keyvalue, tmp, sizeof(tmp)); diff --git a/lib/krb5/salt-des3.c b/lib/krb5/salt-des3.c index 8cb73cf465a6..a9293ccec9c0 100644 --- a/lib/krb5/salt-des3.c +++ b/lib/krb5/salt-des3.c @@ -113,7 +113,8 @@ DES3_string_to_key_derived(krb5_context context, if (len != 0 && s == NULL) return krb5_enomem(context); memcpy(s, password.data, password.length); - memcpy(s + password.length, salt.saltvalue.data, salt.saltvalue.length); + if (salt.saltvalue.length) + memcpy(s + password.length, salt.saltvalue.data, salt.saltvalue.length); ret = krb5_string_to_key_derived(context, s, len, diff --git a/lib/krb5/send_to_kdc.c b/lib/krb5/send_to_kdc.c index a920db78b649..104db9e26ee3 100644 --- a/lib/krb5/send_to_kdc.c +++ b/lib/krb5/send_to_kdc.c @@ -1161,7 +1161,7 @@ krb5_sendto_context(krb5_context context, break; } action = KRB5_SENDTO_KRBHST; - /* FALLTHOUGH */ + /* FALLTHROUGH */ case KRB5_SENDTO_KRBHST: if (ctx->krbhst == NULL) { ret = krb5_krbhst_init_flags(context, realm, type, @@ -1179,7 +1179,7 @@ krb5_sendto_context(krb5_context context, handle = heim_retain(ctx->krbhst); } action = KRB5_SENDTO_TIMEOUT; - /* FALLTHOUGH */ + /* FALLTHROUGH */ case KRB5_SENDTO_TIMEOUT: /* diff --git a/lib/krb5/send_to_kdc_plugin.h b/lib/krb5/send_to_kdc_plugin.h index 11712b2747ac..0fa43d3aba90 100644 --- a/lib/krb5/send_to_kdc_plugin.h +++ b/lib/krb5/send_to_kdc_plugin.h @@ -45,14 +45,14 @@ #define KRB5_PLUGIN_SEND_TO_KDC_VERSION KRB5_PLUGIN_SEND_TO_KDC_VERSION_2 typedef krb5_error_code -(*krb5plugin_send_to_kdc_func)(krb5_context, +(KRB5_CALLCONV *krb5plugin_send_to_kdc_func)(krb5_context, void *, krb5_krbhst_info *, time_t timeout, const krb5_data *, krb5_data *); typedef krb5_error_code -(*krb5plugin_send_to_realm_func)(krb5_context, +(KRB5_CALLCONV *krb5plugin_send_to_realm_func)(krb5_context, void *, krb5_const_realm, time_t timeout, @@ -62,8 +62,8 @@ typedef krb5_error_code typedef struct krb5plugin_send_to_kdc_ftable { int minor_version; - krb5_error_code (*init)(krb5_context, void **); - void (*fini)(void *); + krb5_error_code (KRB5_CALLCONV *init)(krb5_context, void **); + void (KRB5_CALLCONV *fini)(void *); krb5plugin_send_to_kdc_func send_to_kdc; krb5plugin_send_to_realm_func send_to_realm; /* added in version 2 */ } krb5plugin_send_to_kdc_ftable; diff --git a/lib/krb5/store_emem.c b/lib/krb5/store_emem.c index 6d95bcf525a8..985aba9d1272 100644 --- a/lib/krb5/store_emem.c +++ b/lib/krb5/store_emem.c @@ -70,7 +70,8 @@ emem_store(krb5_storage *sp, const void *data, size_t size) s->base = base; s->ptr = (unsigned char*)base + off; } - memmove(s->ptr, data, size); + if (size) + memmove(s->ptr, data, size); sp->seek(sp, size, SEEK_CUR); return size; } diff --git a/lib/krb5/test_plugin.c b/lib/krb5/test_plugin.c index ed6a9e7f1568..cfc3b6c04df1 100644 --- a/lib/krb5/test_plugin.c +++ b/lib/krb5/test_plugin.c @@ -34,19 +34,19 @@ #include <krb5_locl.h> #include "locate_plugin.h" -static krb5_error_code +static krb5_error_code KRB5_CALLCONV resolve_init(krb5_context context, void **ctx) { *ctx = NULL; return 0; } -static void +static void KRB5_CALLCONV resolve_fini(void *ctx) { } -static krb5_error_code +static krb5_error_code KRB5_CALLCONV resolve_lookup(void *ctx, enum locate_service_type service, const char *realm, diff --git a/lib/krb5/test_store.c b/lib/krb5/test_store.c index 5fac75cd1991..6876cc1db279 100644 --- a/lib/krb5/test_store.c +++ b/lib/krb5/test_store.c @@ -64,7 +64,7 @@ test_int16(krb5_context context, krb5_storage *sp) krb5_error_code ret; int i; int16_t val[] = { - 0, 1, -1, 32768, -32767 + 0, 1, -1, 32767, -32768 }, v; krb5_storage_truncate(sp, 0); diff --git a/lib/krb5/ticket.c b/lib/krb5/ticket.c index 8961c394a492..ef9965060516 100644 --- a/lib/krb5/ticket.c +++ b/lib/krb5/ticket.c @@ -541,10 +541,22 @@ check_client_anonymous(krb5_context context, if (!rep->enc_part.flags.anonymous) return KRB5KDC_ERR_BADOPTION; + /* + * Here we must validate that the AS returned a ticket of the expected type + * for either a fully anonymous request, or authenticated request for an + * anonymous ticket. If this is a TGS request, we're done. Then if the + * 'requested' principal was anonymous, we'll check the 'mapped' principal + * accordingly (without enforcing the name type and perhaps the realm). + * Finally, if the 'requested' principal was not anonymous, well check + * that the 'mapped' principal has an anonymous name and type, in a + * non-anonymous realm. (Should we also be checking for a realm match + * between the request and the mapped name in this case?) + */ if (is_tgs_rep) - flags = KRB5_ANON_MATCH_ANY; - else if (krb5_principal_is_anonymous(context, requested, KRB5_ANON_MATCH_ANY)) - flags = KRB5_ANON_MATCH_UNAUTHENTICATED; + flags = KRB5_ANON_MATCH_ANY_NONT; + else if (krb5_principal_is_anonymous(context, requested, + KRB5_ANON_MATCH_ANY_NONT)) + flags = KRB5_ANON_MATCH_UNAUTHENTICATED | KRB5_ANON_IGNORE_NAME_TYPE; else flags = KRB5_ANON_MATCH_AUTHENTICATED; @@ -566,7 +578,8 @@ check_client_mismatch(krb5_context context, krb5_keyblock const * key) { if (rep->enc_part.flags.anonymous) { - if (!krb5_principal_is_anonymous(context, mapped, KRB5_ANON_MATCH_ANY)) { + if (!krb5_principal_is_anonymous(context, mapped, + KRB5_ANON_MATCH_ANY_NONT)) { krb5_set_error_message(context, KRB5KRB_AP_ERR_MODIFIED, N_("Anonymous ticket does not contain anonymous " "principal", "")); diff --git a/lib/krb5/transited.c b/lib/krb5/transited.c index 35c00e65add4..8ad122afa92b 100644 --- a/lib/krb5/transited.c +++ b/lib/krb5/transited.c @@ -281,6 +281,7 @@ decode_realms(krb5_context context, r = make_realm(tmp); if(r == NULL){ free_realms(*realms); + *realms = NULL; return krb5_enomem(context); } *realms = append_realm(*realms, r); @@ -289,7 +290,8 @@ decode_realms(krb5_context context, } tmp = malloc(tr + i - start + 1); if(tmp == NULL){ - free(*realms); + free_realms(*realms); + *realms = NULL; return krb5_enomem(context); } memcpy(tmp, start, tr + i - start); @@ -297,6 +299,7 @@ decode_realms(krb5_context context, r = make_realm(tmp); if(r == NULL){ free_realms(*realms); + *realms = NULL; return krb5_enomem(context); } *realms = append_realm(*realms, r); diff --git a/lib/krb5/verify_krb5_conf.cat8 b/lib/krb5/verify_krb5_conf.cat8 index 25143916cfc9..289f2f1cb278 100644 --- a/lib/krb5/verify_krb5_conf.cat8 +++ b/lib/krb5/verify_krb5_conf.cat8 @@ -1,32 +1,31 @@ - VERIFY_KRB5_CONF(8) BSD System Manager's Manual VERIFY_KRB5_CONF(8) -NNAAMMEE - vveerriiffyy__kkrrbb55__ccoonnff -- checks krb5.conf for obvious errors +[1mNAME[0m + [1mverify_krb5_conf [22m-- checks krb5.conf for obvious errors -SSYYNNOOPPSSIISS - vveerriiffyy__kkrrbb55__ccoonnff _[_c_o_n_f_i_g_-_f_i_l_e_] +[1mSYNOPSIS[0m + [1mverify_krb5_conf [4m[22m[config-file][0m -DDEESSCCRRIIPPTTIIOONN - vveerriiffyy__kkrrbb55__ccoonnff reads the configuration file _k_r_b_5_._c_o_n_f, or the file +[1mDESCRIPTION[0m + [1mverify_krb5_conf [22mreads the configuration file [4mkrb5.conf[24m, or the file given on the command line, parses it, checking verifying that the syntax is not correctly wrong. - If the file is syntactically correct, vveerriiffyy__kkrrbb55__ccoonnff tries to verify + If the file is syntactically correct, [1mverify_krb5_conf [22mtries to verify that the contents of the file is of relevant nature. -EENNVVIIRROONNMMEENNTT +[1mENVIRONMENT[0m KRB5_CONFIG points to the configuration file to read. -FFIILLEESS +[1mFILES[0m /etc/krb5.conf Kerberos 5 configuration file -DDIIAAGGNNOOSSTTIICCSS - Possible output from vveerriiffyy__kkrrbb55__ccoonnff include: +[1mDIAGNOSTICS[0m + Possible output from [1mverify_krb5_conf [22minclude: <path>: failed to parse <something> as size/time/number/boolean Usually means that <something> is misspelled, or that it contains - weird characters. The parsing done by vveerriiffyy__kkrrbb55__ccoonnff is more + weird characters. The parsing done by [1mverify_krb5_conf [22mis more strict than the one performed by libkrb5, so strings that work in real life might be reported as bad. @@ -36,18 +35,18 @@ DDIIAAGGNNOOSSTTIICCSS <path>: unknown or wrong type Means that <path> is either a string when it should be a list, - vice versa, or just that vveerriiffyy__kkrrbb55__ccoonnff is confused. + vice versa, or just that [1mverify_krb5_conf [22mis confused. <path>: unknown entry - Means that <string> is not known by vveerriiffyy__kkrrbb55__ccoonnff. + Means that <string> is not known by [1mverify_krb5_conf[22m. -SSEEEE AALLSSOO +[1mSEE ALSO[0m krb5.conf(5) -BBUUGGSS +[1mBUGS[0m Since each application can put almost anything in the config file, it's - hard to come up with a watertight verification process. Most of the - default settings are sanity checked, but this does not mean that every + hard to come up with a watertight verification process. Most of the de- + fault settings are sanity checked, but this does not mean that every problem is discovered, or that everything that is reported as a possible problem actually is one. This tool should thus be used with some care. diff --git a/lib/libedit/Makefile.in b/lib/libedit/Makefile.in index ea0c8c9d94c7..24ed118de587 100644 --- a/lib/libedit/Makefile.in +++ b/lib/libedit/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -135,9 +135,9 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in + cscope distdir distdir-am dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ + config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -154,9 +154,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in COPYING \ ChangeLog INSTALL THANKS compile config.guess config.sub \ @@ -199,6 +196,8 @@ am__relativize = \ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best DIST_TARGETS = dist-gzip +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -216,6 +215,8 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -226,8 +227,10 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -313,6 +316,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -350,8 +354,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -492,8 +496,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -573,6 +579,10 @@ dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -615,6 +625,8 @@ distcheck: dist eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -630,7 +642,7 @@ distcheck: dist $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ @@ -792,18 +804,18 @@ uninstall-am: am--refresh check check-am clean clean-cscope clean-generic \ clean-libtool cscope cscopelist-am ctags ctags-am dist \ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am + dist-xz dist-zip dist-zstd distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am .PRECIOUS: Makefile diff --git a/lib/libedit/aclocal.m4 b/lib/libedit/aclocal.m4 index 5954fb8cd506..9bdf1cc3df82 100644 --- a/lib/libedit/aclocal.m4 +++ b/lib/libedit/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.5 -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,15 +14,16 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, -[m4_warning([this file was generated for autoconf 2.69. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],, +[m4_warning([this file was generated for autoconf 2.71. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -53,7 +54,7 @@ m4_define([_LT_COPYING], [dnl # along with this program. If not, see <http://www.gnu.org/licenses/>. ]) -# serial 58 LT_INIT +# serial 59 LT_INIT # LT_PREREQ(VERSION) @@ -203,6 +204,7 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_DECL_FILECMD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl @@ -241,8 +243,8 @@ esac ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -794,7 +796,7 @@ _LT_EOF # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -1056,8 +1058,8 @@ int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1081,17 +1083,12 @@ _LT_EOF _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[[012]][[,.]]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -1140,12 +1137,12 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], [ if test yes != "$lt_cv_apple_cc_single_mod"; then _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1259,7 +1256,8 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) # _LT_WITH_SYSROOT # ---------------- AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) +[m4_require([_LT_DECL_SED])dnl +AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], [Search for dependent libraries within DIR (or the compiler's sysroot @@ -1276,7 +1274,7 @@ case $with_sysroot in #( fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -1306,7 +1304,7 @@ ia64-*-hpux*) # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -1323,7 +1321,7 @@ ia64-*-hpux*) echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -1335,7 +1333,7 @@ ia64-*-hpux*) ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -1357,7 +1355,7 @@ mips64*-*linux*) echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -1365,7 +1363,7 @@ mips64*-*linux*) emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -1373,7 +1371,7 @@ mips64*-*linux*) emul="${emul}ltsmip" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -1393,14 +1391,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -1468,7 +1466,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -1507,9 +1505,22 @@ need_locks=$enable_libtool_lock m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cru} _LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. + +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS +_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. +_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], + [Flags to create an archive]) AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], [lt_cv_ar_at_file=no @@ -1728,7 +1739,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1771,7 +1782,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[ ]]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -2221,26 +2232,35 @@ m4_defun([_LT_CMD_STRIPLIB], striplib= old_striplib= AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) +if test -z "$STRIP"; then + AC_MSG_RESULT([no]) else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) - else + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac + ;; + esac + fi fi _LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) _LT_DECL([], [striplib], [1]) @@ -2563,7 +2583,7 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; @@ -2573,14 +2593,14 @@ m4_if([$1], [],[ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -2599,7 +2619,7 @@ m4_if([$1], [],[ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -2636,7 +2656,7 @@ m4_if([$1], [],[ ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -2669,7 +2689,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -2881,6 +2901,9 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command @@ -2889,7 +2912,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -3468,7 +3491,7 @@ beos*) bsdi[[45]]*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -3502,14 +3525,14 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -3523,7 +3546,7 @@ haiku*) ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' @@ -3570,7 +3593,7 @@ netbsd*) newos6*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -3697,13 +3720,13 @@ else mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -3729,7 +3752,7 @@ else # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -3969,7 +3992,7 @@ esac if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -3987,20 +4010,20 @@ fi # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -4024,7 +4047,7 @@ for ac_symprfx in "" "_"; do if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ @@ -4042,9 +4065,9 @@ for ac_symprfx in "" "_"; do " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -4331,7 +4354,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -4414,7 +4437,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4750,7 +4773,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4933,7 +4956,7 @@ m4_if([$1], [CXX], [ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) @@ -4941,7 +4964,7 @@ m4_if([$1], [CXX], [ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) + cl* | icl*) _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ;; *) @@ -4998,15 +5021,15 @@ dnl Note also adjust exclude_expsyms for C++ above. case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -5058,7 +5081,7 @@ dnl Note also adjust exclude_expsyms for C++ above. _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -5170,6 +5193,7 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; interix[[3-9]]*) @@ -5184,7 +5208,7 @@ _LT_EOF # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -5227,7 +5251,7 @@ _LT_EOF _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes @@ -5239,7 +5263,7 @@ _LT_EOF if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi @@ -5255,7 +5279,7 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -5387,7 +5411,7 @@ _LT_EOF if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -5570,12 +5594,12 @@ _LT_EOF cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=yes @@ -5616,7 +5640,7 @@ _LT_EOF fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Tell ltmain to make .lib files, not .a files. @@ -5664,7 +5688,7 @@ _LT_EOF ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes @@ -5875,6 +5899,7 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; osf3*) @@ -6641,8 +6666,8 @@ if test yes != "$_lt_caught_CXX_error"; then cygwin* | mingw* | pw32* | cegcc*) case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC + ,cl* | no,cl* | ,icl* | no,icl*) + # Native MSVC or ICC # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' @@ -6740,6 +6765,7 @@ if test yes != "$_lt_caught_CXX_error"; then emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; dgux*) @@ -6770,7 +6796,7 @@ if test yes != "$_lt_caught_CXX_error"; then _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_TAGVAR(ld_shlibs, $1)=yes @@ -6907,7 +6933,7 @@ if test yes != "$_lt_caught_CXX_error"; then # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in @@ -7047,13 +7073,13 @@ if test yes != "$_lt_caught_CXX_error"; then _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -8191,6 +8217,14 @@ _LT_DECL([], [DLLTOOL], [1], [DLL creation program]) AC_SUBST([DLLTOOL]) ]) +# _LT_DECL_FILECMD +# ---------------- +# Check for a file(cmd) program that can be used to detect file type and magic +m4_defun([_LT_DECL_FILECMD], +[AC_CHECK_TOOL([FILECMD], [file], [:]) +_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) +])# _LD_DECL_FILECMD + # _LT_DECL_SED # ------------ # Check for a fully-functional sed program, that truncates @@ -8370,8 +8404,8 @@ _LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -8802,7 +8836,7 @@ LT_OPTION_DEFINE([LTDL_INIT], [convenience], # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software # Foundation, Inc. # Written by Gary V. Vaughan, 2004 # @@ -8927,7 +8961,8 @@ m4_define([lt_dict_filter], # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, +# Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -8936,23 +8971,23 @@ m4_define([lt_dict_filter], # @configure_input@ -# serial 4179 ltversion.m4 +# serial 4245 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.6]) -m4_define([LT_PACKAGE_REVISION], [2.4.6]) +m4_define([LT_PACKAGE_VERSION], [2.4.7]) +m4_define([LT_PACKAGE_REVISION], [2.4.7]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.6' -macro_revision='2.4.6' +[macro_version='2.4.7' +macro_revision='2.4.7' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives @@ -9049,7 +9084,7 @@ m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -# Copyright (C) 2002-2017 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9061,10 +9096,10 @@ m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.15' +[am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15.1], [], +m4_if([$1], [1.16.5], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -9080,14 +9115,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15.1])dnl +[AM_AUTOMAKE_VERSION([1.16.5])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9139,7 +9174,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9170,7 +9205,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9361,13 +9396,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. - # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -9375,49 +9409,43 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -9426,18 +9454,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # ----------------------------- # This macro should only be invoked once -- use via AC_REQUIRE. # -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9465,6 +9492,10 @@ m4_defn([AC_PROG_CC]) # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.65])dnl +m4_ifdef([_$0_ALREADY_INIT], + [m4_fatal([$0 expanded multiple times +]m4_defn([_$0_ALREADY_INIT]))], + [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -9501,7 +9532,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl @@ -9524,8 +9555,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -9553,6 +9584,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], [m4_define([AC_PROG_OBJCXX], m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi +AC_SUBST([CTAGS]) +if test -z "$ETAGS"; then + ETAGS=etags +fi +AC_SUBST([ETAGS]) +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi +AC_SUBST([CSCOPE]) + AC_REQUIRE([AM_SILENT_RULES])dnl dnl The testsuite driver may need to know about EXEEXT, so add the dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This @@ -9592,7 +9637,7 @@ END Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: <http://www.gnu.org/software/coreutils/>. +that behaves properly: <https://www.gnu.org/software/coreutils/>. If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -9634,7 +9679,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9655,7 +9700,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9676,7 +9721,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9684,49 +9729,42 @@ AC_SUBST([am__leading_dot])]) # AM_MAKE_INCLUDE() # ----------------- -# Check to see how make treats includes. +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9747,12 +9785,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -9765,7 +9798,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9794,7 +9827,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9841,7 +9874,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9860,7 +9893,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9941,7 +9974,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2017 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10001,7 +10034,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2017 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10029,7 +10062,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2017 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10048,7 +10081,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2017 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/lib/libedit/compile b/lib/libedit/compile index 2ab71e4ea13e..df363c8fbfbc 100755 --- a/lib/libedit/compile +++ b/lib/libedit/compile @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -53,7 +53,7 @@ func_file_conv () MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ func_file_conv () mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) @@ -340,7 +340,7 @@ exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/lib/libedit/config.guess b/lib/libedit/config.guess index 2193702b12af..c7f17e8fb978 100755 --- a/lib/libedit/config.guess +++ b/lib/libedit/config.guess @@ -1,12 +1,14 @@ -#! /bin/sh +#!/usr/bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2017 Free Software Foundation, Inc. +# Copyright 1992-2022 Free Software Foundation, Inc. -timestamp='2017-05-27' +# shellcheck disable=SC2006,SC2268 # see below for rationale + +timestamp='2022-05-25' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -15,7 +17,7 @@ timestamp='2017-05-27' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see <http://www.gnu.org/licenses/>. +# along with this program; if not, see <https://www.gnu.org/licenses/>. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -27,11 +29,19 @@ timestamp='2017-05-27' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess # # Please send patches to <config-patches@gnu.org>. +# The "shellcheck disable" line above the timestamp inhibits complaints +# about features and limitations of the classic Bourne shell that were +# superseded or lifted in POSIX. However, this script identifies a wide +# variety of pre-POSIX systems that do not have POSIX shells at all, and +# even some reasonably current systems (Solaris 10 as case-in-point) still +# have a pre-POSIX /bin/sh. + + me=`echo "$0" | sed -e 's,.*/,,'` usage="\ @@ -39,7 +49,7 @@ Usage: $0 [OPTION] Output the configuration name of the system \`$me' is run on. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -50,7 +60,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2017 Free Software Foundation, Inc. +Copyright 1992-2022 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -84,7 +94,8 @@ if test $# != 0; then exit 1 fi -trap 'exit 1' 1 2 15 +# Just in case it came from the environment. +GUESS= # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires @@ -96,66 +107,90 @@ trap 'exit 1' 1 2 15 # Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +tmp= +# shellcheck disable=SC2172 +trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 + +set_cc_for_build() { + # prevent multiple calls if $tmp is already set + test "$tmp" && return 0 + : "${TMPDIR=/tmp}" + # shellcheck disable=SC2039,SC3028 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } + dummy=$tmp/dummy + case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in + ,,) echo "int x;" > "$dummy.c" + for driver in cc gcc c89 c99 ; do + if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD=$driver + break + fi + done + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; + esac +} # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then +if test -f /.attbin/uname ; then PATH=$PATH:/.attbin ; export PATH fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in +case $UNAME_SYSTEM in Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu + LIBC=unknown - eval $set_cc_for_build - cat <<-EOF > $dummy.c + set_cc_for_build + cat <<-EOF > "$dummy.c" #include <features.h> #if defined(__UCLIBC__) LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc - #else + #elif defined(__GLIBC__) LIBC=gnu + #else + #include <stdarg.h> + /* First heuristic to detect musl libc. */ + #ifdef __DEFINED_va_list + LIBC=musl + #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "$cc_set_libc" + + # Second heuristic to detect musl libc. + if [ "$LIBC" = unknown ] && + command -v ldd >/dev/null && + ldd --version 2>&1 | grep -q ^musl; then + LIBC=musl + fi + + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + if [ "$LIBC" = unknown ]; then + LIBC=gnu + fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -167,32 +202,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - /sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || \ + /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ echo unknown)` - case "${UNAME_MACHINE_ARCH}" in + case $UNAME_MACHINE_ARCH in + aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; earmv*) - arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` machine=${arch}${endian}-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + *) machine=$UNAME_MACHINE_ARCH-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case "${UNAME_MACHINE_ARCH}" in + case $UNAME_MACHINE_ARCH in earm*) os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build + set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -208,10 +243,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ;; esac # Determine ABI tags. - case "${UNAME_MACHINE_ARCH}" in + case $UNAME_MACHINE_ARCH in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` ;; esac # The OS release @@ -219,47 +254,68 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in + case $UNAME_VERSION in Debian*) release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` + release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}${abi}" - exit ;; + GUESS=$machine-${os}${release}${abi-} + ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE + ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE + ;; + *:SecBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` + GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE + ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE + ;; + *:MidnightBSD:*:*) + GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE + ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE + ;; *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE + ;; + *:OS108:*:*) + GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE + ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; + GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE + ;; *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE + ;; *:Sortix:*:*) - echo ${UNAME_MACHINE}-unknown-sortix - exit ;; + GUESS=$UNAME_MACHINE-unknown-sortix + ;; + *:Twizzler:*:*) + GUESS=$UNAME_MACHINE-unknown-twizzler + ;; + *:Redox:*:*) + GUESS=$UNAME_MACHINE-unknown-redox + ;; + mips:OSF1:*.*) + GUESS=mips-dec-osf1 + ;; alpha:OSF1:*:*) + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + trap '' 0 case $UNAME_RELEASE in *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -273,7 +329,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in + case $ALPHA_CPU_TYPE in "EV4 (21064)") UNAME_MACHINE=alpha ;; "EV4.5 (21064)") @@ -310,126 +366,121 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; + OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + GUESS=$UNAME_MACHINE-dec-osf$OSF_REL + ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; + GUESS=m68k-unknown-sysv4 + ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; + GUESS=$UNAME_MACHINE-unknown-amigaos + ;; *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; + GUESS=$UNAME_MACHINE-unknown-morphos + ;; *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; + GUESS=i370-ibm-openedition + ;; *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; + GUESS=s390-ibm-zvmoe + ;; *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; + GUESS=powerpc-ibm-os400 + ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; + GUESS=arm-acorn-riscix$UNAME_RELEASE + ;; arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; + GUESS=arm-unknown-riscos + ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; + GUESS=hppa1.1-hitachi-hiuxmpp + ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; + case `(/bin/universe) 2>/dev/null` in + att) GUESS=pyramid-pyramid-sysv3 ;; + *) GUESS=pyramid-pyramid-bsd ;; + esac + ;; NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; + GUESS=pyramid-pyramid-svr4 + ;; DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; + GUESS=sparc-icl-nx6 + ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; + sparc) GUESS=sparc-icl-nx7 ;; + esac + ;; s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL + ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-hal-solaris2$SUN_REL + ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris2$SUN_REL + ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} - exit ;; + GUESS=i386-pc-auroraux$UNAME_RELEASE + ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build + set_cc_for_build SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then SUN_ARCH=x86_64 fi fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$SUN_ARCH-pc-solaris2$SUN_REL + ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris3$SUN_REL + ;; sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in + case `/usr/bin/arch -k` in Series*|S4*) UNAME_RELEASE=`uname -v` ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` + GUESS=sparc-sun-sunos$SUN_REL + ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; + GUESS=m68k-sun-sunos$UNAME_RELEASE + ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 - case "`/bin/arch`" in + test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 + case `/bin/arch` in sun3) - echo m68k-sun-sunos${UNAME_RELEASE} + GUESS=m68k-sun-sunos$UNAME_RELEASE ;; sun4) - echo sparc-sun-sunos${UNAME_RELEASE} + GUESS=sparc-sun-sunos$UNAME_RELEASE ;; esac - exit ;; + ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; + GUESS=sparc-auspex-sunos$UNAME_RELEASE + ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -439,44 +490,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + GUESS=m68k-milan-mint$UNAME_RELEASE + ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + GUESS=m68k-hades-mint$UNAME_RELEASE + ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + GUESS=m68k-unknown-mint$UNAME_RELEASE + ;; m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; + GUESS=m68k-apple-machten$UNAME_RELEASE + ;; powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; + GUESS=powerpc-apple-machten$UNAME_RELEASE + ;; RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; + GUESS=mips-dec-mach_bsd4.3 + ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; + GUESS=mips-dec-ultrix$UNAME_RELEASE + ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; + GUESS=vax-dec-ultrix$UNAME_RELEASE + ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; + GUESS=clipper-intergraph-clix$UNAME_RELEASE + ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include <stdio.h> /* for printf() prototype */ int main (int argc, char *argv[]) { @@ -485,95 +536,96 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in #endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); #endif #endif exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && + dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} - exit ;; + GUESS=mips-mips-riscos$UNAME_RELEASE + ;; Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; + GUESS=powerpc-motorola-powermax + ;; Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; + GUESS=powerpc-harris-powermax + ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; + GUESS=powerpc-harris-powermax + ;; Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; + GUESS=powerpc-harris-powerunix + ;; m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; + GUESS=m88k-harris-cxux7 + ;; m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; + GUESS=m88k-motorola-sysv4 + ;; m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; + GUESS=m88k-motorola-sysv3 + ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] + if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ + test "$TARGET_BINARY_INTERFACE"x = x then - echo m88k-dg-dgux${UNAME_RELEASE} + GUESS=m88k-dg-dgux$UNAME_RELEASE else - echo m88k-dg-dguxbcs${UNAME_RELEASE} + GUESS=m88k-dg-dguxbcs$UNAME_RELEASE fi else - echo i586-dg-dgux${UNAME_RELEASE} + GUESS=i586-dg-dgux$UNAME_RELEASE fi - exit ;; + ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; + GUESS=m88k-dolphin-sysv3 + ;; M88*:*:R3*:*) # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; + GUESS=m88k-motorola-sysv3 + ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; + GUESS=m88k-tektronix-sysv3 + ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; + GUESS=m68k-tektronix-bsd + ;; *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; + IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'` + GUESS=mips-sgi-irix$IRIX_REL + ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id + ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; + GUESS=i386-ibm-aix + ;; ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then + if test -x /usr/bin/oslevel ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; + GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV + ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #include <sys/systemcfg.h> main() @@ -584,77 +636,77 @@ EOF exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then - echo "$SYSTEM_NAME" + GUESS=$SYSTEM_NAME else - echo rs6000-ibm-aix3.2.5 + GUESS=rs6000-ibm-aix3.2.5 fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 + GUESS=rs6000-ibm-aix3.2.4 else - echo rs6000-ibm-aix3.2 + GUESS=rs6000-ibm-aix3.2 fi - exit ;; + ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc fi - if [ -x /usr/bin/lslpp ] ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + if test -x /usr/bin/lslpp ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; + GUESS=$IBM_ARCH-ibm-aix$IBM_REV + ;; *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit ;; + GUESS=rs6000-ibm-aix + ;; + ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) + GUESS=romp-ibm-bsd4.4 + ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 + GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to + ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; + GUESS=rs6000-bull-bosx + ;; DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; + GUESS=m68k-bull-sysv3 + ;; 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; + GUESS=m68k-hp-bsd + ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; + GUESS=m68k-hp-bsd4.4 + ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + case $UNAME_MACHINE in + 9000/31?) HP_ARCH=m68000 ;; + 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then + if test -x /usr/bin/getconf; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in + case $sc_cpu_version in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in + case $sc_kernel_bits in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + if test "$HP_ARCH" = ""; then + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE #include <stdlib.h> @@ -687,13 +739,13 @@ EOF exit (0); } EOF - (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = hppa2.0w ] + if test "$HP_ARCH" = hppa2.0w then - eval $set_cc_for_build + set_cc_for_build # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -712,15 +764,15 @@ EOF HP_ARCH=hppa64 fi fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; + GUESS=$HP_ARCH-hp-hpux$HPUX_REV + ;; ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + GUESS=ia64-hp-hpux$HPUX_REV + ;; 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #include <unistd.h> int main () @@ -745,38 +797,38 @@ EOF exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit ;; + GUESS=unknown-hitachi-hiuxwe2 + ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) + GUESS=hppa1.1-hp-bsd + ;; 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; + GUESS=hppa1.0-hp-bsd + ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; + GUESS=hppa1.0-hp-mpeix + ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) + GUESS=hppa1.1-hp-osf + ;; hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; + GUESS=hppa1.0-hp-osf + ;; i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk + if test -x /usr/sbin/sysversion ; then + GUESS=$UNAME_MACHINE-unknown-osf1mk else - echo ${UNAME_MACHINE}-unknown-osf1 + GUESS=$UNAME_MACHINE-unknown-osf1 fi - exit ;; + ;; parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; + GUESS=hppa1.1-hp-lites + ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; + GUESS=c1-convex-bsd + ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd @@ -784,140 +836,148 @@ EOF fi exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; + GUESS=c34-convex-bsd + ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; + GUESS=c38-convex-bsd + ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; + GUESS=c4-convex-bsd + ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=ymp-cray-unicos$CRAY_REL + ;; CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=t90-cray-unicos$CRAY_REL + ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=alphaev5-cray-unicosmk$CRAY_REL + ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=sv1-cray-unicos$CRAY_REL + ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=craynv-cray-unicosmp$CRAY_REL + ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` + GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE + ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; + GUESS=sparc-unknown-bsdi$UNAME_RELEASE + ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE + ;; + arm:FreeBSD:*:*) + UNAME_PROCESSOR=`uname -p` + set_cc_for_build + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi + else + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf + fi + ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in + case $UNAME_PROCESSOR in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL + ;; i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; + GUESS=$UNAME_MACHINE-pc-cygwin + ;; *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 - exit ;; + GUESS=$UNAME_MACHINE-pc-mingw64 + ;; *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-mingw32 + ;; *:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-msys + ;; i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-pw32 + ;; + *:SerenityOS:*:*) + GUESS=$UNAME_MACHINE-pc-serenity + ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case $UNAME_MACHINE in x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; + GUESS=i586-pc-interix$UNAME_RELEASE + ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + GUESS=x86_64-unknown-interix$UNAME_RELEASE + ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; + GUESS=ia64-unknown-interix$UNAME_RELEASE + ;; esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; + GUESS=$UNAME_MACHINE-pc-uwin + ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; + GUESS=x86_64-pc-cygwin + ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=powerpcle-unknown-solaris2$SUN_REL + ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; + GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'` + GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL + ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; + GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC + ;; + *:Minix:*:*) + GUESS=$UNAME_MACHINE-unknown-minix + ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -928,183 +988,236 @@ EOF esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; arm*:Linux:*:*) - eval $set_cc_for_build + set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf fi fi - exit ;; + ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; e2k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-pc-linux-$LIBC + ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; k1om:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + IS_GLIBC=0 + test x"${LIBC}" = xgnu && IS_GLIBC=1 + sed 's/^ //' << EOF > "$dummy.c" #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el + #undef mips + #undef mipsel + #undef mips64 + #undef mips64el + #if ${IS_GLIBC} && defined(_ABI64) + LIBCABI=gnuabi64 + #else + #if ${IS_GLIBC} && defined(_ABIN32) + LIBCABI=gnuabin32 + #else + LIBCABI=${LIBC} + #endif + #endif + + #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa64r6 + #else + #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa32r6 + #else + #if defined(__mips64) + CPU=mips64 + #else + CPU=mips + #endif + #endif + #endif + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el + MIPS_ENDIAN=el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} + MIPS_ENDIAN= #else - CPU= + MIPS_ENDIAN= #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'` + eval "$cc_set_vars" + test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } ;; mips64el:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} - exit ;; + GUESS=or1k-unknown-linux-$LIBC + ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} - exit ;; + GUESS=sparc-unknown-linux-$LIBC + ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} - exit ;; + GUESS=hppa64-unknown-linux-$LIBC + ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;; + PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;; + *) GUESS=hppa-unknown-linux-$LIBC ;; esac - exit ;; + ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} - exit ;; + GUESS=powerpc64-unknown-linux-$LIBC + ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} - exit ;; + GUESS=powerpc-unknown-linux-$LIBC + ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} - exit ;; + GUESS=powerpc64le-unknown-linux-$LIBC + ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} - exit ;; - riscv32:Linux:*:* | riscv64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; + GUESS=powerpcle-unknown-linux-$LIBC + ;; + riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-ibm-linux-$LIBC + ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-dec-linux-$LIBC + ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} - exit ;; + set_cc_for_build + CPU=$UNAME_MACHINE + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __i386__ + ABI=x86 + #else + #ifdef __ILP32__ + ABI=x32 + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + x86) CPU=i686 ;; + x32) LIBCABI=${LIBC}x32 ;; + esac + fi + GUESS=$CPU-pc-linux-$LIBCABI + ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; + GUESS=i386-sequent-sysv4 + ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; + GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION + ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; + GUESS=$UNAME_MACHINE-pc-os2-emx + ;; i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; + GUESS=$UNAME_MACHINE-unknown-stop + ;; i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; + GUESS=$UNAME_MACHINE-unknown-atheos + ;; i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; + GUESS=$UNAME_MACHINE-pc-syllable + ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; + GUESS=i386-unknown-lynxos$UNAME_RELEASE + ;; i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + GUESS=$UNAME_MACHINE-pc-msdosdjgpp + ;; + i*86:*:4.*:*) + UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL fi - exit ;; + ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in @@ -1112,12 +1225,12 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; + GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` - echo ${UNAME_MACHINE}-pc-isc$UNAME_REL + GUESS=$UNAME_MACHINE-pc-isc$UNAME_REL elif /bin/uname -X 2>/dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1127,11 +1240,11 @@ EOF && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL else - echo ${UNAME_MACHINE}-pc-sysv32 + GUESS=$UNAME_MACHINE-pc-sysv32 fi - exit ;; + ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -1139,31 +1252,31 @@ EOF # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; + GUESS=i586-pc-msdosdjgpp + ;; Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; + GUESS=i386-pc-mach3 + ;; paragon:*:*:*) - echo i860-intel-osf1 - exit ;; + GUESS=i860-intel-osf1 + ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4 fi - exit ;; + ;; mini*:CTIX:SYS*5:*) # "miniframe" - echo m68010-convergent-sysv - exit ;; + GUESS=m68010-convergent-sysv + ;; mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; + GUESS=m68k-convergent-sysv + ;; M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; + GUESS=m68k-diab-dnix + ;; M68*:*:R3V[5678]*:*) test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) @@ -1171,9 +1284,9 @@ EOF test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; @@ -1182,259 +1295,440 @@ EOF test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; + GUESS=m68k-unknown-lynxos$UNAME_RELEASE + ;; mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; + GUESS=m68k-atari-sysv4 + ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; + GUESS=sparc-unknown-lynxos$UNAME_RELEASE + ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; + GUESS=rs6000-unknown-lynxos$UNAME_RELEASE + ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; + GUESS=powerpc-unknown-lynxos$UNAME_RELEASE + ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit ;; + GUESS=mips-dde-sysv$UNAME_RELEASE + ;; RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; + GUESS=mips-sni-sysv4 + ;; RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; + GUESS=mips-sni-sysv4 + ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 + GUESS=$UNAME_MACHINE-sni-sysv4 else - echo ns32k-sni-sysv + GUESS=ns32k-sni-sysv fi - exit ;; + ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says <Richard.M.Bartel@ccMail.Census.GOV> - echo i586-unisys-sysv4 - exit ;; + GUESS=i586-unisys-sysv4 + ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes <hewes@openmarket.com>. # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; + GUESS=hppa1.1-stratus-sysv4 + ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; + GUESS=i860-stratus-sysv4 + ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; + GUESS=$UNAME_MACHINE-stratus-vos + ;; *:VOS:*:*) # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; + GUESS=hppa1.1-stratus-vos + ;; mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit ;; + GUESS=m68k-apple-aux$UNAME_RELEASE + ;; news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; + GUESS=mips-sony-newsos6 + ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + if test -d /usr/nec; then + GUESS=mips-nec-sysv$UNAME_RELEASE else - echo mips-unknown-sysv${UNAME_RELEASE} + GUESS=mips-unknown-sysv$UNAME_RELEASE fi - exit ;; + ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; + GUESS=powerpc-be-beos + ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; + GUESS=powerpc-apple-beos + ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; + GUESS=i586-pc-beos + ;; BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - x86_64:Haiku:*:*) - echo x86_64-unknown-haiku - exit ;; + GUESS=i586-pc-haiku + ;; + ppc:Haiku:*:*) # Haiku running on Apple PowerPC + GUESS=powerpc-apple-haiku + ;; + *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) + GUESS=$UNAME_MACHINE-unknown-haiku + ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; + GUESS=sx4-nec-superux$UNAME_RELEASE + ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit ;; + GUESS=sx5-nec-superux$UNAME_RELEASE + ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; + GUESS=sx6-nec-superux$UNAME_RELEASE + ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; + GUESS=sx7-nec-superux$UNAME_RELEASE + ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; + GUESS=sx8-nec-superux$UNAME_RELEASE + ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; + GUESS=sx8r-nec-superux$UNAME_RELEASE + ;; SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux${UNAME_RELEASE} - exit ;; + GUESS=sxace-nec-superux$UNAME_RELEASE + ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; + GUESS=powerpc-apple-rhapsody$UNAME_RELEASE + ;; *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE + ;; + arm64:Darwin:*:*) + GUESS=aarch64-apple-darwin$UNAME_RELEASE + ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc + UNAME_PROCESSOR=`uname -p` + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + if command -v xcode-select > /dev/null 2> /dev/null && \ + ! xcode-select --print-path > /dev/null 2> /dev/null ; then + # Avoid executing cc if there is no toolchain installed as + # cc will be a stub that puts up a graphical alert + # prompting the user to install developer tools. + CC_FOR_BUILD=no_compiler_found + else + set_cc_for_build fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc - if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_PPC >/dev/null - then - UNAME_PROCESSOR=powerpc - fi + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc fi elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 + # uname -m returns i386 or x86_64 + UNAME_PROCESSOR=$UNAME_MACHINE fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE + ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE + ;; *:QNX:*:4*) - echo i386-pc-qnx - exit ;; + GUESS=i386-pc-qnx + ;; NEO-*:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} - exit ;; + GUESS=neo-tandem-nsk$UNAME_RELEASE + ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; + GUESS=nse-tandem-nsk$UNAME_RELEASE + ;; NSR-*:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; + GUESS=nsr-tandem-nsk$UNAME_RELEASE + ;; + NSV-*:NONSTOP_KERNEL:*:*) + GUESS=nsv-tandem-nsk$UNAME_RELEASE + ;; NSX-*:NONSTOP_KERNEL:*:*) - echo nsx-tandem-nsk${UNAME_RELEASE} - exit ;; + GUESS=nsx-tandem-nsk$UNAME_RELEASE + ;; *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; + GUESS=mips-compaq-nonstopux + ;; BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; + GUESS=bs2000-siemens-sysv + ;; DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE + ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = 386; then + if test "${cputype-}" = 386; then UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" + elif test "x${cputype-}" != x; then + UNAME_MACHINE=$cputype fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; + GUESS=$UNAME_MACHINE-unknown-plan9 + ;; *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; + GUESS=pdp10-unknown-tops10 + ;; *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; + GUESS=pdp10-unknown-tenex + ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; + GUESS=pdp10-dec-tops20 + ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; + GUESS=pdp10-xkl-tops20 + ;; *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; + GUESS=pdp10-unknown-tops20 + ;; *:ITS:*:*) - echo pdp10-unknown-its - exit ;; + GUESS=pdp10-unknown-its + ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; + GUESS=mips-sei-seiux$UNAME_RELEASE + ;; *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; + DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL + ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; + case $UNAME_MACHINE in + A*) GUESS=alpha-dec-vms ;; + I*) GUESS=ia64-dec-vms ;; + V*) GUESS=vax-dec-vms ;; esac ;; *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; + GUESS=i386-pc-xenix + ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` - exit ;; + SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'` + GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL + ;; i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; + GUESS=$UNAME_MACHINE-pc-rdos + ;; + i*86:Fiwix:*:*) + GUESS=$UNAME_MACHINE-pc-fiwix + ;; + *:AROS:*:*) + GUESS=$UNAME_MACHINE-unknown-aros + ;; x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx - exit ;; + GUESS=$UNAME_MACHINE-unknown-esx + ;; amd64:Isilon\ OneFS:*:*) - echo x86_64-unknown-onefs - exit ;; + GUESS=x86_64-unknown-onefs + ;; + *:Unleashed:*:*) + GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE + ;; +esac + +# Do we have a guess based on uname results? +if test "x$GUESS" != x; then + echo "$GUESS" + exit +fi + +# No uname command or uname output not recognized. +set_cc_for_build +cat > "$dummy.c" <<EOF +#ifdef _SEQUENT_ +#include <sys/types.h> +#include <sys/utsname.h> +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#include <signal.h> +#if defined(_SIZE_T_) || defined(SIGLOST) +#include <sys/utsname.h> +#endif +#endif +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include <sys/param.h> + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); +#endif + +#if defined (vax) +#if !defined (ultrix) +#include <sys/param.h> +#if defined (BSD) +#if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +#else +#if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#endif +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#else +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname un; + uname (&un); + printf ("vax-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("vax-dec-ultrix\n"); exit (0); +#endif +#endif +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname *un; + uname (&un); + printf ("mips-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("mips-dec-ultrix\n"); exit (0); +#endif +#endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. +test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } + +echo "$0: unable to guess system type" >&2 + +case $UNAME_MACHINE:$UNAME_SYSTEM in + mips:Linux | mips64:Linux) + # If we got here on MIPS GNU/Linux, output extra information. + cat >&2 <<EOF + +NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize +the system type. Please install a C compiler and try again. +EOF + ;; esac cat >&2 <<EOF -$0: unable to guess system type This script (version $timestamp), has failed to recognize the -operating system you are using. If your script is old, overwrite -config.guess and config.sub with the latest versions from: +operating system you are using. If your script is old, overwrite *all* +copies of config.guess and config.sub with the latest versions from: - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess + https://git.savannah.gnu.org/cgit/config.git/plain/config.guess and - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub + https://git.savannah.gnu.org/cgit/config.git/plain/config.sub +EOF + +our_year=`echo $timestamp | sed 's,-.*,,'` +thisyear=`date +%Y` +# shellcheck disable=SC2003 +script_age=`expr "$thisyear" - "$our_year"` +if test "$script_age" -lt 3 ; then + cat >&2 <<EOF If $0 has already been updated, send the following data and any information you think might be pertinent to config-patches@gnu.org to @@ -1457,16 +1751,17 @@ hostinfo = `(hostinfo) 2>/dev/null` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} +UNAME_MACHINE = "$UNAME_MACHINE" +UNAME_RELEASE = "$UNAME_RELEASE" +UNAME_SYSTEM = "$UNAME_SYSTEM" +UNAME_VERSION = "$UNAME_VERSION" EOF +fi exit 1 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/lib/libedit/config.h.in b/lib/libedit/config.h.in index ba283cc39f52..df72043034d0 100644 --- a/lib/libedit/config.h.in +++ b/lib/libedit/config.h.in @@ -45,8 +45,8 @@ /* Define to 1 if you have the <limits.h> header file. */ #undef HAVE_LIMITS_H -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H +/* Define to 1 if you have the <minix/config.h> header file. */ +#undef HAVE_MINIX_CONFIG_H /* Define to 1 if you have the <ncurses.h> header file. */ #undef HAVE_NCURSES_H @@ -64,6 +64,9 @@ /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the <stdio.h> header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H @@ -117,6 +120,9 @@ /* Define to 1 if you have the <vfork.h> header file. */ #undef HAVE_VFORK_H +/* Define to 1 if you have the <wchar.h> header file. */ +#undef HAVE_WCHAR_H + /* Define to 1 if you have the `wcsdup' function. */ #undef HAVE_WCSDUP @@ -157,48 +163,106 @@ /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS /* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif /* Enable GNU extensions on systems that have them. */ #ifndef _GNU_SOURCE # undef _GNU_SOURCE #endif -/* Enable threading extensions on Solaris. */ +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS #endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif /* Enable extensions on HP NonStop. */ #ifndef _TANDEM_SOURCE # undef _TANDEM_SOURCE #endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE #endif /* Version number of package */ #undef VERSION -/* Define to 1 if on MINIX. */ -#undef _MINIX - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -#undef _POSIX_1_SOURCE - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -#undef _POSIX_SOURCE - /* Define to empty if `const' does not conform to ANSI C. */ #undef const -/* Define to `int' if <sys/types.h> does not define. */ +/* Define as a signed integer type capable of holding a process identifier. */ #undef pid_t /* Define to `unsigned int' if <sys/types.h> does not define. */ diff --git a/lib/libedit/config.sub b/lib/libedit/config.sub index 40ea5dfe1152..b41da55df458 100755 --- a/lib/libedit/config.sub +++ b/lib/libedit/config.sub @@ -1,12 +1,14 @@ -#! /bin/sh +#!/usr/bin/sh # Configuration validation subroutine script. -# Copyright 1992-2017 Free Software Foundation, Inc. +# Copyright 1992-2022 Free Software Foundation, Inc. -timestamp='2017-04-02' +# shellcheck disable=SC2006,SC2268 # see below for rationale + +timestamp='2022-01-03' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -15,7 +17,7 @@ timestamp='2017-04-02' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see <http://www.gnu.org/licenses/>. +# along with this program; if not, see <https://www.gnu.org/licenses/>. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,7 +35,7 @@ timestamp='2017-04-02' # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -50,6 +52,13 @@ timestamp='2017-04-02' # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. +# The "shellcheck disable" line above the timestamp inhibits complaints +# about features and limitations of the classic Bourne shell that were +# superseded or lifted in POSIX. However, this script identifies a wide +# variety of pre-POSIX systems that do not have POSIX shells at all, and +# even some reasonably current systems (Solaris 10 as case-in-point) still +# have a pre-POSIX /bin/sh. + me=`echo "$0" | sed -e 's,.*/,,'` usage="\ @@ -57,7 +66,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -67,7 +76,7 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright 1992-2017 Free Software Foundation, Inc. +Copyright 1992-2022 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -89,12 +98,12 @@ while test $# -gt 0 ; do - ) # Use stdin as input. break ;; -* ) - echo "$me: invalid option $1$help" + echo "$me: invalid option $1$help" >&2 exit 1 ;; *local*) # First pass through any local machine types. - echo $1 + echo "$1" exit ;; * ) @@ -110,1252 +119,1186 @@ case $# in exit 1;; esac -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | cloudabi*-eabi* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac +# Split fields of configuration type +# shellcheck disable=SC2162 +saved_IFS=$IFS +IFS="-" read field1 field2 field3 field4 <<EOF +$1 +EOF +IFS=$saved_IFS -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; - -bluegene*) - os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*178) - os=-lynxos178 - ;; - -lynx*5) - os=-lynxos5 - ;; - -lynx*) - os=-lynxos +# Separate into logical components for further validation +case $1 in + *-*-*-*-*) + echo Invalid configuration \`"$1"\': more than four components >&2 + exit 1 ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + *-*-*-*) + basic_machine=$field1-$field2 + basic_os=$field3-$field4 ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` + *-*-*) + # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two + # parts + maybe_os=$field2-$field3 + case $maybe_os in + nto-qnx* | linux-* | uclinux-uclibc* \ + | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ + | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ + | storm-chaos* | os2-emx* | rtmk-nova*) + basic_machine=$field1 + basic_os=$maybe_os + ;; + android-linux) + basic_machine=$field1-unknown + basic_os=linux-android + ;; + *) + basic_machine=$field1-$field2 + basic_os=$field3 + ;; + esac ;; - -psos*) - os=-psos + *-*) + # A lone config we happen to match not fitting any pattern + case $field1-$field2 in + decstation-3100) + basic_machine=mips-dec + basic_os= + ;; + *-*) + # Second component is usually, but not always the OS + case $field2 in + # Prevent following clause from handling this valid os + sun*os*) + basic_machine=$field1 + basic_os=$field2 + ;; + zephyr*) + basic_machine=$field1-unknown + basic_os=$field2 + ;; + # Manufacturers + dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ + | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ + | unicom* | ibm* | next | hp | isi* | apollo | altos* \ + | convergent* | ncr* | news | 32* | 3600* | 3100* \ + | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ + | ultra | tti* | harris | dolphin | highlevel | gould \ + | cbm | ns | masscomp | apple | axis | knuth | cray \ + | microblaze* | sim | cisco \ + | oki | wec | wrs | winbond) + basic_machine=$field1-$field2 + basic_os= + ;; + *) + basic_machine=$field1 + basic_os=$field2 + ;; + esac + ;; + esac ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint + *) + # Convert single-component short-hands not valid as part of + # multi-component configurations. + case $field1 in + 386bsd) + basic_machine=i386-pc + basic_os=bsd + ;; + a29khif) + basic_machine=a29k-amd + basic_os=udi + ;; + adobe68k) + basic_machine=m68010-adobe + basic_os=scout + ;; + alliant) + basic_machine=fx80-alliant + basic_os= + ;; + altos | altos3068) + basic_machine=m68k-altos + basic_os= + ;; + am29k) + basic_machine=a29k-none + basic_os=bsd + ;; + amdahl) + basic_machine=580-amdahl + basic_os=sysv + ;; + amiga) + basic_machine=m68k-unknown + basic_os= + ;; + amigaos | amigados) + basic_machine=m68k-unknown + basic_os=amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + basic_os=sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + basic_os=sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + basic_os=bsd + ;; + aros) + basic_machine=i386-pc + basic_os=aros + ;; + aux) + basic_machine=m68k-apple + basic_os=aux + ;; + balance) + basic_machine=ns32k-sequent + basic_os=dynix + ;; + blackfin) + basic_machine=bfin-unknown + basic_os=linux + ;; + cegcc) + basic_machine=arm-unknown + basic_os=cegcc + ;; + convex-c1) + basic_machine=c1-convex + basic_os=bsd + ;; + convex-c2) + basic_machine=c2-convex + basic_os=bsd + ;; + convex-c32) + basic_machine=c32-convex + basic_os=bsd + ;; + convex-c34) + basic_machine=c34-convex + basic_os=bsd + ;; + convex-c38) + basic_machine=c38-convex + basic_os=bsd + ;; + cray) + basic_machine=j90-cray + basic_os=unicos + ;; + crds | unos) + basic_machine=m68k-crds + basic_os= + ;; + da30) + basic_machine=m68k-da30 + basic_os= + ;; + decstation | pmax | pmin | dec3100 | decstatn) + basic_machine=mips-dec + basic_os= + ;; + delta88) + basic_machine=m88k-motorola + basic_os=sysv3 + ;; + dicos) + basic_machine=i686-pc + basic_os=dicos + ;; + djgpp) + basic_machine=i586-pc + basic_os=msdosdjgpp + ;; + ebmon29k) + basic_machine=a29k-amd + basic_os=ebmon + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + basic_os=ose + ;; + gmicro) + basic_machine=tron-gmicro + basic_os=sysv + ;; + go32) + basic_machine=i386-pc + basic_os=go32 + ;; + h8300hms) + basic_machine=h8300-hitachi + basic_os=hms + ;; + h8300xray) + basic_machine=h8300-hitachi + basic_os=xray + ;; + h8500hms) + basic_machine=h8500-hitachi + basic_os=hms + ;; + harris) + basic_machine=m88k-harris + basic_os=sysv3 + ;; + hp300 | hp300hpux) + basic_machine=m68k-hp + basic_os=hpux + ;; + hp300bsd) + basic_machine=m68k-hp + basic_os=bsd + ;; + hppaosf) + basic_machine=hppa1.1-hp + basic_os=osf + ;; + hppro) + basic_machine=hppa1.1-hp + basic_os=proelf + ;; + i386mach) + basic_machine=i386-mach + basic_os=mach + ;; + isi68 | isi) + basic_machine=m68k-isi + basic_os=sysv + ;; + m68knommu) + basic_machine=m68k-unknown + basic_os=linux + ;; + magnum | m3230) + basic_machine=mips-mips + basic_os=sysv + ;; + merlin) + basic_machine=ns32k-utek + basic_os=sysv + ;; + mingw64) + basic_machine=x86_64-pc + basic_os=mingw64 + ;; + mingw32) + basic_machine=i686-pc + basic_os=mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + basic_os=mingw32ce + ;; + monitor) + basic_machine=m68k-rom68k + basic_os=coff + ;; + morphos) + basic_machine=powerpc-unknown + basic_os=morphos + ;; + moxiebox) + basic_machine=moxie-unknown + basic_os=moxiebox + ;; + msdos) + basic_machine=i386-pc + basic_os=msdos + ;; + msys) + basic_machine=i686-pc + basic_os=msys + ;; + mvs) + basic_machine=i370-ibm + basic_os=mvs + ;; + nacl) + basic_machine=le32-unknown + basic_os=nacl + ;; + ncr3000) + basic_machine=i486-ncr + basic_os=sysv4 + ;; + netbsd386) + basic_machine=i386-pc + basic_os=netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + basic_os=linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + basic_os=newsos + ;; + news1000) + basic_machine=m68030-sony + basic_os=newsos + ;; + necv70) + basic_machine=v70-nec + basic_os=sysv + ;; + nh3000) + basic_machine=m68k-harris + basic_os=cxux + ;; + nh[45]000) + basic_machine=m88k-harris + basic_os=cxux + ;; + nindy960) + basic_machine=i960-intel + basic_os=nindy + ;; + mon960) + basic_machine=i960-intel + basic_os=mon960 + ;; + nonstopux) + basic_machine=mips-compaq + basic_os=nonstopux + ;; + os400) + basic_machine=powerpc-ibm + basic_os=os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + basic_os=ose + ;; + os68k) + basic_machine=m68k-none + basic_os=os68k + ;; + paragon) + basic_machine=i860-intel + basic_os=osf + ;; + parisc) + basic_machine=hppa-unknown + basic_os=linux + ;; + psp) + basic_machine=mipsallegrexel-sony + basic_os=psp + ;; + pw32) + basic_machine=i586-unknown + basic_os=pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + basic_os=rdos + ;; + rdos32) + basic_machine=i386-pc + basic_os=rdos + ;; + rom68k) + basic_machine=m68k-rom68k + basic_os=coff + ;; + sa29200) + basic_machine=a29k-amd + basic_os=udi + ;; + sei) + basic_machine=mips-sei + basic_os=seiux + ;; + sequent) + basic_machine=i386-sequent + basic_os= + ;; + sps7) + basic_machine=m68k-bull + basic_os=sysv2 + ;; + st2000) + basic_machine=m68k-tandem + basic_os= + ;; + stratus) + basic_machine=i860-stratus + basic_os=sysv4 + ;; + sun2) + basic_machine=m68000-sun + basic_os= + ;; + sun2os3) + basic_machine=m68000-sun + basic_os=sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + basic_os=sunos4 + ;; + sun3) + basic_machine=m68k-sun + basic_os= + ;; + sun3os3) + basic_machine=m68k-sun + basic_os=sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + basic_os=sunos4 + ;; + sun4) + basic_machine=sparc-sun + basic_os= + ;; + sun4os3) + basic_machine=sparc-sun + basic_os=sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + basic_os=sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + basic_os=solaris2 + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + basic_os= + ;; + sv1) + basic_machine=sv1-cray + basic_os=unicos + ;; + symmetry) + basic_machine=i386-sequent + basic_os=dynix + ;; + t3e) + basic_machine=alphaev5-cray + basic_os=unicos + ;; + t90) + basic_machine=t90-cray + basic_os=unicos + ;; + toad1) + basic_machine=pdp10-xkl + basic_os=tops20 + ;; + tpf) + basic_machine=s390x-ibm + basic_os=tpf + ;; + udi29k) + basic_machine=a29k-amd + basic_os=udi + ;; + ultra3) + basic_machine=a29k-nyu + basic_os=sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + basic_os=none + ;; + vaxv) + basic_machine=vax-dec + basic_os=sysv + ;; + vms) + basic_machine=vax-dec + basic_os=vms + ;; + vsta) + basic_machine=i386-pc + basic_os=vsta + ;; + vxworks960) + basic_machine=i960-wrs + basic_os=vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + basic_os=vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + basic_os=vxworks + ;; + xbox) + basic_machine=i686-pc + basic_os=mingw32 + ;; + ymp) + basic_machine=ymp-cray + basic_os=unicos + ;; + *) + basic_machine=$1 + basic_os= + ;; + esac ;; esac -# Decode aliases for certain CPU-COMPANY combinations. +# Decode 1-component or ad-hoc basic machines case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ - | ba \ - | be32 | be64 \ - | bfin \ - | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | e2k | epiphany \ - | fido | fr30 | frv | ft32 \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | hexagon \ - | i370 | i860 | i960 | ia16 | ia64 \ - | ip2k | iq2000 \ - | k1om \ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r6 | mipsisa32r6el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r6 | mipsisa64r6el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ - | open8 | or1k | or1knd | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pru \ - | pyramid \ - | riscv32 | riscv64 \ - | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu \ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | visium \ - | wasm32 \ - | we32k \ - | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - c54x) - basic_machine=tic54x-unknown - ;; - c55x) - basic_machine=tic55x-unknown - ;; - c6x) - basic_machine=tic6x-unknown - ;; - leon|leon[3-9]) - basic_machine=sparc-$basic_machine - ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) - basic_machine=$basic_machine-unknown - os=-none + # Here we handle the default manufacturer of certain CPU types. It is in + # some cases the only manufacturer, in others, it is the most popular. + w89k) + cpu=hppa1.1 + vendor=winbond ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + op50n) + cpu=hppa1.1 + vendor=oki ;; - ms1) - basic_machine=mt-unknown + op60c) + cpu=hppa1.1 + vendor=oki ;; - - strongarm | thumb | xscale) - basic_machine=arm-unknown + ibm*) + cpu=i370 + vendor=ibm ;; - xgate) - basic_machine=$basic_machine-unknown - os=-none + orion105) + cpu=clipper + vendor=highlevel ;; - xscaleeb) - basic_machine=armeb-unknown + mac | mpw | mac-mpw) + cpu=m68k + vendor=apple ;; - - xscaleel) - basic_machine=armel-unknown + pmac | pmac-mpw) + cpu=powerpc + vendor=apple ;; - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | ba-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | e2k-* | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ - | ip2k-* | iq2000-* \ - | k1om-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa32r6-* | mipsisa32r6el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64r6-* | mipsisa64r6el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | or1k*-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pru-* \ - | pyramid-* \ - | riscv32-* | riscv64-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | visium-* \ - | wasm32-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att + cpu=m68000 + vendor=att ;; 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - asmjs) - basic_machine=asmjs-unknown - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux + cpu=we32k + vendor=att ;; bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec + cpu=powerpc + vendor=ibm + basic_os=cnk ;; decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 + cpu=pdp10 + vendor=dec + basic_os=tops10 ;; decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 + cpu=pdp10 + vendor=dec + basic_os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp + cpu=m68k + vendor=motorola ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - e500v[12]) - basic_machine=powerpc-unknown - os=$os"spe" - ;; - e500v[12]-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - os=$os"spe" - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd + dpx2*) + cpu=m68k + vendor=bull + basic_os=sysv3 ;; encore | umax | mmax) - basic_machine=ns32k-encore + cpu=ns32k + vendor=encore ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose + elxsi) + cpu=elxsi + vendor=elxsi + basic_os=${basic_os:-bsd} ;; fx2800) - basic_machine=i860-alliant + cpu=i860 + vendor=alliant ;; genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 + cpu=ns32k + vendor=ns ;; h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux + cpu=hppa1.1 + vendor=hitachi + basic_os=hiuxwe2 ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp + cpu=m68000 + vendor=hp ;; hp9k3[2-9][0-9]) - basic_machine=m68k-hp + cpu=m68k + vendor=hp ;; hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k78[0-9] | hp78[0-9]) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm + cpu=hppa1.0 + vendor=hp ;; i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv32 ;; i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv4 ;; i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv ;; i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=solaris2 ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta + j90 | j90-cray) + cpu=j90 + vendor=cray + basic_os=${basic_os:-unicos} ;; iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) + cpu=mips + vendor=sgi + case $basic_os in + irix*) ;; *) - os=-irix4 + basic_os=irix4 ;; esac ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - leon-*|leon[3-9]-*) - basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; miniframe) - basic_machine=m68000-convergent + cpu=m68000 + vendor=convergent ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - moxiebox) - basic_machine=moxie-unknown - os=-moxiebox - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - msys) - basic_machine=i686-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos + *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) + cpu=m68k + vendor=atari + basic_os=mint ;; news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) + cpu=mips + vendor=sony + basic_os=newsos + ;; + next | m*-next) + cpu=m68k + vendor=next + case $basic_os in + openstep*) + ;; + nextstep*) ;; - -ns2*) - os=-nextstep2 + ns2*) + basic_os=nextstep2 ;; *) - os=-nextstep3 + basic_os=nextstep3 ;; esac ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - nsx-tandem) - basic_machine=nsx-tandem + cpu=np1 + vendor=gould ;; op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k + cpu=hppa1.1 + vendor=oki + basic_os=proelf ;; pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux + cpu=hppa1.1 + vendor=hitachi + basic_os=hiuxwe2 ;; pbd) - basic_machine=sparc-tti + cpu=sparc + vendor=tti ;; pbb) - basic_machine=m68k-tti + cpu=m68k + vendor=tti ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + pc532) + cpu=ns32k + vendor=pc532 ;; pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm + cpu=pn + vendor=gould ;; - ppc | ppcbe) basic_machine=powerpc-unknown - ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + power) + cpu=power + vendor=ibm ;; ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=-rdos - ;; - rdos32) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff + cpu=i386 + vendor=ibm ;; rm[46]00) - basic_machine=mips-siemens + cpu=mips + vendor=siemens ;; rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm + cpu=romp + vendor=ibm ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown + sde) + cpu=mipsisa32 + vendor=sde + basic_os=${basic_os:-elf} ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown + simso-wrs) + cpu=sparclite + vendor=wrs + basic_os=vxworks ;; - sde) - basic_machine=mipsisa32-sde - os=-elf + tower | tower-32) + cpu=m68k + vendor=ncr ;; - sei) - basic_machine=mips-sei - os=-seiux + vpp*|vx|vx-*) + cpu=f301 + vendor=fujitsu ;; - sequent) - basic_machine=i386-sequent + w65) + cpu=w65 + vendor=wdc ;; - sh) - basic_machine=sh-hitachi - os=-hms + w89k-*) + cpu=hppa1.1 + vendor=winbond + basic_os=proelf ;; - sh5el) - basic_machine=sh5le-unknown + none) + cpu=none + vendor=none ;; - sh64) - basic_machine=sh64-unknown + leon|leon[3-9]) + cpu=sparc + vendor=$basic_machine ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks + leon-*|leon[3-9]-*) + cpu=sparc + vendor=`echo "$basic_machine" | sed 's/-.*//'` ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 + + *-*) + # shellcheck disable=SC2162 + saved_IFS=$IFS + IFS="-" read cpu vendor <<EOF +$basic_machine +EOF + IFS=$saved_IFS ;; - spur) - basic_machine=spur-unknown + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + cpu=$basic_machine + vendor=pc ;; - st2000) - basic_machine=m68k-tandem + # These rules are duplicated from below for sake of the special case above; + # i.e. things that normalized to x86 arches should also default to "pc" + pc98) + cpu=i386 + vendor=pc ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 + x64 | amd64) + cpu=x86_64 + vendor=pc ;; - strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + # Recognize the basic CPU types without company name. + *) + cpu=$basic_machine + vendor=unknown ;; - sun2) - basic_machine=m68000-sun +esac + +unset -v basic_machine + +# Decode basic machines in the full and proper CPU-Company form. +case $cpu-$vendor in + # Here we handle the default manufacturer of certain CPU types in canonical form. It is in + # some cases the only manufacturer, in others, it is the most popular. + craynv-unknown) + vendor=cray + basic_os=${basic_os:-unicosmp} ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 + c90-unknown | c90-cray) + vendor=cray + basic_os=${Basic_os:-unicos} ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 + fx80-unknown) + vendor=alliant ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 + romp-unknown) + vendor=ibm ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 + mmix-unknown) + vendor=knuth ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 + microblaze-unknown | microblazeel-unknown) + vendor=xilinx ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 + rs6000-unknown) + vendor=ibm ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 + vax-unknown) + vendor=dec ;; - sun3 | sun3-*) - basic_machine=m68k-sun + pdp11-unknown) + vendor=dec ;; - sun4) - basic_machine=sparc-sun + we32k-unknown) + vendor=att ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun + cydra-unknown) + vendor=cydrome ;; - sv1) - basic_machine=sv1-cray - os=-unicos + i370-ibm*) + vendor=ibm ;; - symmetry) - basic_machine=i386-sequent - os=-dynix + orion-unknown) + vendor=highlevel ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos + xps-unknown | xps100-unknown) + cpu=xps100 + vendor=honeywell ;; - t90) - basic_machine=t90-cray - os=-unicos + + # Here we normalize CPU types with a missing or matching vendor + armh-unknown | armh-alt) + cpu=armv7l + vendor=alt + basic_os=${basic_os:-linux-gnueabihf} ;; - tile*) - basic_machine=$basic_machine-unknown - os=-linux-gnu + dpx20-unknown | dpx20-bull) + cpu=rs6000 + vendor=bull + basic_os=${basic_os:-bosx} ;; - tx39) - basic_machine=mipstx39-unknown + + # Here we normalize CPU types irrespective of the vendor + amd64-*) + cpu=x86_64 ;; - tx39el) - basic_machine=mipstx39el-unknown + blackfin-*) + cpu=bfin + basic_os=linux ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 + c54x-*) + cpu=tic54x ;; - tower | tower-32) - basic_machine=m68k-ncr + c55x-*) + cpu=tic55x ;; - tpf) - basic_machine=s390x-ibm - os=-tpf + c6x-*) + cpu=tic6x ;; - udi29k) - basic_machine=a29k-amd - os=-udi + e500v[12]-*) + cpu=powerpc + basic_os=${basic_os}"spe" ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 + mips3*-*) + cpu=mips64 ;; - v810 | necv810) - basic_machine=v810-nec - os=-none + ms1-*) + cpu=mt ;; - vaxv) - basic_machine=vax-dec - os=-sysv + m68knommu-*) + cpu=m68k + basic_os=linux ;; - vms) - basic_machine=vax-dec - os=-vms + m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*) + cpu=s12z ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu + openrisc-*) + cpu=or32 ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks + parisc-*) + cpu=hppa + basic_os=linux ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + cpu=i586 ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks + pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*) + cpu=i686 ;; - wasm32) - basic_machine=wasm32-unknown + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + cpu=i686 ;; - w65*) - basic_machine=w65-wdc - os=-none + pentium4-*) + cpu=i786 ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf + pc98-*) + cpu=i386 ;; - xbox) - basic_machine=i686-pc - os=-mingw32 + ppc-* | ppcbe-*) + cpu=powerpc ;; - xps | xps100) - basic_machine=xps100-honeywell + ppcle-* | powerpclittle-*) + cpu=powerpcle ;; - xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ppc64-*) + cpu=powerpc64 ;; - ymp) - basic_machine=ymp-cray - os=-unicos + ppc64le-* | powerpc64little-*) + cpu=powerpc64le ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim + sb1-*) + cpu=mipsisa64sb1 ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim + sb1el-*) + cpu=mipsisa64sb1el ;; - none) - basic_machine=none-none - os=-none + sh5e[lb]-*) + cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'` ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond + spur-*) + cpu=spur ;; - op50n) - basic_machine=hppa1.1-oki + strongarm-* | thumb-*) + cpu=arm ;; - op60c) - basic_machine=hppa1.1-oki + tx39-*) + cpu=mipstx39 ;; - romp) - basic_machine=romp-ibm + tx39el-*) + cpu=mipstx39el ;; - mmix) - basic_machine=mmix-knuth + x64-*) + cpu=x86_64 ;; - rs6000) - basic_machine=rs6000-ibm + xscale-* | xscalee[bl]-*) + cpu=`echo "$cpu" | sed 's/^xscale/arm/'` ;; - vax) - basic_machine=vax-dec + arm64-* | aarch64le-*) + cpu=aarch64 ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown + + # Recognize the canonical CPU Types that limit and/or modify the + # company names they are paired with. + cr16-*) + basic_os=${basic_os:-elf} ;; - pdp11) - basic_machine=pdp11-dec + crisv32-* | etraxfs*-*) + cpu=crisv32 + vendor=axis ;; - we32k) - basic_machine=we32k-att + cris-* | etrax*-*) + cpu=cris + vendor=axis ;; - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown + crx-*) + basic_os=${basic_os:-elf} ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun + neo-tandem) + cpu=neo + vendor=tandem ;; - cydra) - basic_machine=cydra-cydrome + nse-tandem) + cpu=nse + vendor=tandem ;; - orion) - basic_machine=orion-highlevel + nsr-tandem) + cpu=nsr + vendor=tandem ;; - orion105) - basic_machine=clipper-highlevel + nsv-tandem) + cpu=nsv + vendor=tandem ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple + nsx-tandem) + cpu=nsx + vendor=tandem ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple + mipsallegrexel-sony) + cpu=mipsallegrexel + vendor=sony ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. + tile*-*) + basic_os=${basic_os:-linux-gnu} ;; + *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 + # Recognize the canonical CPU types that are allowed with any + # company name. + case $cpu in + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | abacus \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ + | alphapca5[67] | alpha64pca5[67] \ + | am33_2.0 \ + | amdgcn \ + | arc | arceb | arc32 | arc64 \ + | arm | arm[lb]e | arme[lb] | armv* \ + | avr | avr32 \ + | asmjs \ + | ba \ + | be32 | be64 \ + | bfin | bpf | bs2000 \ + | c[123]* | c30 | [cjt]90 | c4x \ + | c8051 | clipper | craynv | csky | cydra \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | elxsi | epiphany \ + | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ + | h8300 | h8500 \ + | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i*86 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | loongarch32 | loongarch64 | loongarchx32 \ + | m32c | m32r | m32rle \ + | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ + | m88110 | m88k | maxq | mb | mcore | mep | metag \ + | microblaze | microblazeel \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64eb | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r3 | mipsisa32r3el \ + | mipsisa32r5 | mipsisa32r5el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r3 | mipsisa64r3el \ + | mipsisa64r5 | mipsisa64r5el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mmix \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nfp \ + | nios | nios2 | nios2eb | nios2el \ + | none | np1 | ns16k | ns32k | nvptx \ + | open8 \ + | or1k* \ + | or32 \ + | orion \ + | picochip \ + | pdp10 | pdp11 | pj | pjl | pn | power \ + | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ + | pru \ + | pyramid \ + | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ + | rl78 | romp | rs6000 | rx \ + | s390 | s390x \ + | score \ + | sh | shl \ + | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ + | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ + | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ + | spu \ + | tahoe \ + | thumbv7* \ + | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ + | tron \ + | ubicom32 \ + | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ + | vax \ + | visium \ + | w65 \ + | wasm32 | wasm64 \ + | we32k \ + | x86 | x86_64 | xc16x | xgate | xps100 \ + | xstormy16 | xtensa* \ + | ymp \ + | z8k | z80) + ;; + + *) + echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 + exit 1 + ;; + esac ;; esac # Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` +case $vendor in + digital*) + vendor=dec ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + commodore*) + vendor=cbm ;; *) ;; @@ -1363,203 +1306,215 @@ esac # Decode manufacturer-specific aliases for certain operating systems. -if [ x"$os" != x"" ] +if test x$basic_os != x then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + +# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just +# set os. +case $basic_os in + gnu/linux*) + kernel=linux + os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'` + ;; + os2-emx) + kernel=os2 + os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'` + ;; + nto-qnx*) + kernel=nto + os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'` + ;; + *-*) + # shellcheck disable=SC2162 + saved_IFS=$IFS + IFS="-" read kernel os <<EOF +$basic_os +EOF + IFS=$saved_IFS + ;; + # Default OS when just kernel was specified + nto*) + kernel=nto + os=`echo "$basic_os" | sed -e 's|nto|qnx|'` + ;; + linux*) + kernel=linux + os=`echo "$basic_os" | sed -e 's|linux|gnu|'` ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` + *) + kernel= + os=$basic_os ;; - -solaris) - os=-solaris2 +esac + +# Now, normalize the OS (knowing we just have one component, it's not a kernel, +# etc.) +case $os in + # First match some system type aliases that might get confused + # with valid system types. + # solaris* is a basic system type, with this one exception. + auroraux) + os=auroraux ;; - -svr4*) - os=-sysv4 + bluegene*) + os=cnk ;; - -unixware*) - os=-sysv4.2uw + solaris1 | solaris1.*) + os=`echo "$os" | sed -e 's|solaris1|sunos4|'` ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + solaris) + os=solaris2 ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* | -cloudabi* | -sortix* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac + unixware*) + os=sysv4.2uw ;; - -nto-qnx*) + # es1800 is here to avoid being matched by es* (a different OS) + es1800*) + os=ose ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` + # Some version numbers need modification + chorusos*) + os=chorusos ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + isc) + os=isc2.2 ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` + sco6) + os=sco5v6 ;; - -linux-dietlibc) - os=-linux-dietlibc + sco5) + os=sco3.2v5 ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` + sco4) + os=sco3.2v4 ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` + sco3.2.[4-9]*) + os=`echo "$os" | sed -e 's/sco3.2./sco3.2v/'` ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` + sco*v* | scout) + # Don't match below ;; - -opened*) - os=-openedition + sco*) + os=sco3.2v2 ;; - -os400*) - os=-os400 + psos*) + os=psos ;; - -wince*) - os=-wince + qnx*) + os=qnx ;; - -osfrose*) - os=-osfrose + hiux*) + os=hiuxwe2 ;; - -osf*) - os=-osf + lynx*178) + os=lynxos178 ;; - -utek*) - os=-bsd + lynx*5) + os=lynxos5 ;; - -dynix*) - os=-bsd + lynxos*) + # don't get caught up in next wildcard ;; - -acis*) - os=-aos + lynx*) + os=lynxos ;; - -atheos*) - os=-atheos + mac[0-9]*) + os=`echo "$os" | sed -e 's|mac|macos|'` ;; - -syllable*) - os=-syllable + opened*) + os=openedition ;; - -386bsd) - os=-bsd + os400*) + os=os400 ;; - -ctix* | -uts*) - os=-sysv + sunos5*) + os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; - -nova*) - os=-rtmk-nova + sunos6*) + os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; - -ns2 ) - os=-nextstep2 + wince*) + os=wince ;; - -nsk*) - os=-nsk + utek*) + os=bsd ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` + dynix*) + os=bsd ;; - -sinix*) - os=-sysv4 + acis*) + os=aos ;; - -tpf*) - os=-tpf + atheos*) + os=atheos ;; - -triton*) - os=-sysv3 + syllable*) + os=syllable ;; - -oss*) - os=-sysv3 + 386bsd) + os=bsd ;; - -svr4) - os=-sysv4 + ctix* | uts*) + os=sysv ;; - -svr3) - os=-sysv3 + nova*) + os=rtmk-nova ;; - -sysvr4) - os=-sysv4 + ns2) + os=nextstep2 ;; - # This must come after -sysvr4. - -sysv*) + # Preserve the version number of sinix5. + sinix5.*) + os=`echo "$os" | sed -e 's|sinix|sysv|'` ;; - -ose*) - os=-ose + sinix*) + os=sysv4 ;; - -es1800*) - os=-ose + tpf*) + os=tpf ;; - -xenix) - os=-xenix + triton*) + os=sysv3 ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + oss*) + os=sysv3 ;; - -aros*) - os=-aros + svr4*) + os=sysv4 ;; - -zvmoe) - os=-zvmoe + svr3) + os=sysv3 ;; - -dicos*) - os=-dicos + sysvr4) + os=sysv4 ;; - -nacl*) + ose*) + os=ose ;; - -ios) + *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + os=mint ;; - -none) + dicos*) + os=dicos + ;; + pikeos*) + # Until real need of OS specific support for + # particular features comes up, bare metal + # configurations are quite functional. + case $cpu in + arm*) + os=eabi + ;; + *) + os=elf + ;; + esac ;; *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 + # No normalization, but not necessarily accepted, that comes below. ;; esac + else # Here we handle the default operating systems that come with various machines. @@ -1572,264 +1527,363 @@ else # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. -case $basic_machine in +kernel= +case $cpu-$vendor in score-*) - os=-elf + os=elf ;; spu-*) - os=-elf + os=elf ;; *-acorn) - os=-riscix1.2 + os=riscix1.2 ;; arm*-rebel) - os=-linux + kernel=linux + os=gnu ;; arm*-semi) - os=-aout + os=aout ;; c4x-* | tic4x-*) - os=-coff + os=coff ;; c8051-*) - os=-elf + os=elf + ;; + clipper-intergraph) + os=clix ;; hexagon-*) - os=-elf + os=elf ;; tic54x-*) - os=-coff + os=coff ;; tic55x-*) - os=-coff + os=coff ;; tic6x-*) - os=-coff + os=coff ;; # This must come before the *-dec entry. pdp10-*) - os=-tops20 + os=tops20 ;; pdp11-*) - os=-none + os=none ;; *-dec | vax-*) - os=-ultrix4.2 + os=ultrix4.2 ;; m68*-apollo) - os=-domain + os=domain ;; i386-sun) - os=-sunos4.0.2 + os=sunos4.0.2 ;; m68000-sun) - os=-sunos3 + os=sunos3 ;; m68*-cisco) - os=-aout + os=aout ;; mep-*) - os=-elf + os=elf ;; mips*-cisco) - os=-elf + os=elf ;; mips*-*) - os=-elf + os=elf ;; or32-*) - os=-coff + os=coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 + os=sysv3 ;; sparc-* | *-sun) - os=-sunos4.1.1 + os=sunos4.1.1 ;; pru-*) - os=-elf + os=elf ;; *-be) - os=-beos - ;; - *-haiku) - os=-haiku + os=beos ;; *-ibm) - os=-aix + os=aix ;; *-knuth) - os=-mmixware + os=mmixware ;; *-wec) - os=-proelf + os=proelf ;; *-winbond) - os=-proelf + os=proelf ;; *-oki) - os=-proelf + os=proelf ;; *-hp) - os=-hpux + os=hpux ;; *-hitachi) - os=-hiux + os=hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv + os=sysv ;; *-cbm) - os=-amigaos + os=amigaos ;; *-dg) - os=-dgux + os=dgux ;; *-dolphin) - os=-sysv3 + os=sysv3 ;; m68k-ccur) - os=-rtu + os=rtu ;; m88k-omron*) - os=-luna + os=luna ;; - *-next ) - os=-nextstep + *-next) + os=nextstep ;; *-sequent) - os=-ptx + os=ptx ;; *-crds) - os=-unos + os=unos ;; *-ns) - os=-genix + os=genix ;; i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 + os=mvs ;; *-gould) - os=-sysv + os=sysv ;; *-highlevel) - os=-bsd + os=bsd ;; *-encore) - os=-bsd + os=bsd ;; *-sgi) - os=-irix + os=irix ;; *-siemens) - os=-sysv4 + os=sysv4 ;; *-masscomp) - os=-rtu + os=rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=-uxpv + os=uxpv ;; *-rom68k) - os=-coff + os=coff ;; *-*bug) - os=-coff + os=coff ;; *-apple) - os=-macos + os=macos ;; *-atari*) - os=-mint + os=mint + ;; + *-wrs) + os=vxworks ;; *) - os=-none + os=none ;; esac + fi +# Now, validate our (potentially fixed-up) OS. +case $os in + # Sometimes we do "kernel-libc", so those need to count as OSes. + musl* | newlib* | relibc* | uclibc*) + ;; + # Likewise for "kernel-abi" + eabi* | gnueabi*) + ;; + # VxWorks passes extra cpu info in the 4th filed. + simlinux | simwindows | spe) + ;; + # Now accept the basic system types. + # The portable systems comes first. + # Each alternative MUST end in a * to match a version number. + gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ + | hiux* | abug | nacl* | netware* | windows* \ + | os9* | macos* | osx* | ios* \ + | mpw* | magic* | mmixware* | mon960* | lnews* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* | twizzler* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | mirbsd* | netbsd* | dicos* | openedition* | ose* \ + | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \ + | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* | serenity* \ + | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | mint* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ + | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ + | fiwix* ) + ;; + # This one is extra strict with allowed versions + sco3.2v2 | sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + none) + ;; + *) + echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 + exit 1 + ;; +esac + +# As a final step for OS-related things, validate the OS-kernel combination +# (given a valid OS), if there is a kernel. +case $kernel-$os in + linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ + | linux-musl* | linux-relibc* | linux-uclibc* ) + ;; + uclinux-uclibc* ) + ;; + -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) + # These are just libc implementations, not actual OSes, and thus + # require a kernel. + echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 + exit 1 + ;; + kfreebsd*-gnu* | kopensolaris*-gnu*) + ;; + vxworks-simlinux | vxworks-simwindows | vxworks-spe) + ;; + nto-qnx*) + ;; + os2-emx) + ;; + *-eabi* | *-gnueabi*) + ;; + -*) + # Blank kernel with real OS is always fine. + ;; + *-*) + echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 + exit 1 + ;; +esac + # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) +case $vendor in + unknown) + case $cpu-$os in + *-riscix*) vendor=acorn ;; - -sunos*) + *-sunos*) vendor=sun ;; - -cnk*|-aix*) + *-cnk* | *-aix*) vendor=ibm ;; - -beos*) + *-beos*) vendor=be ;; - -hpux*) + *-hpux*) vendor=hp ;; - -mpeix*) + *-mpeix*) vendor=hp ;; - -hiux*) + *-hiux*) vendor=hitachi ;; - -unos*) + *-unos*) vendor=crds ;; - -dgux*) + *-dgux*) vendor=dg ;; - -luna*) + *-luna*) vendor=omron ;; - -genix*) + *-genix*) vendor=ns ;; - -mvs* | -opened*) + *-clix*) + vendor=intergraph + ;; + *-mvs* | *-opened*) + vendor=ibm + ;; + *-os400*) vendor=ibm ;; - -os400*) + s390-* | s390x-*) vendor=ibm ;; - -ptx*) + *-ptx*) vendor=sequent ;; - -tpf*) + *-tpf*) vendor=ibm ;; - -vxsim* | -vxworks* | -windiss*) + *-vxsim* | *-vxworks* | *-windiss*) vendor=wrs ;; - -aux*) + *-aux*) vendor=apple ;; - -hms*) + *-hms*) vendor=hitachi ;; - -mpw* | -macos*) + *-mpw* | *-macos*) vendor=apple ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) vendor=atari ;; - -vos*) + *-vos*) vendor=stratus ;; esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; esac -echo $basic_machine$os +echo "$cpu-$vendor-${kernel:+$kernel-}$os" exit # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/lib/libedit/configure b/lib/libedit/configure index 68a69d141b8e..71876136f9ee 100755 --- a/lib/libedit/configure +++ b/lib/libedit/configure @@ -1,9 +1,10 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libedit 3.1. +# Generated by GNU Autoconf 2.71 for libedit 3.1. # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -14,14 +15,16 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -31,46 +34,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi +if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -79,13 +82,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -94,8 +90,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -107,30 +107,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. @@ -152,20 +132,22 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else +else \$as_nop case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -185,18 +167,20 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; } as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : -else +else \$as_nop exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 +blah=\$(echo \$(echo blah)) +test x\"\$blah\" = xblah || exit 1 test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1 test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' @@ -204,31 +188,40 @@ test \$(( 1 + 1 )) = 2 || exit 1 ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO PATH=/empty FPATH=/empty; export PATH FPATH test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ - || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" - if (eval "$as_required") 2>/dev/null; then : + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null +then : as_have_required=yes -else +else $as_nop as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : -else +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base + as_shell=$as_dir$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +then : break 2 fi fi @@ -236,14 +229,21 @@ fi esac as_found=false done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi +fi - if test "x$CONFIG_SHELL" != x; then : + if test "x$CONFIG_SHELL" != x +then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -261,18 +261,19 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." + if test x$as_have_required = xno +then : + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." + if test ${ZSH_VERSION+y} ; then + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, + printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system, $0: including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." @@ -299,6 +300,7 @@ as_fn_unset () } as_unset=as_fn_unset + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -316,6 +318,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -330,7 +340,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -339,7 +349,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -378,12 +388,13 @@ as_fn_executable_p () # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -395,18 +406,27 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -418,9 +438,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -447,7 +467,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -491,7 +511,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -505,6 +525,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits exit } + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -518,6 +542,13 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -586,7 +617,7 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libedit' -PACKAGE_TARNAME='libedit-20190607' +PACKAGE_TARNAME='libedit-20221115' PACKAGE_VERSION='3.1' PACKAGE_STRING='libedit 3.1' PACKAGE_BUGREPORT='' @@ -595,44 +626,42 @@ PACKAGE_URL='' ac_unique_file="src/el.c" # Factoring default headers for most tests. ac_includes_default="\ -#include <stdio.h> -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> +#include <stddef.h> +#ifdef HAVE_STDIO_H +# include <stdio.h> #endif -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include <stdlib.h> -# include <stddef.h> -#else -# ifdef HAVE_STDLIB_H -# include <stdlib.h> -# endif #endif #ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include <memory.h> -# endif # include <string.h> #endif -#ifdef HAVE_STRINGS_H -# include <strings.h> -#endif #ifdef HAVE_INTTYPES_H # include <inttypes.h> #endif #ifdef HAVE_STDINT_H # include <stdint.h> #endif +#ifdef HAVE_STRINGS_H +# include <strings.h> +#endif +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif" +ac_header_c_list= +ac_func_c_list= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +CPP MANTYPE NROFF LT_VERSION @@ -648,12 +677,15 @@ ac_ct_AR AR DLLTOOL OBJDUMP +FILECMD LN_S NM ac_ct_DUMPBIN DUMPBIN LD FGREP +EGREP +GREP SED host_os host_vendor @@ -668,6 +700,9 @@ AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V +CSCOPE +ETAGS +CTAGS am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE @@ -675,7 +710,6 @@ am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE -am__quote am__include DEPDIR am__untar @@ -701,9 +735,6 @@ am__isrc INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -EGREP -GREP -CPP OBJEXT EXEEXT ac_ct_CC @@ -730,6 +761,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -748,7 +780,8 @@ PACKAGE_VERSION PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +am__quote' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -771,8 +804,8 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP -LT_SYS_LIBRARY_PATH' +LT_SYS_LIBRARY_PATH +CPP' # Initialize some variables set by options. @@ -811,6 +844,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -840,8 +874,6 @@ do *) ac_optarg=yes ;; esac - # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -882,9 +914,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -908,9 +940,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1063,6 +1095,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1112,9 +1153,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1128,9 +1169,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1174,9 +1215,9 @@ Try \`$0 --help' for more information" *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1192,7 +1233,7 @@ if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1200,7 +1241,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1256,7 +1297,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | +printf "%s\n" X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1353,6 +1394,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1362,7 +1404,7 @@ Fine tuning of the installation directories: --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] --docdir=DIR documentation root - [DATAROOTDIR/doc/libedit-20190607] + [DATAROOTDIR/doc/libedit-20221115] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1424,9 +1466,9 @@ Some influential environment variables: LIBS libraries to pass to the linker, e.g. -l<library> CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> - CPP C preprocessor LT_SYS_LIBRARY_PATH User-defined run-time library search path. + CPP C preprocessor Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1447,9 +1489,9 @@ if test "$ac_init_help" = "recursive"; then case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1477,7 +1519,8 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -1485,7 +1528,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1495,9 +1538,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF libedit configure 3.1 -generated by GNU Autoconf 2.69 +generated by GNU Autoconf 2.71 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1514,14 +1557,14 @@ fi ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1529,14 +1572,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1546,172 +1590,6 @@ fi } # ac_fn_c_try_compile -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_c_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_mongrel - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists and can be compiled using the include files in @@ -1719,26 +1597,28 @@ fi ac_fn_c_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1749,14 +1629,14 @@ $as_echo "$ac_res" >&6; } ac_fn_c_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext + rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1764,17 +1644,18 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1795,11 +1676,12 @@ fi ac_fn_c_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case <limits.h> declares $2. @@ -1807,16 +1689,9 @@ else #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif + which can conflict with char $2 (); below. */ +#include <limits.h> #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -1834,24 +1709,25 @@ choke me #endif int -main () +main (void) { return $2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func @@ -1863,17 +1739,18 @@ $as_echo "$ac_res" >&6; } ac_fn_c_check_type () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof ($2)) return 0; @@ -1881,12 +1758,13 @@ if (sizeof ($2)) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof (($2))) return 0; @@ -1894,22 +1772,104 @@ if (sizeof (($2))) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop eval "$3=yes" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that +# executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: program exited with status $ac_status" >&5 + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + } +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES # ---------------------------------------------------- # Tries to find if the field MEMBER exists in type AGGR, after including @@ -1917,16 +1877,17 @@ $as_echo "$ac_res" >&6; } ac_fn_c_check_member () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 -$as_echo_n "checking for $2.$3... " >&6; } -if eval \${$4+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +printf %s "checking for $2.$3... " >&6; } +if eval test \${$4+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $5 int -main () +main (void) { static $2 ac_aggr; if (ac_aggr.$3) @@ -1935,14 +1896,15 @@ return 0; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$4=yes" -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $5 int -main () +main (void) { static $2 ac_aggr; if (sizeof ac_aggr.$3) @@ -1951,29 +1913,50 @@ return 0; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$4=yes" -else +else $as_nop eval "$4=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$4 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_member +ac_configure_args_raw= +for ac_arg +do + case $ac_arg in + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append ac_configure_args_raw " '$ac_arg'" +done + +case $ac_configure_args_raw in + *$as_nl*) + ac_safe_unquote= ;; + *) + ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. + ac_unsafe_a="$ac_unsafe_z#~" + ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" + ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; +esac + cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by libedit $as_me 3.1, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was - $ $0 $@ + $ $0$ac_configure_args_raw _ACEOF exec 5>>config.log @@ -2006,8 +1989,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + printf "%s\n" "PATH: $as_dir" done IFS=$as_save_IFS @@ -2042,7 +2029,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -2077,11 +2064,13 @@ done # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - $as_echo "## ---------------- ## + printf "%s\n" "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -2092,8 +2081,8 @@ trap 'exit_status=$? case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -2117,7 +2106,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - $as_echo "## ----------------- ## + printf "%s\n" "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -2125,14 +2114,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + printf "%s\n" "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -2140,15 +2129,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - $as_echo "## ----------- ## + printf "%s\n" "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -2156,8 +2145,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -2171,63 +2160,48 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -$as_echo "/* confdefs.h */" > confdefs.h +printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_files="$CONFIG_SITE" elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + ac_site_files="$prefix/share/config.site $prefix/etc/config.site" else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" + +for ac_site_file in $ac_site_files do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + case $ac_site_file in #( + */*) : + ;; #( + *) : + ac_site_file=./$ac_site_file ;; +esac + if test -f "$ac_site_file" && test -r "$ac_site_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file See \`config.log' for more details" "$LINENO" 5; } fi @@ -2237,19 +2211,439 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" +# Test code for whether the C compiler supports C89 (global declarations) +ac_c_conftest_c89_globals=' +/* Does the compiler advertise C89 conformance? + Do not test the value of __STDC__, because some compilers set it to 0 + while being otherwise adequately conformant. */ +#if !defined __STDC__ +# error "Compiler does not advertise C89 conformance" +#endif + +#include <stddef.h> +#include <stdarg.h> +struct stat; +/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ +struct buf { int x; }; +struct buf * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not \xHH hex character constants. + These do not provoke an error unfortunately, instead are silently treated + as an "x". The following induces an error, until -std is added to get + proper ANSI mode. Curiously \x00 != x always comes out true, for an + array size at least. It is necessary to write \x00 == 0 to get something + that is true only with -std. */ +int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) '\''x'\'' +int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), + int, int);' + +# Test code for whether the C compiler supports C89 (body of main). +ac_c_conftest_c89_main=' +ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); +' + +# Test code for whether the C compiler supports C99 (global declarations) +ac_c_conftest_c99_globals=' +// Does the compiler advertise C99 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L +# error "Compiler does not advertise C99 conformance" +#endif + +#include <stdbool.h> +extern int puts (const char *); +extern int printf (const char *, ...); +extern int dprintf (int, const char *, ...); +extern void *malloc (size_t); + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +// dprintf is used instead of fprintf to avoid needing to declare +// FILE and stderr. +#define debug(...) dprintf (2, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + #error "your preprocessor is broken" +#endif +#if BIG_OK +#else + #error "your preprocessor is broken" +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case '\''s'\'': // string + str = va_arg (args_copy, const char *); + break; + case '\''d'\'': // int + number = va_arg (args_copy, int); + break; + case '\''f'\'': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +} +' + +# Test code for whether the C compiler supports C99 (body of main). +ac_c_conftest_c99_main=' + // Check bool. + _Bool success = false; + success |= (argc != 0); + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[0] = argv[0][0]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' + || dynamic_array[ni.number - 1] != 543); +' + +# Test code for whether the C compiler supports C11 (global declarations) +ac_c_conftest_c11_globals=' +// Does the compiler advertise C11 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L +# error "Compiler does not advertise C11 conformance" +#endif + +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; +' + +# Test code for whether the C compiler supports C11 (body of main). +ac_c_conftest_c11_main=' + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + v1.i = 2; + v1.w.k = 5; + ok |= v1.i != 5; +' + +# Test code for whether the C compiler supports C11 (complete). +ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} +${ac_c_conftest_c11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + ${ac_c_conftest_c11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C99 (complete). +ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + return ok; +} +" + +# Test code for whether the C compiler supports C89 (complete). +ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + return ok; +} +" + +as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" +as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" +as_fn_append ac_header_c_list " vfork.h vfork_h HAVE_VFORK_H" +as_fn_append ac_func_c_list " fork HAVE_FORK" +as_fn_append ac_func_c_list " vfork HAVE_VFORK" + +# Auxiliary files required by this configure script. +ac_aux_files="config.guess config.sub ltmain.sh missing install-sh compile" + +# Locations in which to look for auxiliary files. +ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.." + +# Search for a directory containing all of the required auxiliary files, +# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. +# If we don't find one directory that contains all the files we need, +# we report the set of missing files from the *first* directory in +# $ac_aux_dir_candidates and give up. +ac_missing_aux_files="" +ac_first_candidate=: +printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in $ac_aux_dir_candidates +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + + printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 + ac_aux_dir_found=yes + ac_install_sh= + for ac_aux in $ac_aux_files + do + # As a special case, if "install-sh" is required, that requirement + # can be satisfied by any of "install-sh", "install.sh", or "shtool", + # and $ac_install_sh is set appropriately for whichever one is found. + if test x"$ac_aux" = x"install-sh" + then + if test -f "${as_dir}install-sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 + ac_install_sh="${as_dir}install-sh -c" + elif test -f "${as_dir}install.sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 + ac_install_sh="${as_dir}install.sh -c" + elif test -f "${as_dir}shtool"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 + ac_install_sh="${as_dir}shtool install -c" + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} install-sh" + else + break + fi + fi + else + if test -f "${as_dir}${ac_aux}"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" + else + break + fi + fi + fi + done + if test "$ac_aux_dir_found" = yes; then + ac_aux_dir="$as_dir" + break + fi + ac_first_candidate=false + + as_found=false +done +IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 +fi + + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +if test -f "${ac_aux_dir}config.guess"; then + ac_config_guess="$SHELL ${ac_aux_dir}config.guess" +fi +if test -f "${ac_aux_dir}config.sub"; then + ac_config_sub="$SHELL ${ac_aux_dir}config.sub" +fi +if test -f "$ac_aux_dir/configure"; then + ac_configure="$SHELL ${ac_aux_dir}configure" +fi + # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -2260,12 +2654,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -2274,24 +2668,24 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -2301,11 +2695,12 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2323,33 +2718,15 @@ ac_config_headers="$ac_config_headers config.h" # features of Posix that are extensions to C (define _GNU_SOURCE) -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -fi -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + + + + + + + # Expand $ac_aux_dir to an absolute path. @@ -2363,11 +2740,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2375,11 +2753,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2390,11 +2772,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2403,11 +2785,12 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -2415,11 +2798,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2430,11 +2817,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2442,8 +2829,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2456,11 +2843,12 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2468,11 +2856,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2483,11 +2875,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2496,11 +2888,12 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2509,15 +2902,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2533,18 +2930,18 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2555,11 +2952,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2567,11 +2965,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2582,11 +2984,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2599,11 +3001,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -2611,11 +3014,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2626,11 +3033,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2642,8 +3049,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2651,25 +3058,129 @@ esac fi fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +fi + + +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do +for ac_option in --version -v -V -qversion -version; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2679,7 +3190,7 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -2687,7 +3198,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -2699,9 +3210,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +printf %s "checking whether the C compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -2722,11 +3233,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -2743,7 +3255,7 @@ do # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -2759,44 +3271,46 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else +else $as_nop ac_file='' fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +printf %s "checking for C compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -2810,15 +3324,15 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -2827,7 +3341,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> int -main () +main (void) { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -2839,8 +3353,8 @@ _ACEOF ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -2848,10 +3362,10 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -2859,39 +3373,40 @@ $as_echo "$ac_try_echo"; } >&5 *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details" "$LINENO" 5; } fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -2905,11 +3420,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -2918,31 +3434,32 @@ $as_echo "$ac_try_echo"; } >&5 break;; esac done -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -2952,29 +3469,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+set} +ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -2983,57 +3504,60 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes -else +else $as_nop CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -3048,94 +3572,144 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <stdarg.h> -#include <stdio.h> -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c89_program _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC - fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 +fi fi ac_ext=c @@ -3144,21 +3718,23 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=c + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +printf %s "checking whether $CC understands -c and -o together... " >&6; } +if test ${am_cv_prog_cc_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -3186,8 +3762,8 @@ _ACEOF rm -f core conftest* unset am_i fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +printf "%s\n" "$am_cv_prog_cc_c_o" >&6; } if test "$am_cv_prog_cc_c_o" != yes; then # Losing compiler, so override with the script. # FIXME: It is wrong to rewrite CC. @@ -3204,468 +3780,181 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes +ac_header= ac_cache= +for ac_item in $ac_header_c_list do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - # <limits.h> exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <ac_nonexistent.h> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - done - ac_cv_prog_CPP=$CPP -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - # <limits.h> exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <ac_nonexistent.h> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <float.h> +# define __EXTENSIONS__ 1 + $ac_includes_default int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <string.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_safe_to_define___extensions__=yes +else $as_nop + ac_cv_safe_to_define___extensions__=no fi -rm -f conftest* - +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <stdlib.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : -else - ac_cv_header_stdc=no -fi -rm -f conftest* + #include <wchar.h> + mbstate_t x; +int +main (void) +{ -fi + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <ctype.h> -#include <stdlib.h> -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) + #define _XOPEN_SOURCE 500 + #include <wchar.h> + mbstate_t x; int -main () +main (void) { - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; + + ; return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi - +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } -$as_echo "#define STDC_HEADERS 1" >>confdefs.h + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h -fi + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h -fi + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h -done + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h - ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" -if test "x$ac_cv_header_minix_config_h" = xyes; then : - MINIX=yes -else - MINIX= -fi - + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h - if test "$MINIX" = yes; then + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h -$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h -$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h -$as_echo "#define _MINIX 1" >>confdefs.h + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h - fi + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 -$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if ${ac_cv_safe_to_define___extensions__+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h -# define __EXTENSIONS__ 1 - $ac_includes_default -int -main () -{ + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_safe_to_define___extensions__=yes -else - ac_cv_safe_to_define___extensions__=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else $as_nop + MINIX= fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 -$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } - test $ac_cv_safe_to_define___extensions__ = yes && - $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h - - $as_echo "#define _ALL_SOURCE 1" >>confdefs.h - - $as_echo "#define _GNU_SOURCE 1" >>confdefs.h + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h - $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h - $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h +fi +am__api_version='1.16' -am__api_version='1.15' -# Find a good install program. We prefer a C program (faster), + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: # SysV /etc/install, /usr/sbin/install @@ -3679,20 +3968,25 @@ am__api_version='1.15' # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +printf %s "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${ac_cv_path_install+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + # Account for fact that we put trailing slashes in our PATH walk. +case $as_dir in #(( + ./ | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; @@ -3702,13 +3996,13 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # program-specific install script used by HP pwplus--don't use. : else @@ -3716,12 +4010,12 @@ case $as_dir/ in #(( echo one > conftest.one echo two > conftest.two mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && test -s conftest.one && test -s conftest.two && test -s conftest.dir/conftest.one && test -s conftest.dir/conftest.two then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" break 3 fi fi @@ -3737,7 +4031,7 @@ IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir fi - if test "${ac_cv_path_install+set}" = set; then + if test ${ac_cv_path_install+y}; then INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. Don't cache a @@ -3747,8 +4041,8 @@ fi INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +printf "%s\n" "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -3758,8 +4052,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -$as_echo_n "checking whether build environment is sane... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +printf %s "checking whether build environment is sane... " >&6; } # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -3813,8 +4107,8 @@ else as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } # If we didn't sleep, we still need to ensure time stamps of config.status and # generated files are strictly newer. am_sleep_pid= @@ -3833,23 +4127,19 @@ test "$program_suffix" != NONE && # Double any \ or $. # By default was `s,x,x', remove it if useless. ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` +program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"` -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + + if test x"${MISSING+set}" != xset; then + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh+set}" != xset; then @@ -3869,11 +4159,12 @@ if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -3881,11 +4172,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3896,11 +4191,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3909,11 +4204,12 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -3921,11 +4217,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3936,11 +4236,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +printf "%s\n" "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -3948,8 +4248,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -3961,25 +4261,31 @@ fi fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5 +printf %s "checking for a race-free mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if ${ac_cv_path_mkdir+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${ac_cv_path_mkdir+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ + as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue + case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir ('*'coreutils) '* | \ + 'BusyBox '* | \ 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext break 3;; esac done @@ -3990,7 +4296,7 @@ IFS=$as_save_IFS fi test -d ./--version && rmdir ./--version - if test "${ac_cv_path_mkdir+set}" = set; then + if test ${ac_cv_path_mkdir+y}; then MKDIR_P="$ac_cv_path_mkdir -p" else # As a last resort, use the slow shell script. Don't cache a @@ -4000,18 +4306,19 @@ fi MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +printf "%s\n" "$MKDIR_P" >&6; } for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AWK+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else @@ -4019,11 +4326,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4034,24 +4345,25 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +printf "%s\n" "$AWK" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -n "$AWK" && break done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else +ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval test \${ac_cv_prog_make_${ac_make}_set+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat >conftest.make <<\_ACEOF SHELL = /bin/sh all: @@ -4067,12 +4379,12 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -4089,48 +4401,49 @@ DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" - -am_make=${MAKE-make} -cat > confinc << 'END' +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +printf "%s\n" "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : +if test ${enable_dependency_tracking+y} +then : enableval=$enable_dependency_tracking; fi @@ -4149,7 +4462,8 @@ fi # Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : +if test ${enable_silent_rules+y} +then : enableval=$enable_silent_rules; fi @@ -4159,12 +4473,13 @@ case $enable_silent_rules in # ((( *) AM_DEFAULT_VERBOSITY=1;; esac am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +printf %s "checking whether $am_make supports nested variables... " >&6; } +if test ${am_cv_make_support_nested_variables+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if printf "%s\n" 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -4176,8 +4491,8 @@ else am_cv_make_support_nested_variables=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -4208,18 +4523,14 @@ fi # Define the identity of the package. - PACKAGE='libedit-20190607' + PACKAGE='libedit-20221115' VERSION='3.1' -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF +printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF +printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h # Some tools Automake needs. @@ -4239,8 +4550,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The @@ -4261,11 +4572,12 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +printf %s "checking dependency style of $depcc... " >&6; } +if test ${am_cv_CC_dependencies_compiler_type+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -4372,8 +4684,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -4387,6 +4699,20 @@ else fi +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi + +if test -z "$ETAGS"; then + ETAGS=etags +fi + +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi + + # POSIX will say in a future version that running "rm -f" with no argument # is OK; and we want to be able to make that assumption in our Makefile @@ -4419,7 +4745,7 @@ END Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: <http://www.gnu.org/software/coreutils/>. +that behaves properly: <https://www.gnu.org/software/coreutils/>. If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -4432,14 +4758,15 @@ fi case `pwd` in *\ * | *\ *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac -macro_version='2.4.6' -macro_revision='2.4.6' +macro_version='2.4.7' +macro_revision='2.4.7' + @@ -4455,26 +4782,29 @@ macro_revision='2.4.6' ltmain=$ac_aux_dir/ltmain.sh -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else + + # Make sure we can run config.sub. +$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +printf %s "checking build system type... " >&6; } +if test ${ac_cv_build+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_build_alias=$build_alias test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 +ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +printf "%s\n" "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -4493,21 +4823,22 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +printf %s "checking host system type... " >&6; } +if test ${ac_cv_host+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +printf "%s\n" "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -4547,8 +4878,8 @@ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -$as_echo_n "checking how to print strings... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +printf %s "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then @@ -4574,12 +4905,12 @@ func_echo_all () } case $ECHO in - printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -$as_echo "printf" >&6; } ;; - print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -$as_echo "print -r" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -$as_echo "cat" >&6; } ;; + printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +printf "%s\n" "printf" >&6; } ;; + print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +printf "%s\n" "print -r" >&6; } ;; + *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +printf "%s\n" "cat" >&6; } ;; esac @@ -4595,11 +4926,12 @@ esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +printf %s "checking for a sed that does not truncate output... " >&6; } +if test ${ac_cv_path_SED+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" @@ -4613,10 +4945,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in sed gsed + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + ac_path_SED="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED @@ -4625,13 +4962,13 @@ case `"$ac_path_SED" --version 2>&1` in ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" + printf "%s\n" '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -4659,8 +4996,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +printf "%s\n" "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -4677,11 +5014,154 @@ Xsed="$SED -e 1s/^X//" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -$as_echo_n "checking for fgrep... " >&6; } -if ${ac_cv_path_FGREP+:} false; then : - $as_echo_n "(cached) " >&6 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +printf %s "checking for grep that handles long lines and -e... " >&6; } +if test ${ac_cv_path_GREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in grep ggrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else + ac_cv_path_GREP=$GREP +fi + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +printf "%s\n" "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +printf %s "checking for egrep... " >&6; } +if test ${ac_cv_path_EGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in egrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +printf "%s\n" "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +printf %s "checking for fgrep... " >&6; } +if test ${ac_cv_path_FGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 then ac_cv_path_FGREP="$GREP -F" else @@ -4692,10 +5172,15 @@ else for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in fgrep + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP @@ -4704,13 +5189,13 @@ case `"$ac_path_FGREP" --version 2>&1` in ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'FGREP' >> "conftest.nl" + printf "%s\n" 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -4739,8 +5224,8 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -$as_echo "$ac_cv_path_FGREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +printf "%s\n" "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" @@ -4765,17 +5250,18 @@ test -z "$GREP" && GREP=grep # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : +if test ${with_gnu_ld+y} +then : withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes -else +else $as_nop with_gnu_ld=no fi ac_prog=ld if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +printf %s "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return, which upsets mingw @@ -4804,15 +5290,16 @@ $as_echo_n "checking for ld used by $CC... " >&6; } ;; esac elif test yes = "$with_gnu_ld"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +printf %s "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +printf %s "checking for non-GNU ld... " >&6; } fi -if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${lt_cv_path_LD+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$LD"; then lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do @@ -4841,18 +5328,19 @@ fi LD=$lt_cv_path_LD if test -n "$LD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -$as_echo "$LD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +printf "%s\n" "$LD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +printf %s "checking if the linker ($LD) is GNU ld... " >&6; } +if test ${lt_cv_prog_gnu_ld+y} +then : + printf %s "(cached) " >&6 +else $as_nop # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) @@ -4863,8 +5351,8 @@ case `$LD -v 2>&1 </dev/null` in ;; esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -4875,11 +5363,12 @@ with_gnu_ld=$lt_cv_prog_gnu_ld -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 -$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if ${lt_cv_path_NM+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if test ${lt_cv_path_NM+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM=$NM @@ -4904,13 +5393,13 @@ else mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -4929,8 +5418,8 @@ else : ${lt_cv_path_NM=no} fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 -$as_echo "$lt_cv_path_NM" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +printf "%s\n" "$lt_cv_path_NM" >&6; } if test no != "$lt_cv_path_NM"; then NM=$lt_cv_path_NM else @@ -4943,11 +5432,12 @@ else do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DUMPBIN+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$DUMPBIN"; then ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. else @@ -4955,11 +5445,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4970,11 +5464,11 @@ fi fi DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 -$as_echo "$DUMPBIN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +printf "%s\n" "$DUMPBIN" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4987,11 +5481,12 @@ if test -z "$DUMPBIN"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DUMPBIN+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_DUMPBIN"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. else @@ -4999,11 +5494,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5014,11 +5513,11 @@ fi fi ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 -$as_echo "$ac_ct_DUMPBIN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +printf "%s\n" "$ac_ct_DUMPBIN" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5030,15 +5529,15 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DUMPBIN=$ac_ct_DUMPBIN fi fi - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -5059,11 +5558,12 @@ test -z "$NM" && NM=nm -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 -$as_echo_n "checking the name lister ($NM) interface... " >&6; } -if ${lt_cv_nm_interface+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +printf %s "checking the name lister ($NM) interface... " >&6; } +if test ${lt_cv_nm_interface+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) @@ -5079,26 +5579,27 @@ else fi rm -f conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 -$as_echo "$lt_cv_nm_interface" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +printf "%s\n" "$lt_cv_nm_interface" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +printf %s "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +printf "%s\n" "no, using $LN_S" >&6; } fi # find the maximum length of command line arguments -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 -$as_echo_n "checking the maximum length of command line arguments... " >&6; } -if ${lt_cv_sys_max_cmd_len+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +printf %s "checking the maximum length of command line arguments... " >&6; } +if test ${lt_cv_sys_max_cmd_len+y} +then : + printf %s "(cached) " >&6 +else $as_nop i=0 teststring=ABCD @@ -5140,7 +5641,7 @@ else lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -5183,7 +5684,7 @@ else sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[ ]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -5225,11 +5726,11 @@ else fi if test -n "$lt_cv_sys_max_cmd_len"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 -$as_echo "$lt_cv_sys_max_cmd_len" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 +printf "%s\n" "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -5273,11 +5774,12 @@ esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -if ${lt_cv_to_host_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +printf %s "checking how to convert $build file names to $host format... " >&6; } +if test ${lt_cv_to_host_file_cmd+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $host in *-*-mingw* ) case $build in @@ -5313,18 +5815,19 @@ esac fi to_host_file_cmd=$lt_cv_to_host_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -$as_echo "$lt_cv_to_host_file_cmd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -if ${lt_cv_to_tool_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +printf %s "checking how to convert $build file names to toolchain format... " >&6; } +if test ${lt_cv_to_tool_file_cmd+y} +then : + printf %s "(cached) " >&6 +else $as_nop #assume ordinary cross tools, or native build. lt_cv_to_tool_file_cmd=func_convert_file_noop case $host in @@ -5340,22 +5843,23 @@ esac fi to_tool_file_cmd=$lt_cv_to_tool_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -$as_echo "$lt_cv_to_tool_file_cmd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 -$as_echo_n "checking for $LD option to reload object files... " >&6; } -if ${lt_cv_ld_reload_flag+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +printf %s "checking for $LD option to reload object files... " >&6; } +if test ${lt_cv_ld_reload_flag+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ld_reload_flag='-r' fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 -$as_echo "$lt_cv_ld_reload_flag" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +printf "%s\n" "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -5386,13 +5890,122 @@ esac if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args. +set dummy ${ac_tool_prefix}file; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_FILECMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$FILECMD"; then + ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_FILECMD="${ac_tool_prefix}file" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +FILECMD=$ac_cv_prog_FILECMD +if test -n "$FILECMD"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5 +printf "%s\n" "$FILECMD" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_FILECMD"; then + ac_ct_FILECMD=$FILECMD + # Extract the first word of "file", so it can be a program name with args. +set dummy file; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_FILECMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_FILECMD"; then + ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_FILECMD="file" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD +if test -n "$ac_ct_FILECMD"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FILECMD" >&5 +printf "%s\n" "$ac_ct_FILECMD" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_FILECMD" = x; then + FILECMD=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + FILECMD=$ac_ct_FILECMD + fi +else + FILECMD="$ac_cv_prog_FILECMD" +fi + + + + + + + +if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OBJDUMP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else @@ -5400,11 +6013,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5415,11 +6032,11 @@ fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +printf "%s\n" "$OBJDUMP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5428,11 +6045,12 @@ if test -z "$ac_cv_prog_OBJDUMP"; then ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OBJDUMP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_OBJDUMP"; then ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. else @@ -5440,11 +6058,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5455,11 +6077,11 @@ fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +printf "%s\n" "$ac_ct_OBJDUMP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OBJDUMP" = x; then @@ -5467,8 +6089,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OBJDUMP=$ac_ct_OBJDUMP @@ -5487,11 +6109,12 @@ test -z "$OBJDUMP" && OBJDUMP=objdump -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 -$as_echo_n "checking how to recognize dependent libraries... " >&6; } -if ${lt_cv_deplibs_check_method+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +printf %s "checking how to recognize dependent libraries... " >&6; } +if test ${lt_cv_deplibs_check_method+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= lt_cv_deplibs_check_method='unknown' @@ -5517,7 +6140,7 @@ beos*) bsdi[45]*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -5551,14 +6174,14 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -5572,7 +6195,7 @@ haiku*) ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' @@ -5619,7 +6242,7 @@ netbsd*) newos6*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -5687,8 +6310,8 @@ os2*) esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 -$as_echo "$lt_cv_deplibs_check_method" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +printf "%s\n" "$lt_cv_deplibs_check_method" >&6; } file_magic_glob= want_nocaseglob=no @@ -5732,11 +6355,12 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DLLTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else @@ -5744,11 +6368,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5759,11 +6387,11 @@ fi fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +printf "%s\n" "$DLLTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5772,11 +6400,12 @@ if test -z "$ac_cv_prog_DLLTOOL"; then ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DLLTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_DLLTOOL"; then ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. else @@ -5784,11 +6413,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5799,11 +6432,11 @@ fi fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +printf "%s\n" "$ac_ct_DLLTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_DLLTOOL" = x; then @@ -5811,8 +6444,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DLLTOOL=$ac_ct_DLLTOOL @@ -5832,11 +6465,12 @@ test -z "$DLLTOOL" && DLLTOOL=dlltool -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +printf %s "checking how to associate runtime and link libraries... " >&6; } +if test ${lt_cv_sharedlib_from_linklib_cmd+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_sharedlib_from_linklib_cmd='unknown' case $host_os in @@ -5859,8 +6493,8 @@ cygwin* | mingw* | pw32* | cegcc*) esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; } sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO @@ -5875,11 +6509,12 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AR+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else @@ -5887,11 +6522,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5902,11 +6541,11 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +printf "%s\n" "$AR" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5919,11 +6558,12 @@ if test -z "$AR"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_AR+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else @@ -5931,11 +6571,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5946,11 +6590,11 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +printf "%s\n" "$ac_ct_AR" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5962,8 +6606,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR @@ -5971,42 +6615,60 @@ esac fi : ${AR=ar} -: ${AR_FLAGS=cru} +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -$as_echo_n "checking for archiver @FILE support... " >&6; } -if ${lt_cv_ar_at_file+:} false; then : - $as_echo_n "(cached) " >&6 -else + + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. + + + + + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +printf %s "checking for archiver @FILE support... " >&6; } +if test ${lt_cv_ar_at_file+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ar_at_file=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 (eval $lt_ar_try) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. @@ -6014,7 +6676,7 @@ if ac_fn_c_try_compile "$LINENO"; then : { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 (eval $lt_ar_try) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ @@ -6023,11 +6685,11 @@ if ac_fn_c_try_compile "$LINENO"; then : rm -f conftest.* libconftest.a fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -$as_echo "$lt_cv_ar_at_file" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +printf "%s\n" "$lt_cv_ar_at_file" >&6; } if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= @@ -6044,11 +6706,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -6056,11 +6719,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6071,11 +6738,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6084,11 +6751,12 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -6096,11 +6764,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6111,11 +6783,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +printf "%s\n" "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -6123,8 +6795,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -6143,11 +6815,12 @@ test -z "$STRIP" && STRIP=: if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else @@ -6155,11 +6828,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6170,11 +6847,11 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +printf "%s\n" "$RANLIB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6183,11 +6860,12 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else @@ -6195,11 +6873,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6210,11 +6892,11 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +printf "%s\n" "$ac_ct_RANLIB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -6222,8 +6904,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -6312,11 +6994,12 @@ compiler=$CC # Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 -$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if ${lt_cv_sys_global_symbol_pipe+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +printf %s "checking command to parse $NM output from $compiler object... " >&6; } +if test ${lt_cv_sys_global_symbol_pipe+y} +then : + printf %s "(cached) " >&6 +else $as_nop # These are sane defaults that work on at least a few old systems. # [They come from Ultrix. What could be older than Ultrix?!! ;)] @@ -6371,7 +7054,7 @@ esac if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -6389,20 +7072,20 @@ fi # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -6426,7 +7109,7 @@ for ac_symprfx in "" "_"; do if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ @@ -6444,9 +7127,9 @@ for ac_symprfx in "" "_"; do " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -6468,14 +7151,14 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -6544,7 +7227,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi @@ -6579,11 +7262,11 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -$as_echo "failed" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +printf "%s\n" "failed" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +printf "%s\n" "ok" >&6; } fi # Response file support. @@ -6629,13 +7312,14 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -$as_echo_n "checking for sysroot... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +printf %s "checking for sysroot... " >&6; } # Check whether --with-sysroot was given. -if test "${with_sysroot+set}" = set; then : +if test ${with_sysroot+y} +then : withval=$with_sysroot; -else +else $as_nop with_sysroot=no fi @@ -6648,29 +7332,30 @@ case $with_sysroot in #( fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 -$as_echo "$with_sysroot" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +printf "%s\n" "$with_sysroot" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -$as_echo "${lt_sysroot:-no}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +printf "%s\n" "${lt_sysroot:-no}" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 -$as_echo_n "checking for a working dd... " >&6; } -if ${ac_cv_path_lt_DD+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +printf %s "checking for a working dd... " >&6; } +if test ${ac_cv_path_lt_DD+y} +then : + printf %s "(cached) " >&6 +else $as_nop printf 0123456789abcdef0123456789abcdef >conftest.i cat conftest.i conftest.i >conftest2.i : ${lt_DD:=$DD} @@ -6681,10 +7366,15 @@ if test -z "$lt_DD"; then for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in dd; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in dd + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + ac_path_lt_DD="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_lt_DD" || continue if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then cmp -s conftest.i conftest.out \ @@ -6704,15 +7394,16 @@ fi rm -f conftest.i conftest2.i conftest.out fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 -$as_echo "$ac_cv_path_lt_DD" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +printf "%s\n" "$ac_cv_path_lt_DD" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 -$as_echo_n "checking how to truncate binary pipes... " >&6; } -if ${lt_cv_truncate_bin+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +printf %s "checking how to truncate binary pipes... " >&6; } +if test ${lt_cv_truncate_bin+y} +then : + printf %s "(cached) " >&6 +else $as_nop printf 0123456789abcdef0123456789abcdef >conftest.i cat conftest.i conftest.i >conftest2.i lt_cv_truncate_bin= @@ -6723,8 +7414,8 @@ fi rm -f conftest.i conftest2.i conftest.out test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 -$as_echo "$lt_cv_truncate_bin" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +printf "%s\n" "$lt_cv_truncate_bin" >&6; } @@ -6747,7 +7438,8 @@ func_cc_basename () } # Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then : +if test ${enable_libtool_lock+y} +then : enableval=$enable_libtool_lock; fi @@ -6763,9 +7455,9 @@ ia64-*-hpux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -6783,10 +7475,10 @@ ia64-*-hpux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -6798,7 +7490,7 @@ ia64-*-hpux*) ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -6821,10 +7513,10 @@ mips64*-*linux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -6832,7 +7524,7 @@ mips64*-*linux*) emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -6840,7 +7532,7 @@ mips64*-*linux*) emul="${emul}ltsmip" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -6862,16 +7554,16 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -6925,11 +7617,12 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 -$as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if ${lt_cv_cc_needs_belf+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +printf %s "checking whether the C compiler needs -belf... " >&6; } +if test ${lt_cv_cc_needs_belf+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6940,19 +7633,20 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_cc_needs_belf=yes -else +else $as_nop lt_cv_cc_needs_belf=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -6961,8 +7655,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 -$as_echo "$lt_cv_cc_needs_belf" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +printf "%s\n" "$lt_cv_cc_needs_belf" >&6; } if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS=$SAVE_CFLAGS @@ -6975,9 +7669,9 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -7012,11 +7706,12 @@ need_locks=$enable_libtool_lock if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. set dummy ${ac_tool_prefix}mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_MANIFEST_TOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$MANIFEST_TOOL"; then ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. else @@ -7024,11 +7719,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7039,11 +7738,11 @@ fi fi MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL if test -n "$MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -$as_echo "$MANIFEST_TOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +printf "%s\n" "$MANIFEST_TOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7052,11 +7751,12 @@ if test -z "$ac_cv_prog_MANIFEST_TOOL"; then ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL # Extract the first word of "mt", so it can be a program name with args. set dummy mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_MANIFEST_TOOL"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. else @@ -7064,11 +7764,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7079,11 +7783,11 @@ fi fi ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL if test -n "$ac_ct_MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_MANIFEST_TOOL" = x; then @@ -7091,8 +7795,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL @@ -7102,11 +7806,12 @@ else fi test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -if ${lt_cv_path_mainfest_tool+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if test ${lt_cv_path_mainfest_tool+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_path_mainfest_tool=no echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out @@ -7116,8 +7821,8 @@ else fi rm -f conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -$as_echo "$lt_cv_path_mainfest_tool" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +printf "%s\n" "$lt_cv_path_mainfest_tool" >&6; } if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -7132,11 +7837,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DSYMUTIL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$DSYMUTIL"; then ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. else @@ -7144,11 +7850,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7159,11 +7869,11 @@ fi fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +printf "%s\n" "$DSYMUTIL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7172,11 +7882,12 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DSYMUTIL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_DSYMUTIL"; then ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. else @@ -7184,11 +7895,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7199,11 +7914,11 @@ fi fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +printf "%s\n" "$ac_ct_DSYMUTIL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_DSYMUTIL" = x; then @@ -7211,8 +7926,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DSYMUTIL=$ac_ct_DSYMUTIL @@ -7224,11 +7939,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_NMEDIT+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$NMEDIT"; then ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. else @@ -7236,11 +7952,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7251,11 +7971,11 @@ fi fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -$as_echo "$NMEDIT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +printf "%s\n" "$NMEDIT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7264,11 +7984,12 @@ if test -z "$ac_cv_prog_NMEDIT"; then ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_NMEDIT+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_NMEDIT"; then ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. else @@ -7276,11 +7997,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7291,11 +8016,11 @@ fi fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 -$as_echo "$ac_ct_NMEDIT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +printf "%s\n" "$ac_ct_NMEDIT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_NMEDIT" = x; then @@ -7303,8 +8028,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac NMEDIT=$ac_ct_NMEDIT @@ -7316,11 +8041,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_LIPO+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$LIPO"; then ac_cv_prog_LIPO="$LIPO" # Let the user override the test. else @@ -7328,11 +8054,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7343,11 +8073,11 @@ fi fi LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -$as_echo "$LIPO" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +printf "%s\n" "$LIPO" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7356,11 +8086,12 @@ if test -z "$ac_cv_prog_LIPO"; then ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_LIPO+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_LIPO"; then ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. else @@ -7368,11 +8099,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7383,11 +8118,11 @@ fi fi ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 -$as_echo "$ac_ct_LIPO" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +printf "%s\n" "$ac_ct_LIPO" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_LIPO" = x; then @@ -7395,8 +8130,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac LIPO=$ac_ct_LIPO @@ -7408,11 +8143,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$OTOOL"; then ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. else @@ -7420,11 +8156,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7435,11 +8175,11 @@ fi fi OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -$as_echo "$OTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +printf "%s\n" "$OTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7448,11 +8188,12 @@ if test -z "$ac_cv_prog_OTOOL"; then ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_OTOOL"; then ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. else @@ -7460,11 +8201,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7475,11 +8220,11 @@ fi fi ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 -$as_echo "$ac_ct_OTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +printf "%s\n" "$ac_ct_OTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OTOOL" = x; then @@ -7487,8 +8232,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL=$ac_ct_OTOOL @@ -7500,11 +8245,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OTOOL64+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$OTOOL64"; then ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. else @@ -7512,11 +8258,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7527,11 +8277,11 @@ fi fi OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 -$as_echo "$OTOOL64" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +printf "%s\n" "$OTOOL64" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7540,11 +8290,12 @@ if test -z "$ac_cv_prog_OTOOL64"; then ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OTOOL64+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_OTOOL64"; then ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. else @@ -7552,11 +8303,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7567,11 +8322,11 @@ fi fi ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 -$as_echo "$ac_ct_OTOOL64" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +printf "%s\n" "$ac_ct_OTOOL64" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OTOOL64" = x; then @@ -7579,8 +8334,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL64=$ac_ct_OTOOL64 @@ -7615,11 +8370,12 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 -$as_echo_n "checking for -single_module linker flag... " >&6; } -if ${lt_cv_apple_cc_single_mod+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +printf %s "checking for -single_module linker flag... " >&6; } +if test ${lt_cv_apple_cc_single_mod+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_apple_cc_single_mod=no if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override @@ -7648,14 +8404,15 @@ else rm -f conftest.* fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -$as_echo "$lt_cv_apple_cc_single_mod" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 -$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if ${lt_cv_ld_exported_symbols_list+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +printf %s "checking for -exported_symbols_list linker flag... " >&6; } +if test ${lt_cv_ld_exported_symbols_list+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS echo "_main" > conftest.sym @@ -7664,39 +8421,41 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_ld_exported_symbols_list=yes -else +else $as_nop lt_cv_ld_exported_symbols_list=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 -$as_echo_n "checking for -force_load linker flag... " >&6; } -if ${lt_cv_ld_force_load+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +printf %s "checking for -force_load linker flag... " >&6; } +if test ${lt_cv_ld_force_load+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5 + $AR $AR_FLAGS libconftest.a conftest.o 2>&5 echo "$RANLIB libconftest.a" >&5 $RANLIB libconftest.a 2>&5 cat > conftest.c << _LT_EOF @@ -7716,24 +8475,19 @@ _LT_EOF rm -rf conftest.dSYM fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 -$as_echo "$lt_cv_ld_force_load" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +printf "%s\n" "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[012][,.]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[012],*|,*powerpc*-darwin[5-8]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -7788,19 +8542,14 @@ func_munge_path_list () esac } -for ac_header in dlfcn.h -do : - ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " -if test "x$ac_cv_header_dlfcn_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DLFCN_H 1 -_ACEOF +if test "x$ac_cv_header_dlfcn_h" = xyes +then : + printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h fi -done - @@ -7816,7 +8565,8 @@ done # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then : +if test ${enable_shared+y} +then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -7834,7 +8584,7 @@ if test "${enable_shared+set}" = set; then : IFS=$lt_save_ifs ;; esac -else +else $as_nop enable_shared=yes fi @@ -7847,7 +8597,8 @@ fi # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : +if test ${enable_static+y} +then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -7865,7 +8616,7 @@ if test "${enable_static+set}" = set; then : IFS=$lt_save_ifs ;; esac -else +else $as_nop enable_static=yes fi @@ -7879,7 +8630,8 @@ fi # Check whether --with-pic was given. -if test "${with_pic+set}" = set; then : +if test ${with_pic+y} +then : withval=$with_pic; lt_p=${PACKAGE-default} case $withval in yes|no) pic_mode=$withval ;; @@ -7896,7 +8648,7 @@ if test "${with_pic+set}" = set; then : IFS=$lt_save_ifs ;; esac -else +else $as_nop pic_mode=default fi @@ -7908,7 +8660,8 @@ fi # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then : +if test ${enable_fast_install+y} +then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -7926,7 +8679,7 @@ if test "${enable_fast_install+set}" = set; then : IFS=$lt_save_ifs ;; esac -else +else $as_nop enable_fast_install=yes fi @@ -7940,11 +8693,12 @@ fi shared_archive_member_spec= case $host,$enable_shared in power*-*-aix[5-9]*,yes) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 -$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +printf %s "checking which variant of shared library versioning to provide... " >&6; } # Check whether --with-aix-soname was given. -if test "${with_aix_soname+set}" = set; then : +if test ${with_aix_soname+y} +then : withval=$with_aix_soname; case $withval in aix|svr4|both) ;; @@ -7953,18 +8707,19 @@ if test "${with_aix_soname+set}" = set; then : ;; esac lt_cv_with_aix_soname=$with_aix_soname -else - if ${lt_cv_with_aix_soname+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + if test ${lt_cv_with_aix_soname+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_with_aix_soname=aix fi with_aix_soname=$lt_cv_with_aix_soname fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 -$as_echo "$with_aix_soname" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +printf "%s\n" "$with_aix_soname" >&6; } if test aix != "$with_aix_soname"; then # For the AIX way of multilib, we name the shared archive member # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', @@ -8046,11 +8801,12 @@ if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 -$as_echo_n "checking for objdir... " >&6; } -if ${lt_cv_objdir+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +printf %s "checking for objdir... " >&6; } +if test ${lt_cv_objdir+y} +then : + printf %s "(cached) " >&6 +else $as_nop rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null if test -d .libs; then @@ -8061,17 +8817,15 @@ else fi rmdir .libs 2>/dev/null fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -$as_echo "$lt_cv_objdir" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +printf "%s\n" "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir -cat >>confdefs.h <<_ACEOF -#define LT_OBJDIR "$lt_cv_objdir/" -_ACEOF +printf "%s\n" "#define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h @@ -8092,8 +8846,8 @@ esac ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -8117,11 +8871,12 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 -$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +printf %s "checking for ${ac_tool_prefix}file... " >&6; } +if test ${lt_cv_path_MAGIC_CMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. @@ -8170,11 +8925,11 @@ fi MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +printf "%s\n" "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -8183,11 +8938,12 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 -$as_echo_n "checking for file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +printf %s "checking for file... " >&6; } +if test ${lt_cv_path_MAGIC_CMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. @@ -8236,11 +8992,11 @@ fi MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +printf "%s\n" "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -8321,11 +9077,12 @@ if test yes = "$GCC"; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if test ${lt_cv_prog_compiler_rtti_exceptions+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -8356,8 +9113,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -8598,7 +9355,7 @@ lt_prog_compiler_static= lt_prog_compiler_static='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' @@ -8714,26 +9471,28 @@ case $host_os in ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +printf %s "checking for $compiler option to produce PIC... " >&6; } +if test ${lt_cv_prog_compiler_pic+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_pic=$lt_prog_compiler_pic fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -$as_echo "$lt_cv_prog_compiler_pic" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; } lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if ${lt_cv_prog_compiler_pic_works+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if test ${lt_cv_prog_compiler_pic_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -8764,8 +9523,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; } if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in @@ -8793,11 +9552,12 @@ fi # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if test ${lt_cv_prog_compiler_static_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_static_works=no save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" @@ -8821,8 +9581,8 @@ else LDFLAGS=$save_LDFLAGS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 -$as_echo "$lt_cv_prog_compiler_static_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; } if test yes = "$lt_cv_prog_compiler_static_works"; then : @@ -8836,11 +9596,12 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test ${lt_cv_prog_compiler_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest @@ -8883,19 +9644,20 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test ${lt_cv_prog_compiler_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest @@ -8938,8 +9700,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } @@ -8947,19 +9709,19 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; } hard_links=nottested if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +printf %s "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +printf "%s\n" "$hard_links" >&6; } if test no = "$hard_links"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -8971,8 +9733,8 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= allow_undefined_flag= @@ -9016,15 +9778,15 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -9076,7 +9838,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -9188,6 +9950,7 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes + file_list_spec='@' ;; interix[3-9]*) @@ -9202,7 +9965,7 @@ _LT_EOF # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -9245,7 +10008,7 @@ _LT_EOF compiler_needs_object=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes @@ -9257,7 +10020,7 @@ _LT_EOF if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi @@ -9273,7 +10036,7 @@ _LT_EOF archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -9405,7 +10168,7 @@ _LT_EOF if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -9527,21 +10290,23 @@ _LT_EOF if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_aix_libpath_+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -9556,7 +10321,7 @@ if ac_fn_c_try_link "$LINENO"; then : lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then lt_cv_aix_libpath_=/usr/lib:/lib @@ -9580,21 +10345,23 @@ fi if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_aix_libpath_+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -9609,7 +10376,7 @@ if ac_fn_c_try_link "$LINENO"; then : lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then lt_cv_aix_libpath_=/usr/lib:/lib @@ -9672,12 +10439,12 @@ fi cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported always_export_symbols=yes @@ -9718,7 +10485,7 @@ fi fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported # Tell ltmain to make .lib files, not .a files. @@ -9759,8 +10526,8 @@ fi output_verbose_link_cmd=func_echo_all archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + archive_expsym_cmds="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -9794,7 +10561,7 @@ fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -9860,11 +10627,12 @@ fi # Older versions of the 11.00 compiler do not understand -b yet # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 -$as_echo_n "checking if $CC understands -b... " >&6; } -if ${lt_cv_prog_compiler__b+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +printf %s "checking if $CC understands -b... " >&6; } +if test ${lt_cv_prog_compiler__b+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler__b=no save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -b" @@ -9888,8 +10656,8 @@ else LDFLAGS=$save_LDFLAGS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 -$as_echo "$lt_cv_prog_compiler__b" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +printf "%s\n" "$lt_cv_prog_compiler__b" >&6; } if test yes = "$lt_cv_prog_compiler__b"; then archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' @@ -9929,28 +10697,30 @@ fi # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -if ${lt_cv_irix_exported_symbol+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if test ${lt_cv_irix_exported_symbol+y} +then : + printf %s "(cached) " >&6 +else $as_nop save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_irix_exported_symbol=yes -else +else $as_nop lt_cv_irix_exported_symbol=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -$as_echo "$lt_cv_irix_exported_symbol" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } if test yes = "$lt_cv_irix_exported_symbol"; then archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi @@ -10042,6 +10812,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes + file_list_spec='@' ;; osf3*) @@ -10230,8 +11001,8 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 -$as_echo "$ld_shlibs" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +printf "%s\n" "$ld_shlibs" >&6; } test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -10267,18 +11038,19 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +printf %s "checking whether -lc should be explicitly linked in... " >&6; } +if test ${lt_cv_archive_cmds_need_lc+y} +then : + printf %s "(cached) " >&6 +else $as_nop $RM conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest @@ -10296,7 +11068,7 @@ else if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then lt_cv_archive_cmds_need_lc=no @@ -10310,8 +11082,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; } archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc ;; esac @@ -10470,8 +11242,8 @@ esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +printf %s "checking dynamic linker characteristics... " >&6; } if test yes = "$GCC"; then case $host_os in @@ -10733,7 +11505,7 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; @@ -10743,14 +11515,14 @@ cygwin* | mingw* | pw32* | cegcc*) ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -10769,7 +11541,7 @@ cygwin* | mingw* | pw32* | cegcc*) done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -10806,7 +11578,7 @@ cygwin* | mingw* | pw32* | cegcc*) ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -10839,7 +11611,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -11032,9 +11804,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) shlibpath_overrides_runpath=no # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_shlibpath_overrides_runpath+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_shlibpath_overrides_runpath=no save_LDFLAGS=$LDFLAGS save_libdir=$libdir @@ -11044,19 +11817,21 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : +if ac_fn_c_try_link "$LINENO" +then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null +then : lt_cv_shlibpath_overrides_runpath=yes fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS libdir=$save_libdir @@ -11070,6 +11845,9 @@ fi # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command @@ -11078,7 +11856,7 @@ fi # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -11288,8 +12066,8 @@ uts4*) dynamic_linker=no ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +printf "%s\n" "$dynamic_linker" >&6; } test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -11410,8 +12188,8 @@ configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +printf %s "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || @@ -11435,8 +12213,8 @@ else # directories. hardcode_action=unsupported fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 -$as_echo "$hardcode_action" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +printf "%s\n" "$hardcode_action" >&6; } if test relink = "$hardcode_action" || test yes = "$inherit_rpath"; then @@ -11480,11 +12258,12 @@ else darwin*) # if libdl is installed we need to link against it - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +printf %s "checking for dlopen in -ldl... " >&6; } +if test ${ac_cv_lib_dl_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11493,32 +12272,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlopen=yes -else +else $as_nop ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes +then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl -else +else $as_nop lt_cv_dlopen=dyld lt_cv_dlopen_libs= @@ -11538,14 +12316,16 @@ fi *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = xyes; then : +if test "x$ac_cv_func_shl_load" = xyes +then : lt_cv_dlopen=shl_load -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 -$as_echo_n "checking for shl_load in -ldld... " >&6; } -if ${ac_cv_lib_dld_shl_load+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +printf %s "checking for shl_load in -ldld... " >&6; } +if test ${ac_cv_lib_dld_shl_load+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11554,41 +12334,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char shl_load (); int -main () +main (void) { return shl_load (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dld_shl_load=yes -else +else $as_nop ac_cv_lib_dld_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = xyes +then : lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld -else +else $as_nop ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = xyes; then : +if test "x$ac_cv_func_dlopen" = xyes +then : lt_cv_dlopen=dlopen -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +printf %s "checking for dlopen in -ldl... " >&6; } +if test ${ac_cv_lib_dl_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11597,37 +12378,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlopen=yes -else +else $as_nop ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes +then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 -$as_echo_n "checking for dlopen in -lsvld... " >&6; } -if ${ac_cv_lib_svld_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +printf %s "checking for dlopen in -lsvld... " >&6; } +if test ${ac_cv_lib_svld_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11636,37 +12417,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_svld_dlopen=yes -else +else $as_nop ac_cv_lib_svld_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 -$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = xyes +then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 -$as_echo_n "checking for dld_link in -ldld... " >&6; } -if ${ac_cv_lib_dld_dld_link+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +printf %s "checking for dld_link in -ldld... " >&6; } +if test ${ac_cv_lib_dld_dld_link+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11675,30 +12456,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dld_link (); int -main () +main (void) { return dld_link (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dld_dld_link=yes -else +else $as_nop ac_cv_lib_dld_dld_link=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 -$as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = xyes +then : lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -11737,11 +12517,12 @@ fi save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 -$as_echo_n "checking whether a program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +printf %s "checking whether a program can dlopen itself... " >&6; } +if test ${lt_cv_dlopen_self+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else @@ -11820,7 +12601,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -11838,16 +12619,17 @@ rm -fr conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 -$as_echo "$lt_cv_dlopen_self" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +printf "%s\n" "$lt_cv_dlopen_self" >&6; } if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 -$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self_static+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +printf %s "checking whether a statically linked program can dlopen itself... " >&6; } +if test ${lt_cv_dlopen_self_static+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else @@ -11926,7 +12708,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -11944,8 +12726,8 @@ rm -fr conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 -$as_echo "$lt_cv_dlopen_self_static" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +printf "%s\n" "$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS=$save_CPPFLAGS @@ -11983,32 +12765,43 @@ fi striplib= old_striplib= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 -$as_echo_n "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +printf %s "checking whether stripping libraries is possible... " >&6; } +if test -z "$STRIP"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +else + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ;; - esac + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + ;; + *) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ;; + esac + fi fi @@ -12023,13 +12816,13 @@ fi # Report what library types will actually be built - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 -$as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +printf %s "checking if libtool supports shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +printf "%s\n" "$can_build_shared" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 -$as_echo_n "checking whether to build shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +printf %s "checking whether to build shared libraries... " >&6; } test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -12053,15 +12846,15 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } fi ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +printf "%s\n" "$enable_shared" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 -$as_echo_n "checking whether to build static libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +printf %s "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test yes = "$enable_shared" || enable_static=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +printf "%s\n" "$enable_static" >&6; } @@ -12103,7 +12896,8 @@ LT_VERSION=0:36:0 # Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : +if test ${enable_silent_rules+y} +then : enableval=$enable_silent_rules; fi @@ -12113,12 +12907,13 @@ case $enable_silent_rules in # ((( *) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +printf %s "checking whether $am_make supports nested variables... " >&6; } +if test ${am_cv_make_support_nested_variables+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if printf "%s\n" 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -12130,8 +12925,8 @@ else am_cv_make_support_nested_variables=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -12143,204 +12938,29 @@ AM_BACKSLASH='\' # Checks for programs. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 -$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } -if ${ac_cv_prog_cc_c99+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c99=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdarg.h> -#include <stdbool.h> -#include <stdlib.h> -#include <wchar.h> -#include <stdio.h> - -// Check varargs macros. These examples are taken from C99 6.10.3.5. -#define debug(...) fprintf (stderr, __VA_ARGS__) -#define showlist(...) puts (#__VA_ARGS__) -#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -static void -test_varargs_macros (void) -{ - int x = 1234; - int y = 5678; - debug ("Flag"); - debug ("X = %d\n", x); - showlist (The first, second, and third items.); - report (x>y, "x is %d but y is %d", x, y); -} - -// Check long long types. -#define BIG64 18446744073709551615ull -#define BIG32 4294967295ul -#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -#if !BIG_OK - your preprocessor is broken; -#endif -#if BIG_OK -#else - your preprocessor is broken; -#endif -static long long int bignum = -9223372036854775807LL; -static unsigned long long int ubignum = BIG64; - -struct incomplete_array -{ - int datasize; - double data[]; -}; - -struct named_init { - int number; - const wchar_t *name; - double average; -}; - -typedef const char *ccp; - -static inline int -test_restrict (ccp restrict text) -{ - // See if C++-style comments work. - // Iterate through items via the restricted pointer. - // Also check for declarations in for loops. - for (unsigned int i = 0; *(text+i) != '\0'; ++i) - continue; - return 0; -} - -// Check varargs and va_copy. -static void -test_varargs (const char *format, ...) -{ - va_list args; - va_start (args, format); - va_list args_copy; - va_copy (args_copy, args); - - const char *str; - int number; - float fnumber; - - while (*format) - { - switch (*format++) - { - case 's': // string - str = va_arg (args_copy, const char *); - break; - case 'd': // int - number = va_arg (args_copy, int); - break; - case 'f': // float - fnumber = va_arg (args_copy, double); - break; - default: - break; - } - } - va_end (args_copy); - va_end (args); -} - -int -main () -{ - - // Check bool. - _Bool success = false; - - // Check restrict. - if (test_restrict ("String literal") == 0) - success = true; - char *restrict newvar = "Another string"; - - // Check varargs. - test_varargs ("s, d' f .", "string", 65, 34.234); - test_varargs_macros (); - - // Check flexible array members. - struct incomplete_array *ia = - malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); - ia->datasize = 10; - for (int i = 0; i < ia->datasize; ++i) - ia->data[i] = i * 1.234; - - // Check named initializers. - struct named_init ni = { - .number = 34, - .name = L"Test wide string", - .average = 543.34343, - }; - - ni.number = 58; - - int dynamic_array[ni.number]; - dynamic_array[ni.number - 1] = 543; - - // work around unused variable warnings - return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' - || dynamic_array[ni.number - 1] != 543); - - ; - return 0; -} -_ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c99=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c99" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c99" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c99" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 -$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c99" != xno; then : - -fi - #AC_PROG_CC -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +printf %s "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +printf "%s\n" "no, using $LN_S" >&6; } fi for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AWK+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else @@ -12348,11 +12968,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12363,11 +12987,11 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +printf "%s\n" "$AWK" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -12381,11 +13005,12 @@ done do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_NROFF+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_NROFF+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $NROFF in [\\/]* | ?:[\\/]*) ac_cv_path_NROFF="$NROFF" # Let the user override the test with a path. @@ -12395,11 +13020,15 @@ else for as_dir in $TestPath do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_NROFF="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_NROFF="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12411,11 +13040,11 @@ esac fi NROFF=$ac_cv_path_NROFF if test -n "$NROFF"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NROFF" >&5 -$as_echo "$NROFF" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NROFF" >&5 +printf "%s\n" "$NROFF" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -12430,11 +13059,12 @@ test -n "$NROFF" || NROFF="/bin/false" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5 -$as_echo_n "checking for tgetent in -lcurses... " >&6; } -if ${ac_cv_lib_curses_tgetent+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5 +printf %s "checking for tgetent in -lcurses... " >&6; } +if test ${ac_cv_lib_curses_tgetent+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lcurses $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12443,42 +13073,40 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char tgetent (); int -main () +main (void) { return tgetent (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_curses_tgetent=yes -else +else $as_nop ac_cv_lib_curses_tgetent=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_tgetent" >&5 -$as_echo "$ac_cv_lib_curses_tgetent" >&6; } -if test "x$ac_cv_lib_curses_tgetent" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBCURSES 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_tgetent" >&5 +printf "%s\n" "$ac_cv_lib_curses_tgetent" >&6; } +if test "x$ac_cv_lib_curses_tgetent" = xyes +then : + printf "%s\n" "#define HAVE_LIBCURSES 1" >>confdefs.h LIBS="-lcurses $LIBS" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5 -$as_echo_n "checking for tgetent in -lncurses... " >&6; } -if ${ac_cv_lib_ncurses_tgetent+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5 +printf %s "checking for tgetent in -lncurses... " >&6; } +if test ${ac_cv_lib_ncurses_tgetent+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lncurses $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12487,37 +13115,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char tgetent (); int -main () +main (void) { return tgetent (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_ncurses_tgetent=yes -else +else $as_nop ac_cv_lib_ncurses_tgetent=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5 -$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; } -if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBNCURSES 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5 +printf "%s\n" "$ac_cv_lib_ncurses_tgetent" >&6; } +if test "x$ac_cv_lib_ncurses_tgetent" = xyes +then : + printf "%s\n" "#define HAVE_LIBNCURSES 1" >>confdefs.h LIBS="-lncurses $LIBS" -else +else $as_nop as_fn_error $? "libcurses or libncurses are required!" "$LINENO" 5 fi @@ -12528,19 +13153,20 @@ fi # Checks for header files. ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 -$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } -if eval \${$as_ac_Header+:} false; then : - $as_echo_n "(cached) " >&6 -else + as_ac_Header=`printf "%s\n" "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 +printf %s "checking for $ac_hdr that defines DIR... " >&6; } +if eval test \${$as_ac_Header+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <$ac_hdr> int -main () +main (void) { if ((DIR *) 0) return 0; @@ -12548,19 +13174,21 @@ return 0; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$as_ac_Header=yes" -else +else $as_nop eval "$as_ac_Header=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$as_ac_Header - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Header"\" = x"yes" +then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 +#define `printf "%s\n" "HAVE_$ac_hdr" | $as_tr_cpp` 1 _ACEOF ac_header_dirent=$ac_hdr; break @@ -12569,11 +13197,12 @@ fi done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 -$as_echo_n "checking for library containing opendir... " >&6; } -if ${ac_cv_search_opendir+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +printf %s "checking for library containing opendir... " >&6; } +if test ${ac_cv_search_opendir+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12581,56 +13210,59 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char opendir (); int -main () +main (void) { return opendir (); ; return 0; } _ACEOF -for ac_lib in '' dir; do +for ac_lib in '' dir +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_opendir=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_opendir+:} false; then : + if test ${ac_cv_search_opendir+y} +then : break fi done -if ${ac_cv_search_opendir+:} false; then : +if test ${ac_cv_search_opendir+y} +then : -else +else $as_nop ac_cv_search_opendir=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 -$as_echo "$ac_cv_search_opendir" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +printf "%s\n" "$ac_cv_search_opendir" >&6; } ac_res=$ac_cv_search_opendir -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 -$as_echo_n "checking for library containing opendir... " >&6; } -if ${ac_cv_search_opendir+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +printf %s "checking for library containing opendir... " >&6; } +if test ${ac_cv_search_opendir+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12638,169 +13270,137 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char opendir (); int -main () +main (void) { return opendir (); ; return 0; } _ACEOF -for ac_lib in '' x; do +for ac_lib in '' x +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_opendir=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_opendir+:} false; then : + if test ${ac_cv_search_opendir+y} +then : break fi done -if ${ac_cv_search_opendir+:} false; then : +if test ${ac_cv_search_opendir+y} +then : -else +else $as_nop ac_cv_search_opendir=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 -$as_echo "$ac_cv_search_opendir" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +printf "%s\n" "$ac_cv_search_opendir" >&6; } ac_res=$ac_cv_search_opendir -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <float.h> +# Autoupdate added the next two lines to ensure that your configure +# script's behavior did not change. They are probably safe to remove. -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <string.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <ctype.h> -#include <stdlib.h> -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +printf %s "checking for egrep... " >&6; } +if test ${ac_cv_path_EGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in egrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_cv_path_EGREP=$EGREP fi + fi fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +printf "%s\n" "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" -$as_echo "#define STDC_HEADERS 1" >>confdefs.h -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 -$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } -if ${ac_cv_header_sys_wait_h+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 +printf %s "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } +if test ${ac_cv_header_sys_wait_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> @@ -12813,7 +13413,7 @@ else #endif int -main () +main (void) { int s; wait (&s); @@ -12822,75 +13422,126 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_header_sys_wait_h=yes -else +else $as_nop ac_cv_header_sys_wait_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 -$as_echo "$ac_cv_header_sys_wait_h" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 +printf "%s\n" "$ac_cv_header_sys_wait_h" >&6; } if test $ac_cv_header_sys_wait_h = yes; then -$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h fi -for ac_header in fcntl.h limits.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default" +if test "x$ac_cv_header_fcntl_h" = xyes +then : + printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default" +if test "x$ac_cv_header_limits_h" = xyes +then : + printf "%s\n" "#define HAVE_LIMITS_H 1" >>confdefs.h -done +fi +ac_fn_c_check_header_compile "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" +if test "x$ac_cv_header_stdint_h" = xyes +then : + printf "%s\n" "#define HAVE_STDINT_H 1" >>confdefs.h +fi +ac_fn_c_check_header_compile "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = xyes +then : + printf "%s\n" "#define HAVE_STDLIB_H 1" >>confdefs.h -ac_fn_c_check_header_mongrel "$LINENO" "termios.h" "ac_cv_header_termios_h" "$ac_includes_default" -if test "x$ac_cv_header_termios_h" = xyes; then : +fi +ac_fn_c_check_header_compile "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default" +if test "x$ac_cv_header_string_h" = xyes +then : + printf "%s\n" "#define HAVE_STRING_H 1" >>confdefs.h -else - as_fn_error $? "termios.h is required!" "$LINENO" 5 fi +ac_fn_c_check_header_compile "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_ioctl_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_IOCTL_H 1" >>confdefs.h +fi +ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_param_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" +if test "x$ac_cv_header_unistd_h" = xyes +then : + printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default" +if test "x$ac_cv_header_curses_h" = xyes +then : + printf "%s\n" "#define HAVE_CURSES_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default" +if test "x$ac_cv_header_ncurses_h" = xyes +then : + printf "%s\n" "#define HAVE_NCURSES_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/cdefs.h" "ac_cv_header_sys_cdefs_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_cdefs_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_CDEFS_H 1" >>confdefs.h + +fi + + +ac_fn_c_check_header_compile "$LINENO" "termios.h" "ac_cv_header_termios_h" "$ac_includes_default" +if test "x$ac_cv_header_termios_h" = xyes +then : + +else $as_nop + as_fn_error $? "termios.h is required!" "$LINENO" 5 +fi ## include curses.h to prevent "Present But Cannot Be Compiled" -for ac_header in term.h -do : - ac_fn_c_check_header_compile "$LINENO" "term.h" "ac_cv_header_term_h" "#if HAVE_CURSES_H +ac_fn_c_check_header_compile "$LINENO" "term.h" "ac_cv_header_term_h" "#if HAVE_CURSES_H # include <curses.h> #elif HAVE_NCURSES_H # include <ncurses.h> #endif " -if test "x$ac_cv_header_term_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_TERM_H 1 -_ACEOF +if test "x$ac_cv_header_term_h" = xyes +then : + printf "%s\n" "#define HAVE_TERM_H 1" >>confdefs.h fi -done - # Checks for typedefs, structures, and compiler characteristics. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 -$as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if ${ac_cv_c_const+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +printf %s "checking for an ANSI C-conforming const... " >&6; } +if test ${ac_cv_c_const+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __cplusplus @@ -12903,7 +13554,7 @@ main () /* NEC SVR4.0.2 mips cc rejects this. */ struct point {int x, y;}; static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. + /* IBM XL C 1.02.0.0 rejects this. It does not let you subtract one const X* pointer from another in an arm of an if-expression whose if-part is not a constant expression */ @@ -12931,7 +13582,7 @@ main () iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying + { /* IBM XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ struct s { int j; const int *ap[3]; } bx; struct s *b = &bx; b->j = 5; @@ -12947,49 +13598,74 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_const=yes -else +else $as_nop ac_cv_c_const=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 -$as_echo "$ac_cv_c_const" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +printf "%s\n" "$ac_cv_c_const" >&6; } if test $ac_cv_c_const = no; then -$as_echo "#define const /**/" >>confdefs.h +printf "%s\n" "#define const /**/" >>confdefs.h fi -ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" -if test "x$ac_cv_type_pid_t" = xyes; then : -else + ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default +" +if test "x$ac_cv_type_pid_t" = xyes +then : + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #if defined _WIN64 && !defined __CYGWIN__ + LLP64 + #endif + +int +main (void) +{ + + ; + return 0; +} -cat >>confdefs.h <<_ACEOF -#define pid_t int _ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_pid_type='int' +else $as_nop + ac_pid_type='__int64' +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +printf "%s\n" "#define pid_t $ac_pid_type" >>confdefs.h + fi + ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = xyes; then : +if test "x$ac_cv_type_size_t" = xyes +then : -else +else $as_nop -cat >>confdefs.h <<_ACEOF -#define size_t unsigned int -_ACEOF +printf "%s\n" "#define size_t unsigned int" >>confdefs.h fi ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "$ac_includes_default" -if test "x$ac_cv_type_u_int32_t" = xyes; then : +if test "x$ac_cv_type_u_int32_t" = xyes +then : -cat >>confdefs.h <<_ACEOF -#define HAVE_U_INT32_T 1 -_ACEOF +printf "%s\n" "#define HAVE_U_INT32_T 1" >>confdefs.h fi @@ -13005,64 +13681,60 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif int -main () +main (void) { size_t x = SIZE_MAX; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : have_size_max=yes -else +else $as_nop have_size_max=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext if test "$have_size_max" = yes; then -$as_echo "#define HAVE_SIZE_MAX 1" >>confdefs.h +printf "%s\n" "#define HAVE_SIZE_MAX 1" >>confdefs.h fi # Checks for library functions. -for ac_header in vfork.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default" -if test "x$ac_cv_header_vfork_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_VFORK_H 1 -_ACEOF - -fi +ac_func= +for ac_item in $ac_func_c_list +do + if test $ac_func; then + ac_fn_c_check_func "$LINENO" $ac_func ac_cv_func_$ac_func + if eval test \"x\$ac_cv_func_$ac_func\" = xyes; then + echo "#define $ac_item 1" >> confdefs.h + fi + ac_func= + else + ac_func=$ac_item + fi done -for ac_func in fork vfork -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -fi -done if test "x$ac_cv_func_fork" = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5 -$as_echo_n "checking for working fork... " >&6; } -if ${ac_cv_func_fork_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5 +printf %s "checking for working fork... " >&6; } +if test ${ac_cv_func_fork_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "$cross_compiling" = yes +then : ac_cv_func_fork_works=cross -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int -main () +main (void) { /* By Ruediger Kuhlmann. */ @@ -13072,9 +13744,10 @@ main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : ac_cv_func_fork_works=yes -else +else $as_nop ac_cv_func_fork_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -13082,8 +13755,8 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5 -$as_echo "$ac_cv_func_fork_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5 +printf "%s\n" "$ac_cv_func_fork_works" >&6; } else ac_cv_func_fork_works=$ac_cv_func_fork @@ -13098,27 +13771,37 @@ if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_fork_works=yes ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5 -$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5 +printf "%s\n" "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;} fi ac_cv_func_vfork_works=$ac_cv_func_vfork if test "x$ac_cv_func_vfork" = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5 -$as_echo_n "checking for working vfork... " >&6; } -if ${ac_cv_func_vfork_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5 +printf %s "checking for working vfork... " >&6; } +if test ${ac_cv_func_vfork_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "$cross_compiling" = yes +then : ac_cv_func_vfork_works=cross -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Thanks to Paul Eggert for this test. */ $ac_includes_default +#include <signal.h> #include <sys/wait.h> #ifdef HAVE_VFORK_H # include <vfork.h> #endif + +static void +do_nothing (int sig) +{ + (void) sig; +} + /* On some sparc systems, changes by the child to local and incoming argument registers are propagated back to the parent. The compiler is told about this with #include <vfork.h>, but some compilers @@ -13126,11 +13809,7 @@ $ac_includes_default static variable whose address is put into a register that is clobbered by the vfork. */ static void -#ifdef __cplusplus sparc_address_test (int arg) -# else -sparc_address_test (arg) int arg; -#endif { static pid_t child; if (!child) { @@ -13148,13 +13827,18 @@ sparc_address_test (arg) int arg; } int -main () +main (void) { pid_t parent = getpid (); pid_t child; sparc_address_test (0); + /* On Solaris 2.4, changes by the child to the signal handler + also munge signal handlers in the parent. To detect this, + start by putting the parent's handler in a known state. */ + signal (SIGTERM, SIG_DFL); + child = vfork (); if (child == 0) { @@ -13176,6 +13860,10 @@ main () || p != p5 || p != p6 || p != p7) _exit(1); + /* Alter the child's signal handler. */ + if (signal (SIGTERM, do_nothing) != SIG_DFL) + _exit(1); + /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent from child file descriptors. If the child closes a descriptor before it execs or exits, this munges the parent's descriptor @@ -13191,6 +13879,9 @@ main () /* Was there some problem with vforking? */ child < 0 + /* Did the child munge the parent's signal handler? */ + || signal (SIGTERM, SIG_DFL) != SIG_DFL + /* Did the child fail? (This shouldn't happen.) */ || status @@ -13203,9 +13894,10 @@ main () } } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : ac_cv_func_vfork_works=yes -else +else $as_nop ac_cv_func_vfork_works=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -13213,37 +13905,171 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5 -$as_echo "$ac_cv_func_vfork_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5 +printf "%s\n" "$ac_cv_func_vfork_works" >&6; } fi; if test "x$ac_cv_func_fork_works" = xcross; then ac_cv_func_vfork_works=$ac_cv_func_vfork - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5 -$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5 +printf "%s\n" "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;} fi if test "x$ac_cv_func_vfork_works" = xyes; then -$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h +printf "%s\n" "#define HAVE_WORKING_VFORK 1" >>confdefs.h else -$as_echo "#define vfork fork" >>confdefs.h +printf "%s\n" "#define vfork fork" >>confdefs.h fi if test "x$ac_cv_func_fork_works" = xyes; then -$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h +printf "%s\n" "#define HAVE_WORKING_FORK 1" >>confdefs.h fi -if test $ac_cv_c_compiler_gnu = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 -$as_echo_n "checking whether $CC needs -traditional... " >&6; } -if ${ac_cv_prog_gcc_traditional+:} false; then : - $as_echo_n "(cached) " >&6 +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +printf %s "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test ${ac_cv_prog_CPP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + # Double quotes because $CC needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <limits.h> + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + +else $as_nop + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <ac_nonexistent.h> +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + # Broken: success on invalid input. +continue +else $as_nop + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok +then : + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP else + ac_cv_prog_CPP=$CPP +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +printf "%s\n" "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <limits.h> + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + +else $as_nop + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <ac_nonexistent.h> +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + # Broken: success on invalid input. +continue +else $as_nop + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok +then : + +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +if test $ac_cv_c_compiler_gnu = yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 +printf %s "checking whether $CC needs -traditional... " >&6; } +if test ${ac_cv_prog_gcc_traditional+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_pattern="Autoconf.*'x'" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13251,12 +14077,13 @@ else Autoconf TIOCGETP _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then : + $EGREP "$ac_pattern" >/dev/null 2>&1 +then : ac_cv_prog_gcc_traditional=yes -else +else $as_nop ac_cv_prog_gcc_traditional=no fi -rm -f conftest* +rm -rf conftest* if test $ac_cv_prog_gcc_traditional = no; then @@ -13266,15 +14093,16 @@ rm -f conftest* Autoconf TCGETA _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then : + $EGREP "$ac_pattern" >/dev/null 2>&1 +then : ac_cv_prog_gcc_traditional=yes fi -rm -f conftest* +rm -rf conftest* fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5 -$as_echo "$ac_cv_prog_gcc_traditional" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5 +printf "%s\n" "$ac_cv_prog_gcc_traditional" >&6; } if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi @@ -13283,55 +14111,62 @@ fi ## _AIX is offended by rpl_malloc and rpl_realloc #AC_FUNC_MALLOC #AC_FUNC_REALLOC -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 -$as_echo_n "checking return type of signal handlers... " >&6; } -if ${ac_cv_type_signal+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 +printf %s "checking return type of signal handlers... " >&6; } +if test ${ac_cv_type_signal+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <signal.h> int -main () +main (void) { return *(signal (0, 0)) (0) == 1; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_type_signal=int -else +else $as_nop ac_cv_type_signal=void fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 -$as_echo "$ac_cv_type_signal" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 +printf "%s\n" "$ac_cv_type_signal" >&6; } -cat >>confdefs.h <<_ACEOF -#define RETSIGTYPE $ac_cv_type_signal -_ACEOF +printf "%s\n" "#define RETSIGTYPE $ac_cv_type_signal" >>confdefs.h -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 -$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } -if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 +printf %s "checking whether lstat correctly handles trailing slash... " >&6; } +if test ${ac_cv_func_lstat_dereferences_slashed_symlink+y} +then : + printf %s "(cached) " >&6 +else $as_nop rm -f conftest.sym conftest.file echo >conftest.file if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then - if test "$cross_compiling" = yes; then : - ac_cv_func_lstat_dereferences_slashed_symlink=no -else + if test "$cross_compiling" = yes +then : + case "$host_os" in # (( + # Guess yes on glibc systems. + *-gnu*) ac_cv_func_lstat_dereferences_slashed_symlink=yes ;; + # If we don't know, assume the worst. + *) ac_cv_func_lstat_dereferences_slashed_symlink=no ;; + esac +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int -main () +main (void) { struct stat sbuf; /* Linux will dereference the symlink and fail, as required by POSIX. @@ -13342,9 +14177,10 @@ struct stat sbuf; return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : ac_cv_func_lstat_dereferences_slashed_symlink=yes -else +else $as_nop ac_cv_func_lstat_dereferences_slashed_symlink=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -13359,14 +14195,12 @@ fi rm -f conftest.sym conftest.file fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 -$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 +printf "%s\n" "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && -cat >>confdefs.h <<_ACEOF -#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 -_ACEOF +printf "%s\n" "#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1" >>confdefs.h if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then @@ -13378,19 +14212,21 @@ esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5 -$as_echo_n "checking whether stat accepts an empty string... " >&6; } -if ${ac_cv_func_stat_empty_string_bug+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5 +printf %s "checking whether stat accepts an empty string... " >&6; } +if test ${ac_cv_func_stat_empty_string_bug+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "$cross_compiling" = yes +then : ac_cv_func_stat_empty_string_bug=yes -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int -main () +main (void) { struct stat sbuf; return stat ("", &sbuf) == 0; @@ -13398,9 +14234,10 @@ struct stat sbuf; return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : ac_cv_func_stat_empty_string_bug=no -else +else $as_nop ac_cv_func_stat_empty_string_bug=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -13408,8 +14245,8 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5 -$as_echo "$ac_cv_func_stat_empty_string_bug" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5 +printf "%s\n" "$ac_cv_func_stat_empty_string_bug" >&6; } if test $ac_cv_func_stat_empty_string_bug = yes; then case " $LIBOBJS " in *" stat.$ac_objext "* ) ;; @@ -13418,27 +14255,38 @@ if test $ac_cv_func_stat_empty_string_bug = yes; then esac -cat >>confdefs.h <<_ACEOF -#define HAVE_STAT_EMPTY_STRING_BUG 1 -_ACEOF +printf "%s\n" "#define HAVE_STAT_EMPTY_STRING_BUG 1" >>confdefs.h fi -for ac_func in getline isascii issetugid wcsdup -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +ac_fn_c_check_func "$LINENO" "getline" "ac_cv_func_getline" +if test "x$ac_cv_func_getline" = xyes +then : + printf "%s\n" "#define HAVE_GETLINE 1" >>confdefs.h fi -done +ac_fn_c_check_func "$LINENO" "isascii" "ac_cv_func_isascii" +if test "x$ac_cv_func_isascii" = xyes +then : + printf "%s\n" "#define HAVE_ISASCII 1" >>confdefs.h +fi +ac_fn_c_check_func "$LINENO" "issetugid" "ac_cv_func_issetugid" +if test "x$ac_cv_func_issetugid" = xyes +then : + printf "%s\n" "#define HAVE_ISSETUGID 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpwnam_r and getpwuid_r are posix like" >&5 -$as_echo_n "checking whether getpwnam_r and getpwuid_r are posix like... " >&6; } +fi +ac_fn_c_check_func "$LINENO" "wcsdup" "ac_cv_func_wcsdup" +if test "x$ac_cv_func_wcsdup" = xyes +then : + printf "%s\n" "#define HAVE_WCSDUP 1" >>confdefs.h + +fi + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getpwnam_r and getpwuid_r are posix like" >&5 +printf %s "checking whether getpwnam_r and getpwuid_r are posix like... " >&6; } # The prototype for the POSIX version is: # int getpwnam_r(char *, struct passwd *, char *, size_t, struct passwd **) # int getpwuid_r(uid_t, struct passwd *, char *, size_t, struct passwd **); @@ -13448,7 +14296,7 @@ $as_echo_n "checking whether getpwnam_r and getpwuid_r are posix like... " >&6; #include <sys/types.h> #include <pwd.h> int -main () +main (void) { getpwnam_r(NULL, NULL, NULL, (size_t)0, NULL); getpwuid_r((uid_t)0, NULL, NULL, (size_t)0, NULL); @@ -13456,22 +14304,23 @@ getpwnam_r(NULL, NULL, NULL, (size_t)0, NULL); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : -$as_echo "#define HAVE_GETPW_R_POSIX 1" >>confdefs.h +printf "%s\n" "#define HAVE_GETPW_R_POSIX 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpwnam_r and getpwuid_r are posix _draft_ like" >&5 -$as_echo_n "checking whether getpwnam_r and getpwuid_r are posix _draft_ like... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getpwnam_r and getpwuid_r are posix _draft_ like" >&5 +printf %s "checking whether getpwnam_r and getpwuid_r are posix _draft_ like... " >&6; } # The prototype for the POSIX draft version is: # struct passwd *getpwuid_r(uid_t, struct passwd *, char *, int); # struct passwd *getpwnam_r(char *, struct passwd *, char *, int); @@ -13481,7 +14330,7 @@ $as_echo_n "checking whether getpwnam_r and getpwuid_r are posix _draft_ like... #include <sys/types.h> #include <pwd.h> int -main () +main (void) { getpwnam_r(NULL, NULL, NULL, (size_t)0); getpwuid_r((uid_t)0, NULL, NULL, (size_t)0); @@ -13489,17 +14338,18 @@ getpwnam_r(NULL, NULL, NULL, (size_t)0); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : -$as_echo "#define HAVE_GETPW_R_DRAFT 1" >>confdefs.h +printf "%s\n" "#define HAVE_GETPW_R_DRAFT 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext @@ -13508,9 +14358,10 @@ ac_fn_c_check_member "$LINENO" "struct dirent" "d_namlen" "ac_cv_member_struct_d #endif " -if test "x$ac_cv_member_struct_dirent_d_namlen" = xyes; then : +if test "x$ac_cv_member_struct_dirent_d_namlen" = xyes +then : -$as_echo "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" >>confdefs.h +printf "%s\n" "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" >>confdefs.h fi @@ -13546,8 +14397,8 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -13577,15 +14428,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -13599,8 +14450,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;} fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -13617,7 +14468,7 @@ U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -13628,14 +14479,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 -$as_echo_n "checking that generated files are newer than configure... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +printf %s "checking that generated files are newer than configure... " >&6; } if test -n "$am_sleep_pid"; then # Hide warnings about reused PIDs. wait $am_sleep_pid 2>/dev/null fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 -$as_echo "done" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5 +printf "%s\n" "done" >&6; } if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -13657,8 +14508,8 @@ fi ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -13681,14 +14532,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -13698,46 +14551,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi +if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -13746,13 +14599,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -13761,8 +14607,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -13774,30 +14624,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -13810,13 +14640,14 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -13843,18 +14674,20 @@ as_fn_unset () { eval $1=; unset $1;} } as_unset=as_fn_unset + # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -13866,12 +14699,13 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` @@ -13902,7 +14736,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -13924,6 +14758,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -13937,6 +14775,12 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -13978,7 +14822,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -13987,7 +14831,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -14050,7 +14894,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by libedit $as_me 3.1, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -14112,14 +14956,16 @@ $config_commands Report bugs to the package provider." _ACEOF +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ libedit config.status 3.1 -configured by $0, generated by GNU Autoconf 2.69, +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -14159,15 +15005,15 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; + printf "%s\n" "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; + printf "%s\n" "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -14175,7 +15021,7 @@ do --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; @@ -14184,7 +15030,7 @@ do as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; + printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -14212,7 +15058,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -14226,7 +15072,7 @@ exec 5>>config.log sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - $as_echo "$ac_log" + printf "%s\n" "$ac_log" } >&5 _ACEOF @@ -14234,7 +15080,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" # The HP-UX ksh and POSIX shell print the target directory to stdout @@ -14278,6 +15124,7 @@ lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_q lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`' OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' @@ -14286,6 +15133,7 @@ want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`' AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' @@ -14406,6 +15254,7 @@ LN_S \ lt_SP2NL \ lt_NL2SP \ reload_flag \ +FILECMD \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -14414,7 +15263,6 @@ want_nocaseglob \ DLLTOOL \ sharedlib_from_linklib_cmd \ AR \ -AR_FLAGS \ archiver_list_spec \ STRIP \ RANLIB \ @@ -14543,9 +15391,9 @@ done # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands + test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files + test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers + test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands fi # Have a temporary directory for convenience. Make it in the build tree @@ -14881,7 +15729,7 @@ do esac || as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -14889,17 +15737,17 @@ do # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | + ac_sed_conf_input=`printf "%s\n" "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -14916,7 +15764,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | +printf "%s\n" X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -14940,9 +15788,9 @@ $as_echo X"$ac_file" | case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -15004,8 +15852,8 @@ ac_sed_dataroot=' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -15049,9 +15897,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -15067,20 +15915,20 @@ which seems to be undefined. Please make sure it is defined" >&2;} # if test x"$ac_file" != x-; then { - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi @@ -15100,7 +15948,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$_am_arg" : 'X\(//\)[^/]' \| \ X"$_am_arg" : 'X\(//\)$' \| \ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$_am_arg" | +printf "%s\n" X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -15120,8 +15968,8 @@ $as_echo X"$_am_arg" | s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -$as_echo "$as_me: executing $ac_file commands" >&6;} + :C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +printf "%s\n" "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -15131,29 +15979,35 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + case $CONFIG_FILES in #( + *\'*) : + eval set x "$CONFIG_FILES" ;; #( + *) : + set x $CONFIG_FILES ;; #( + *) : + ;; +esac shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`$as_dirname -- "$am_mf" || +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$am_mf" : 'X\(//\)[^/]' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -15171,53 +16025,50 @@ $as_echo X"$mf" | q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ + am_filepart=`$as_basename -- "$am_mf" || +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +printf "%s\n" X/"$am_mf" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q } - /^X\(\/\/\)$/{ + /^X\/\(\/\/\)$/{ s//\1/ q } - /^X\(\/\).*/{ + /^X\/\(\/\).*/{ s//\1/ q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + { echo "$as_me:$LINENO: cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles" >&5 + (cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } || am_rc=$? done + if test $am_rc -ne 0; then + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking). +See \`config.log' for more details" "$LINENO" 5; } + fi + { am_dirpart=; unset am_dirpart;} + { am_filepart=; unset am_filepart;} + { am_mf=; unset am_mf;} + { am_rc=; unset am_rc;} + rm -f conftest-deps.mk } ;; "libtool":C) @@ -15355,6 +16206,9 @@ to_host_file_cmd=$lt_cv_to_host_file_cmd # convert \$build files to toolchain format. to_tool_file_cmd=$lt_cv_to_tool_file_cmd +# A file(cmd) program that detects file types. +FILECMD=$lt_FILECMD + # An object symbol dumper. OBJDUMP=$lt_OBJDUMP @@ -15379,8 +16233,11 @@ sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd # The archiver. AR=$lt_AR +# Flags to create an archive (by configure). +lt_ar_flags=$lt_ar_flags + # Flags to create an archive. -AR_FLAGS=$lt_AR_FLAGS +AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"} # How to feed a file listing to the archiver. archiver_list_spec=$lt_archiver_list_spec @@ -15748,6 +16605,7 @@ _LT_EOF esac + ltmain=$ac_aux_dir/ltmain.sh @@ -15755,7 +16613,7 @@ ltmain=$ac_aux_dir/ltmain.sh # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -15797,7 +16655,8 @@ if test "$no_create" != yes; then $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + diff --git a/lib/libedit/depcomp b/lib/libedit/depcomp index b39f98f9ae9f..715e34311ed2 100755 --- a/lib/libedit/depcomp +++ b/lib/libedit/depcomp @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ scriptversion=2016-01-11.22; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -783,7 +783,7 @@ exit 0 # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/lib/libedit/install-sh b/lib/libedit/install-sh index 0360b79e7d02..ec298b537402 100755 --- a/lib/libedit/install-sh +++ b/lib/libedit/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2016-01-11.22; # UTC +scriptversion=2020-11-14.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -69,6 +69,11 @@ posix_mkdir= # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -99,18 +104,28 @@ Options: --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Email bug reports to bug-automake@gnu.org. +Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -137,8 +152,13 @@ while test $# -ne 0; do -o) chowncmd="$chownprog $2" shift;; + -p) cpprog="$cpprog -p";; + -s) stripcmd=$stripprog;; + -S) backupsuffix="$2" + shift;; + -t) is_target_a_directory=always dst_arg=$2 @@ -255,6 +275,10 @@ do dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -271,15 +295,18 @@ do fi dst=$dst_arg - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. + # If destination is a directory, append the input filename. if test -d "$dst"; then if test "$is_target_a_directory" = never; then echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst - dst=$dstdir/`basename "$src"` + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac dstdir_status=0 else dstdir=`dirname "$dst"` @@ -288,27 +315,16 @@ do fi fi + case $dstdir in + */) dstdirslash=$dstdir;; + *) dstdirslash=$dstdir/;; + esac + obsolete_mkdir_used=false if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - # With -d, create the new directory with the user-specified mode. # Otherwise, rely on $mkdir_umask. if test -n "$dir_arg"; then @@ -318,43 +334,49 @@ do fi posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; esac if @@ -365,7 +387,7 @@ do then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. @@ -394,7 +416,7 @@ do prefixes= else if $posix_mkdir; then - (umask=$mkdir_umask && + (umask $mkdir_umask && $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break # Don't fail if two instances are running concurrently. test -d "$prefix" || exit 1 @@ -427,14 +449,25 @@ do else # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ + dsttmp=${dstdirslash}_inst.$$_ + rmtmp=${dstdirslash}_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -460,6 +493,13 @@ do then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -474,9 +514,9 @@ do # file should still install successfully. { test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || + $doit $rmcmd "$dst" 2>/dev/null || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } } || { echo "$0: cannot unlink or rename $dst" >&2 (exit 1); exit 1 @@ -493,7 +533,7 @@ do done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/lib/libedit/ltmain.sh b/lib/libedit/ltmain.sh index 0f0a2da3f9dd..49fcad1365c6 100644 --- a/lib/libedit/ltmain.sh +++ b/lib/libedit/ltmain.sh @@ -1,12 +1,12 @@ -#! /bin/sh +#! /usr/bin/env sh ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in -## by inline-source v2014-01-03.01 +## by inline-source v2019-02-19.15 -# libtool (GNU libtool) 2.4.6 +# libtool (GNU libtool) 2.4.7 # Provide generalized library-building support services. # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -# Copyright (C) 1996-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2019, 2021-2022 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -31,8 +31,8 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.6 -package_revision=2.4.6 +VERSION=2.4.7 +package_revision=2.4.7 ## ------ ## @@ -64,34 +64,25 @@ package_revision=2.4.6 # libraries, which are installed to $pkgauxdir. # Set a version string for this script. -scriptversion=2015-01-20.17; # UTC +scriptversion=2019-02-19.15; # UTC # General shell script boiler plate, and helper functions. # Written by Gary V. Vaughan, 2004 -# Copyright (C) 2004-2015 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. - -# As a special exception to the GNU General Public License, if you distribute -# this file as part of a program or library that is built using GNU Libtool, -# you may include this file under the same distribution terms that you use -# for the rest of that program. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# This is free software. There is NO warranty; not even for +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Copyright (C) 2004-2019, 2021 Bootstrap Authors +# +# This file is dual licensed under the terms of the MIT license +# <https://opensource.org/license/MIT>, and GPL version 2 or later +# <http://www.gnu.org/licenses/gpl-2.0.html>. You must apply one of +# these licenses when using or redistributing this software or any of +# the files within it. See the URLs above, or the file `LICENSE` +# included in the Bootstrap distribution for the full license texts. -# Please report bugs or propose patches to gary@gnu.org. +# Please report bugs or propose patches to: +# <https://github.com/gnulib-modules/bootstrap/issues> ## ------ ## @@ -139,9 +130,12 @@ do _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# These NLS vars are set unconditionally (bootstrap issue #24). Unset those +# in case the environment reset is needed later and the $save_* variant is not +# defined (see the code above). +LC_ALL=C +LANGUAGE=C +export LANGUAGE LC_ALL # Make sure IFS has a sensible default sp=' ' @@ -159,6 +153,26 @@ if test "${PATH_SEPARATOR+set}" != set; then fi +# func_unset VAR +# -------------- +# Portably unset VAR. +# In some shells, an 'unset VAR' statement leaves a non-zero return +# status if VAR is already unset, which might be problematic if the +# statement is used at the end of a function (thus poisoning its return +# value) or when 'set -e' is active (causing even a spurious abort of +# the script in this case). +func_unset () +{ + { eval $1=; (eval unset $1) >/dev/null 2>&1 && eval unset $1 || : ; } +} + + +# Make sure CDPATH doesn't cause `cd` commands to output the target dir. +func_unset CDPATH + +# Make sure ${,E,F}GREP behave sanely. +func_unset GREP_OPTIONS + ## ------------------------- ## ## Locate command utilities. ## @@ -259,7 +273,7 @@ test -z "$SED" && { rm -f conftest.in conftest.tmp conftest.nl conftest.out } - func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin" rm -f conftest.sed SED=$func_path_progs_result } @@ -295,7 +309,7 @@ test -z "$GREP" && { rm -f conftest.in conftest.tmp conftest.nl conftest.out } - func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin" GREP=$func_path_progs_result } @@ -360,6 +374,35 @@ sed_double_backslash="\ s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g s/\n//g" +# require_check_ifs_backslash +# --------------------------- +# Check if we can use backslash as IFS='\' separator, and set +# $check_ifs_backshlash_broken to ':' or 'false'. +require_check_ifs_backslash=func_require_check_ifs_backslash +func_require_check_ifs_backslash () +{ + _G_save_IFS=$IFS + IFS='\' + _G_check_ifs_backshlash='a\\b' + for _G_i in $_G_check_ifs_backshlash + do + case $_G_i in + a) + check_ifs_backshlash_broken=false + ;; + '') + break + ;; + *) + check_ifs_backshlash_broken=: + break + ;; + esac + done + IFS=$_G_save_IFS + require_check_ifs_backslash=: +} + ## ----------------- ## ## Global variables. ## @@ -580,16 +623,16 @@ if test yes = "$_G_HAVE_PLUSEQ_OP"; then { $debug_cmd - func_quote_for_eval "$2" - eval "$1+=\\ \$func_quote_for_eval_result" + func_quote_arg pretty "$2" + eval "$1+=\\ \$func_quote_arg_result" }' else func_append_quoted () { $debug_cmd - func_quote_for_eval "$2" - eval "$1=\$$1\\ \$func_quote_for_eval_result" + func_quote_arg pretty "$2" + eval "$1=\$$1\\ \$func_quote_arg_result" } fi @@ -1091,85 +1134,203 @@ func_relative_path () } -# func_quote_for_eval ARG... -# -------------------------- -# Aesthetically quote ARGs to be evaled later. -# This function returns two values: -# i) func_quote_for_eval_result -# double-quoted, suitable for a subsequent eval -# ii) func_quote_for_eval_unquoted_result -# has all characters that are still active within double -# quotes backslashified. -func_quote_for_eval () +# func_quote_portable EVAL ARG +# ---------------------------- +# Internal function to portably implement func_quote_arg. Note that we still +# keep attention to performance here so we as much as possible try to avoid +# calling sed binary (so far O(N) complexity as long as func_append is O(1)). +func_quote_portable () { $debug_cmd - func_quote_for_eval_unquoted_result= - func_quote_for_eval_result= - while test 0 -lt $#; do - case $1 in - *[\\\`\"\$]*) - _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; - *) - _G_unquoted_arg=$1 ;; - esac - if test -n "$func_quote_for_eval_unquoted_result"; then - func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" - else - func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + $require_check_ifs_backslash + + func_quote_portable_result=$2 + + # one-time-loop (easy break) + while true + do + if $1; then + func_quote_portable_result=`$ECHO "$2" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` + break fi - case $_G_unquoted_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and variable expansion - # for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - _G_quoted_arg=\"$_G_unquoted_arg\" + # Quote for eval. + case $func_quote_portable_result in + *[\\\`\"\$]*) + # Fallback to sed for $func_check_bs_ifs_broken=:, or when the string + # contains the shell wildcard characters. + case $check_ifs_backshlash_broken$func_quote_portable_result in + :*|*[\[\*\?]*) + func_quote_portable_result=`$ECHO "$func_quote_portable_result" \ + | $SED "$sed_quote_subst"` + break + ;; + esac + + func_quote_portable_old_IFS=$IFS + for _G_char in '\' '`' '"' '$' + do + # STATE($1) PREV($2) SEPARATOR($3) + set start "" "" + func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy + IFS=$_G_char + for _G_part in $func_quote_portable_result + do + case $1 in + quote) + func_append func_quote_portable_result "$3$2" + set quote "$_G_part" "\\$_G_char" + ;; + start) + set first "" "" + func_quote_portable_result= + ;; + first) + set quote "$_G_part" "" + ;; + esac + done + done + IFS=$func_quote_portable_old_IFS ;; - *) - _G_quoted_arg=$_G_unquoted_arg - ;; + *) ;; esac - - if test -n "$func_quote_for_eval_result"; then - func_append func_quote_for_eval_result " $_G_quoted_arg" - else - func_append func_quote_for_eval_result "$_G_quoted_arg" - fi - shift + break done + + func_quote_portable_unquoted_result=$func_quote_portable_result + case $func_quote_portable_result in + # double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # many bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + func_quote_portable_result=\"$func_quote_portable_result\" + ;; + esac } -# func_quote_for_expand ARG -# ------------------------- -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () -{ - $debug_cmd +# func_quotefast_eval ARG +# ----------------------- +# Quote one ARG (internal). This is equivalent to 'func_quote_arg eval ARG', +# but optimized for speed. Result is stored in $func_quotefast_eval. +if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then + printf -v _GL_test_printf_tilde %q '~' + if test '\~' = "$_GL_test_printf_tilde"; then + func_quotefast_eval () + { + printf -v func_quotefast_eval_result %q "$1" + } + else + # Broken older Bash implementations. Make those faster too if possible. + func_quotefast_eval () + { + case $1 in + '~'*) + func_quote_portable false "$1" + func_quotefast_eval_result=$func_quote_portable_result + ;; + *) + printf -v func_quotefast_eval_result %q "$1" + ;; + esac + } + fi +else + func_quotefast_eval () + { + func_quote_portable false "$1" + func_quotefast_eval_result=$func_quote_portable_result + } +fi - case $1 in - *[\\\`\"]*) - _G_arg=`$ECHO "$1" | $SED \ - -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; - *) - _G_arg=$1 ;; + +# func_quote_arg MODEs ARG +# ------------------------ +# Quote one ARG to be evaled later. MODEs argument may contain zero or more +# specifiers listed below separated by ',' character. This function returns two +# values: +# i) func_quote_arg_result +# double-quoted (when needed), suitable for a subsequent eval +# ii) func_quote_arg_unquoted_result +# has all characters that are still active within double +# quotes backslashified. Available only if 'unquoted' is specified. +# +# Available modes: +# ---------------- +# 'eval' (default) +# - escape shell special characters +# 'expand' +# - the same as 'eval'; but do not quote variable references +# 'pretty' +# - request aesthetic output, i.e. '"a b"' instead of 'a\ b'. This might +# be used later in func_quote to get output like: 'echo "a b"' instead +# of 'echo a\ b'. This is slower than default on some shells. +# 'unquoted' +# - produce also $func_quote_arg_unquoted_result which does not contain +# wrapping double-quotes. +# +# Examples for 'func_quote_arg pretty,unquoted string': +# +# string | *_result | *_unquoted_result +# ------------+-----------------------+------------------- +# " | \" | \" +# a b | "a b" | a b +# "a b" | "\"a b\"" | \"a b\" +# * | "*" | * +# z="${x-$y}" | "z=\"\${x-\$y}\"" | z=\"\${x-\$y}\" +# +# Examples for 'func_quote_arg pretty,unquoted,expand string': +# +# string | *_result | *_unquoted_result +# --------------+---------------------+-------------------- +# z="${x-$y}" | "z=\"${x-$y}\"" | z=\"${x-$y}\" +func_quote_arg () +{ + _G_quote_expand=false + case ,$1, in + *,expand,*) + _G_quote_expand=: + ;; esac - case $_G_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - _G_arg=\"$_G_arg\" + case ,$1, in + *,pretty,*|*,expand,*|*,unquoted,*) + func_quote_portable $_G_quote_expand "$2" + func_quote_arg_result=$func_quote_portable_result + func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result + ;; + *) + # Faster quote-for-eval for some shells. + func_quotefast_eval "$2" + func_quote_arg_result=$func_quotefast_eval_result ;; esac +} - func_quote_for_expand_result=$_G_arg + +# func_quote MODEs ARGs... +# ------------------------ +# Quote all ARGs to be evaled later and join them into single command. See +# func_quote_arg's description for more info. +func_quote () +{ + $debug_cmd + _G_func_quote_mode=$1 ; shift + func_quote_result= + while test 0 -lt $#; do + func_quote_arg "$_G_func_quote_mode" "$1" + if test -n "$func_quote_result"; then + func_append func_quote_result " $func_quote_arg_result" + else + func_append func_quote_result "$func_quote_arg_result" + fi + shift + done } @@ -1215,8 +1376,8 @@ func_show_eval () _G_cmd=$1 _G_fail_exp=${2-':'} - func_quote_for_expand "$_G_cmd" - eval "func_notquiet $func_quote_for_expand_result" + func_quote_arg pretty,expand "$_G_cmd" + eval "func_notquiet $func_quote_arg_result" $opt_dry_run || { eval "$_G_cmd" @@ -1241,8 +1402,8 @@ func_show_eval_locale () _G_fail_exp=${2-':'} $opt_quiet || { - func_quote_for_expand "$_G_cmd" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$_G_cmd" + eval "func_echo $func_quote_arg_result" } $opt_dry_run || { @@ -1369,30 +1530,26 @@ func_lt_ver () # End: #! /bin/sh -# Set a version string for this script. -scriptversion=2014-01-07.03; # UTC - # A portable, pluggable option parser for Bourne shell. # Written by Gary V. Vaughan, 2010 -# Copyright (C) 2010-2015 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This is free software. There is NO warranty; not even for +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Copyright (C) 2010-2019, 2021 Bootstrap Authors +# +# This file is dual licensed under the terms of the MIT license +# <https://opensource.org/license/MIT>, and GPL version 2 or later +# <http://www.gnu.org/licenses/gpl-2.0.html>. You must apply one of +# these licenses when using or redistributing this software or any of +# the files within it. See the URLs above, or the file `LICENSE` +# included in the Bootstrap distribution for the full license texts. -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# Please report bugs or propose patches to: +# <https://github.com/gnulib-modules/bootstrap/issues> -# Please report bugs or propose patches to gary@gnu.org. +# Set a version string for this script. +scriptversion=2019-02-19.15; # UTC ## ------ ## @@ -1415,7 +1572,7 @@ scriptversion=2014-01-07.03; # UTC # # In order for the '--version' option to work, you will need to have a # suitably formatted comment like the one at the top of this file -# starting with '# Written by ' and ending with '# warranty; '. +# starting with '# Written by ' and ending with '# Copyright'. # # For '-h' and '--help' to work, you will also need a one line # description of your script's purpose in a comment directly above the @@ -1427,7 +1584,7 @@ scriptversion=2014-01-07.03; # UTC # to display verbose messages only when your user has specified # '--verbose'. # -# After sourcing this file, you can plug processing for additional +# After sourcing this file, you can plug in processing for additional # options by amending the variables from the 'Configuration' section # below, and following the instructions in the 'Option parsing' # section further down. @@ -1476,8 +1633,8 @@ fatal_help="Try '\$progname --help' for more information." ## ------------------------- ## # This section contains functions for adding, removing, and running hooks -# to the main code. A hook is just a named list of of function, that can -# be run in order later on. +# in the main code. A hook is just a list of function names that can be +# run in order later on. # func_hookable FUNC_NAME # ----------------------- @@ -1510,7 +1667,8 @@ func_add_hook () # func_remove_hook FUNC_NAME HOOK_FUNC # ------------------------------------ -# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +# Remove HOOK_FUNC from the list of hook functions to be called by +# FUNC_NAME. func_remove_hook () { $debug_cmd @@ -1519,10 +1677,28 @@ func_remove_hook () } +# func_propagate_result FUNC_NAME_A FUNC_NAME_B +# --------------------------------------------- +# If the *_result variable of FUNC_NAME_A _is set_, assign its value to +# *_result variable of FUNC_NAME_B. +func_propagate_result () +{ + $debug_cmd + + func_propagate_result_result=: + if eval "test \"\${${1}_result+set}\" = set" + then + eval "${2}_result=\$${1}_result" + else + func_propagate_result_result=false + fi +} + + # func_run_hooks FUNC_NAME [ARG]... # --------------------------------- # Run all hook functions registered to FUNC_NAME. -# It is assumed that the list of hook functions contains nothing more +# It's assumed that the list of hook functions contains nothing more # than a whitespace-delimited list of legal shell function names, and # no effort is wasted trying to catch shell meta-characters or preserve # whitespace. @@ -1532,22 +1708,19 @@ func_run_hooks () case " $hookable_fns " in *" $1 "*) ;; - *) func_fatal_error "'$1' does not support hook funcions.n" ;; + *) func_fatal_error "'$1' does not support hook functions." ;; esac eval _G_hook_fns=\$$1_hooks; shift for _G_hook in $_G_hook_fns; do - eval $_G_hook '"$@"' - - # store returned options list back into positional - # parameters for next 'cmd' execution. - eval _G_hook_result=\$${_G_hook}_result - eval set dummy "$_G_hook_result"; shift + func_unset "${_G_hook}_result" + eval $_G_hook '${1+"$@"}' + func_propagate_result $_G_hook func_run_hooks + if $func_propagate_result_result; then + eval set dummy "$func_run_hooks_result"; shift + fi done - - func_quote_for_eval ${1+"$@"} - func_run_hooks_result=$func_quote_for_eval_result } @@ -1557,10 +1730,18 @@ func_run_hooks () ## --------------- ## # In order to add your own option parsing hooks, you must accept the -# full positional parameter list in your hook function, remove any -# options that you action, and then pass back the remaining unprocessed -# options in '<hooked_function_name>_result', escaped suitably for -# 'eval'. Like this: +# full positional parameter list from your hook function. You may remove +# or edit any options that you action, and then pass back the remaining +# unprocessed options in '<hooked_function_name>_result', escaped +# suitably for 'eval'. +# +# The '<hooked_function_name>_result' variable is automatically unset +# before your hook gets called; for best performance, only set the +# *_result variable when necessary (i.e. don't call the 'func_quote' +# function unnecessarily because it can be an expensive operation on some +# machines). +# +# Like this: # # my_options_prep () # { @@ -1570,9 +1751,8 @@ func_run_hooks () # usage_message=$usage_message' # -s, --silent don'\''t print informational messages # ' -# -# func_quote_for_eval ${1+"$@"} -# my_options_prep_result=$func_quote_for_eval_result +# # No change in '$@' (ignored completely by this hook). Leave +# # my_options_prep_result variable intact. # } # func_add_hook func_options_prep my_options_prep # @@ -1581,25 +1761,36 @@ func_run_hooks () # { # $debug_cmd # -# # Note that for efficiency, we parse as many options as we can +# args_changed=false +# +# # Note that, for efficiency, we parse as many options as we can # # recognise in a loop before passing the remainder back to the # # caller on the first unrecognised argument we encounter. # while test $# -gt 0; do # opt=$1; shift # case $opt in -# --silent|-s) opt_silent=: ;; +# --silent|-s) opt_silent=: +# args_changed=: +# ;; # # Separate non-argument short options: # -s*) func_split_short_opt "$_G_opt" # set dummy "$func_split_short_opt_name" \ # "-$func_split_short_opt_arg" ${1+"$@"} # shift +# args_changed=: # ;; -# *) set dummy "$_G_opt" "$*"; shift; break ;; +# *) # Make sure the first unrecognised option "$_G_opt" +# # is added back to "$@" in case we need it later, +# # if $args_changed was set to 'true'. +# set dummy "$_G_opt" ${1+"$@"}; shift; break ;; # esac # done # -# func_quote_for_eval ${1+"$@"} -# my_silent_option_result=$func_quote_for_eval_result +# # Only call 'func_quote' here if we processed at least one argument. +# if $args_changed; then +# func_quote eval ${1+"$@"} +# my_silent_option_result=$func_quote_result +# fi # } # func_add_hook func_parse_options my_silent_option # @@ -1610,17 +1801,26 @@ func_run_hooks () # # $opt_silent && $opt_verbose && func_fatal_help "\ # '--silent' and '--verbose' options are mutually exclusive." -# -# func_quote_for_eval ${1+"$@"} -# my_option_validation_result=$func_quote_for_eval_result # } # func_add_hook func_validate_options my_option_validation # -# You'll alse need to manually amend $usage_message to reflect the extra +# You'll also need to manually amend $usage_message to reflect the extra # options you parse. It's preferable to append if you can, so that # multiple option parsing hooks can be added safely. +# func_options_finish [ARG]... +# ---------------------------- +# Finishing the option parse loop (call 'func_options' hooks ATM). +func_options_finish () +{ + $debug_cmd + + func_run_hooks func_options ${1+"$@"} + func_propagate_result func_run_hooks func_options_finish +} + + # func_options [ARG]... # --------------------- # All the functions called inside func_options are hookable. See the @@ -1630,17 +1830,27 @@ func_options () { $debug_cmd - func_options_prep ${1+"$@"} - eval func_parse_options \ - ${func_options_prep_result+"$func_options_prep_result"} - eval func_validate_options \ - ${func_parse_options_result+"$func_parse_options_result"} + _G_options_quoted=false - eval func_run_hooks func_options \ - ${func_validate_options_result+"$func_validate_options_result"} + for my_func in options_prep parse_options validate_options options_finish + do + func_unset func_${my_func}_result + func_unset func_run_hooks_result + eval func_$my_func '${1+"$@"}' + func_propagate_result func_$my_func func_options + if $func_propagate_result_result; then + eval set dummy "$func_options_result"; shift + _G_options_quoted=: + fi + done - # save modified positional parameters for caller - func_options_result=$func_run_hooks_result + $_G_options_quoted || { + # As we (func_options) are top-level options-parser function and + # nobody quoted "$@" for us yet, we need to do it explicitly for + # caller. + func_quote eval ${1+"$@"} + func_options_result=$func_quote_result + } } @@ -1649,9 +1859,8 @@ func_options () # All initialisations required before starting the option parse loop. # Note that when calling hook functions, we pass through the list of # positional parameters. If a hook function modifies that list, and -# needs to propogate that back to rest of this script, then the complete -# modified list must be put in 'func_run_hooks_result' before -# returning. +# needs to propagate that back to rest of this script, then the complete +# modified list must be put in 'func_run_hooks_result' before returning. func_hookable func_options_prep func_options_prep () { @@ -1662,9 +1871,7 @@ func_options_prep () opt_warning_types= func_run_hooks func_options_prep ${1+"$@"} - - # save modified positional parameters for caller - func_options_prep_result=$func_run_hooks_result + func_propagate_result func_run_hooks func_options_prep } @@ -1676,25 +1883,32 @@ func_parse_options () { $debug_cmd - func_parse_options_result= - + _G_parse_options_requote=false # this just eases exit handling while test $# -gt 0; do # Defer to hook functions for initial option parsing, so they # get priority in the event of reusing an option name. func_run_hooks func_parse_options ${1+"$@"} - - # Adjust func_parse_options positional parameters to match - eval set dummy "$func_run_hooks_result"; shift + func_propagate_result func_run_hooks func_parse_options + if $func_propagate_result_result; then + eval set dummy "$func_parse_options_result"; shift + # Even though we may have changed "$@", we passed the "$@" array + # down into the hook and it quoted it for us (because we are in + # this if-branch). No need to quote it again. + _G_parse_options_requote=false + fi # Break out of the loop if we already parsed every option. test $# -gt 0 || break + # We expect that one of the options parsed in this function matches + # and thus we remove _G_opt from "$@" and need to re-quote. + _G_match_parse_options=: _G_opt=$1 shift case $_G_opt in --debug|-x) debug_cmd='set -x' - func_echo "enabling shell trace mode" + func_echo "enabling shell trace mode" >&2 $debug_cmd ;; @@ -1704,7 +1918,10 @@ func_parse_options () ;; --warnings|--warning|-W) - test $# = 0 && func_missing_arg $_G_opt && break + if test $# = 0 && func_missing_arg $_G_opt; then + _G_parse_options_requote=: + break + fi case " $warning_categories $1" in *" $1 "*) # trailing space prevents matching last $1 above @@ -1757,15 +1974,24 @@ func_parse_options () shift ;; - --) break ;; + --) _G_parse_options_requote=: ; break ;; -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; - *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift + _G_match_parse_options=false + break + ;; esac + + if $_G_match_parse_options; then + _G_parse_options_requote=: + fi done - # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - func_parse_options_result=$func_quote_for_eval_result + if $_G_parse_options_requote; then + # save modified positional parameters for caller + func_quote eval ${1+"$@"} + func_parse_options_result=$func_quote_result + fi } @@ -1782,12 +2008,10 @@ func_validate_options () test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" func_run_hooks func_validate_options ${1+"$@"} + func_propagate_result func_run_hooks func_validate_options # Bail if the options were screwed! $exit_cmd $EXIT_FAILURE - - # save modified positional parameters for caller - func_validate_options_result=$func_run_hooks_result } @@ -1843,8 +2067,8 @@ func_missing_arg () # func_split_equals STRING # ------------------------ -# Set func_split_equals_lhs and func_split_equals_rhs shell variables after -# splitting STRING at the '=' sign. +# Set func_split_equals_lhs and func_split_equals_rhs shell variables +# after splitting STRING at the '=' sign. test -z "$_G_HAVE_XSI_OPS" \ && (eval 'x=a/b/c; test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ @@ -1859,8 +2083,9 @@ then func_split_equals_lhs=${1%%=*} func_split_equals_rhs=${1#*=} - test "x$func_split_equals_lhs" = "x$1" \ - && func_split_equals_rhs= + if test "x$func_split_equals_lhs" = "x$1"; then + func_split_equals_rhs= + fi }' else # ...otherwise fall back to using expr, which is often a shell builtin. @@ -1870,7 +2095,7 @@ else func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` func_split_equals_rhs= - test "x$func_split_equals_lhs" = "x$1" \ + test "x$func_split_equals_lhs=" = "x$1" \ || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` } fi #func_split_equals @@ -1896,7 +2121,7 @@ else { $debug_cmd - func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_name=`expr "x$1" : 'x\(-.\)'` func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` } fi #func_split_short_opt @@ -1938,31 +2163,44 @@ func_usage_message () # func_version # ------------ # Echo version message to standard output and exit. +# The version message is extracted from the calling file's header +# comments, with leading '# ' stripped: +# 1. First display the progname and version +# 2. Followed by the header comment line matching /^# Written by / +# 3. Then a blank line followed by the first following line matching +# /^# Copyright / +# 4. Immediately followed by any lines between the previous matches, +# except lines preceding the intervening completely blank line. +# For example, see the header comments of this file. func_version () { $debug_cmd printf '%s\n' "$progname $scriptversion" $SED -n ' - /(C)/!b go - :more - /\./!{ - N - s|\n# | | - b more - } - :go - /^# Written by /,/# warranty; / { - s|^# || - s|^# *$|| - s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| - p + /^# Written by /!b + s|^# ||; p; n + + :fwd2blnk + /./ { + n + b fwd2blnk } - /^# Written by / { - s|^# || - p + p; n + + :holdwrnt + s|^# || + s|^# *$|| + /^Copyright /!{ + /./H + n + b holdwrnt } - /^warranty; /q' < "$progpath" + + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + G + s|\(\n\)\n*|\1|g + p; q' < "$progpath" exit $? } @@ -1972,12 +2210,12 @@ func_version () # mode: shell-script # sh-indentation: 2 # eval: (add-hook 'before-save-hook 'time-stamp) -# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-pattern: "30/scriptversion=%:y-%02m-%02d.%02H; # UTC" # time-stamp-time-zone: "UTC" # End: # Set a version string. -scriptversion='(GNU libtool) 2.4.6' +scriptversion='(GNU libtool) 2.4.7' # func_echo ARG... @@ -2068,7 +2306,7 @@ include the following information: compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname (GNU libtool) 2.4.6 + version: $progname (GNU libtool) 2.4.7 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` @@ -2124,7 +2362,7 @@ fi # a configuration failure hint, and exit. func_fatal_configuration () { - func__fatal_error ${1+"$@"} \ + func_fatal_error ${1+"$@"} \ "See the $PACKAGE documentation for more information." \ "Fatal configuration error." } @@ -2270,6 +2508,8 @@ libtool_options_prep () nonopt= preserve_args= + _G_rc_lt_options_prep=: + # Shorthand for --mode=foo, only valid as the first argument case $1 in clean|clea|cle|cl) @@ -2293,11 +2533,16 @@ libtool_options_prep () uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) shift; set dummy --mode uninstall ${1+"$@"}; shift ;; + *) + _G_rc_lt_options_prep=false + ;; esac - # Pass back the list of options. - func_quote_for_eval ${1+"$@"} - libtool_options_prep_result=$func_quote_for_eval_result + if $_G_rc_lt_options_prep; then + # Pass back the list of options. + func_quote eval ${1+"$@"} + libtool_options_prep_result=$func_quote_result + fi } func_add_hook func_options_prep libtool_options_prep @@ -2309,9 +2554,12 @@ libtool_parse_options () { $debug_cmd + _G_rc_lt_parse_options=false + # Perform our own loop to consume as many options as possible in # each iteration. while test $# -gt 0; do + _G_match_lt_parse_options=: _G_opt=$1 shift case $_G_opt in @@ -2386,15 +2634,20 @@ libtool_parse_options () func_append preserve_args " $_G_opt" ;; - # An option not handled by this hook function: - *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"} ; shift + _G_match_lt_parse_options=false + break + ;; esac + $_G_match_lt_parse_options && _G_rc_lt_parse_options=: done - - # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - libtool_parse_options_result=$func_quote_for_eval_result + if $_G_rc_lt_parse_options; then + # save modified positional parameters for caller + func_quote eval ${1+"$@"} + libtool_parse_options_result=$func_quote_result + fi } func_add_hook func_parse_options libtool_parse_options @@ -2415,17 +2668,10 @@ libtool_validate_options () # preserve --debug test : = "$debug_cmd" || func_append preserve_args " --debug" - case $host in - # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 - # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 - *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac + # Keeping compiler generated duplicates in $postdeps and $predeps is not + # harmful, and is necessary in a majority of systems that use it to satisfy + # symbol dependencies. + opt_duplicate_compiler_generated_deps=: $opt_help || { # Sanity checks first: @@ -2451,8 +2697,8 @@ libtool_validate_options () } # Pass back the unparsed argument list - func_quote_for_eval ${1+"$@"} - libtool_validate_options_result=$func_quote_for_eval_result + func_quote eval ${1+"$@"} + libtool_validate_options_result=$func_quote_result } func_add_hook func_validate_options libtool_validate_options @@ -3418,8 +3664,8 @@ func_mode_compile () esac done - func_quote_for_eval "$libobj" - test "X$libobj" != "X$func_quote_for_eval_result" \ + func_quote_arg pretty "$libobj" + test "X$libobj" != "X$func_quote_arg_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" @@ -3492,8 +3738,8 @@ compiler." func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result + func_quote_arg pretty "$srcfile" + qsrcfile=$func_quote_arg_result # Only build a PIC object if we are building libtool libraries. if test yes = "$build_libtool_libs"; then @@ -3648,7 +3894,8 @@ This mode accepts the following additional options: -prefer-non-pic try to build non-PIC objects only -shared do not build a '.o' file suitable for static linking -static only build a '.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler + -Wc,FLAG + -Xcompiler FLAG pass FLAG directly to the compiler COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. @@ -3754,6 +4001,8 @@ The following components of LINK-COMMAND are treated specially: -weak LIBNAME declare that the target provides the LIBNAME interface -Wc,FLAG -Xcompiler FLAG pass linker-specific FLAG directly to the compiler + -Wa,FLAG + -Xassembler FLAG pass linker-specific FLAG directly to the assembler -Wl,FLAG -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) @@ -4096,8 +4345,8 @@ func_mode_install () case $nonopt in *shtool*) :;; *) false;; esac then # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " + func_quote_arg pretty "$nonopt" + install_prog="$func_quote_arg_result " arg=$1 shift else @@ -4107,8 +4356,8 @@ func_mode_install () # The real first argument should be the name of the installation program. # Aesthetically quote it. - func_quote_for_eval "$arg" - func_append install_prog "$func_quote_for_eval_result" + func_quote_arg pretty "$arg" + func_append install_prog "$func_quote_arg_result" install_shared_prog=$install_prog case " $install_prog " in *[\\\ /]cp\ *) install_cp=: ;; @@ -4165,12 +4414,12 @@ func_mode_install () esac # Aesthetically quote the argument. - func_quote_for_eval "$arg" - func_append install_prog " $func_quote_for_eval_result" + func_quote_arg pretty "$arg" + func_append install_prog " $func_quote_arg_result" if test -n "$arg2"; then - func_quote_for_eval "$arg2" + func_quote_arg pretty "$arg2" fi - func_append install_shared_prog " $func_quote_for_eval_result" + func_append install_shared_prog " $func_quote_arg_result" done test -z "$install_prog" && \ @@ -4181,8 +4430,8 @@ func_mode_install () if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" - func_append install_shared_prog " -m $func_quote_for_eval_result" + func_quote_arg pretty "$install_override_mode" + func_append install_shared_prog " -m $func_quote_arg_result" fi fi @@ -4478,8 +4727,8 @@ func_mode_install () relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` $opt_quiet || { - func_quote_for_expand "$relink_command" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$relink_command" + eval "func_echo $func_quote_arg_result" } if eval "$relink_command"; then : else @@ -5258,7 +5507,8 @@ else if test \"\$libtool_execute_magic\" != \"$magic\"; then file=\"\$0\"" - qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + func_quote_arg pretty "$ECHO" + qECHO=$func_quote_arg_result $ECHO "\ # A function that is used when there is no print builtin or printf. @@ -5268,7 +5518,7 @@ func_fallback_echo () \$1 _LTECHO_EOF' } - ECHO=\"$qECHO\" + ECHO=$qECHO fi # Very basic option parsing. These options are (a) specific to @@ -6611,9 +6861,9 @@ func_mode_link () while test "$#" -gt 0; do arg=$1 shift - func_quote_for_eval "$arg" - qarg=$func_quote_for_eval_unquoted_result - func_append libtool_args " $func_quote_for_eval_result" + func_quote_arg pretty,unquoted "$arg" + qarg=$func_quote_arg_unquoted_result + func_append libtool_args " $func_quote_arg_result" # If the previous option needs an argument, assign it. if test -n "$prev"; then @@ -6849,6 +7099,13 @@ func_mode_link () prev= continue ;; + xassembler) + func_append compiler_flags " -Xassembler $qarg" + prev= + func_append compile_command " -Xassembler $qarg" + func_append finalize_command " -Xassembler $qarg" + continue + ;; xcclinker) func_append linker_flags " $qarg" func_append compiler_flags " $qarg" @@ -7019,7 +7276,7 @@ func_mode_link () # These systems don't actually have a C library (as such) test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*) # Do not include libc due to us having libc/libc_r. test X-lc = "X$arg" && continue ;; @@ -7039,7 +7296,7 @@ func_mode_link () esac elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -7069,8 +7326,20 @@ func_mode_link () prev=xcompiler continue ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + # Solaris ld rejects as of 11.4. Refer to Oracle bug 22985199. + -pthread) + case $host in + *solaris2*) ;; + *) + case "$new_inherited_linker_flags " in + *" $arg "*) ;; + * ) func_append new_inherited_linker_flags " $arg" ;; + esac + ;; + esac + continue + ;; + -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" @@ -7211,9 +7480,9 @@ func_mode_link () save_ifs=$IFS; IFS=, for flag in $args; do IFS=$save_ifs - func_quote_for_eval "$flag" - func_append arg " $func_quote_for_eval_result" - func_append compiler_flags " $func_quote_for_eval_result" + func_quote_arg pretty "$flag" + func_append arg " $func_quote_arg_result" + func_append compiler_flags " $func_quote_arg_result" done IFS=$save_ifs func_stripname ' ' '' "$arg" @@ -7227,16 +7496,21 @@ func_mode_link () save_ifs=$IFS; IFS=, for flag in $args; do IFS=$save_ifs - func_quote_for_eval "$flag" - func_append arg " $wl$func_quote_for_eval_result" - func_append compiler_flags " $wl$func_quote_for_eval_result" - func_append linker_flags " $func_quote_for_eval_result" + func_quote_arg pretty "$flag" + func_append arg " $wl$func_quote_arg_result" + func_append compiler_flags " $wl$func_quote_arg_result" + func_append linker_flags " $func_quote_arg_result" done IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; + -Xassembler) + prev=xassembler + continue + ;; + -Xcompiler) prev=xcompiler continue @@ -7254,8 +7528,8 @@ func_mode_link () # -msg_* for osf cc -msg_*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; # Flags to be passed through unchanged, with rationale: @@ -7272,12 +7546,17 @@ func_mode_link () # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -specs=* GCC specs files # -stdlib=* select c++ std lib with clang + # -fsanitize=* Clang/GCC memory and address sanitizer + # -fuse-ld=* Linker select flags for GCC + # -Wa,* Pass flags directly to the assembler -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ + -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*) + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" @@ -7298,15 +7577,15 @@ func_mode_link () continue else # Otherwise treat like 'Some other compiler flag' below - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result fi ;; # Some other compiler flag. -* | +*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; *.$objext) @@ -7426,8 +7705,8 @@ func_mode_link () *) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; esac # arg @@ -8632,7 +8911,7 @@ func_mode_link () test CXX = "$tagname" && { case $host_os in linux*) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 func_suncc_cstd_abi @@ -8805,7 +9084,7 @@ func_mode_link () # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|freebsd-elf|linux|osf|windows|none) + darwin|freebsd-elf|linux|midnightbsd-elf|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result age=$number_minor @@ -8896,7 +9175,7 @@ func_mode_link () versuffix=.$current.$revision ;; - freebsd-elf) + freebsd-elf | midnightbsd-elf) func_arith $current - $age major=.$func_arith_result versuffix=$major.$age.$revision @@ -9122,7 +9401,7 @@ func_mode_link () *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*) # Do not include libc due to us having libc/libc_r. ;; *-*-sco3.2v5* | *-*-sco5v6*) @@ -9933,8 +10212,8 @@ EOF for cmd in $concat_cmds; do IFS=$save_ifs $opt_quiet || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$cmd" + eval "func_echo $func_quote_arg_result" } $opt_dry_run || eval "$cmd" || { lt_exit=$? @@ -10027,8 +10306,8 @@ EOF eval cmd=\"$cmd\" IFS=$save_ifs $opt_quiet || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$cmd" + eval "func_echo $func_quote_arg_result" } $opt_dry_run || eval "$cmd" || { lt_exit=$? @@ -10502,12 +10781,13 @@ EOF elif eval var_value=\$$var; test -z "$var_value"; then relink_command="$var=; export $var; $relink_command" else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + func_quote_arg pretty "$var_value" + relink_command="$var=$func_quote_arg_result; export $var; $relink_command" fi done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + func_quote eval cd "`pwd`" + func_quote_arg pretty,unquoted "($func_quote_result; $relink_command)" + relink_command=$func_quote_arg_unquoted_result fi # Only actually do things if not in dry run mode. @@ -10747,13 +11027,15 @@ EOF elif eval var_value=\$$var; test -z "$var_value"; then relink_command="$var=; export $var; $relink_command" else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + func_quote_arg pretty,unquoted "$var_value" + relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command" fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + func_quote eval cd "`pwd`" + relink_command="($func_quote_result; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + func_quote_arg pretty,unquoted "$relink_command" + relink_command=$func_quote_arg_unquoted_result if test yes = "$hardcode_automatic"; then relink_command= fi diff --git a/lib/libedit/missing b/lib/libedit/missing index c6e379584baf..1fe1611f1851 100755 --- a/lib/libedit/missing +++ b/lib/libedit/missing @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ else exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,7 +207,7 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/lib/libedit/src/Makefile.in b/lib/libedit/src/Makefile.in index db7091d89ef1..a562a00b4155 100644 --- a/lib/libedit/src/Makefile.in +++ b/lib/libedit/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,7 +160,20 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/chared.Plo ./$(DEPDIR)/chartype.Plo \ + ./$(DEPDIR)/common.Plo ./$(DEPDIR)/el.Plo ./$(DEPDIR)/eln.Plo \ + ./$(DEPDIR)/emacs.Plo ./$(DEPDIR)/filecomplete.Plo \ + ./$(DEPDIR)/hist.Plo ./$(DEPDIR)/history.Plo \ + ./$(DEPDIR)/historyn.Plo ./$(DEPDIR)/keymacro.Plo \ + ./$(DEPDIR)/map.Plo ./$(DEPDIR)/parse.Plo \ + ./$(DEPDIR)/prompt.Plo ./$(DEPDIR)/read.Plo \ + ./$(DEPDIR)/readline.Plo ./$(DEPDIR)/refresh.Plo \ + ./$(DEPDIR)/search.Plo ./$(DEPDIR)/sig.Plo \ + ./$(DEPDIR)/terminal.Plo ./$(DEPDIR)/tokenizer.Plo \ + ./$(DEPDIR)/tokenizern.Plo ./$(DEPDIR)/tty.Plo \ + ./$(DEPDIR)/unvis.Plo ./$(DEPDIR)/vi.Plo ./$(DEPDIR)/vis.Plo \ + ./$(DEPDIR)/wcsdup.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -204,8 +217,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -221,6 +232,8 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -231,8 +244,10 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -318,6 +333,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -365,8 +381,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -422,33 +438,39 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chared.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chartype.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/el.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eln.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emacs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filecomplete.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hist.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/history.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/historyn.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keymacro.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/map.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prompt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readline.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refresh.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/search.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sig.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terminal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tokenizer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tokenizern.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tty.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unvis.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vi.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vis.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcsdup.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chared.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chartype.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/el.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eln.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emacs.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filecomplete.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hist.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/history.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/historyn.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keymacro.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/map.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prompt.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readline.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refresh.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/search.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sig.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terminal.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tokenizer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tokenizern.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tty.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unvis.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vi.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vis.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcsdup.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -528,8 +550,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -569,7 +593,8 @@ installdirs: done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -606,7 +631,33 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/chared.Plo + -rm -f ./$(DEPDIR)/chartype.Plo + -rm -f ./$(DEPDIR)/common.Plo + -rm -f ./$(DEPDIR)/el.Plo + -rm -f ./$(DEPDIR)/eln.Plo + -rm -f ./$(DEPDIR)/emacs.Plo + -rm -f ./$(DEPDIR)/filecomplete.Plo + -rm -f ./$(DEPDIR)/hist.Plo + -rm -f ./$(DEPDIR)/history.Plo + -rm -f ./$(DEPDIR)/historyn.Plo + -rm -f ./$(DEPDIR)/keymacro.Plo + -rm -f ./$(DEPDIR)/map.Plo + -rm -f ./$(DEPDIR)/parse.Plo + -rm -f ./$(DEPDIR)/prompt.Plo + -rm -f ./$(DEPDIR)/read.Plo + -rm -f ./$(DEPDIR)/readline.Plo + -rm -f ./$(DEPDIR)/refresh.Plo + -rm -f ./$(DEPDIR)/search.Plo + -rm -f ./$(DEPDIR)/sig.Plo + -rm -f ./$(DEPDIR)/terminal.Plo + -rm -f ./$(DEPDIR)/tokenizer.Plo + -rm -f ./$(DEPDIR)/tokenizern.Plo + -rm -f ./$(DEPDIR)/tty.Plo + -rm -f ./$(DEPDIR)/unvis.Plo + -rm -f ./$(DEPDIR)/vi.Plo + -rm -f ./$(DEPDIR)/vis.Plo + -rm -f ./$(DEPDIR)/wcsdup.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -652,7 +703,33 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/chared.Plo + -rm -f ./$(DEPDIR)/chartype.Plo + -rm -f ./$(DEPDIR)/common.Plo + -rm -f ./$(DEPDIR)/el.Plo + -rm -f ./$(DEPDIR)/eln.Plo + -rm -f ./$(DEPDIR)/emacs.Plo + -rm -f ./$(DEPDIR)/filecomplete.Plo + -rm -f ./$(DEPDIR)/hist.Plo + -rm -f ./$(DEPDIR)/history.Plo + -rm -f ./$(DEPDIR)/historyn.Plo + -rm -f ./$(DEPDIR)/keymacro.Plo + -rm -f ./$(DEPDIR)/map.Plo + -rm -f ./$(DEPDIR)/parse.Plo + -rm -f ./$(DEPDIR)/prompt.Plo + -rm -f ./$(DEPDIR)/read.Plo + -rm -f ./$(DEPDIR)/readline.Plo + -rm -f ./$(DEPDIR)/refresh.Plo + -rm -f ./$(DEPDIR)/search.Plo + -rm -f ./$(DEPDIR)/sig.Plo + -rm -f ./$(DEPDIR)/terminal.Plo + -rm -f ./$(DEPDIR)/tokenizer.Plo + -rm -f ./$(DEPDIR)/tokenizern.Plo + -rm -f ./$(DEPDIR)/tty.Plo + -rm -f ./$(DEPDIR)/unvis.Plo + -rm -f ./$(DEPDIR)/vi.Plo + -rm -f ./$(DEPDIR)/vis.Plo + -rm -f ./$(DEPDIR)/wcsdup.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -671,11 +748,11 @@ ps-am: uninstall-am: uninstall-libLTLIBRARIES -.MAKE: all check install install-am install-strip +.MAKE: all check install install-am install-exec install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ diff --git a/lib/ntlm/Makefile.in b/lib/ntlm/Makefile.in index 28cebe5ca621..aec7ce8e9b13 100644 --- a/lib/ntlm/Makefile.in +++ b/lib/ntlm/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -102,7 +102,6 @@ subdir = lib/ntlm ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ $(top_srcdir)/cf/auth-modules.m4 \ - $(top_srcdir)/cf/broken-getaddrinfo.m4 \ $(top_srcdir)/cf/broken-glob.m4 \ $(top_srcdir)/cf/broken-realloc.m4 \ $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ @@ -215,7 +214,9 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/ntlm.Plo ./$(DEPDIR)/ntlm_err.Plo \ + ./$(DEPDIR)/test_ntlm.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -261,8 +262,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no @@ -418,6 +417,7 @@ am__set_TESTS_bases = \ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck TEST_SUITE_LOG = test-suite.log @@ -465,9 +465,12 @@ CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLANG_FORMAT = @CLANG_FORMAT@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DB1LIB = @DB1LIB@ DB3LIB = @DB3LIB@ @@ -485,8 +488,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GCD_MIG = @GCD_MIG@ GREP = @GREP@ GROFF = @GROFF@ @@ -595,6 +600,11 @@ PKG_CONFIG = @PKG_CONFIG@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LDADD = @PTHREAD_LDADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -654,9 +664,14 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -741,8 +756,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty): @@ -755,6 +770,15 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -793,15 +817,6 @@ clean-libLTLIBRARIES: libheimntlm.la: $(libheimntlm_la_OBJECTS) $(libheimntlm_la_DEPENDENCIES) $(EXTRA_libheimntlm_la_DEPENDENCIES) $(AM_V_CCLD)$(libheimntlm_la_LINK) -rpath $(libdir) $(libheimntlm_la_OBJECTS) $(libheimntlm_la_LIBADD) $(LIBS) -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - test_ntlm$(EXEEXT): $(test_ntlm_OBJECTS) $(test_ntlm_DEPENDENCIES) $(EXTRA_test_ntlm_DEPENDENCIES) @rm -f test_ntlm$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_ntlm_OBJECTS) $(test_ntlm_LDADD) $(LIBS) @@ -812,9 +827,15 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntlm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntlm_err.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ntlm.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntlm.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntlm_err.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ntlm.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1044,7 +1065,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ @@ -1057,7 +1078,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: $(check_PROGRAMS) @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -1099,8 +1120,10 @@ test_ntlm.log: test_ntlm$(EXEEXT) @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1138,6 +1161,8 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) all-local +install-checkPROGRAMS: install-libLTLIBRARIES + installdirs: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -1182,7 +1207,9 @@ clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-libtool mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/ntlm.Plo + -rm -f ./$(DEPDIR)/ntlm_err.Plo + -rm -f ./$(DEPDIR)/test_ntlm.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1230,7 +1257,9 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/ntlm.Plo + -rm -f ./$(DEPDIR)/ntlm_err.Plo + -rm -f ./$(DEPDIR)/test_ntlm.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1253,10 +1282,10 @@ uninstall-am: uninstall-dist_includeHEADERS uninstall-libLTLIBRARIES \ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: check-am install-am install-data-am install-strip uninstall-am -.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \ - check-am check-local clean clean-checkPROGRAMS clean-generic \ - clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ - ctags-am dist-hook distclean distclean-compile \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \ + check-TESTS check-am check-local clean clean-checkPROGRAMS \ + clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \ + ctags ctags-am dist-hook distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags distdir dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-data-hook \ @@ -1354,11 +1383,20 @@ check-local:: test "$$failed" -eq 0 || exit 1; \ fi +# It's useful for debugging to format generated sources. The default for all +# clang-format styles is to sort includes, but in many cases in-tree we really +# don't want to do that. .x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @if [ -z "$(CLANG_FORMAT)" ]; then \ + cmp -s $< $@ 2> /dev/null || cp $< $@; \ + else \ + cp $< $@.tmp.c; \ + $(CLANG_FORMAT) -style='{BasedOnStyle: Chromium, SortIncludes: false}' -i $@.tmp.c; \ + cmp -s $@.tmp.c $@ 2> /dev/null || mv $@.tmp.c $@; \ + fi .hx.h: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @cmp -s $< $@ 2> /dev/null || cp $< $@; #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ diff --git a/lib/otp/Makefile.in b/lib/otp/Makefile.in index 839c51add3f7..04095ab81e88 100644 --- a/lib/otp/Makefile.in +++ b/lib/otp/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -107,7 +107,6 @@ subdir = lib/otp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ $(top_srcdir)/cf/auth-modules.m4 \ - $(top_srcdir)/cf/broken-getaddrinfo.m4 \ $(top_srcdir)/cf/broken-glob.m4 \ $(top_srcdir)/cf/broken-realloc.m4 \ $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ @@ -157,6 +156,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +PROGRAMS = $(noinst_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -209,7 +209,6 @@ am__v_lt_1 = libotp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libotp_la_LDFLAGS) $(LDFLAGS) -o $@ -PROGRAMS = $(noinst_PROGRAMS) otptest_SOURCES = otptest.c otptest_OBJECTS = otptest.$(OBJEXT) otptest_DEPENDENCIES = libotp.la @@ -226,7 +225,15 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/ndbm_wrap.Plo ./$(DEPDIR)/otp.Plo \ + ./$(DEPDIR)/otp_challenge.Plo ./$(DEPDIR)/otp_db.Plo \ + ./$(DEPDIR)/otp_md.Plo ./$(DEPDIR)/otp_parse.Plo \ + ./$(DEPDIR)/otp_print.Plo ./$(DEPDIR)/otp_verify.Plo \ + ./$(DEPDIR)/otptest.Po ./$(DEPDIR)/snprintf.Plo \ + ./$(DEPDIR)/strcasecmp.Plo ./$(DEPDIR)/strlcat.Plo \ + ./$(DEPDIR)/strlcpy.Plo ./$(DEPDIR)/strlwr.Plo \ + ./$(DEPDIR)/strncasecmp.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -272,8 +279,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/Makefile.am.common \ $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/depcomp \ @@ -299,9 +304,12 @@ CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLANG_FORMAT = @CLANG_FORMAT@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DB1LIB = @DB1LIB@ DB3LIB = @DB3LIB@ @@ -319,8 +327,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GCD_MIG = @GCD_MIG@ GREP = @GREP@ GROFF = @GROFF@ @@ -429,6 +439,11 @@ PKG_CONFIG = @PKG_CONFIG@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LDADD = @PTHREAD_LDADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -488,9 +503,14 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -587,8 +607,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty): @@ -601,6 +621,24 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -639,24 +677,6 @@ clean-libLTLIBRARIES: libotp.la: $(libotp_la_OBJECTS) $(libotp_la_DEPENDENCIES) $(EXTRA_libotp_la_DEPENDENCIES) $(AM_V_CCLD)$(libotp_la_LINK) -rpath $(libdir) $(libotp_la_OBJECTS) $(libotp_la_LIBADD) $(LIBS) -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - otptest$(EXEEXT): $(otptest_OBJECTS) $(otptest_DEPENDENCIES) $(EXTRA_otptest_DEPENDENCIES) @rm -f otptest$(EXEEXT) $(AM_V_CCLD)$(LINK) $(otptest_OBJECTS) $(otptest_LDADD) $(LIBS) @@ -667,21 +687,27 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ndbm_wrap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otp_challenge.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otp_db.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otp_md.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otp_parse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otp_print.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otp_verify.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otptest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strcasecmp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcat.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcpy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlwr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strncasecmp.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ndbm_wrap.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otp_challenge.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otp_db.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otp_md.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otp_parse.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otp_print.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otp_verify.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otptest.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strcasecmp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcat.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcpy.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlwr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strncasecmp.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -782,8 +808,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -820,7 +848,9 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-local +all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(HEADERS) all-local +install-checkPROGRAMS: install-libLTLIBRARIES + installdirs: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -862,7 +892,21 @@ clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-libtool clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/ndbm_wrap.Plo + -rm -f ./$(DEPDIR)/otp.Plo + -rm -f ./$(DEPDIR)/otp_challenge.Plo + -rm -f ./$(DEPDIR)/otp_db.Plo + -rm -f ./$(DEPDIR)/otp_md.Plo + -rm -f ./$(DEPDIR)/otp_parse.Plo + -rm -f ./$(DEPDIR)/otp_print.Plo + -rm -f ./$(DEPDIR)/otp_verify.Plo + -rm -f ./$(DEPDIR)/otptest.Po + -rm -f ./$(DEPDIR)/snprintf.Plo + -rm -f ./$(DEPDIR)/strcasecmp.Plo + -rm -f ./$(DEPDIR)/strlcat.Plo + -rm -f ./$(DEPDIR)/strlcpy.Plo + -rm -f ./$(DEPDIR)/strlwr.Plo + -rm -f ./$(DEPDIR)/strncasecmp.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -909,7 +953,21 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/ndbm_wrap.Plo + -rm -f ./$(DEPDIR)/otp.Plo + -rm -f ./$(DEPDIR)/otp_challenge.Plo + -rm -f ./$(DEPDIR)/otp_db.Plo + -rm -f ./$(DEPDIR)/otp_md.Plo + -rm -f ./$(DEPDIR)/otp_parse.Plo + -rm -f ./$(DEPDIR)/otp_print.Plo + -rm -f ./$(DEPDIR)/otp_verify.Plo + -rm -f ./$(DEPDIR)/otptest.Po + -rm -f ./$(DEPDIR)/snprintf.Plo + -rm -f ./$(DEPDIR)/strcasecmp.Plo + -rm -f ./$(DEPDIR)/strlcat.Plo + -rm -f ./$(DEPDIR)/strlcpy.Plo + -rm -f ./$(DEPDIR)/strlwr.Plo + -rm -f ./$(DEPDIR)/strncasecmp.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -931,8 +989,8 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: check-am install-am install-data-am install-strip uninstall-am -.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am \ - check-local clean clean-checkPROGRAMS clean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \ + check-am check-local clean clean-checkPROGRAMS clean-generic \ clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS \ cscopelist-am ctags ctags-am dist-hook distclean \ distclean-compile distclean-generic distclean-libtool \ @@ -1030,11 +1088,20 @@ check-local:: test "$$failed" -eq 0 || exit 1; \ fi +# It's useful for debugging to format generated sources. The default for all +# clang-format styles is to sort includes, but in many cases in-tree we really +# don't want to do that. .x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @if [ -z "$(CLANG_FORMAT)" ]; then \ + cmp -s $< $@ 2> /dev/null || cp $< $@; \ + else \ + cp $< $@.tmp.c; \ + $(CLANG_FORMAT) -style='{BasedOnStyle: Chromium, SortIncludes: false}' -i $@.tmp.c; \ + cmp -s $@.tmp.c $@ 2> /dev/null || mv $@.tmp.c $@; \ + fi .hx.h: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @cmp -s $< $@ 2> /dev/null || cp $< $@; #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ diff --git a/lib/roken/Makefile.in b/lib/roken/Makefile.in index 41af2c3d40ac..ffb92430e37e 100644 --- a/lib/roken/Makefile.in +++ b/lib/roken/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -116,7 +116,6 @@ subdir = lib/roken ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ $(top_srcdir)/cf/auth-modules.m4 \ - $(top_srcdir)/cf/broken-getaddrinfo.m4 \ $(top_srcdir)/cf/broken-glob.m4 \ $(top_srcdir)/cf/broken-realloc.m4 \ $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ @@ -166,6 +165,8 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +@CROSS_COMPILE_FALSE@am__EXEEXT_1 = make-roken$(EXEEXT) +PROGRAMS = $(noinst_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -256,8 +257,6 @@ libtest_la_OBJECTS = $(am_libtest_la_OBJECTS) libtest_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libtest_la_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -@CROSS_COMPILE_FALSE@am__EXEEXT_1 = make-roken$(EXEEXT) -PROGRAMS = $(noinst_PROGRAMS) base64_test_SOURCES = base64-test.c base64_test_OBJECTS = base64-test.$(OBJEXT) base64_test_LDADD = $(LDADD) @@ -350,7 +349,117 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = $(DEPDIR)/chown.Plo $(DEPDIR)/closefrom.Plo \ + $(DEPDIR)/copyhostent.Plo $(DEPDIR)/daemon.Plo \ + $(DEPDIR)/ecalloc.Plo $(DEPDIR)/emalloc.Plo \ + $(DEPDIR)/erealloc.Plo $(DEPDIR)/err.Plo $(DEPDIR)/errx.Plo \ + $(DEPDIR)/estrdup.Plo $(DEPDIR)/fchown.Plo $(DEPDIR)/flock.Plo \ + $(DEPDIR)/fnmatch.Plo $(DEPDIR)/freeaddrinfo.Plo \ + $(DEPDIR)/freehostent.Plo $(DEPDIR)/gai_strerror.Plo \ + $(DEPDIR)/getaddrinfo.Plo $(DEPDIR)/getcap.Plo \ + $(DEPDIR)/getcwd.Plo $(DEPDIR)/getdtablesize.Plo \ + $(DEPDIR)/getegid.Plo $(DEPDIR)/geteuid.Plo \ + $(DEPDIR)/getgid.Plo $(DEPDIR)/gethostname.Plo \ + $(DEPDIR)/getifaddrs.Plo $(DEPDIR)/getipnodebyaddr.Plo \ + $(DEPDIR)/getipnodebyname.Plo $(DEPDIR)/getnameinfo.Plo \ + $(DEPDIR)/getopt.Plo $(DEPDIR)/gettimeofday.Plo \ + $(DEPDIR)/getuid.Plo $(DEPDIR)/getusershell.Plo \ + $(DEPDIR)/glob.Plo $(DEPDIR)/hstrerror.Plo \ + $(DEPDIR)/inet_aton.Plo $(DEPDIR)/inet_ntop.Plo \ + $(DEPDIR)/inet_pton.Plo $(DEPDIR)/initgroups.Plo \ + $(DEPDIR)/innetgr.Plo $(DEPDIR)/iruserok.Plo \ + $(DEPDIR)/localtime_r.Plo $(DEPDIR)/lstat.Plo \ + $(DEPDIR)/memmove.Plo $(DEPDIR)/memset_s.Plo \ + $(DEPDIR)/mkstemp.Plo $(DEPDIR)/putenv.Plo $(DEPDIR)/rcmd.Plo \ + $(DEPDIR)/readv.Plo $(DEPDIR)/recvmsg.Plo \ + $(DEPDIR)/sendmsg.Plo $(DEPDIR)/setegid.Plo \ + $(DEPDIR)/setenv.Plo $(DEPDIR)/seteuid.Plo \ + $(DEPDIR)/strcasecmp.Plo $(DEPDIR)/strdup.Plo \ + $(DEPDIR)/strerror.Plo $(DEPDIR)/strftime.Plo \ + $(DEPDIR)/strlcat.Plo $(DEPDIR)/strlcpy.Plo \ + $(DEPDIR)/strlwr.Plo $(DEPDIR)/strncasecmp.Plo \ + $(DEPDIR)/strndup.Plo $(DEPDIR)/strnlen.Plo \ + $(DEPDIR)/strptime.Plo $(DEPDIR)/strsep.Plo \ + $(DEPDIR)/strsep_copy.Plo $(DEPDIR)/strtok_r.Plo \ + $(DEPDIR)/strtoll.Plo $(DEPDIR)/strtoull.Plo \ + $(DEPDIR)/strupr.Plo $(DEPDIR)/swab.Plo $(DEPDIR)/timegm.Plo \ + $(DEPDIR)/tsearch.Plo $(DEPDIR)/unsetenv.Plo \ + $(DEPDIR)/verr.Plo $(DEPDIR)/verrx.Plo $(DEPDIR)/vsyslog.Plo \ + $(DEPDIR)/vwarn.Plo $(DEPDIR)/vwarnx.Plo $(DEPDIR)/warn.Plo \ + $(DEPDIR)/warnx.Plo $(DEPDIR)/writev.Plo \ + ./$(DEPDIR)/base64-test.Po ./$(DEPDIR)/getaddrinfo-test.Po \ + ./$(DEPDIR)/getifaddrs-test.Po \ + ./$(DEPDIR)/getxxyyy_test-getxxyyy.Po ./$(DEPDIR)/hex-test.Po \ + ./$(DEPDIR)/libroken_la-base64.Plo \ + ./$(DEPDIR)/libroken_la-bswap.Plo \ + ./$(DEPDIR)/libroken_la-cloexec.Plo \ + ./$(DEPDIR)/libroken_la-concat.Plo \ + ./$(DEPDIR)/libroken_la-ct.Plo \ + ./$(DEPDIR)/libroken_la-detach.Plo \ + ./$(DEPDIR)/libroken_la-doxygen.Plo \ + ./$(DEPDIR)/libroken_la-dumpdata.Plo \ + ./$(DEPDIR)/libroken_la-environment.Plo \ + ./$(DEPDIR)/libroken_la-eread.Plo \ + ./$(DEPDIR)/libroken_la-esetenv.Plo \ + ./$(DEPDIR)/libroken_la-ewrite.Plo \ + ./$(DEPDIR)/libroken_la-get_default_username.Plo \ + ./$(DEPDIR)/libroken_la-get_window_size.Plo \ + ./$(DEPDIR)/libroken_la-getaddrinfo_hostspec.Plo \ + ./$(DEPDIR)/libroken_la-getarg.Plo \ + ./$(DEPDIR)/libroken_la-getnameinfo_verified.Plo \ + ./$(DEPDIR)/libroken_la-getprogname.Plo \ + ./$(DEPDIR)/libroken_la-getxxyyy.Plo \ + ./$(DEPDIR)/libroken_la-h_errno.Plo \ + ./$(DEPDIR)/libroken_la-hex.Plo \ + ./$(DEPDIR)/libroken_la-hostent_find_fqdn.Plo \ + ./$(DEPDIR)/libroken_la-issuid.Plo \ + ./$(DEPDIR)/libroken_la-k_getpwnam.Plo \ + ./$(DEPDIR)/libroken_la-k_getpwuid.Plo \ + ./$(DEPDIR)/libroken_la-mini_inetd.Plo \ + ./$(DEPDIR)/libroken_la-mkdir.Plo \ + ./$(DEPDIR)/libroken_la-net_read.Plo \ + ./$(DEPDIR)/libroken_la-net_write.Plo \ + ./$(DEPDIR)/libroken_la-parse_bytes.Plo \ + ./$(DEPDIR)/libroken_la-parse_time.Plo \ + ./$(DEPDIR)/libroken_la-parse_units.Plo \ + ./$(DEPDIR)/libroken_la-qsort.Plo \ + ./$(DEPDIR)/libroken_la-rand.Plo \ + ./$(DEPDIR)/libroken_la-realloc.Plo \ + ./$(DEPDIR)/libroken_la-resolve.Plo \ + ./$(DEPDIR)/libroken_la-roken_gethostby.Plo \ + ./$(DEPDIR)/libroken_la-rtbl.Plo \ + ./$(DEPDIR)/libroken_la-setprogname.Plo \ + ./$(DEPDIR)/libroken_la-signal.Plo \ + ./$(DEPDIR)/libroken_la-simple_exec.Plo \ + ./$(DEPDIR)/libroken_la-snprintf.Plo \ + ./$(DEPDIR)/libroken_la-socket.Plo \ + ./$(DEPDIR)/libroken_la-socket_wrapper.Plo \ + ./$(DEPDIR)/libroken_la-strcollect.Plo \ + ./$(DEPDIR)/libroken_la-strerror_r.Plo \ + ./$(DEPDIR)/libroken_la-strpool.Plo \ + ./$(DEPDIR)/libroken_la-timeval.Plo \ + ./$(DEPDIR)/libroken_la-tm2time.Plo \ + ./$(DEPDIR)/libroken_la-unvis.Plo \ + ./$(DEPDIR)/libroken_la-verify.Plo \ + ./$(DEPDIR)/libroken_la-vis.Plo \ + ./$(DEPDIR)/libroken_la-warnerr.Plo \ + ./$(DEPDIR)/libroken_la-write_pid.Plo \ + ./$(DEPDIR)/libroken_la-xfree.Plo \ + ./$(DEPDIR)/libtest_la-snprintf.Plo \ + ./$(DEPDIR)/libtest_la-strftime.Plo \ + ./$(DEPDIR)/libtest_la-strptime.Plo \ + ./$(DEPDIR)/libtest_la-tsearch.Plo ./$(DEPDIR)/make-roken.Po \ + ./$(DEPDIR)/parse_bytes-test.Po \ + ./$(DEPDIR)/parse_reply_test-parse_reply-test.Po \ + ./$(DEPDIR)/parse_reply_test-resolve.Po \ + ./$(DEPDIR)/parse_time-test.Po ./$(DEPDIR)/resolve-test.Po \ + ./$(DEPDIR)/rkpty.Po \ + ./$(DEPDIR)/snprintf_test-snprintf-test.Po \ + ./$(DEPDIR)/strpftime_test-strpftime-test.Po \ + ./$(DEPDIR)/test-detach.Po ./$(DEPDIR)/test-mem.Po \ + ./$(DEPDIR)/test-readenv.Po \ + ./$(DEPDIR)/tsearch_test-tsearch-test.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -415,8 +524,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no @@ -572,6 +679,7 @@ am__set_TESTS_bases = \ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck TEST_SUITE_LOG = test-suite.log @@ -635,9 +743,12 @@ CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLANG_FORMAT = @CLANG_FORMAT@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DB1LIB = @DB1LIB@ DB3LIB = @DB3LIB@ @@ -655,8 +766,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GCD_MIG = @GCD_MIG@ GREP = @GREP@ GROFF = @GROFF@ @@ -765,6 +878,11 @@ PKG_CONFIG = @PKG_CONFIG@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LDADD = @PTHREAD_LDADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -824,9 +942,14 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -990,8 +1113,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty): @@ -1004,6 +1127,24 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -1056,24 +1197,6 @@ libroken.la: $(libroken_la_OBJECTS) $(libroken_la_DEPENDENCIES) $(EXTRA_libroken libtest.la: $(libtest_la_OBJECTS) $(libtest_la_DEPENDENCIES) $(EXTRA_libtest_la_DEPENDENCIES) $(AM_V_CCLD)$(libtest_la_LINK) $(libtest_la_OBJECTS) $(libtest_la_LIBADD) $(LIBS) -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - base64-test$(EXEEXT): $(base64_test_OBJECTS) $(base64_test_DEPENDENCIES) $(EXTRA_base64_test_DEPENDENCIES) @rm -f base64-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(base64_test_OBJECTS) $(base64_test_LDADD) $(LIBS) @@ -1144,165 +1267,171 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chown.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/closefrom.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/copyhostent.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/daemon.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ecalloc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/emalloc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/erealloc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/err.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/errx.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/estrdup.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fchown.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/flock.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fnmatch.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/freeaddrinfo.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/freehostent.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gai_strerror.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getaddrinfo.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getcap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getcwd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getdtablesize.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getegid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/geteuid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getgid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gethostname.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getifaddrs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getipnodebyaddr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getipnodebyname.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getnameinfo.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gettimeofday.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getuid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getusershell.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/glob.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hstrerror.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inet_aton.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inet_ntop.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inet_pton.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/initgroups.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/innetgr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/iruserok.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/localtime_r.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/lstat.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memmove.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memset_s.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkstemp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/putenv.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rcmd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/readv.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/recvmsg.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sendmsg.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/setegid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/setenv.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/seteuid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strcasecmp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strdup.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strerror.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strftime.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strlcat.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strlcpy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strlwr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strncasecmp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strndup.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strnlen.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strptime.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strsep.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strsep_copy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtok_r.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoll.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoull.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strupr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/swab.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/timegm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tsearch.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/unsetenv.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/verr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/verrx.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vsyslog.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vwarn.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vwarnx.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/warn.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/warnx.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/writev.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base64-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getaddrinfo-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getifaddrs-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getxxyyy_test-getxxyyy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hex-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-base64.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-bswap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-cloexec.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-concat.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-ct.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-detach.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-doxygen.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-dumpdata.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-environment.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-eread.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-esetenv.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-ewrite.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-get_default_username.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-get_window_size.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-getaddrinfo_hostspec.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-getarg.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-getnameinfo_verified.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-getprogname.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-getxxyyy.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-h_errno.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-hex.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-hostent_find_fqdn.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-issuid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-k_getpwnam.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-k_getpwuid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-mini_inetd.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-mkdir.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-net_read.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-net_write.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-parse_bytes.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-parse_time.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-parse_units.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-qsort.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-rand.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-realloc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-resolve.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-roken_gethostby.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-rtbl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-setprogname.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-signal.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-simple_exec.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-snprintf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-socket.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-socket_wrapper.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-strcollect.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-strerror_r.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-strpool.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-timeval.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-tm2time.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-unvis.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-verify.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-vis.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-warnerr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-write_pid.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-xfree.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_la-snprintf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_la-strftime.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_la-strptime.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_la-tsearch.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/make-roken.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_bytes-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_reply_test-parse_reply-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_reply_test-resolve.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_time-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resolve-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rkpty.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf_test-snprintf-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strpftime_test-strpftime-test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-detach.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mem.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-readenv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tsearch_test-tsearch-test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chown.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/closefrom.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/copyhostent.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/daemon.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ecalloc.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/emalloc.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/erealloc.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/err.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/errx.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/estrdup.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fchown.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/flock.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fnmatch.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/freeaddrinfo.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/freehostent.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gai_strerror.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getaddrinfo.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getcap.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getcwd.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getdtablesize.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getegid.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/geteuid.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getgid.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gethostname.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getifaddrs.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getipnodebyaddr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getipnodebyname.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getnameinfo.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gettimeofday.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getuid.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getusershell.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/glob.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/hstrerror.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inet_aton.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inet_ntop.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/inet_pton.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/initgroups.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/innetgr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/iruserok.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/localtime_r.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/lstat.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memmove.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/memset_s.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/mkstemp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/putenv.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rcmd.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/readv.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/recvmsg.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sendmsg.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/setegid.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/setenv.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/seteuid.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strcasecmp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strdup.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strerror.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strftime.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strlcat.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strlcpy.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strlwr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strncasecmp.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strndup.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strnlen.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strptime.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strsep.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strsep_copy.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtok_r.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoll.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoull.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strupr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/swab.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/timegm.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tsearch.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/unsetenv.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/verr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/verrx.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vsyslog.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vwarn.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vwarnx.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/warn.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/warnx.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/writev.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base64-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getaddrinfo-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getifaddrs-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getxxyyy_test-getxxyyy.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hex-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-base64.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-bswap.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-cloexec.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-concat.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-ct.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-detach.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-doxygen.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-dumpdata.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-environment.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-eread.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-esetenv.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-ewrite.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-get_default_username.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-get_window_size.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-getaddrinfo_hostspec.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-getarg.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-getnameinfo_verified.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-getprogname.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-getxxyyy.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-h_errno.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-hex.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-hostent_find_fqdn.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-issuid.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-k_getpwnam.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-k_getpwuid.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-mini_inetd.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-mkdir.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-net_read.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-net_write.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-parse_bytes.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-parse_time.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-parse_units.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-qsort.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-rand.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-realloc.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-resolve.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-roken_gethostby.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-rtbl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-setprogname.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-signal.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-simple_exec.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-snprintf.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-socket.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-socket_wrapper.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-strcollect.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-strerror_r.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-strpool.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-timeval.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-tm2time.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-unvis.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-verify.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-vis.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-warnerr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-write_pid.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libroken_la-xfree.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_la-snprintf.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_la-strftime.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_la-strptime.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_la-tsearch.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/make-roken.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_bytes-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_reply_test-parse_reply-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_reply_test-resolve.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_time-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resolve-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rkpty.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf_test-snprintf-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strpftime_test-strpftime-test.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-detach.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-mem.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-readenv.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tsearch_test-tsearch-test.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -2093,7 +2222,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ @@ -2106,7 +2235,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: $(check_PROGRAMS) @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -2232,8 +2361,10 @@ tsearch-test.log: tsearch-test$(EXEEXT) @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -2271,15 +2402,18 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(HEADERS) \ +all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(MANS) $(HEADERS) \ all-local +install-checkPROGRAMS: install-libLTLIBRARIES + installdirs: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(rokenincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -2320,7 +2454,165 @@ clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -rf $(DEPDIR) ./$(DEPDIR) + -rm -f $(DEPDIR)/chown.Plo + -rm -f $(DEPDIR)/closefrom.Plo + -rm -f $(DEPDIR)/copyhostent.Plo + -rm -f $(DEPDIR)/daemon.Plo + -rm -f $(DEPDIR)/ecalloc.Plo + -rm -f $(DEPDIR)/emalloc.Plo + -rm -f $(DEPDIR)/erealloc.Plo + -rm -f $(DEPDIR)/err.Plo + -rm -f $(DEPDIR)/errx.Plo + -rm -f $(DEPDIR)/estrdup.Plo + -rm -f $(DEPDIR)/fchown.Plo + -rm -f $(DEPDIR)/flock.Plo + -rm -f $(DEPDIR)/fnmatch.Plo + -rm -f $(DEPDIR)/freeaddrinfo.Plo + -rm -f $(DEPDIR)/freehostent.Plo + -rm -f $(DEPDIR)/gai_strerror.Plo + -rm -f $(DEPDIR)/getaddrinfo.Plo + -rm -f $(DEPDIR)/getcap.Plo + -rm -f $(DEPDIR)/getcwd.Plo + -rm -f $(DEPDIR)/getdtablesize.Plo + -rm -f $(DEPDIR)/getegid.Plo + -rm -f $(DEPDIR)/geteuid.Plo + -rm -f $(DEPDIR)/getgid.Plo + -rm -f $(DEPDIR)/gethostname.Plo + -rm -f $(DEPDIR)/getifaddrs.Plo + -rm -f $(DEPDIR)/getipnodebyaddr.Plo + -rm -f $(DEPDIR)/getipnodebyname.Plo + -rm -f $(DEPDIR)/getnameinfo.Plo + -rm -f $(DEPDIR)/getopt.Plo + -rm -f $(DEPDIR)/gettimeofday.Plo + -rm -f $(DEPDIR)/getuid.Plo + -rm -f $(DEPDIR)/getusershell.Plo + -rm -f $(DEPDIR)/glob.Plo + -rm -f $(DEPDIR)/hstrerror.Plo + -rm -f $(DEPDIR)/inet_aton.Plo + -rm -f $(DEPDIR)/inet_ntop.Plo + -rm -f $(DEPDIR)/inet_pton.Plo + -rm -f $(DEPDIR)/initgroups.Plo + -rm -f $(DEPDIR)/innetgr.Plo + -rm -f $(DEPDIR)/iruserok.Plo + -rm -f $(DEPDIR)/localtime_r.Plo + -rm -f $(DEPDIR)/lstat.Plo + -rm -f $(DEPDIR)/memmove.Plo + -rm -f $(DEPDIR)/memset_s.Plo + -rm -f $(DEPDIR)/mkstemp.Plo + -rm -f $(DEPDIR)/putenv.Plo + -rm -f $(DEPDIR)/rcmd.Plo + -rm -f $(DEPDIR)/readv.Plo + -rm -f $(DEPDIR)/recvmsg.Plo + -rm -f $(DEPDIR)/sendmsg.Plo + -rm -f $(DEPDIR)/setegid.Plo + -rm -f $(DEPDIR)/setenv.Plo + -rm -f $(DEPDIR)/seteuid.Plo + -rm -f $(DEPDIR)/strcasecmp.Plo + -rm -f $(DEPDIR)/strdup.Plo + -rm -f $(DEPDIR)/strerror.Plo + -rm -f $(DEPDIR)/strftime.Plo + -rm -f $(DEPDIR)/strlcat.Plo + -rm -f $(DEPDIR)/strlcpy.Plo + -rm -f $(DEPDIR)/strlwr.Plo + -rm -f $(DEPDIR)/strncasecmp.Plo + -rm -f $(DEPDIR)/strndup.Plo + -rm -f $(DEPDIR)/strnlen.Plo + -rm -f $(DEPDIR)/strptime.Plo + -rm -f $(DEPDIR)/strsep.Plo + -rm -f $(DEPDIR)/strsep_copy.Plo + -rm -f $(DEPDIR)/strtok_r.Plo + -rm -f $(DEPDIR)/strtoll.Plo + -rm -f $(DEPDIR)/strtoull.Plo + -rm -f $(DEPDIR)/strupr.Plo + -rm -f $(DEPDIR)/swab.Plo + -rm -f $(DEPDIR)/timegm.Plo + -rm -f $(DEPDIR)/tsearch.Plo + -rm -f $(DEPDIR)/unsetenv.Plo + -rm -f $(DEPDIR)/verr.Plo + -rm -f $(DEPDIR)/verrx.Plo + -rm -f $(DEPDIR)/vsyslog.Plo + -rm -f $(DEPDIR)/vwarn.Plo + -rm -f $(DEPDIR)/vwarnx.Plo + -rm -f $(DEPDIR)/warn.Plo + -rm -f $(DEPDIR)/warnx.Plo + -rm -f $(DEPDIR)/writev.Plo + -rm -f ./$(DEPDIR)/base64-test.Po + -rm -f ./$(DEPDIR)/getaddrinfo-test.Po + -rm -f ./$(DEPDIR)/getifaddrs-test.Po + -rm -f ./$(DEPDIR)/getxxyyy_test-getxxyyy.Po + -rm -f ./$(DEPDIR)/hex-test.Po + -rm -f ./$(DEPDIR)/libroken_la-base64.Plo + -rm -f ./$(DEPDIR)/libroken_la-bswap.Plo + -rm -f ./$(DEPDIR)/libroken_la-cloexec.Plo + -rm -f ./$(DEPDIR)/libroken_la-concat.Plo + -rm -f ./$(DEPDIR)/libroken_la-ct.Plo + -rm -f ./$(DEPDIR)/libroken_la-detach.Plo + -rm -f ./$(DEPDIR)/libroken_la-doxygen.Plo + -rm -f ./$(DEPDIR)/libroken_la-dumpdata.Plo + -rm -f ./$(DEPDIR)/libroken_la-environment.Plo + -rm -f ./$(DEPDIR)/libroken_la-eread.Plo + -rm -f ./$(DEPDIR)/libroken_la-esetenv.Plo + -rm -f ./$(DEPDIR)/libroken_la-ewrite.Plo + -rm -f ./$(DEPDIR)/libroken_la-get_default_username.Plo + -rm -f ./$(DEPDIR)/libroken_la-get_window_size.Plo + -rm -f ./$(DEPDIR)/libroken_la-getaddrinfo_hostspec.Plo + -rm -f ./$(DEPDIR)/libroken_la-getarg.Plo + -rm -f ./$(DEPDIR)/libroken_la-getnameinfo_verified.Plo + -rm -f ./$(DEPDIR)/libroken_la-getprogname.Plo + -rm -f ./$(DEPDIR)/libroken_la-getxxyyy.Plo + -rm -f ./$(DEPDIR)/libroken_la-h_errno.Plo + -rm -f ./$(DEPDIR)/libroken_la-hex.Plo + -rm -f ./$(DEPDIR)/libroken_la-hostent_find_fqdn.Plo + -rm -f ./$(DEPDIR)/libroken_la-issuid.Plo + -rm -f ./$(DEPDIR)/libroken_la-k_getpwnam.Plo + -rm -f ./$(DEPDIR)/libroken_la-k_getpwuid.Plo + -rm -f ./$(DEPDIR)/libroken_la-mini_inetd.Plo + -rm -f ./$(DEPDIR)/libroken_la-mkdir.Plo + -rm -f ./$(DEPDIR)/libroken_la-net_read.Plo + -rm -f ./$(DEPDIR)/libroken_la-net_write.Plo + -rm -f ./$(DEPDIR)/libroken_la-parse_bytes.Plo + -rm -f ./$(DEPDIR)/libroken_la-parse_time.Plo + -rm -f ./$(DEPDIR)/libroken_la-parse_units.Plo + -rm -f ./$(DEPDIR)/libroken_la-qsort.Plo + -rm -f ./$(DEPDIR)/libroken_la-rand.Plo + -rm -f ./$(DEPDIR)/libroken_la-realloc.Plo + -rm -f ./$(DEPDIR)/libroken_la-resolve.Plo + -rm -f ./$(DEPDIR)/libroken_la-roken_gethostby.Plo + -rm -f ./$(DEPDIR)/libroken_la-rtbl.Plo + -rm -f ./$(DEPDIR)/libroken_la-setprogname.Plo + -rm -f ./$(DEPDIR)/libroken_la-signal.Plo + -rm -f ./$(DEPDIR)/libroken_la-simple_exec.Plo + -rm -f ./$(DEPDIR)/libroken_la-snprintf.Plo + -rm -f ./$(DEPDIR)/libroken_la-socket.Plo + -rm -f ./$(DEPDIR)/libroken_la-socket_wrapper.Plo + -rm -f ./$(DEPDIR)/libroken_la-strcollect.Plo + -rm -f ./$(DEPDIR)/libroken_la-strerror_r.Plo + -rm -f ./$(DEPDIR)/libroken_la-strpool.Plo + -rm -f ./$(DEPDIR)/libroken_la-timeval.Plo + -rm -f ./$(DEPDIR)/libroken_la-tm2time.Plo + -rm -f ./$(DEPDIR)/libroken_la-unvis.Plo + -rm -f ./$(DEPDIR)/libroken_la-verify.Plo + -rm -f ./$(DEPDIR)/libroken_la-vis.Plo + -rm -f ./$(DEPDIR)/libroken_la-warnerr.Plo + -rm -f ./$(DEPDIR)/libroken_la-write_pid.Plo + -rm -f ./$(DEPDIR)/libroken_la-xfree.Plo + -rm -f ./$(DEPDIR)/libtest_la-snprintf.Plo + -rm -f ./$(DEPDIR)/libtest_la-strftime.Plo + -rm -f ./$(DEPDIR)/libtest_la-strptime.Plo + -rm -f ./$(DEPDIR)/libtest_la-tsearch.Plo + -rm -f ./$(DEPDIR)/make-roken.Po + -rm -f ./$(DEPDIR)/parse_bytes-test.Po + -rm -f ./$(DEPDIR)/parse_reply_test-parse_reply-test.Po + -rm -f ./$(DEPDIR)/parse_reply_test-resolve.Po + -rm -f ./$(DEPDIR)/parse_time-test.Po + -rm -f ./$(DEPDIR)/resolve-test.Po + -rm -f ./$(DEPDIR)/rkpty.Po + -rm -f ./$(DEPDIR)/snprintf_test-snprintf-test.Po + -rm -f ./$(DEPDIR)/strpftime_test-strpftime-test.Po + -rm -f ./$(DEPDIR)/test-detach.Po + -rm -f ./$(DEPDIR)/test-mem.Po + -rm -f ./$(DEPDIR)/test-readenv.Po + -rm -f ./$(DEPDIR)/tsearch_test-tsearch-test.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -2369,7 +2661,165 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf $(DEPDIR) ./$(DEPDIR) + -rm -f $(DEPDIR)/chown.Plo + -rm -f $(DEPDIR)/closefrom.Plo + -rm -f $(DEPDIR)/copyhostent.Plo + -rm -f $(DEPDIR)/daemon.Plo + -rm -f $(DEPDIR)/ecalloc.Plo + -rm -f $(DEPDIR)/emalloc.Plo + -rm -f $(DEPDIR)/erealloc.Plo + -rm -f $(DEPDIR)/err.Plo + -rm -f $(DEPDIR)/errx.Plo + -rm -f $(DEPDIR)/estrdup.Plo + -rm -f $(DEPDIR)/fchown.Plo + -rm -f $(DEPDIR)/flock.Plo + -rm -f $(DEPDIR)/fnmatch.Plo + -rm -f $(DEPDIR)/freeaddrinfo.Plo + -rm -f $(DEPDIR)/freehostent.Plo + -rm -f $(DEPDIR)/gai_strerror.Plo + -rm -f $(DEPDIR)/getaddrinfo.Plo + -rm -f $(DEPDIR)/getcap.Plo + -rm -f $(DEPDIR)/getcwd.Plo + -rm -f $(DEPDIR)/getdtablesize.Plo + -rm -f $(DEPDIR)/getegid.Plo + -rm -f $(DEPDIR)/geteuid.Plo + -rm -f $(DEPDIR)/getgid.Plo + -rm -f $(DEPDIR)/gethostname.Plo + -rm -f $(DEPDIR)/getifaddrs.Plo + -rm -f $(DEPDIR)/getipnodebyaddr.Plo + -rm -f $(DEPDIR)/getipnodebyname.Plo + -rm -f $(DEPDIR)/getnameinfo.Plo + -rm -f $(DEPDIR)/getopt.Plo + -rm -f $(DEPDIR)/gettimeofday.Plo + -rm -f $(DEPDIR)/getuid.Plo + -rm -f $(DEPDIR)/getusershell.Plo + -rm -f $(DEPDIR)/glob.Plo + -rm -f $(DEPDIR)/hstrerror.Plo + -rm -f $(DEPDIR)/inet_aton.Plo + -rm -f $(DEPDIR)/inet_ntop.Plo + -rm -f $(DEPDIR)/inet_pton.Plo + -rm -f $(DEPDIR)/initgroups.Plo + -rm -f $(DEPDIR)/innetgr.Plo + -rm -f $(DEPDIR)/iruserok.Plo + -rm -f $(DEPDIR)/localtime_r.Plo + -rm -f $(DEPDIR)/lstat.Plo + -rm -f $(DEPDIR)/memmove.Plo + -rm -f $(DEPDIR)/memset_s.Plo + -rm -f $(DEPDIR)/mkstemp.Plo + -rm -f $(DEPDIR)/putenv.Plo + -rm -f $(DEPDIR)/rcmd.Plo + -rm -f $(DEPDIR)/readv.Plo + -rm -f $(DEPDIR)/recvmsg.Plo + -rm -f $(DEPDIR)/sendmsg.Plo + -rm -f $(DEPDIR)/setegid.Plo + -rm -f $(DEPDIR)/setenv.Plo + -rm -f $(DEPDIR)/seteuid.Plo + -rm -f $(DEPDIR)/strcasecmp.Plo + -rm -f $(DEPDIR)/strdup.Plo + -rm -f $(DEPDIR)/strerror.Plo + -rm -f $(DEPDIR)/strftime.Plo + -rm -f $(DEPDIR)/strlcat.Plo + -rm -f $(DEPDIR)/strlcpy.Plo + -rm -f $(DEPDIR)/strlwr.Plo + -rm -f $(DEPDIR)/strncasecmp.Plo + -rm -f $(DEPDIR)/strndup.Plo + -rm -f $(DEPDIR)/strnlen.Plo + -rm -f $(DEPDIR)/strptime.Plo + -rm -f $(DEPDIR)/strsep.Plo + -rm -f $(DEPDIR)/strsep_copy.Plo + -rm -f $(DEPDIR)/strtok_r.Plo + -rm -f $(DEPDIR)/strtoll.Plo + -rm -f $(DEPDIR)/strtoull.Plo + -rm -f $(DEPDIR)/strupr.Plo + -rm -f $(DEPDIR)/swab.Plo + -rm -f $(DEPDIR)/timegm.Plo + -rm -f $(DEPDIR)/tsearch.Plo + -rm -f $(DEPDIR)/unsetenv.Plo + -rm -f $(DEPDIR)/verr.Plo + -rm -f $(DEPDIR)/verrx.Plo + -rm -f $(DEPDIR)/vsyslog.Plo + -rm -f $(DEPDIR)/vwarn.Plo + -rm -f $(DEPDIR)/vwarnx.Plo + -rm -f $(DEPDIR)/warn.Plo + -rm -f $(DEPDIR)/warnx.Plo + -rm -f $(DEPDIR)/writev.Plo + -rm -f ./$(DEPDIR)/base64-test.Po + -rm -f ./$(DEPDIR)/getaddrinfo-test.Po + -rm -f ./$(DEPDIR)/getifaddrs-test.Po + -rm -f ./$(DEPDIR)/getxxyyy_test-getxxyyy.Po + -rm -f ./$(DEPDIR)/hex-test.Po + -rm -f ./$(DEPDIR)/libroken_la-base64.Plo + -rm -f ./$(DEPDIR)/libroken_la-bswap.Plo + -rm -f ./$(DEPDIR)/libroken_la-cloexec.Plo + -rm -f ./$(DEPDIR)/libroken_la-concat.Plo + -rm -f ./$(DEPDIR)/libroken_la-ct.Plo + -rm -f ./$(DEPDIR)/libroken_la-detach.Plo + -rm -f ./$(DEPDIR)/libroken_la-doxygen.Plo + -rm -f ./$(DEPDIR)/libroken_la-dumpdata.Plo + -rm -f ./$(DEPDIR)/libroken_la-environment.Plo + -rm -f ./$(DEPDIR)/libroken_la-eread.Plo + -rm -f ./$(DEPDIR)/libroken_la-esetenv.Plo + -rm -f ./$(DEPDIR)/libroken_la-ewrite.Plo + -rm -f ./$(DEPDIR)/libroken_la-get_default_username.Plo + -rm -f ./$(DEPDIR)/libroken_la-get_window_size.Plo + -rm -f ./$(DEPDIR)/libroken_la-getaddrinfo_hostspec.Plo + -rm -f ./$(DEPDIR)/libroken_la-getarg.Plo + -rm -f ./$(DEPDIR)/libroken_la-getnameinfo_verified.Plo + -rm -f ./$(DEPDIR)/libroken_la-getprogname.Plo + -rm -f ./$(DEPDIR)/libroken_la-getxxyyy.Plo + -rm -f ./$(DEPDIR)/libroken_la-h_errno.Plo + -rm -f ./$(DEPDIR)/libroken_la-hex.Plo + -rm -f ./$(DEPDIR)/libroken_la-hostent_find_fqdn.Plo + -rm -f ./$(DEPDIR)/libroken_la-issuid.Plo + -rm -f ./$(DEPDIR)/libroken_la-k_getpwnam.Plo + -rm -f ./$(DEPDIR)/libroken_la-k_getpwuid.Plo + -rm -f ./$(DEPDIR)/libroken_la-mini_inetd.Plo + -rm -f ./$(DEPDIR)/libroken_la-mkdir.Plo + -rm -f ./$(DEPDIR)/libroken_la-net_read.Plo + -rm -f ./$(DEPDIR)/libroken_la-net_write.Plo + -rm -f ./$(DEPDIR)/libroken_la-parse_bytes.Plo + -rm -f ./$(DEPDIR)/libroken_la-parse_time.Plo + -rm -f ./$(DEPDIR)/libroken_la-parse_units.Plo + -rm -f ./$(DEPDIR)/libroken_la-qsort.Plo + -rm -f ./$(DEPDIR)/libroken_la-rand.Plo + -rm -f ./$(DEPDIR)/libroken_la-realloc.Plo + -rm -f ./$(DEPDIR)/libroken_la-resolve.Plo + -rm -f ./$(DEPDIR)/libroken_la-roken_gethostby.Plo + -rm -f ./$(DEPDIR)/libroken_la-rtbl.Plo + -rm -f ./$(DEPDIR)/libroken_la-setprogname.Plo + -rm -f ./$(DEPDIR)/libroken_la-signal.Plo + -rm -f ./$(DEPDIR)/libroken_la-simple_exec.Plo + -rm -f ./$(DEPDIR)/libroken_la-snprintf.Plo + -rm -f ./$(DEPDIR)/libroken_la-socket.Plo + -rm -f ./$(DEPDIR)/libroken_la-socket_wrapper.Plo + -rm -f ./$(DEPDIR)/libroken_la-strcollect.Plo + -rm -f ./$(DEPDIR)/libroken_la-strerror_r.Plo + -rm -f ./$(DEPDIR)/libroken_la-strpool.Plo + -rm -f ./$(DEPDIR)/libroken_la-timeval.Plo + -rm -f ./$(DEPDIR)/libroken_la-tm2time.Plo + -rm -f ./$(DEPDIR)/libroken_la-unvis.Plo + -rm -f ./$(DEPDIR)/libroken_la-verify.Plo + -rm -f ./$(DEPDIR)/libroken_la-vis.Plo + -rm -f ./$(DEPDIR)/libroken_la-warnerr.Plo + -rm -f ./$(DEPDIR)/libroken_la-write_pid.Plo + -rm -f ./$(DEPDIR)/libroken_la-xfree.Plo + -rm -f ./$(DEPDIR)/libtest_la-snprintf.Plo + -rm -f ./$(DEPDIR)/libtest_la-strftime.Plo + -rm -f ./$(DEPDIR)/libtest_la-strptime.Plo + -rm -f ./$(DEPDIR)/libtest_la-tsearch.Plo + -rm -f ./$(DEPDIR)/make-roken.Po + -rm -f ./$(DEPDIR)/parse_bytes-test.Po + -rm -f ./$(DEPDIR)/parse_reply_test-parse_reply-test.Po + -rm -f ./$(DEPDIR)/parse_reply_test-resolve.Po + -rm -f ./$(DEPDIR)/parse_time-test.Po + -rm -f ./$(DEPDIR)/resolve-test.Po + -rm -f ./$(DEPDIR)/rkpty.Po + -rm -f ./$(DEPDIR)/snprintf_test-snprintf-test.Po + -rm -f ./$(DEPDIR)/strpftime_test-strpftime-test.Po + -rm -f ./$(DEPDIR)/test-detach.Po + -rm -f ./$(DEPDIR)/test-mem.Po + -rm -f ./$(DEPDIR)/test-readenv.Po + -rm -f ./$(DEPDIR)/tsearch_test-tsearch-test.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -2394,20 +2844,21 @@ uninstall-am: uninstall-dist_includeHEADERS uninstall-libLTLIBRARIES \ uninstall-man: uninstall-man3 .MAKE: all check check-am install install-am install-data-am \ - install-strip uninstall-am - -.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \ - check-am check-local clean clean-checkPROGRAMS clean-generic \ - clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ - clean-noinstPROGRAMS cscopelist-am ctags ctags-am dist-hook \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-data-hook install-dist_includeHEADERS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-exec-local install-html install-html-am install-info \ - install-info-am install-libLTLIBRARIES install-man \ - install-man3 install-nodist_includeHEADERS \ + install-exec install-strip uninstall-am + +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \ + check-TESTS check-am check-local clean clean-checkPROGRAMS \ + clean-generic clean-libLTLIBRARIES clean-libtool \ + clean-noinstLTLIBRARIES clean-noinstPROGRAMS cscopelist-am \ + ctags ctags-am dist-hook distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-hook \ + install-dist_includeHEADERS install-dvi install-dvi-am \ + install-exec install-exec-am install-exec-local install-html \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-man3 \ + install-nodist_includeHEADERS \ install-nodist_rokenincludeHEADERS install-pdf install-pdf-am \ install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ @@ -2500,11 +2951,20 @@ check-local:: test "$$failed" -eq 0 || exit 1; \ fi +# It's useful for debugging to format generated sources. The default for all +# clang-format styles is to sort includes, but in many cases in-tree we really +# don't want to do that. .x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @if [ -z "$(CLANG_FORMAT)" ]; then \ + cmp -s $< $@ 2> /dev/null || cp $< $@; \ + else \ + cp $< $@.tmp.c; \ + $(CLANG_FORMAT) -style='{BasedOnStyle: Chromium, SortIncludes: false}' -i $@.tmp.c; \ + cmp -s $@.tmp.c $@ 2> /dev/null || mv $@.tmp.c $@; \ + fi .hx.h: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @cmp -s $< $@ 2> /dev/null || cp $< $@; #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ diff --git a/lib/roken/ecalloc.cat3 b/lib/roken/ecalloc.cat3 index 550cf3f223cd..c22a85444539 100644 --- a/lib/roken/ecalloc.cat3 +++ b/lib/roken/ecalloc.cat3 @@ -1,46 +1,45 @@ - ECALLOC(3) BSD Library Functions Manual ECALLOC(3) -NNAAMMEE - eeccaalllloocc, eemmaalllloocc, eerreeaadd, eerreeaalllloocc, eesseetteennvv, eessttrrdduupp, eewwrriittee -- exit-on- +[1mNAME[0m + [1mecalloc[22m, [1memalloc[22m, [1meread[22m, [1merealloc[22m, [1mesetenv[22m, [1mestrdup[22m, [1mewrite [22m-- exit-on- failure wrapper functions -LLIIBBRRAARRYY +[1mLIBRARY[0m The roken library (libroken, -lroken) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<rrookkeenn..hh>> +[1mSYNOPSIS[0m + [1m#include <roken.h>[0m - _v_o_i_d _* - eeccaalllloocc(_s_i_z_e___t _n_u_m_b_e_r, _s_i_z_e___t _s_i_z_e); + [4mvoid[24m [4m*[0m + [1mecalloc[22m([4msize_t[24m [4mnumber[24m, [4msize_t[24m [4msize[24m); - _v_o_i_d _* - eemmaalllloocc(_s_i_z_e___t _s_z); + [4mvoid[24m [4m*[0m + [1memalloc[22m([4msize_t[24m [4msz[24m); - _s_s_i_z_e___t - eerreeaadd(_i_n_t _f_d, _v_o_i_d _*_b_u_f, _s_i_z_e___t _n_b_y_t_e_s); + [4mssize_t[0m + [1meread[22m([4mint[24m [4mfd[24m, [4mvoid[24m [4m*buf[24m, [4msize_t[24m [4mnbytes[24m); - _v_o_i_d _* - eerreeaalllloocc(_v_o_i_d _*_p_t_r, _s_i_z_e___t _s_z); + [4mvoid[24m [4m*[0m + [1merealloc[22m([4mvoid[24m [4m*ptr[24m, [4msize_t[24m [4msz[24m); - _v_o_i_d - eesseetteennvv(_c_o_n_s_t _c_h_a_r _*_v_a_r, _c_o_n_s_t _c_h_a_r _*_v_a_l, _i_n_t _r_e_w_r_i_t_e); + [4mvoid[0m + [1mesetenv[22m([4mconst[24m [4mchar[24m [4m*var[24m, [4mconst[24m [4mchar[24m [4m*val[24m, [4mint[24m [4mrewrite[24m); - _c_h_a_r _* - eessttrrdduupp(_c_o_n_s_t _c_h_a_r _*_s_t_r); + [4mchar[24m [4m*[0m + [1mestrdup[22m([4mconst[24m [4mchar[24m [4m*str[24m); - _s_s_i_z_e___t - eewwrriittee(_i_n_t _f_d, _c_o_n_s_t _v_o_i_d _*_b_u_f, _s_i_z_e___t _n_b_y_t_e_s); + [4mssize_t[0m + [1mewrite[22m([4mint[24m [4mfd[24m, [4mconst[24m [4mvoid[24m [4m*buf[24m, [4msize_t[24m [4mnbytes[24m); -DDEESSCCRRIIPPTTIIOONN - These functions do the same as the ones without the ``e'' prefix, but if +[1mDESCRIPTION[0m + These functions do the same as the ones without the "e" prefix, but if there is an error they will print a message with errx(3), and exit. For - eerreeaadd and eewwrriittee this is also true for partial data. + [1meread [22mand [1mewrite [22mthis is also true for partial data. This is useful in applications when there is no need for a more advanced failure mode. -SSEEEE AALLSSOO +[1mSEE ALSO[0m read(2), write(2), calloc(3), errx(3), malloc(3), realloc(3), setenv(3), strdup(3) diff --git a/lib/roken/getaddrinfo.c b/lib/roken/getaddrinfo.c index c8ed95413fe3..ae21bf11090c 100644 --- a/lib/roken/getaddrinfo.c +++ b/lib/roken/getaddrinfo.c @@ -188,7 +188,7 @@ get_null (const struct addrinfo *hints, struct addrinfo *first = NULL; struct addrinfo **current = &first; int family = PF_UNSPEC; - int ret; + int ret = 0; if (hints != NULL) family = hints->ai_family; @@ -209,6 +209,8 @@ get_null (const struct addrinfo *hints, if (family == PF_INET6 || family == PF_UNSPEC) { ret = add_one (port, protocol, socktype, ¤t, const_v6, &v6_addr, NULL); + if (ret) + return ret; } #endif if (family == PF_INET || family == PF_UNSPEC) { @@ -216,7 +218,7 @@ get_null (const struct addrinfo *hints, ¤t, const_v4, &v4_addr, NULL); } *res = first; - return 0; + return ret; } static int diff --git a/lib/roken/getarg.cat3 b/lib/roken/getarg.cat3 index 6e08f7e4843e..bc3d11fa82e4 100644 --- a/lib/roken/getarg.cat3 +++ b/lib/roken/getarg.cat3 @@ -1,39 +1,38 @@ - GETARG(3) BSD Library Functions Manual GETARG(3) -NNAAMMEE - ggeettaarrgg, aarrgg__pprriinnttuussaaggee -- collect command line options +[1mNAME[0m + [1mgetarg[22m, [1marg_printusage [22m-- collect command line options -SSYYNNOOPPSSIISS - ##iinncclluuddee <<ggeettaarrgg..hh>> +[1mSYNOPSIS[0m + [1m#include <getarg.h>[0m - _i_n_t - ggeettaarrgg(_s_t_r_u_c_t _g_e_t_a_r_g_s _*_a_r_g_s, _s_i_z_e___t _n_u_m___a_r_g_s, _i_n_t _a_r_g_c, _c_h_a_r _*_*_a_r_g_v, - _i_n_t _*_o_p_t_i_n_d); + [4mint[0m + [1mgetarg[22m([4mstruct[24m [4mgetargs[24m [4m*args[24m, [4msize_t[24m [4mnum_args[24m, [4mint[24m [4margc[24m, [4mchar[24m [4m**argv[24m, + [4mint[24m [4m*optind[24m); - _v_o_i_d - aarrgg__pprriinnttuussaaggee(_s_t_r_u_c_t _g_e_t_a_r_g_s _*_a_r_g_s, _s_i_z_e___t _n_u_m___a_r_g_s, - _c_o_n_s_t _c_h_a_r _*_p_r_o_g_n_a_m_e, _c_o_n_s_t _c_h_a_r _*_e_x_t_r_a___s_t_r_i_n_g); + [4mvoid[0m + [1marg_printusage[22m([4mstruct[24m [4mgetargs[24m [4m*args[24m, [4msize_t[24m [4mnum_args[24m, + [4mconst[24m [4mchar[24m [4m*progname[24m, [4mconst[24m [4mchar[24m [4m*extra_string[24m); -DDEESSCCRRIIPPTTIIOONN - ggeettaarrgg() collects any command line options given to a program in an eas- - ily used way. aarrgg__pprriinnttuussaaggee() pretty-prints the available options, with +[1mDESCRIPTION[0m + [1mgetarg[22m() collects any command line options given to a program in an eas- + ily used way. [1marg_printusage[22m() pretty-prints the available options, with a short help text. - _a_r_g_s is the option specification to use, and it's an array of _s_t_r_u_c_t - _g_e_t_a_r_g_s elements. _n_u_m___a_r_g_s is the size of _a_r_g_s (in elements). _a_r_g_c and - _a_r_g_v are the argument count and argument vector to extract option from. - _o_p_t_i_n_d is a pointer to an integer where the index to the last processed + [4margs[24m is the option specification to use, and it's an array of [4mstruct[0m + [4mgetargs[24m elements. [4mnum_args[24m is the size of [4margs[24m (in elements). [4margc[24m and + [4margv[24m are the argument count and argument vector to extract option from. + [4moptind[24m is a pointer to an integer where the index to the last processed argument is stored, it must be initialised to the first index (minus one) to process (normally 0) before the first call. - _a_r_g___p_r_i_n_t_u_s_a_g_e take the same _a_r_g_s and _n_u_m___a_r_g_s as getarg; _p_r_o_g_n_a_m_e is the - name of the program (to be used in the help text), and _e_x_t_r_a___s_t_r_i_n_g is a + [4marg_printusage[24m take the same [4margs[24m and [4mnum_args[24m as getarg; [4mprogname[24m is the + name of the program (to be used in the help text), and [4mextra_string[24m is a string to print after the actual options to indicate more arguments. The usefulness of this function is realised only be people who has used pro- grams that has help strings that doesn't match what the code does. - The _g_e_t_a_r_g_s struct has the following elements. + The [4mgetargs[24m struct has the following elements. struct getargs{ const char *long_name; @@ -51,43 +50,43 @@ DDEESSCCRRIIPPTTIIOONN const char *arg_help; }; - _l_o_n_g___n_a_m_e is the long name of the option, it can be NULL, if you don't - want a long name. _s_h_o_r_t___n_a_m_e is the characted to use as short option, it - can be zero. If the option has a value the _v_a_l_u_e field gets filled in - with that value interpreted as specified by the _t_y_p_e field. _h_e_l_p is a + [4mlong_name[24m is the long name of the option, it can be NULL, if you don't + want a long name. [4mshort_name[24m is the characted to use as short option, it + can be zero. If the option has a value the [4mvalue[24m field gets filled in + with that value interpreted as specified by the [4mtype[24m field. [4mhelp[24m is a longer help string for the option as a whole, if it's NULL the help text for the option is omitted (but it's still displayed in the synopsis). - _a_r_g___h_e_l_p is a description of the argument, if NULL a default value will + [4marg_help[24m is a description of the argument, if NULL a default value will be used, depending on the type of the option: - arg_integer the argument is a signed integer, and _v_a_l_u_e should - point to an _i_n_t. + arg_integer the argument is a signed integer, and [4mvalue[24m should + point to an [4mint[24m. - _a_r_g___s_t_r_i_n_g the argument is a string, and _v_a_l_u_e should point to a - _c_h_a_r_*. + [4marg_string[24m the argument is a string, and [4mvalue[24m should point to a + [4mchar*[24m. - _a_r_g___f_l_a_g the argument is a flag, and _v_a_l_u_e should point to a - _i_n_t. It gets filled in with either zero or one, - depending on how the option is given, the normal case + [4marg_flag[24m the argument is a flag, and [4mvalue[24m should point to a + [4mint[24m. It gets filled in with either zero or one, de- + pending on how the option is given, the normal case being one. Note that if the option isn't given, the value isn't altered, so it should be initialised to some useful default. - _a_r_g___n_e_g_a_t_i_v_e___f_l_a_g this is the same as _a_r_g___f_l_a_g but it reverses the mean- + [4marg_negative_flag[24m this is the same as [4marg_flag[24m but it reverses the mean- ing of the flag (a given short option clears the flag), and the synopsis of a long option is negated. - _a_r_g___s_t_r_i_n_g_s the argument can be given multiple times, and the val- - ues are collected in an array; _v_a_l_u_e should be a - pointer to a _s_t_r_u_c_t _g_e_t_a_r_g___s_t_r_i_n_g_s structure, which + [4marg_strings[24m the argument can be given multiple times, and the val- + ues are collected in an array; [4mvalue[24m should be a + pointer to a [4mstruct[24m [4mgetarg_strings[24m structure, which holds a length and a string pointer. - _a_r_g___d_o_u_b_l_e argument is a double precision floating point value, - and _v_a_l_u_e should point to a _d_o_u_b_l_e. + [4marg_double[24m argument is a double precision floating point value, + and [4mvalue[24m should point to a [4mdouble[24m. - _a_r_g___c_o_l_l_e_c_t allows more fine-grained control of the option parsing - process. _v_a_l_u_e should be a pointer to a - _g_e_t_a_r_g___c_o_l_l_e_c_t___i_n_f_o structure: + [4marg_collect[24m allows more fine-grained control of the option parsing + process. [4mvalue[24m should be a pointer to a + [4mgetarg_collect_info[24m structure: typedef int (*getarg_collect_func)(int short_opt, int argc, @@ -101,31 +100,31 @@ DDEESSCCRRIIPPTTIIOONN void *data; } getarg_collect_info; - With the _f_u_n_c member set to a function to call, and - _d_a_t_a to some application specific data. The parameters + With the [4mfunc[24m member set to a function to call, and + [4mdata[24m to some application specific data. The parameters to the collect function are: - _s_h_o_r_t___f_l_a_g non-zero if this call is via a short option + [4mshort_flag[24m non-zero if this call is via a short option flag, zero otherwise - _a_r_g_c, _a_r_g_v the whole argument list + [4margc[24m, [4margv[24m the whole argument list - _o_p_t_i_n_d pointer to the index in argv where the flag is + [4moptind[24m pointer to the index in argv where the flag is - _o_p_t_a_r_g pointer to the index in argv[*optind] where the + [4moptarg[24m pointer to the index in argv[*optind] where the flag name starts - _d_a_t_a application specific data + [4mdata[24m application specific data - You can modify _*_o_p_t_i_n_d, and _*_o_p_t_a_r_g, but to do this - correct you (more or less) have to know about the - inner workings of getarg. + You can modify [4m*optind[24m, and [4m*optarg[24m, but to do this + correct you (more or less) have to know about the in- + ner workings of getarg. - You can skip parts of arguments by increasing _*_o_p_t_a_r_g - (you could implement the --zz_3 set of flags from ggzziipp + You can skip parts of arguments by increasing [4m*optarg[0m + (you could implement the [1m-z[4m[22m3[24m set of flags from [1mgzip[0m with this), or whole argument strings by increasing - _*_o_p_t_i_n_d (let's say you want a flag --cc _x _y _z to specify - a coordinate); if you also have to set _*_o_p_t_a_r_g to a + [4m*optind[24m (let's say you want a flag [1m-c [4m[22mx[24m [4my[24m [4mz[24m to specify + a coordinate); if you also have to set [4m*optarg[24m to a sane value. The collect function should return one of @@ -133,26 +132,26 @@ DDEESSCCRRIIPPTTIIOONN ENOMEM on error, zero otherwise. For your convenience there is a function, - ggeettaarrgg__ooppttaarrgg(), that returns the traditional argument + [1mgetarg_optarg[22m(), that returns the traditional argument string, and you pass it all arguments, sans data, that where given to the collection function. Don't use this more this unless you absolutely have to. - Option parsing is similar to what getopt uses. Short options without - arguments can be compressed (--xxyyzz is the same as --xx --yy --zz), and short - options with arguments take these as either the rest of the argv-string - or as the next option (--oo_f_o_o, or --oo _f_o_o). + Option parsing is similar to what getopt uses. Short options without ar- + guments can be compressed ([1m-xyz [22mis the same as [1m-x -y -z[22m), and short op- + tions with arguments take these as either the rest of the argv-string or + as the next option ([1m-o[4m[22mfoo[24m, or [1m-o [4m[22mfoo[24m). Long option names are prefixed with -- (double dash), and the value with - a = (equal), ----ffoooo==_b_a_r. Long option flags can either be specified as - they are (----hheellpp), or with an (boolean parsable) option (----hheellpp==_y_e_s, - ----hheellpp==_t_r_u_e, or similar), or they can also be negated (----nnoo--hheellpp is the - same as ----hheellpp==no), and if you're really confused you can do it multiple - times (----nnoo--nnoo--hheellpp==_f_a_l_s_e, or even ----nnoo--nnoo--hheellpp==_m_a_y_b_e). + a = (equal), [1m--foo=[4m[22mbar[24m. Long option flags can either be specified as + they are ([1m--help[22m), or with an (boolean parsable) option ([1m--help=[4m[22myes[24m, + [1m--help=[4m[22mtrue[24m, or similar), or they can also be negated ([1m--no-help [22mis the + same as [1m--help=[22mno), and if you're really confused you can do it multiple + times ([1m--no-no-help=[4m[22mfalse[24m, or even [1m--no-no-help=[4m[22mmaybe[24m). -EEXXAAMMPPLLEE +[1mEXAMPLE[0m #include <stdio.h> #include <string.h> #include <getarg.h> @@ -213,7 +212,7 @@ EEXXAAMMPPLLEE -w tons, --weight=tons weight of shippment -c, --no-catalog include product catalog -BBUUGGSS +[1mBUGS[0m It should be more flexible, so it would be possible to use other more complicated option syntaxes, such as what ps(1), and tar(1), uses, or the AFS model where you can skip the flag names as long as the options come @@ -225,7 +224,7 @@ BBUUGGSS It's very confusing that the struct you pass in is called getargS. -SSEEEE AALLSSOO +[1mSEE ALSO[0m getopt(3) ROKEN September 24, 1999 ROKEN diff --git a/lib/roken/getxxyyy.c b/lib/roken/getxxyyy.c index 5beed69df6de..25ce38b3e228 100644 --- a/lib/roken/getxxyyy.c +++ b/lib/roken/getxxyyy.c @@ -53,7 +53,7 @@ rk_getpwnam_r(const char *name, struct passwd *pwd, char *buffer, size_t bufsize, struct passwd **result) { struct passwd *p; - size_t slen, n = 0; + size_t slen; *result = NULL; diff --git a/lib/roken/ndbm_wrap.c b/lib/roken/ndbm_wrap.c index f7b87f1203e9..f8403da44ab2 100644 --- a/lib/roken/ndbm_wrap.c +++ b/lib/roken/ndbm_wrap.c @@ -36,6 +36,8 @@ #include "ndbm_wrap.h" #if defined(HAVE_DBHEADER) #include <db.h> +#elif defined(HAVE_DB6_DB_H) +#include <db6/db.h> #elif defined(HAVE_DB5_DB_H) #include <db5/db.h> #elif defined(HAVE_DB4_DB_H) diff --git a/lib/roken/net_write.c b/lib/roken/net_write.c index e1cfa99074ee..1e8361999ea8 100644 --- a/lib/roken/net_write.c +++ b/lib/roken/net_write.c @@ -36,7 +36,9 @@ #include "roken.h" /* - * Like write but never return partial data. + * Like write but blocking sockets never return partial data, i.e. we retry on + * EINTR. With non-blocking sockets (EWOULDBLOCK or EAGAIN) we return the + * number of bytes written. */ #ifndef _WIN32 @@ -51,10 +53,17 @@ net_write (rk_socket_t fd, const void *buf, size_t nbytes) while (rem > 0) { count = write (fd, cbuf, rem); if (count < 0) { - if (errno == EINTR) + switch (errno) { + case EINTR: continue; - else +#if defined(EAGAIN) && EAGAIN != EWOULDBLOCK + case EAGAIN: +#endif + case EWOULDBLOCK: + return nbytes - rem; + default: return count; + } } cbuf += count; rem -= count; @@ -93,10 +102,25 @@ net_write(rk_socket_t sock, const void *buf, size_t nbytes) count = send (sock, cbuf, rem, 0); #endif if (count < 0) { - if (errno == EINTR) - continue; - else - return count; + if (!use_write) { + switch (rk_SOCK_ERRNO) { + case WSAEINTR: + continue; + case WSAEWOULDBLOCK: + return nbytes - rem; + default: + return count; + } + } else { + switch (errno) { + case EINTR: + continue; + case EWOULDBLOCK: + return nbytes - rem; + default: + return count; + } + } } cbuf += count; rem -= count; diff --git a/lib/roken/parse_time.cat3 b/lib/roken/parse_time.cat3 index ca1c51ff4916..5aab1da9ca05 100644 --- a/lib/roken/parse_time.cat3 +++ b/lib/roken/parse_time.cat3 @@ -1,40 +1,39 @@ - PARSE_TIME(3) BSD Library Functions Manual PARSE_TIME(3) -NNAAMMEE - ppaarrssee__ttiimmee, pprriinntt__ttiimmee__ttaabbllee, uunnppaarrssee__ttiimmee, uunnppaarrssee__ttiimmee__aapppprrooxx, -- parse +[1mNAME[0m + [1mparse_time[22m, [1mprint_time_table[22m, [1munparse_time[22m, [1munparse_time_approx[22m, -- parse and unparse time intervals -LLIIBBRRAARRYY +[1mLIBRARY[0m The roken library (libroken, -lroken) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<ppaarrssee__ttiimmee..hh>> +[1mSYNOPSIS[0m + [1m#include <parse_time.h>[0m - _i_n_t - ppaarrssee__ttiimmee(_c_o_n_s_t _c_h_a_r _*_t_i_m_e_s_p_e_c, _c_o_n_s_t _c_h_a_r _*_d_e_f___u_n_i_t); + [4mint[0m + [1mparse_time[22m([4mconst[24m [4mchar[24m [4m*timespec[24m, [4mconst[24m [4mchar[24m [4m*def_unit[24m); - _v_o_i_d - pprriinntt__ttiimmee__ttaabbllee(_F_I_L_E _*_f); + [4mvoid[0m + [1mprint_time_table[22m([4mFILE[24m [4m*f[24m); - _s_i_z_e___t - uunnppaarrssee__ttiimmee(_i_n_t _s_e_c_o_n_d_s, _c_h_a_r _*_b_u_f, _s_i_z_e___t _l_e_n); + [4msize_t[0m + [1munparse_time[22m([4mint[24m [4mseconds[24m, [4mchar[24m [4m*buf[24m, [4msize_t[24m [4mlen[24m); - _s_i_z_e___t - uunnppaarrssee__ttiimmee__aapppprrooxx(_i_n_t _s_e_c_o_n_d_s, _c_h_a_r _*_b_u_f, _s_i_z_e___t _l_e_n); + [4msize_t[0m + [1munparse_time_approx[22m([4mint[24m [4mseconds[24m, [4mchar[24m [4m*buf[24m, [4msize_t[24m [4mlen[24m); -DDEESSCCRRIIPPTTIIOONN - The ppaarrssee__ttiimmee() function converts the period of time specified into a - number of seconds. The _t_i_m_e_s_p_e_c can be any number of <number unit> pairs +[1mDESCRIPTION[0m + The [1mparse_time[22m() function converts the period of time specified into a + number of seconds. The [4mtimespec[24m can be any number of <number unit> pairs separated by comma and whitespace. The number can be negative. Numbers - without explicit units are taken as being _d_e_f___u_n_i_t. + without explicit units are taken as being [4mdef_unit[24m. - The uunnppaarrssee__ttiimmee() and uunnppaarrssee__ttiimmee__aapppprrooxx() do the opposite of - ppaarrssee__ttiimmee(), that is they take a number of seconds and express that as - human readable strings. _u_n_p_a_r_s_e___t_i_m_e produces an exact time, while - _u_n_p_a_r_s_e___t_i_m_e___a_p_p_r_o_x restricts the result to include only one unit. + The [1munparse_time[22m() and [1munparse_time_approx[22m() do the opposite of + [1mparse_time[22m(), that is they take a number of seconds and express that as + human readable strings. [4munparse_time[24m produces an exact time, while + [4munparse_time_approx[24m restricts the result to include only one unit. - pprriinntt__ttiimmee__ttaabbllee() prints a descriptive list of available units on the + [1mprint_time_table[22m() prints a descriptive list of available units on the passed file descriptor. The possible units include: @@ -48,14 +47,14 @@ DDEESSCCRRIIPPTTIIOONN Units names can be arbitrarily abbreviated (as long as they are unique). -RREETTUURRNN VVAALLUUEESS - ppaarrssee__ttiimmee() returns the number of seconds that represents the expression - in _t_i_m_e_s_p_e_c or -1 on error. uunnppaarrssee__ttiimmee() and uunnppaarrssee__ttiimmee__aapppprrooxx() - return the number of characters written to _b_u_f. if the return value is - greater than or equal to the _l_e_n argument, the string was too short and +[1mRETURN VALUES[0m + [1mparse_time[22m() returns the number of seconds that represents the expression + in [4mtimespec[24m or -1 on error. [1munparse_time[22m() and [1munparse_time_approx[22m() re- + turn the number of characters written to [4mbuf[24m. if the return value is + greater than or equal to the [4mlen[24m argument, the string was too short and some of the printed characters were discarded. -EEXXAAMMPPLLEESS +[1mEXAMPLES[0m #include <stdio.h> #include <parse_time.h> @@ -103,8 +102,8 @@ EEXXAAMMPPLLEESS unparse_time = 12 months 4 days 23 hours 59 minutes 59 seconds unparse_time_approx = 12 months -BBUUGGSS - Since ppaarrssee__ttiimmee() returns -1 on error there is no way to parse "minus +[1mBUGS[0m + Since [1mparse_time[22m() returns -1 on error there is no way to parse "minus one second". Currently "s" at the end of units is ignored. This is a hack for English plural forms. If these functions are ever localised, this scheme will have to change. diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in index 1a9db635686f..bf0f8c796a97 100644 --- a/lib/roken/roken.h.in +++ b/lib/roken/roken.h.in @@ -318,7 +318,16 @@ ROKEN_CPP_START #define fsync _commit -/* The MSVC implementation of snprintf is not C99 compliant. */ +#define timezone _timezone + +#define tzname _tzname + +#define _PIPE_BUFFER_SZ 8192 +#define pipe(fds) _pipe((fds), _PIPE_BUFFER_SZ, O_BINARY); + +#define ftruncate(fd, sz) _chsize((fd), (sz)) + +#if !defined(HAVE_UCRT) #define snprintf rk_snprintf #define vsnprintf rk_vsnprintf #define vasnprintf rk_vasnprintf @@ -326,11 +335,6 @@ ROKEN_CPP_START #define asnprintf rk_asnprintf #define asprintf rk_asprintf -#define _PIPE_BUFFER_SZ 8192 -#define pipe(fds) _pipe((fds), _PIPE_BUFFER_SZ, O_BINARY); - -#define ftruncate(fd, sz) _chsize((fd), (sz)) - ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL rk_snprintf (char *str, size_t sz, const char *format, ...); @@ -348,6 +352,7 @@ rk_vasnprintf (char **ret, size_t max_sz, const char *format, va_list args); ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL rk_vsnprintf (char *str, size_t sz, const char *format, va_list args); +#endif /* !defined(HAVE_UCRT) */ /* missing stat.h predicates */ diff --git a/lib/roken/rtbl.cat3 b/lib/roken/rtbl.cat3 index 3862cd5936e6..afa159e46cf5 100644 --- a/lib/roken/rtbl.cat3 +++ b/lib/roken/rtbl.cat3 @@ -1,110 +1,109 @@ - RTBL(3) BSD Library Functions Manual RTBL(3) -NNAAMMEE - rrttbbll__ccrreeaattee, rrttbbll__ddeessttrrooyy, rrttbbll__sseett__ffllaaggss, rrttbbll__ggeett__ffllaaggss, - rrttbbll__sseett__pprreeffiixx, rrttbbll__sseett__sseeppaarraattoorr, rrttbbll__sseett__ccoolluummnn__pprreeffiixx, - rrttbbll__sseett__ccoolluummnn__aaffffiixx__bbyy__iidd, rrttbbll__aadddd__ccoolluummnn, rrttbbll__aadddd__ccoolluummnn__bbyy__iidd, - rrttbbll__aadddd__ccoolluummnn__eennttrryy, rrttbbll__aadddd__ccoolluummnn__eennttrryy__bbyy__iidd, rrttbbll__nneeww__rrooww, - rrttbbll__ffoorrmmaatt -- format data in simple tables +[1mNAME[0m + [1mrtbl_create[22m, [1mrtbl_destroy[22m, [1mrtbl_set_flags[22m, [1mrtbl_get_flags[22m, + [1mrtbl_set_prefix[22m, [1mrtbl_set_separator[22m, [1mrtbl_set_column_prefix[22m, + [1mrtbl_set_column_affix_by_id[22m, [1mrtbl_add_column[22m, [1mrtbl_add_column_by_id[22m, + [1mrtbl_add_column_entry[22m, [1mrtbl_add_column_entry_by_id[22m, [1mrtbl_new_row[22m, + [1mrtbl_format [22m-- format data in simple tables -LLIIBBRRAARRYY +[1mLIBRARY[0m The roken library (libroken, -lroken) -SSYYNNOOPPSSIISS - ##iinncclluuddee <<rrttbbll..hh>> +[1mSYNOPSIS[0m + [1m#include <rtbl.h>[0m - _i_n_t - rrttbbll__aadddd__ccoolluummnn(_r_t_b_l___t _t_a_b_l_e, _c_o_n_s_t _c_h_a_r _*_c_o_l_u_m_n___n_a_m_e, - _u_n_s_i_g_n_e_d _i_n_t _f_l_a_g_s); + [4mint[0m + [1mrtbl_add_column[22m([4mrtbl_t[24m [4mtable[24m, [4mconst[24m [4mchar[24m [4m*column_name[24m, + [4munsigned[24m [4mint[24m [4mflags[24m); - _i_n_t - rrttbbll__aadddd__ccoolluummnn__bbyy__iidd(_r_t_b_l___t _t_a_b_l_e, _u_n_s_i_g_n_e_d _i_n_t _c_o_l_u_m_n___i_d, - _c_o_n_s_t _c_h_a_r _*_c_o_l_u_m_n___h_e_a_d_e_r, _u_n_s_i_g_n_e_d _i_n_t _f_l_a_g_s); + [4mint[0m + [1mrtbl_add_column_by_id[22m([4mrtbl_t[24m [4mtable[24m, [4munsigned[24m [4mint[24m [4mcolumn_id[24m, + [4mconst[24m [4mchar[24m [4m*column_header[24m, [4munsigned[24m [4mint[24m [4mflags[24m); - _i_n_t - rrttbbll__aadddd__ccoolluummnn__eennttrryy(_r_t_b_l___t _t_a_b_l_e, _c_o_n_s_t _c_h_a_r _*_c_o_l_u_m_n___n_a_m_e, - _c_o_n_s_t _c_h_a_r _*_c_e_l_l___e_n_t_r_y); + [4mint[0m + [1mrtbl_add_column_entry[22m([4mrtbl_t[24m [4mtable[24m, [4mconst[24m [4mchar[24m [4m*column_name[24m, + [4mconst[24m [4mchar[24m [4m*cell_entry[24m); - _i_n_t - rrttbbll__aadddd__ccoolluummnn__eennttrryy__bbyy__iidd(_r_t_b_l___t _t_a_b_l_e, _u_n_s_i_g_n_e_d _i_n_t _c_o_l_u_m_n___i_d, - _c_o_n_s_t _c_h_a_r _*_c_e_l_l___e_n_t_r_y); + [4mint[0m + [1mrtbl_add_column_entry_by_id[22m([4mrtbl_t[24m [4mtable[24m, [4munsigned[24m [4mint[24m [4mcolumn_id[24m, + [4mconst[24m [4mchar[24m [4m*cell_entry[24m); - _r_t_b_l___t - rrttbbll__ccrreeaattee(_v_o_i_d); + [4mrtbl_t[0m + [1mrtbl_create[22m([4mvoid[24m); - _v_o_i_d - rrttbbll__ddeessttrrooyy(_r_t_b_l___t _t_a_b_l_e); + [4mvoid[0m + [1mrtbl_destroy[22m([4mrtbl_t[24m [4mtable[24m); - _i_n_t - rrttbbll__nneeww__rrooww(_r_t_b_l___t _t_a_b_l_e); + [4mint[0m + [1mrtbl_new_row[22m([4mrtbl_t[24m [4mtable[24m); - _i_n_t - rrttbbll__sseett__ccoolluummnn__aaffffiixx__bbyy__iidd(_r_t_b_l___t _t_a_b_l_e, _u_n_s_i_g_n_e_d _i_n_t _c_o_l_u_m_n___i_d, _c_o_n_s_t, - _c_h_a_r, _*_p_r_e_f_i_x_", _c_o_n_s_t _c_h_a_r _*_s_u_f_f_i_x); + [4mint[0m + [1mrtbl_set_column_affix_by_id[22m([4mrtbl_t[24m [4mtable[24m, [4munsigned[24m [4mint[24m [4mcolumn_id[24m, [4mconst[24m, + [4mchar[24m, [4m*prefix"[24m, [4mconst[24m [4mchar[24m [4m*suffix[24m); - _i_n_t - rrttbbll__sseett__ccoolluummnn__pprreeffiixx(_r_t_b_l___t _t_a_b_l_e, _c_o_n_s_t _c_h_a_r _*_c_o_l_u_m_n___n_a_m_e, - _c_o_n_s_t _c_h_a_r _*_p_r_e_f_i_x); + [4mint[0m + [1mrtbl_set_column_prefix[22m([4mrtbl_t[24m [4mtable[24m, [4mconst[24m [4mchar[24m [4m*column_name[24m, + [4mconst[24m [4mchar[24m [4m*prefix[24m); - _u_n_s_i_g_n_e_d _i_n_t - rrttbbll__ggeett__ffllaaggss(_r_t_b_l___t _t_a_b_l_e); + [4munsigned[24m [4mint[0m + [1mrtbl_get_flags[22m([4mrtbl_t[24m [4mtable[24m); - _v_o_i_d - rrttbbll__sseett__ffllaaggss(_r_t_b_l___t _t_a_b_l_e, _u_n_s_i_g_n_e_d _i_n_t _f_l_a_g_s); + [4mvoid[0m + [1mrtbl_set_flags[22m([4mrtbl_t[24m [4mtable[24m, [4munsigned[24m [4mint[24m [4mflags[24m); - _i_n_t - rrttbbll__sseett__pprreeffiixx(_r_t_b_l___t _t_a_b_l_e, _c_o_n_s_t _c_h_a_r _*_p_r_e_f_i_x); + [4mint[0m + [1mrtbl_set_prefix[22m([4mrtbl_t[24m [4mtable[24m, [4mconst[24m [4mchar[24m [4m*prefix[24m); - _i_n_t - rrttbbll__sseett__sseeppaarraattoorr(_r_t_b_l___t _t_a_b_l_e, _c_o_n_s_t _c_h_a_r _*_s_e_p_a_r_a_t_o_r); + [4mint[0m + [1mrtbl_set_separator[22m([4mrtbl_t[24m [4mtable[24m, [4mconst[24m [4mchar[24m [4m*separator[24m); - _i_n_t - rrttbbll__ffoorrmmaatt(_r_t_b_l___t _t_a_b_l_e, _F_I_L_E, _*_f_i_l_e_"); + [4mint[0m + [1mrtbl_format[22m([4mrtbl_t[24m [4mtable[24m, [4mFILE[24m, [4m*file"[24m); -DDEESSCCRRIIPPTTIIOONN +[1mDESCRIPTION[0m This set of functions assemble a simple table consisting of rows and col- umns, allowing it to be printed with certain options. Typical use would be output from tools such as ls(1) or netstat(1), where you have a fixed number of columns, but don't know the column widths before hand. - A table is created with rrttbbll__ccrreeaattee() and destroyed with rrttbbll__ddeessttrrooyy(). + A table is created with [1mrtbl_create[22m() and destroyed with [1mrtbl_destroy[22m(). - Global flags on the table are set with _r_t_b_l___s_e_t___f_l_a_g_s and retrieved with - _r_t_b_l___g_e_t___f_l_a_g_s. At present the only defined flag is + Global flags on the table are set with [4mrtbl_set_flags[24m and retrieved with + [4mrtbl_get_flags[24m. At present the only defined flag is RTBL_HEADER_STYLE_NONE which suppresses printing the header. Before adding data to the table, one or more columns need to be created. - This would normally be done with rrttbbll__aadddd__ccoolluummnn__bbyy__iidd(), _c_o_l_u_m_n___i_d is + This would normally be done with [1mrtbl_add_column_by_id[22m(), [4mcolumn_id[24m is any number of your choice (it's used only to identify columns), - _c_o_l_u_m_n___h_e_a_d_e_r is the header to print at the top of the column, and _f_l_a_g_s + [4mcolumn_header[24m is the header to print at the top of the column, and [4mflags[0m are flags specific to this column. Currently the only defined flag is RTBL_ALIGN_RIGHT, aligning column entries to the right. Columns are printed in the order they are added. - There's also a way to add columns by column name with rrttbbll__aadddd__ccoolluummnn(), + There's also a way to add columns by column name with [1mrtbl_add_column[22m(), but this is less flexible (you need unique header names), and is consid- ered deprecated. - To add data to a column you use rrttbbll__aadddd__ccoolluummnn__eennttrryy__bbyy__iidd(), where the - _c_o_l_u_m_n___i_d is the same as when the column was added (adding data to a non- - existent column is undefined), and _c_e_l_l___e_n_t_r_y is whatever string you wish + To add data to a column you use [1mrtbl_add_column_entry_by_id[22m(), where the + [4mcolumn_id[24m is the same as when the column was added (adding data to a non- + existent column is undefined), and [4mcell_entry[24m is whatever string you wish to include in that cell. It should not include newlines. For columns - added with rrttbbll__aadddd__ccoolluummnn() you must use rrttbbll__aadddd__ccoolluummnn__eennttrryy() - instead. + added with [1mrtbl_add_column[22m() you must use [1mrtbl_add_column_entry[22m() in- + stead. - rrttbbll__nneeww__rrooww() fills all columns with blank entries until they all have + [1mrtbl_new_row[22m() fills all columns with blank entries until they all have the same number of rows. Each column can have a separate prefix and suffix, set with - _r_t_b_l___s_e_t___c_o_l_u_m_n___a_f_f_i_x___b_y___i_d; _r_t_b_l___s_e_t___c_o_l_u_m_n___p_r_e_f_i_x allows setting the + [4mrtbl_set_column_affix_by_id[24m; [4mrtbl_set_column_prefix[24m allows setting the prefix only by column name. In addition to this, columns may be separated - by a string set with _r_t_b_l___s_e_t___s_e_p_a_r_a_t_o_r (by default columns are not + by a string set with [4mrtbl_set_separator[24m (by default columns are not seprated by anything). - The finished table is printed to _f_i_l_e with _r_t_b_l___f_o_r_m_a_t. + The finished table is printed to [4mfile[24m with [4mrtbl_format[24m. -EEXXAAMMPPLLEESS +[1mEXAMPLES[0m This program: #include <stdio.h> diff --git a/lib/roken/snprintf.c b/lib/roken/snprintf.c index 1aae4cd1ff7b..9f6d3ca0412f 100644 --- a/lib/roken/snprintf.c +++ b/lib/roken/snprintf.c @@ -449,13 +449,16 @@ xyzprintf (struct snprintf_state *state, const char *char_format, va_list ap) break; case 'd' : case 'i' : { - longest arg; - u_longest num; + int64_t arg; + uint64_t num; int minusp = 0; PARSE_INT_FORMAT(arg, ap, signed); - if (arg < 0) { + if (arg == INT64_MIN) { + minusp = 1; + num = (uint64_t)INT64_MAX + 1; + } else if (arg < 0) { minusp = 1; num = -arg; } else diff --git a/lib/roken/strtoll.c b/lib/roken/strtoll.c index 1be8761313a3..2e038bf30d6c 100644 --- a/lib/roken/strtoll.c +++ b/lib/roken/strtoll.c @@ -38,6 +38,8 @@ #include "roken.h" +#ifndef HAVE_STRTOLL + /* #include <sys/cdefs.h> */ #include <limits.h> @@ -146,4 +148,4 @@ noconv: *endptr = (char *)(any ? s - 1 : nptr); return (acc); } - +#endif /* !HAVE_STRTOLL */ diff --git a/lib/roken/strtoull.c b/lib/roken/strtoull.c index cdf59448f1a1..3befab552de5 100644 --- a/lib/roken/strtoull.c +++ b/lib/roken/strtoull.c @@ -38,6 +38,8 @@ #include "roken.h" +#ifndef HAVE_STRTOULL + /* #include <sys/cdefs.h> */ #include <limits.h> @@ -124,4 +126,4 @@ noconv: *endptr = (char *)(any ? s - 1 : nptr); return (acc); } - +#endif /* !HAVE_STRTOULL */ diff --git a/lib/sl/Makefile.in b/lib/sl/Makefile.in index 3310ef2bf145..d040d7ff2ebc 100644 --- a/lib/sl/Makefile.in +++ b/lib/sl/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -103,7 +103,6 @@ subdir = lib/sl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ $(top_srcdir)/cf/auth-modules.m4 \ - $(top_srcdir)/cf/broken-getaddrinfo.m4 \ $(top_srcdir)/cf/broken-glob.m4 \ $(top_srcdir)/cf/broken-realloc.m4 \ $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ @@ -153,6 +152,10 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +am__EXEEXT_1 = test_sl$(EXEEXT) +am__installdirs = "$(DESTDIR)$(libexec_heimdaldir)" \ + "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" +PROGRAMS = $(libexec_heimdal_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -180,8 +183,6 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(libdir)" \ - "$(DESTDIR)$(libexec_heimdaldir)" "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) libsl_la_DEPENDENCIES = dist_libsl_la_OBJECTS = sl.lo @@ -196,8 +197,6 @@ am__v_lt_1 = libsl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libsl_la_LDFLAGS) $(LDFLAGS) -o $@ -am__EXEEXT_1 = test_sl$(EXEEXT) -PROGRAMS = $(libexec_heimdal_PROGRAMS) am_slc_OBJECTS = slc-gram.$(OBJEXT) slc-lex.$(OBJEXT) slc_OBJECTS = $(am_slc_OBJECTS) am__DEPENDENCIES_1 = @@ -220,7 +219,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/sl.Plo ./$(DEPDIR)/slc-gram.Po \ + ./$(DEPDIR)/slc-lex.Po ./$(DEPDIR)/snprintf.Plo \ + ./$(DEPDIR)/strdup.Plo ./$(DEPDIR)/strtok_r.Plo \ + ./$(DEPDIR)/strupr.Plo ./$(DEPDIR)/test_sl.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -285,8 +288,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no @@ -442,6 +443,7 @@ am__set_TESTS_bases = \ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck TEST_SUITE_LOG = test-suite.log @@ -490,9 +492,12 @@ CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLANG_FORMAT = @CLANG_FORMAT@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DB1LIB = @DB1LIB@ DB3LIB = @DB3LIB@ @@ -510,8 +515,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GCD_MIG = @GCD_MIG@ GREP = @GREP@ GROFF = @GROFF@ @@ -620,6 +627,11 @@ PKG_CONFIG = @PKG_CONFIG@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LDADD = @PTHREAD_LDADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -679,9 +691,14 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -755,8 +772,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty): @@ -769,44 +786,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -libsl.la: $(libsl_la_OBJECTS) $(libsl_la_DEPENDENCIES) $(EXTRA_libsl_la_DEPENDENCIES) - $(AM_V_CCLD)$(libsl_la_LINK) -rpath $(libdir) $(libsl_la_OBJECTS) $(libsl_la_LIBADD) $(LIBS) - clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ echo " rm -f" $$list; \ @@ -864,6 +843,44 @@ clean-libexec_heimdalPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libsl.la: $(libsl_la_OBJECTS) $(libsl_la_DEPENDENCIES) $(EXTRA_libsl_la_DEPENDENCIES) + $(AM_V_CCLD)$(libsl_la_LINK) -rpath $(libdir) $(libsl_la_OBJECTS) $(libsl_la_LIBADD) $(LIBS) slc-gram.h: slc-gram.c @if test ! -f $@; then rm -f slc-gram.c; else :; fi @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) slc-gram.c; else :; fi @@ -882,14 +899,20 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slc-gram.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slc-lex.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strdup.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtok_r.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strupr.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_sl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sl.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slc-gram.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slc-lex.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strdup.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtok_r.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strupr.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_sl.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1104,7 +1127,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ @@ -1117,7 +1140,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: $(check_PROGRAMS) @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -1159,8 +1182,10 @@ test_sl.log: test_sl$(EXEEXT) @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1197,9 +1222,13 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-local +all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(HEADERS) all-local +install-checkPROGRAMS: install-libLTLIBRARIES + +install-libexecheimdalPROGRAMS: install-libLTLIBRARIES + installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libexec_heimdaldir)" "$(DESTDIR)$(includedir)"; do \ + for dir in "$(DESTDIR)$(libexec_heimdaldir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1245,7 +1274,14 @@ clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-libexec_heimdalPROGRAMS clean-libtool mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/sl.Plo + -rm -f ./$(DEPDIR)/slc-gram.Po + -rm -f ./$(DEPDIR)/slc-lex.Po + -rm -f ./$(DEPDIR)/snprintf.Plo + -rm -f ./$(DEPDIR)/strdup.Plo + -rm -f ./$(DEPDIR)/strtok_r.Plo + -rm -f ./$(DEPDIR)/strupr.Plo + -rm -f ./$(DEPDIR)/test_sl.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1293,7 +1329,14 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/sl.Plo + -rm -f ./$(DEPDIR)/slc-gram.Po + -rm -f ./$(DEPDIR)/slc-lex.Po + -rm -f ./$(DEPDIR)/snprintf.Plo + -rm -f ./$(DEPDIR)/strdup.Plo + -rm -f ./$(DEPDIR)/strtok_r.Plo + -rm -f ./$(DEPDIR)/strupr.Plo + -rm -f ./$(DEPDIR)/test_sl.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1316,17 +1359,17 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: check-am install-am install-data-am install-strip uninstall-am -.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \ - check-am check-local clean clean-checkPROGRAMS clean-generic \ - clean-libLTLIBRARIES clean-libexec_heimdalPROGRAMS \ - clean-libtool cscopelist-am ctags ctags-am dist-hook distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-data-hook install-dvi install-dvi-am install-exec \ - install-exec-am install-exec-local install-html \ - install-html-am install-includeHEADERS install-info \ - install-info-am install-libLTLIBRARIES \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \ + check-TESTS check-am check-local clean clean-checkPROGRAMS \ + clean-generic clean-libLTLIBRARIES \ + clean-libexec_heimdalPROGRAMS clean-libtool cscopelist-am \ + ctags ctags-am dist-hook distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-hook install-dvi \ + install-dvi-am install-exec install-exec-am install-exec-local \ + install-html install-html-am install-includeHEADERS \ + install-info install-info-am install-libLTLIBRARIES \ install-libexec_heimdalPROGRAMS install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ @@ -1417,11 +1460,20 @@ check-local:: test "$$failed" -eq 0 || exit 1; \ fi +# It's useful for debugging to format generated sources. The default for all +# clang-format styles is to sort includes, but in many cases in-tree we really +# don't want to do that. .x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @if [ -z "$(CLANG_FORMAT)" ]; then \ + cmp -s $< $@ 2> /dev/null || cp $< $@; \ + else \ + cp $< $@.tmp.c; \ + $(CLANG_FORMAT) -style='{BasedOnStyle: Chromium, SortIncludes: false}' -i $@.tmp.c; \ + cmp -s $@.tmp.c $@ 2> /dev/null || mv $@.tmp.c $@; \ + fi .hx.h: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @cmp -s $< $@ 2> /dev/null || cp $< $@; #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ diff --git a/lib/sl/sl.c b/lib/sl/sl.c index f6f4bc52ea3d..37e9659d2744 100644 --- a/lib/sl/sl.c +++ b/lib/sl/sl.c @@ -460,6 +460,8 @@ sl_did_you_mean(SL_cmd *cmds, const char *match) for (n = 0, c = cmds; c->name; c++, n++) ; + if (n == 0) + return; metrics = calloc(n, sizeof(metrics[0])); if (metrics == NULL) return; diff --git a/lib/sl/slc-gram.c b/lib/sl/slc-gram.c index 7c9262f79986..9c0cce120752 100644 --- a/lib/sl/slc-gram.c +++ b/lib/sl/slc-gram.c @@ -1,14 +1,14 @@ -/* A Bison parser, made by GNU Bison 2.3. */ +/* A Bison parser, made by GNU Bison 3.8.2. */ -/* Skeleton implementation for Bison's Yacc-like parsers in C +/* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, + Inc. - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,9 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -36,6 +34,10 @@ /* C LALR(1) parser skeleton written by Richard Stallman, by simplifying the original so-called "semantic" parser. */ +/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, + especially those whose name start with YY_ or yy_. They are + private implementation details that can be changed or removed. */ + /* All symbols defined below should begin with yy or YY, to avoid infringing on user name space. This should be done even for local variables, as they might otherwise be expanded by user macros. @@ -43,11 +45,11 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ -/* Identify Bison output. */ -#define YYBISON 1 +/* Identify Bison output, and Bison version. */ +#define YYBISON 30802 -/* Bison version. */ -#define YYBISON_VERSION "2.3" +/* Bison version string. */ +#define YYBISON_VERSION "3.8.2" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -55,29 +57,16 @@ /* Pure parsers. */ #define YYPURE 0 -/* Using locations. */ -#define YYLSP_NEEDED 0 +/* Push parsers. */ +#define YYPUSH 0 +/* Pull parsers. */ +#define YYPULL 1 -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - LITERAL = 258, - STRING = 259 - }; -#endif -/* Tokens. */ -#define LITERAL 258 -#define STRING 259 - - -/* Copy the first part of user declarations. */ +/* First part of user prologue. */ #line 1 "slc-gram.y" /* @@ -134,77 +123,195 @@ extern struct assignment *assignment; #define YYFREE free +#line 127 "slc-gram.c" -/* Enabling traces. */ +# ifndef YY_CAST +# ifdef __cplusplus +# define YY_CAST(Type, Val) static_cast<Type> (Val) +# define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast<Type> (Val) +# else +# define YY_CAST(Type, Val) ((Type) (Val)) +# define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val)) +# endif +# endif +# ifndef YY_NULLPTR +# if defined __cplusplus +# if 201103L <= __cplusplus +# define YY_NULLPTR nullptr +# else +# define YY_NULLPTR 0 +# endif +# else +# define YY_NULLPTR ((void*)0) +# endif +# endif + +/* Use api.header.include to #include this header + instead of duplicating it here. */ +#ifndef YY_YY_SLC_GRAM_H_INCLUDED +# define YY_YY_SLC_GRAM_H_INCLUDED +/* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 0 #endif - -/* Enabling verbose error messages. */ -#ifdef YYERROR_VERBOSE -# undef YYERROR_VERBOSE -# define YYERROR_VERBOSE 1 -#else -# define YYERROR_VERBOSE 0 +#if YYDEBUG +extern int yydebug; #endif -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 +/* Token kinds. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + enum yytokentype + { + YYEMPTY = -2, + YYEOF = 0, /* "end of file" */ + YYerror = 256, /* error */ + YYUNDEF = 257, /* "invalid token" */ + LITERAL = 258, /* LITERAL */ + STRING = 259 /* STRING */ + }; + typedef enum yytokentype yytoken_kind_t; #endif +/* Token kinds. */ +#define YYEMPTY -2 +#define YYEOF 0 +#define YYerror 256 +#define YYUNDEF 257 +#define LITERAL 258 +#define STRING 259 +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -#line 57 "slc-gram.y" +union YYSTYPE { +#line 57 "slc-gram.y" + char *string; struct assignment *assignment; -} -/* Line 193 of yacc.c. */ -#line 165 "slc-gram.c" - YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 + +#line 193 "slc-gram.c" + +}; +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 +# define YYSTYPE_IS_DECLARED 1 #endif +extern YYSTYPE yylval; + + +int yyparse (void); + + +#endif /* !YY_YY_SLC_GRAM_H_INCLUDED */ +/* Symbol kind. */ +enum yysymbol_kind_t +{ + YYSYMBOL_YYEMPTY = -2, + YYSYMBOL_YYEOF = 0, /* "end of file" */ + YYSYMBOL_YYerror = 1, /* error */ + YYSYMBOL_YYUNDEF = 2, /* "invalid token" */ + YYSYMBOL_LITERAL = 3, /* LITERAL */ + YYSYMBOL_STRING = 4, /* STRING */ + YYSYMBOL_5_ = 5, /* '=' */ + YYSYMBOL_6_ = 6, /* '{' */ + YYSYMBOL_7_ = 7, /* '}' */ + YYSYMBOL_YYACCEPT = 8, /* $accept */ + YYSYMBOL_start = 9, /* start */ + YYSYMBOL_assignments = 10, /* assignments */ + YYSYMBOL_assignment = 11 /* assignment */ +}; +typedef enum yysymbol_kind_t yysymbol_kind_t; -/* Copy the second part of user declarations. */ -/* Line 216 of yacc.c. */ -#line 178 "slc-gram.c" #ifdef short # undef short #endif -#ifdef YYTYPE_UINT8 -typedef YYTYPE_UINT8 yytype_uint8; -#else -typedef unsigned char yytype_uint8; +/* On compilers that do not define __PTRDIFF_MAX__ etc., make sure + <limits.h> and (if available) <stdint.h> are included + so that the code can choose integer types of a good width. */ + +#ifndef __PTRDIFF_MAX__ +# include <limits.h> /* INFRINGES ON USER NAME SPACE */ +# if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ +# include <stdint.h> /* INFRINGES ON USER NAME SPACE */ +# define YY_STDINT_H +# endif #endif -#ifdef YYTYPE_INT8 -typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +/* Narrow types that promote to a signed type and that can represent a + signed or unsigned integer of at least N bits. In tables they can + save space and decrease cache pressure. Promoting to a signed type + helps avoid bugs in integer arithmetic. */ + +#ifdef __INT_LEAST8_MAX__ +typedef __INT_LEAST8_TYPE__ yytype_int8; +#elif defined YY_STDINT_H +typedef int_least8_t yytype_int8; +#else typedef signed char yytype_int8; +#endif + +#ifdef __INT_LEAST16_MAX__ +typedef __INT_LEAST16_TYPE__ yytype_int16; +#elif defined YY_STDINT_H +typedef int_least16_t yytype_int16; #else -typedef short int yytype_int8; +typedef short yytype_int16; +#endif + +/* Work around bug in HP-UX 11.23, which defines these macros + incorrectly for preprocessor constants. This workaround can likely + be removed in 2023, as HPE has promised support for HP-UX 11.23 + (aka HP-UX 11i v2) only through the end of 2022; see Table 2 of + <https://h20195.www2.hpe.com/V2/getpdf.aspx/4AA4-7673ENW.pdf>. */ +#ifdef __hpux +# undef UINT_LEAST8_MAX +# undef UINT_LEAST16_MAX +# define UINT_LEAST8_MAX 255 +# define UINT_LEAST16_MAX 65535 #endif -#ifdef YYTYPE_UINT16 -typedef YYTYPE_UINT16 yytype_uint16; +#if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__ +typedef __UINT_LEAST8_TYPE__ yytype_uint8; +#elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \ + && UINT_LEAST8_MAX <= INT_MAX) +typedef uint_least8_t yytype_uint8; +#elif !defined __UINT_LEAST8_MAX__ && UCHAR_MAX <= INT_MAX +typedef unsigned char yytype_uint8; #else -typedef unsigned short int yytype_uint16; +typedef short yytype_uint8; #endif -#ifdef YYTYPE_INT16 -typedef YYTYPE_INT16 yytype_int16; +#if defined __UINT_LEAST16_MAX__ && __UINT_LEAST16_MAX__ <= __INT_MAX__ +typedef __UINT_LEAST16_TYPE__ yytype_uint16; +#elif (!defined __UINT_LEAST16_MAX__ && defined YY_STDINT_H \ + && UINT_LEAST16_MAX <= INT_MAX) +typedef uint_least16_t yytype_uint16; +#elif !defined __UINT_LEAST16_MAX__ && USHRT_MAX <= INT_MAX +typedef unsigned short yytype_uint16; #else -typedef short int yytype_int16; +typedef int yytype_uint16; +#endif + +#ifndef YYPTRDIFF_T +# if defined __PTRDIFF_TYPE__ && defined __PTRDIFF_MAX__ +# define YYPTRDIFF_T __PTRDIFF_TYPE__ +# define YYPTRDIFF_MAXIMUM __PTRDIFF_MAX__ +# elif defined PTRDIFF_MAX +# ifndef ptrdiff_t +# include <stddef.h> /* INFRINGES ON USER NAME SPACE */ +# endif +# define YYPTRDIFF_T ptrdiff_t +# define YYPTRDIFF_MAXIMUM PTRDIFF_MAX +# else +# define YYPTRDIFF_T long +# define YYPTRDIFF_MAXIMUM LONG_MAX +# endif #endif #ifndef YYSIZE_T @@ -212,55 +319,106 @@ typedef short int yytype_int16; # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ # include <stddef.h> /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else -# define YYSIZE_T unsigned int +# define YYSIZE_T unsigned # endif #endif -#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) +#define YYSIZE_MAXIMUM \ + YY_CAST (YYPTRDIFF_T, \ + (YYPTRDIFF_MAXIMUM < YY_CAST (YYSIZE_T, -1) \ + ? YYPTRDIFF_MAXIMUM \ + : YY_CAST (YYSIZE_T, -1))) + +#define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X)) + + +/* Stored state numbers (used for stacks). */ +typedef yytype_int8 yy_state_t; + +/* State numbers in computations. */ +typedef int yy_state_fast_t; #ifndef YY_ # if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include <libintl.h> /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) +# define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ -# define YY_(msgid) msgid +# define YY_(Msgid) Msgid +# endif +#endif + + +#ifndef YY_ATTRIBUTE_PURE +# if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__) +# define YY_ATTRIBUTE_PURE __attribute__ ((__pure__)) +# else +# define YY_ATTRIBUTE_PURE +# endif +#endif + +#ifndef YY_ATTRIBUTE_UNUSED +# if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__) +# define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) +# else +# define YY_ATTRIBUTE_UNUSED # endif #endif /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) +# define YY_USE(E) ((void) (E)) #else -# define YYUSE(e) /* empty */ +# define YY_USE(E) /* empty */ #endif -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(n) (n) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int i) +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__ +# if __GNUC__ * 100 + __GNUC_MINOR__ < 407 +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") +# else +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") \ + _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# endif +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ + _Pragma ("GCC diagnostic pop") #else -static int -YYID (i) - int i; +# define YY_INITIAL_VALUE(Value) Value #endif -{ - return i; -} +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END +#endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ +#endif + +#if defined __cplusplus && defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__ +# define YY_IGNORE_USELESS_CAST_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuseless-cast\"") +# define YY_IGNORE_USELESS_CAST_END \ + _Pragma ("GCC diagnostic pop") +#endif +#ifndef YY_IGNORE_USELESS_CAST_BEGIN +# define YY_IGNORE_USELESS_CAST_BEGIN +# define YY_IGNORE_USELESS_CAST_END #endif -#if ! defined yyoverflow || YYERROR_VERBOSE + +#define YY_ASSERT(E) ((void) (0 && (E))) + +#if !defined yyoverflow /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -277,11 +435,11 @@ YYID (i) # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 + /* Use EXIT_SUCCESS as a witness for stdlib.h. */ +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # endif @@ -289,8 +447,8 @@ YYID (i) # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) + /* Pacify GCC's 'empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, and a page size can be as small as 4096 bytes. So we cannot safely @@ -304,88 +462,89 @@ YYID (i) # ifndef YYSTACK_ALLOC_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif -# if (defined __cplusplus && ! defined _STDLIB_H \ +# if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) + && (defined YYFREE || defined free))) # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined malloc && ! defined EXIT_SUCCESS void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined free && ! defined EXIT_SUCCESS void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif # endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ - +#endif /* !defined yyoverflow */ #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc { - yytype_int16 yyss; - YYSTYPE yyvs; - }; + yy_state_t yyss_alloc; + YYSTYPE yyvs_alloc; +}; /* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) +# define YYSTACK_GAP_MAXIMUM (YYSIZEOF (union yyalloc) - 1) /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (YYID (0)) -# endif -# endif +# define YYCOPY_NEEDED 1 /* Relocate STACK from its old location to the new one. The local variables YYSIZE and YYSTACKSIZE give the old and new number of elements in the stack, and YYPTR gives the new location of the stack. Advance YYPTR to a properly aligned location for the next stack. */ -# define YYSTACK_RELOCATE(Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYPTRDIFF_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * YYSIZEOF (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / YYSIZEOF (*yyptr); \ + } \ + while (0) #endif +#if defined YYCOPY_NEEDED && YYCOPY_NEEDED +/* Copy COUNT objects from SRC to DST. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(Dst, Src, Count) \ + __builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src))) +# else +# define YYCOPY(Dst, Src, Count) \ + do \ + { \ + YYPTRDIFF_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (Dst)[yyi] = (Src)[yyi]; \ + } \ + while (0) +# endif +# endif +#endif /* !YYCOPY_NEEDED */ + /* YYFINAL -- State number of the termination state. */ #define YYFINAL 6 /* YYLAST -- Last index in YYTABLE. */ @@ -397,18 +556,23 @@ union yyalloc #define YYNNTS 4 /* YYNRULES -- Number of rules. */ #define YYNRULES 6 -/* YYNRULES -- Number of states. */ +/* YYNSTATES -- Number of states. */ #define YYNSTATES 12 -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ -#define YYUNDEFTOK 2 +/* YYMAXUTOK -- Last valid token kind. */ #define YYMAXUTOK 259 -#define YYTRANSLATE(YYX) \ - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ -static const yytype_uint8 yytranslate[] = +/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, with out-of-bounds checking. */ +#define YYTRANSLATE(YYX) \ + (0 <= (YYX) && (YYX) <= YYMAXUTOK \ + ? YY_CAST (yysymbol_kind_t, yytranslate[YYX]) \ + : YYSYMBOL_YYUNDEF) + +/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM + as returned by yylex. */ +static const yytype_int8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -439,200 +603,143 @@ static const yytype_uint8 yytranslate[] = }; #if YYDEBUG -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in - YYRHS. */ -static const yytype_uint8 yyprhs[] = -{ - 0, 0, 3, 5, 8, 10, 14 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int8 yyrhs[] = -{ - 9, 0, -1, 10, -1, 11, 10, -1, 11, -1, - 3, 5, 4, -1, 3, 5, 6, 10, 7, -1 -}; - -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const yytype_uint8 yyrline[] = +/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ +static const yytype_int8 yyrline[] = { 0, 70, 70, 76, 81, 84, 93 }; #endif -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +/** Accessing symbol of state STATE. */ +#define YY_ACCESSING_SYMBOL(State) YY_CAST (yysymbol_kind_t, yystos[State]) + +#if YYDEBUG || 0 +/* The user-facing name of the symbol whose (internal) number is + YYSYMBOL. No bounds checking. */ +static const char *yysymbol_name (yysymbol_kind_t yysymbol) YY_ATTRIBUTE_UNUSED; + /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "$end", "error", "$undefined", "LITERAL", "STRING", "'='", "'{'", "'}'", - "$accept", "start", "assignments", "assignment", 0 + "\"end of file\"", "error", "\"invalid token\"", "LITERAL", "STRING", + "'='", "'{'", "'}'", "$accept", "start", "assignments", "assignment", YY_NULLPTR }; -#endif -# ifdef YYPRINT -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ -static const yytype_uint16 yytoknum[] = +static const char * +yysymbol_name (yysymbol_kind_t yysymbol) { - 0, 256, 257, 258, 259, 61, 123, 125 -}; -# endif + return yytname[yysymbol]; +} +#endif -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = -{ - 0, 8, 9, 10, 10, 11, 11 -}; +#define YYPACT_NINF (-5) -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = -{ - 0, 2, 1, 2, 1, 3, 5 -}; +#define yypact_value_is_default(Yyn) \ + ((Yyn) == YYPACT_NINF) -/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state - STATE-NUM when YYTABLE doesn't specify something else to do. Zero - means the default is an error. */ -static const yytype_uint8 yydefact[] = -{ - 0, 0, 0, 2, 4, 0, 1, 3, 5, 0, - 0, 6 -}; +#define YYTABLE_NINF (-1) -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int8 yydefgoto[] = -{ - -1, 2, 3, 4 -}; +#define yytable_value_is_error(Yyn) \ + 0 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -5 static const yytype_int8 yypact[] = { -1, 1, 4, -5, -1, -3, -5, -5, -5, -1, 0, -5 }; +/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not specify something else to do. Zero + means the default is an error. */ +static const yytype_int8 yydefact[] = +{ + 0, 0, 0, 2, 4, 0, 1, 3, 5, 0, + 0, 6 +}; + /* YYPGOTO[NTERM-NUM]. */ static const yytype_int8 yypgoto[] = { -5, -5, -4, -5 }; -/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero, do what YYDEFACT says. - If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -1 -static const yytype_uint8 yytable[] = +/* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int8 yydefgoto[] = +{ + 0, 2, 3, 4 +}; + +/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ +static const yytype_int8 yytable[] = { 7, 8, 1, 9, 6, 10, 5, 11 }; -static const yytype_uint8 yycheck[] = +static const yytype_int8 yycheck[] = { 4, 4, 3, 6, 0, 9, 5, 7 }; -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ -static const yytype_uint8 yystos[] = +/* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of + state STATE-NUM. */ +static const yytype_int8 yystos[] = { 0, 3, 9, 10, 11, 5, 0, 10, 4, 6, 10, 7 }; -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - - -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ +/* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM. */ +static const yytype_int8 yyr1[] = +{ + 0, 8, 9, 10, 10, 11, 11 +}; -#define YYFAIL goto yyerrlab +/* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM. */ +static const yytype_int8 yyr2[] = +{ + 0, 2, 1, 2, 1, 3, 5 +}; -#define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (YYID (0)) - - -#define YYTERROR 1 -#define YYERRCODE 256 - - -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) -#endif +enum { YYENOMEM = -2 }; +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab +#define YYNOMEM goto yyexhaustedlab -#ifndef YY_LOCATION_PRINT -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif -#endif +#define YYRECOVERING() (!!yyerrstatus) -/* YYLEX -- calling `yylex' with the right arguments. */ +#define YYBACKUP(Token, Value) \ + do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ + while (0) + +/* Backward compatibility with an undocumented macro. + Use YYerror or YYUNDEF. */ +#define YYERRCODE YYUNDEF -#ifdef YYLEX_PARAM -# define YYLEX yylex (YYLEX_PARAM) -#else -# define YYLEX yylex () -#endif /* Enable debugging if requested. */ #if YYDEBUG @@ -642,80 +749,58 @@ while (YYID (0)) # define YYFPRINTF fprintf # endif -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (YYID (0)) - -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (0) + + + + +# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Kind, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (0) + + +/*-----------------------------------. +| Print this symbol's value on YYO. | +`-----------------------------------*/ + static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif +yy_symbol_value_print (FILE *yyo, + yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep) { + FILE *yyoutput = yyo; + YY_USE (yyoutput); if (!yyvaluep) return; -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); -# endif - switch (yytype) - { - default: - break; - } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YY_USE (yykind); + YY_IGNORE_MAYBE_UNINITIALIZED_END } -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +/*---------------------------. +| Print this symbol on YYO. | +`---------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif +yy_symbol_print (FILE *yyo, + yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep) { - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + YYFPRINTF (yyo, "%s %s (", + yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind)); - yy_symbol_value_print (yyoutput, yytype, yyvaluep); - YYFPRINTF (yyoutput, ")"); + yy_symbol_value_print (yyo, yykind, yyvaluep); + YYFPRINTF (yyo, ")"); } /*------------------------------------------------------------------. @@ -723,80 +808,68 @@ yy_symbol_print (yyoutput, yytype, yyvaluep) | TOP (included). | `------------------------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) -#else static void -yy_stack_print (bottom, top) - yytype_int16 *bottom; - yytype_int16 *top; -#endif +yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop) { YYFPRINTF (stderr, "Stack now"); - for (; bottom <= top; ++bottom) - YYFPRINTF (stderr, " %d", *bottom); + for (; yybottom <= yytop; yybottom++) + { + int yybot = *yybottom; + YYFPRINTF (stderr, " %d", yybot); + } YYFPRINTF (stderr, "\n"); } -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_reduce_print (YYSTYPE *yyvsp, int yyrule) -#else static void -yy_reduce_print (yyvsp, yyrule) - YYSTYPE *yyvsp; - int yyrule; -#endif +yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp, + int yyrule) { + int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; - unsigned long int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); + YYFPRINTF (stderr, "Reducing stack by rule %d (line %d):\n", + yyrule - 1, yylno); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { - fprintf (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - ); - fprintf (stderr, "\n"); + YYFPRINTF (stderr, " $%d = ", yyi + 1); + yy_symbol_print (stderr, + YY_ACCESSING_SYMBOL (+yyssp[yyi + 1 - yynrhs]), + &yyvsp[(yyi + 1) - (yynrhs)]); + YYFPRINTF (stderr, "\n"); } } -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyvsp, Rule); \ -} while (YYID (0)) +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyssp, yyvsp, Rule); \ +} while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; #else /* !YYDEBUG */ -# define YYDPRINTF(Args) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YYDPRINTF(Args) ((void) 0) +# define YY_SYMBOL_PRINT(Title, Kind, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ /* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH +#ifndef YYINITDEPTH # define YYINITDEPTH 200 #endif @@ -811,478 +884,219 @@ int yydebug; # define YYMAXDEPTH 10000 #endif - - -#if YYERROR_VERBOSE -# ifndef yystrlen -# if defined __GLIBC__ && defined _STRING_H -# define yystrlen strlen -# else -/* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static YYSIZE_T -yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif -{ - YYSIZE_T yylen; - for (yylen = 0; yystr[yylen]; yylen++) - continue; - return yylen; -} -# endif -# endif -# ifndef yystpcpy -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -# define yystpcpy stpcpy -# else -/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in - YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static char * -yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif -{ - char *yyd = yydest; - const char *yys = yysrc; - while ((*yyd++ = *yys++) != '\0') - continue; - return yyd - 1; -} -# endif -# endif - -# ifndef yytnamerr -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary - quotes and backslashes, so that it's suitable for yyerror. The - heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than - backslash-backslash). YYSTR is taken from yytname. If YYRES is - null, do not copy; instead, return the length of what the result - would have been. */ -static YYSIZE_T -yytnamerr (char *yyres, const char *yystr) -{ - if (*yystr == '"') - { - YYSIZE_T yyn = 0; - char const *yyp = yystr; - - for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - do_not_strip_quotes: ; - } - - if (! yyres) - return yystrlen (yystr); - - return yystpcpy (yyres, yystr) - yyres; -} -# endif - -/* Copy into YYRESULT an error message about the unexpected token - YYCHAR while in state YYSTATE. Return the number of bytes copied, - including the terminating null byte. If YYRESULT is null, do not - copy anything; just return the number of bytes that would be - copied. As a special case, return 0 if an ordinary "syntax error" - message will do. Return YYSIZE_MAXIMUM if overflow occurs during - size calculation. */ -static YYSIZE_T -yysyntax_error (char *yyresult, int yystate, int yychar) -{ - int yyn = yypact[yystate]; - - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; - else - { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -# if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -# endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } - - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - - if (yysize_overflow) - return YYSIZE_MAXIMUM; - - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yyresult; - int yyi = 0; - while ((*yyp = *yyf) != '\0') - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - } - return yysize; - } -} -#endif /* YYERROR_VERBOSE */ - /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) -#else static void -yydestruct (yymsg, yytype, yyvaluep) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; -#endif +yydestruct (const char *yymsg, + yysymbol_kind_t yykind, YYSTYPE *yyvaluep) { - YYUSE (yyvaluep); - + YY_USE (yyvaluep); if (!yymsg) yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - - switch (yytype) - { + YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp); - default: - break; - } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YY_USE (yykind); + YY_IGNORE_MAYBE_UNINITIALIZED_END } - - -/* Prevent warnings from -Wmissing-prototypes. */ - -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ - -/* The look-ahead symbol. */ +/* Lookahead token kind. */ int yychar; -/* The semantic value of the look-ahead symbol. */ +/* The semantic value of the lookahead symbol. */ YYSTYPE yylval; - /* Number of syntax errors so far. */ int yynerrs; + /*----------. | yyparse. | `----------*/ -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) int yyparse (void) -#else -int -yyparse () - -#endif -#endif { - - int yystate; - int yyn; - int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ - int yytoken = 0; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif - - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. + yy_state_fast_t yystate = 0; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus = 0; - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ + /* Refer to the stacks through separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; + /* Their size. */ + YYPTRDIFF_T yystacksize = YYINITDEPTH; - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; + /* The state stack: array, bottom, top. */ + yy_state_t yyssa[YYINITDEPTH]; + yy_state_t *yyss = yyssa; + yy_state_t *yyssp = yyss; + /* The semantic value stack: array, bottom, top. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs = yyvsa; + YYSTYPE *yyvsp = yyvs; - -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) - - YYSIZE_T yystacksize = YYINITDEPTH; - + int yyn; + /* The return value of yyparse. */ + int yyresult; + /* Lookahead symbol kind. */ + yysymbol_kind_t yytoken = YYSYMBOL_YYEMPTY; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval; + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) + /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ int yylen = 0; YYDPRINTF ((stderr, "Starting parse\n")); - yystate = 0; - yyerrstatus = 0; - yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - - yyssp = yyss; - yyvsp = yyvs; + yychar = YYEMPTY; /* Cause a token to be read. */ goto yysetstate; + /*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | +| yynewstate -- push a new state, which is found in yystate. | `------------------------------------------------------------*/ - yynewstate: +yynewstate: /* In all cases, when you get here, the value and location stacks have just been pushed. So pushing a state here evens the stacks. */ yyssp++; - yysetstate: - *yyssp = yystate; + +/*--------------------------------------------------------------------. +| yysetstate -- set current state (the top of the stack) to yystate. | +`--------------------------------------------------------------------*/ +yysetstate: + YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + YY_ASSERT (0 <= yystate && yystate < YYNSTATES); + YY_IGNORE_USELESS_CAST_BEGIN + *yyssp = YY_CAST (yy_state_t, yystate); + YY_IGNORE_USELESS_CAST_END + YY_STACK_PRINT (yyss, yyssp); if (yyss + yystacksize - 1 <= yyssp) +#if !defined yyoverflow && !defined YYSTACK_RELOCATE + YYNOMEM; +#else { /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; + YYPTRDIFF_T yysize = yyssp - yyss + 1; -#ifdef yyoverflow +# if defined yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - - &yystacksize); - - yyss = yyss1; - yyvs = yyvs1; + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + yy_state_t *yyss1 = yyss; + YYSTYPE *yyvs1 = yyvs; + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * YYSIZEOF (*yyssp), + &yyvs1, yysize * YYSIZEOF (*yyvsp), + &yystacksize); + yyss = yyss1; + yyvs = yyvs1; } -#else /* no yyoverflow */ -# ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; -# else +# else /* defined YYSTACK_RELOCATE */ /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + YYNOMEM; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; + yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); - + yy_state_t *yyss1 = yyss; + union yyalloc *yyptr = + YY_CAST (union yyalloc *, + YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize)))); + if (! yyptr) + YYNOMEM; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); # undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); } # endif -#endif /* no yyoverflow */ yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; - - YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + YY_IGNORE_USELESS_CAST_BEGIN + YYDPRINTF ((stderr, "Stack size increased to %ld\n", + YY_CAST (long, yystacksize))); + YY_IGNORE_USELESS_CAST_END if (yyss + yystacksize - 1 <= yyssp) - YYABORT; + YYABORT; } +#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */ - YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + + if (yystate == YYFINAL) + YYACCEPT; goto yybackup; + /*-----------. | yybackup. | `-----------*/ yybackup: - /* Do appropriate processing given the current state. Read a - look-ahead token if we need one and don't already have one. */ + lookahead token if we need one and don't already have one. */ - /* First try to decide what to do without reference to look-ahead token. */ + /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; - if (yyn == YYPACT_NINF) + if (yypact_value_is_default (yyn)) goto yydefault; - /* Not known => get a look-ahead token if don't already have one. */ + /* Not known => get a lookahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ + /* YYCHAR is either empty, or end-of-input, or a valid lookahead. */ if (yychar == YYEMPTY) { - YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; + YYDPRINTF ((stderr, "Reading a token\n")); + yychar = yylex (); } if (yychar <= YYEOF) { - yychar = yytoken = YYEOF; + yychar = YYEOF; + yytoken = YYSYMBOL_YYEOF; YYDPRINTF ((stderr, "Now at end of input.\n")); } + else if (yychar == YYerror) + { + /* The scanner already issued an error message, process directly + to error recovery. But do not keep the error token as + lookahead, it is too special and may lead us to an endless + loop in error recovery. */ + yychar = YYUNDEF; + yytoken = YYSYMBOL_YYerror; + goto yyerrlab1; + } else { yytoken = YYTRANSLATE (yychar); @@ -1297,30 +1111,26 @@ yybackup: yyn = yytable[yyn]; if (yyn <= 0) { - if (yyn == 0 || yyn == YYTABLE_NINF) - goto yyerrlab; + if (yytable_value_is_error (yyn)) + goto yyerrlab; yyn = -yyn; goto yyreduce; } - if (yyn == YYFINAL) - YYACCEPT; - /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; - /* Shift the look-ahead token. */ + /* Shift the lookahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - - /* Discard the shifted token unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; - yystate = yyn; + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END + /* Discard the shifted token. */ + yychar = YYEMPTY; goto yynewstate; @@ -1335,14 +1145,14 @@ yydefault: /*-----------------------------. -| yyreduce -- Do a reduction. | +| yyreduce -- do a reduction. | `-----------------------------*/ yyreduce: /* yyn is the number of a rule to reduce with. */ yylen = yyr2[yyn]; /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. + '$$ = $1'. Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison @@ -1355,141 +1165,120 @@ yyreduce: YY_REDUCE_PRINT (yyn); switch (yyn) { - case 2: + case 2: /* start: assignments */ #line 71 "slc-gram.y" - { - assignment = (yyvsp[(1) - (1)].assignment); + { + assignment = (yyvsp[0].assignment); } +#line 1174 "slc-gram.c" break; - case 3: + case 3: /* assignments: assignment assignments */ #line 77 "slc-gram.y" - { - (yyvsp[(1) - (2)].assignment)->next = (yyvsp[(2) - (2)].assignment); - (yyval.assignment) = (yyvsp[(1) - (2)].assignment); + { + (yyvsp[-1].assignment)->next = (yyvsp[0].assignment); + (yyval.assignment) = (yyvsp[-1].assignment); } +#line 1183 "slc-gram.c" break; - case 5: + case 5: /* assignment: LITERAL '=' STRING */ #line 85 "slc-gram.y" - { + { (yyval.assignment) = malloc(sizeof(*(yyval.assignment))); - (yyval.assignment)->name = (yyvsp[(1) - (3)].string); + (yyval.assignment)->name = (yyvsp[-2].string); (yyval.assignment)->type = a_value; (yyval.assignment)->lineno = lineno; - (yyval.assignment)->u.value = (yyvsp[(3) - (3)].string); + (yyval.assignment)->u.value = (yyvsp[0].string); (yyval.assignment)->next = NULL; } +#line 1196 "slc-gram.c" break; - case 6: + case 6: /* assignment: LITERAL '=' '{' assignments '}' */ #line 94 "slc-gram.y" - { + { (yyval.assignment) = malloc(sizeof(*(yyval.assignment))); - (yyval.assignment)->name = (yyvsp[(1) - (5)].string); + (yyval.assignment)->name = (yyvsp[-4].string); (yyval.assignment)->type = a_assignment; (yyval.assignment)->lineno = lineno; - (yyval.assignment)->u.assignment = (yyvsp[(4) - (5)].assignment); + (yyval.assignment)->u.assignment = (yyvsp[-1].assignment); (yyval.assignment)->next = NULL; } +#line 1209 "slc-gram.c" break; -/* Line 1267 of yacc.c. */ -#line 1400 "slc-gram.c" +#line 1213 "slc-gram.c" + default: break; } - YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); + /* User semantic actions sometimes alter yychar, and that requires + that yytoken be updated with the new translation. We take the + approach of translating immediately before every use of yytoken. + One alternative is translating here after every semantic action, + but that translation would be missed if the semantic action invokes + YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or + if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an + incorrect destructor might then be invoked immediately. In the + case of YYERROR or YYBACKUP, subsequent parser actions might lead + to an incorrect destructor call or verbose syntax error message + before the lookahead is translated. */ + YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, &yyloc); YYPOPSTACK (yylen); yylen = 0; - YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; - - /* Now `shift' the result of the reduction. Determine what state + /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTOKENS]; + { + const int yylhs = yyr1[yyn] - YYNTOKENS; + const int yyi = yypgoto[yylhs] + *yyssp; + yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp + ? yytable[yyi] + : yydefgoto[yylhs]); + } goto yynewstate; -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ +/*--------------------------------------. +| yyerrlab -- here on detecting error. | +`--------------------------------------*/ yyerrlab: + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = yychar == YYEMPTY ? YYSYMBOL_YYEMPTY : YYTRANSLATE (yychar); /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { ++yynerrs; -#if ! YYERROR_VERBOSE yyerror (YY_("syntax error")); -#else - { - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (yymsg); - } - else - { - yyerror (YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } - } -#endif } - - if (yyerrstatus == 3) { - /* If just tried and failed to reuse look-ahead token after an - error, discard it. */ + /* If just tried and failed to reuse lookahead token after an + error, discard it. */ if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } else - { - yydestruct ("Error: discarding", - yytoken, &yylval); - yychar = YYEMPTY; - } + { + yydestruct ("Error: discarding", + yytoken, &yylval); + yychar = YYEMPTY; + } } - /* Else will try to reuse look-ahead token after shifting the error + /* Else will try to reuse lookahead token after shifting the error token. */ goto yyerrlab1; @@ -1498,14 +1287,13 @@ yyerrlab: | yyerrorlab -- error raised explicitly by YYERROR. | `---------------------------------------------------*/ yyerrorlab: + /* Pacify compilers when the user code never invokes YYERROR and the + label yyerrorlab therefore never appears in user code. */ + if (0) + YYERROR; + ++yynerrs; - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) - goto yyerrorlab; - - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ YYPOPSTACK (yylen); yylen = 0; @@ -1518,42 +1306,42 @@ yyerrorlab: | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ + yyerrstatus = 3; /* Each real token shifted decrements this. */ + /* Pop stack until we find a state that shifts the error token. */ for (;;) { yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } + if (!yypact_value_is_default (yyn)) + { + yyn += YYSYMBOL_YYerror; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYSYMBOL_YYerror) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } /* Pop the current state because it cannot handle the error token. */ if (yyssp == yyss) - YYABORT; + YYABORT; yydestruct ("Error: popping", - yystos[yystate], yyvsp); + YY_ACCESSING_SYMBOL (yystate), yyvsp); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } - if (yyn == YYFINAL) - YYACCEPT; - + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; + YY_IGNORE_MAYBE_UNINITIALIZED_END /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); + YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp); yystate = yyn; goto yynewstate; @@ -1564,51 +1352,55 @@ yyerrlab1: `-------------------------------------*/ yyacceptlab: yyresult = 0; - goto yyreturn; + goto yyreturnlab; + /*-----------------------------------. | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ yyabortlab: yyresult = 1; - goto yyreturn; + goto yyreturnlab; -#ifndef yyoverflow -/*-------------------------------------------------. -| yyexhaustedlab -- memory exhaustion comes here. | -`-------------------------------------------------*/ + +/*-----------------------------------------------------------. +| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here. | +`-----------------------------------------------------------*/ yyexhaustedlab: yyerror (YY_("memory exhausted")); yyresult = 2; - /* Fall through. */ -#endif + goto yyreturnlab; + -yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval); - /* Do not reclaim the symbols of the rule which action triggered +/*----------------------------------------------------------. +| yyreturnlab -- parsing is finished, clean up and return. | +`----------------------------------------------------------*/ +yyreturnlab: + if (yychar != YYEMPTY) + { + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = YYTRANSLATE (yychar); + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval); + } + /* Do not reclaim the symbols of the rule whose action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); YY_STACK_PRINT (yyss, yyssp); while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); + YY_ACCESSING_SYMBOL (+*yyssp), yyvsp); YYPOPSTACK (1); } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif -#if YYERROR_VERBOSE - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); -#endif - /* Make sure YYID is used. */ - return YYID (yyresult); -} + return yyresult; +} #line 104 "slc-gram.y" @@ -2297,4 +2089,3 @@ main(int argc, char **argv) fclose(yyin); return 0; } - diff --git a/lib/sl/slc-gram.h b/lib/sl/slc-gram.h index b6b16419ded2..c35fef13ab08 100644 --- a/lib/sl/slc-gram.h +++ b/lib/sl/slc-gram.h @@ -1,14 +1,14 @@ -/* A Bison parser, made by GNU Bison 2.3. */ +/* A Bison parser, made by GNU Bison 3.8.2. */ -/* Skeleton interface for Bison's Yacc-like parsers in C +/* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation, + Inc. - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,9 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -33,37 +31,64 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ -/* Tokens. */ +/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, + especially those whose name start with YY_ or yy_. They are + private implementation details that can be changed or removed. */ + +#ifndef YY_YY_SLC_GRAM_H_INCLUDED +# define YY_YY_SLC_GRAM_H_INCLUDED +/* Debug traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif +#if YYDEBUG +extern int yydebug; +#endif + +/* Token kinds. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - LITERAL = 258, - STRING = 259 - }; + enum yytokentype + { + YYEMPTY = -2, + YYEOF = 0, /* "end of file" */ + YYerror = 256, /* error */ + YYUNDEF = 257, /* "invalid token" */ + LITERAL = 258, /* LITERAL */ + STRING = 259 /* STRING */ + }; + typedef enum yytokentype yytoken_kind_t; #endif -/* Tokens. */ +/* Token kinds. */ +#define YYEMPTY -2 +#define YYEOF 0 +#define YYerror 256 +#define YYUNDEF 257 #define LITERAL 258 #define STRING 259 - - - +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -#line 57 "slc-gram.y" +union YYSTYPE { +#line 57 "slc-gram.y" + char *string; struct assignment *assignment; -} -/* Line 1529 of yacc.c. */ -#line 62 "slc-gram.h" - YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 + +#line 80 "slc-gram.h" + +}; +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 +# define YYSTYPE_IS_DECLARED 1 #endif + extern YYSTYPE yylval; + +int yyparse (void); + + +#endif /* !YY_YY_SLC_GRAM_H_INCLUDED */ diff --git a/lib/sl/slc-lex.c b/lib/sl/slc-lex.c index 4afc6df11d1d..f392d32ad180 100644 --- a/lib/sl/slc-lex.c +++ b/lib/sl/slc-lex.c @@ -1,5 +1,5 @@ -#line 3 "slc-lex.c" +#line 2 "slc-lex.c" #define YY_INT_ALIGNED short int @@ -7,8 +7,8 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 35 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -46,7 +46,6 @@ typedef int16_t flex_int16_t; typedef uint16_t flex_uint16_t; typedef int32_t flex_int32_t; typedef uint32_t flex_uint32_t; -typedef uint64_t flex_uint64_t; #else typedef signed char flex_int8_t; typedef short int flex_int16_t; @@ -54,7 +53,6 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -85,63 +83,61 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! FLEXINT_H */ - -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) +#endif /* ! C99 */ -#define YY_USE_CONST +#endif /* ! FLEXINT_H */ -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ +/* begin standard C++ headers. */ -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* Returned upon end-of-file. */ #define YY_NULL 0 -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. +/* Promotes a possibly negative, possibly signed char to an + * integer in range [0..255] for use as an array index. */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) /* Enter a start condition. This macro really ought to take a parameter, * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ #define BEGIN (yy_start) = 1 + 2 * - /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ #define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START - /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ) - +#define YY_NEW_FILE yyrestart( yyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -158,15 +154,16 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE; typedef size_t yy_size_t; #endif -extern yy_size_t yyleng; +extern int yyleng; extern FILE *yyin, *yyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + #define YY_LESS_LINENO(n) + #define YY_LINENO_REWIND_TO(ptr) /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ @@ -181,7 +178,6 @@ extern FILE *yyin, *yyout; YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) - #define unput(c) yyunput( c, (yytext_ptr) ) #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -196,12 +192,12 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -224,7 +220,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -252,7 +248,7 @@ struct yy_buffer_state /* Stack of input buffers. */ static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ -static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ +static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */ /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general @@ -263,7 +259,6 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ : NULL) - /* Same as previous macro, but useful when we know that the buffer stack is not * NULL or when we need an lvalue. For internal use only. */ @@ -271,11 +266,11 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ -yy_size_t yyleng; +static int yy_n_chars; /* number of characters read into yy_ch_buf */ +int yyleng; /* Points to current character in buffer. */ -static char *yy_c_buf_p = (char *) 0; +static char *yy_c_buf_p = NULL; static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ @@ -284,82 +279,78 @@ static int yy_start = 0; /* start state number */ */ static int yy_did_buffer_switch_on_eof; -void yyrestart (FILE *input_file ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); -void yy_delete_buffer (YY_BUFFER_STATE b ); -void yy_flush_buffer (YY_BUFFER_STATE b ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state (void ); - -static void yyensure_buffer_stack (void ); -static void yy_load_buffer_state (void ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); +void yyrestart ( FILE *input_file ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); +void yy_delete_buffer ( YY_BUFFER_STATE b ); +void yy_flush_buffer ( YY_BUFFER_STATE b ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); +void yypop_buffer_state ( void ); -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) +static void yyensure_buffer_stack ( void ); +static void yy_load_buffer_state ( void ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len ); -void *yyalloc (yy_size_t ); -void *yyrealloc (void *,yy_size_t ); -void yyfree (void * ); +void *yyalloc ( yy_size_t ); +void *yyrealloc ( void *, yy_size_t ); +void yyfree ( void * ); #define yy_new_buffer yy_create_buffer - #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } - #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ); \ + yy_create_buffer( yyin, YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } - #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) /* Begin user sect3 */ +typedef flex_uint8_t YY_CHAR; -typedef unsigned char YY_CHAR; - -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; +FILE *yyin = NULL, *yyout = NULL; typedef int yy_state_type; extern int yylineno; - int yylineno = 1; extern char *yytext; +#ifdef yytext_ptr +#undef yytext_ptr +#endif #define yytext_ptr yytext -static yy_state_type yy_get_previous_state (void ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); -static int yy_get_next_buffer (void ); -static void yy_fatal_error (yyconst char msg[] ); +static yy_state_type yy_get_previous_state ( void ); +static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); +static int yy_get_next_buffer ( void ); +static void yynoreturn yy_fatal_error ( const char* msg ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. */ #define YY_DO_BEFORE_ACTION \ (yytext_ptr) = yy_bp; \ - yyleng = (yy_size_t) (yy_cp - yy_bp); \ + yyleng = (int) (yy_cp - yy_bp); \ (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; - #define YY_NUM_RULES 7 #define YY_END_OF_BUFFER 8 /* This struct is not used in this scanner, @@ -369,13 +360,13 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[14] = +static const flex_int16_t yy_accept[14] = { 0, 0, 0, 8, 7, 6, 3, 2, 7, 5, 1, 4, 1, 0 } ; -static yyconst flex_int32_t yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -407,31 +398,31 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[10] = +static const YY_CHAR yy_meta[10] = { 0, 1, 1, 1, 1, 1, 2, 1, 1, 2 } ; -static yyconst flex_int16_t yy_base[15] = +static const flex_int16_t yy_base[15] = { 0, 0, 0, 12, 13, 13, 13, 13, 6, 13, 0, 13, 0, 13, 8 } ; -static yyconst flex_int16_t yy_def[15] = +static const flex_int16_t yy_def[15] = { 0, 13, 1, 13, 13, 13, 13, 13, 13, 13, 14, 13, 14, 0, 13 } ; -static yyconst flex_int16_t yy_nxt[23] = +static const flex_int16_t yy_nxt[23] = { 0, 4, 5, 6, 7, 4, 4, 8, 9, 10, 12, 11, 13, 3, 13, 13, 13, 13, 13, 13, 13, 13, 13 } ; -static yyconst flex_int16_t yy_chk[23] = +static const flex_int16_t yy_chk[23] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 14, 8, 3, 13, 13, 13, 13, 13, 13, 13, 13, @@ -506,7 +497,8 @@ static char * handle_string(void); #undef ECHO -#line 510 "slc-lex.c" +#line 500 "slc-lex.c" +#line 501 "slc-lex.c" #define INITIAL 0 @@ -522,36 +514,36 @@ static char * handle_string(void); #define YY_EXTRA_TYPE void * #endif -static int yy_init_globals (void ); +static int yy_init_globals ( void ); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy (void ); +int yylex_destroy ( void ); -int yyget_debug (void ); +int yyget_debug ( void ); -void yyset_debug (int debug_flag ); +void yyset_debug ( int debug_flag ); -YY_EXTRA_TYPE yyget_extra (void ); +YY_EXTRA_TYPE yyget_extra ( void ); -void yyset_extra (YY_EXTRA_TYPE user_defined ); +void yyset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *yyget_in (void ); +FILE *yyget_in ( void ); -void yyset_in (FILE * in_str ); +void yyset_in ( FILE * _in_str ); -FILE *yyget_out (void ); +FILE *yyget_out ( void ); -void yyset_out (FILE * out_str ); +void yyset_out ( FILE * _out_str ); -yy_size_t yyget_leng (void ); + int yyget_leng ( void ); -char *yyget_text (void ); +char *yyget_text ( void ); -int yyget_lineno (void ); +int yyget_lineno ( void ); -void yyset_lineno (int line_number ); +void yyset_lineno ( int _line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -559,33 +551,41 @@ void yyset_lineno (int line_number ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap (void ); +extern "C" int yywrap ( void ); #else -extern int yywrap (void ); +extern int yywrap ( void ); #endif #endif +#ifndef YY_NO_UNPUT + +#endif + #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ); +static void yy_flex_strncpy ( char *, const char *, int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ); +static int yy_flex_strlen ( const char * ); #endif #ifndef YY_NO_INPUT - #ifdef __cplusplus -static int yyinput (void ); +static int yyinput ( void ); #else -static int input (void ); +static int input ( void ); #endif #endif /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -593,7 +593,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO fwrite( yytext, yyleng, 1, yyout ) +#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -604,7 +604,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - yy_size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -617,7 +617,7 @@ static int input (void ); else \ { \ errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -672,7 +672,7 @@ extern int yylex (void); /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK break; +#define YY_BREAK /*LINTED*/break; #endif #define YY_RULE_SETUP \ @@ -682,14 +682,10 @@ extern int yylex (void); */ YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; -#line 58 "slc-lex.l" - -#line 692 "slc-lex.c" - if ( !(yy_init) ) { (yy_init) = 1; @@ -710,13 +706,18 @@ YY_DECL if ( ! YY_CURRENT_BUFFER ) { yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_load_buffer_state( ); + yy_load_buffer_state( ); } - while ( 1 ) /* loops until end-of-file is reached */ + { +#line 58 "slc-lex.l" + +#line 718 "slc-lex.c" + + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { yy_cp = (yy_c_buf_p); @@ -732,7 +733,7 @@ YY_DECL yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -742,9 +743,9 @@ yy_match: { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 14 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } while ( yy_base[yy_current_state] != 13 ); @@ -888,7 +889,7 @@ case YY_STATE_EOF(INITIAL): { (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap( ) ) + if ( yywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -941,6 +942,7 @@ case YY_STATE_EOF(INITIAL): "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ + } /* end of user's declarations */ } /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer @@ -952,9 +954,9 @@ case YY_STATE_EOF(INITIAL): */ static int yy_get_next_buffer (void) { - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); - register int number_to_move, i; + char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + char *source = (yytext_ptr); + int number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -983,7 +985,7 @@ static int yy_get_next_buffer (void) /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1); for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -996,21 +998,21 @@ static int yy_get_next_buffer (void) else { - yy_size_t num_to_read = + int num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; int yy_c_buf_p_offset = (int) ((yy_c_buf_p) - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { - yy_size_t new_size = b->yy_buf_size * 2; + int new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -1019,11 +1021,12 @@ static int yy_get_next_buffer (void) b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); + yyrealloc( (void *) b->yy_ch_buf, + (yy_size_t) (b->yy_buf_size + 2) ); } else /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; + b->yy_ch_buf = NULL; if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( @@ -1051,7 +1054,7 @@ static int yy_get_next_buffer (void) if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ); + yyrestart( yyin ); } else @@ -1065,12 +1068,15 @@ static int yy_get_next_buffer (void) else ret_val = EOB_ACT_CONTINUE_SCAN; - if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ - yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } (yy_n_chars) += number_to_move; @@ -1086,14 +1092,14 @@ static int yy_get_next_buffer (void) static yy_state_type yy_get_previous_state (void) { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; yy_current_state = (yy_start); for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1103,9 +1109,9 @@ static int yy_get_next_buffer (void) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 14 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; } return yy_current_state; @@ -1118,10 +1124,10 @@ static int yy_get_next_buffer (void) */ static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) { - register int yy_is_jam; - register char *yy_cp = (yy_c_buf_p); + int yy_is_jam; + char *yy_cp = (yy_c_buf_p); - register YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1131,14 +1137,18 @@ static int yy_get_next_buffer (void) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 14 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; yy_is_jam = (yy_current_state == 13); - return yy_is_jam ? 0 : yy_current_state; + return yy_is_jam ? 0 : yy_current_state; } +#ifndef YY_NO_UNPUT + +#endif + #ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput (void) @@ -1163,7 +1173,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (int) ((yy_c_buf_p) - (yytext_ptr)); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -1180,13 +1190,13 @@ static int yy_get_next_buffer (void) */ /* Reset buffer status. */ - yyrestart(yyin ); + yyrestart( yyin ); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap( ) ) + if ( yywrap( ) ) return 0; if ( ! (yy_did_buffer_switch_on_eof) ) @@ -1224,11 +1234,11 @@ static int yy_get_next_buffer (void) if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ); + yy_create_buffer( yyin, YY_BUF_SIZE ); } - yy_init_buffer(YY_CURRENT_BUFFER,input_file ); - yy_load_buffer_state( ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file ); + yy_load_buffer_state( ); } /** Switch to a different input buffer. @@ -1256,7 +1266,7 @@ static int yy_get_next_buffer (void) } YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); + yy_load_buffer_state( ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag @@ -1284,7 +1294,7 @@ static void yy_load_buffer_state (void) { YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -1293,13 +1303,13 @@ static void yy_load_buffer_state (void) /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer(b,file ); + yy_init_buffer( b, file ); return b; } @@ -1318,15 +1328,11 @@ static void yy_load_buffer_state (void) YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ); + yyfree( (void *) b->yy_ch_buf ); - yyfree((void *) b ); + yyfree( (void *) b ); } -#ifndef __cplusplus -extern int isatty (int ); -#endif /* __cplusplus */ - /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, * such as during a yyrestart() or at EOF. @@ -1336,7 +1342,7 @@ extern int isatty (int ); { int oerrno = errno; - yy_flush_buffer(b ); + yy_flush_buffer( b ); b->yy_input_file = file; b->yy_fill_buffer = 1; @@ -1379,7 +1385,7 @@ extern int isatty (int ); b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); + yy_load_buffer_state( ); } /** Pushes the new state onto the stack. The new state becomes @@ -1410,7 +1416,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) YY_CURRENT_BUFFER_LVALUE = new_buffer; /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } @@ -1429,7 +1435,7 @@ void yypop_buffer_state (void) --(yy_buffer_stack_top); if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } } @@ -1447,15 +1453,15 @@ static void yyensure_buffer_stack (void) * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. */ - num_to_alloc = 1; + num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + (yy_buffer_stack_max) = num_to_alloc; (yy_buffer_stack_top) = 0; return; @@ -1464,7 +1470,7 @@ static void yyensure_buffer_stack (void) if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; + yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = (yy_buffer_stack_max) + grow_size; (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc @@ -1484,7 +1490,7 @@ static void yyensure_buffer_stack (void) * @param base the character buffer * @param size the size in bytes of the character buffer * - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) { @@ -1494,23 +1500,23 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ - return 0; + return NULL; - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; - b->yy_input_file = 0; + b->yy_input_file = NULL; b->yy_n_chars = b->yy_buf_size; b->yy_is_interactive = 0; b->yy_at_bol = 1; b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer(b ); + yy_switch_to_buffer( b ); return b; } @@ -1523,28 +1529,29 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) * @note If you want to scan bytes that may contain NUL values, then use * yy_scan_bytes() instead. */ -YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) +YY_BUFFER_STATE yy_scan_string (const char * yystr ) { - return yy_scan_bytes(yystr,strlen(yystr) ); + return yy_scan_bytes( yystr, (int) strlen(yystr) ); } /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. + * @param yybytes the byte buffer to scan + * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; - yy_size_t n, i; + yy_size_t n; + int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) yyalloc(n ); + n = (yy_size_t) (_yybytes_len + 2); + buf = (char *) yyalloc( n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -1553,7 +1560,7 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer(buf,n ); + b = yy_scan_buffer( buf, n ); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -1569,9 +1576,9 @@ YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg ) +static void yynoreturn yy_fatal_error (const char* msg ) { - (void) fprintf( stderr, "%s\n", msg ); + fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -1599,7 +1606,7 @@ static void yy_fatal_error (yyconst char* msg ) */ int yyget_lineno (void) { - + return yylineno; } @@ -1622,7 +1629,7 @@ FILE *yyget_out (void) /** Get the length of the current token. * */ -yy_size_t yyget_leng (void) +int yyget_leng (void) { return yyleng; } @@ -1637,29 +1644,29 @@ char *yyget_text (void) } /** Set the current line number. - * @param line_number + * @param _line_number line number * */ -void yyset_lineno (int line_number ) +void yyset_lineno (int _line_number ) { - yylineno = line_number; + yylineno = _line_number; } /** Set the input stream. This does not discard the current * input buffer. - * @param in_str A readable stream. + * @param _in_str A readable stream. * * @see yy_switch_to_buffer */ -void yyset_in (FILE * in_str ) +void yyset_in (FILE * _in_str ) { - yyin = in_str ; + yyin = _in_str ; } -void yyset_out (FILE * out_str ) +void yyset_out (FILE * _out_str ) { - yyout = out_str ; + yyout = _out_str ; } int yyget_debug (void) @@ -1667,9 +1674,9 @@ int yyget_debug (void) return yy_flex_debug; } -void yyset_debug (int bdebug ) +void yyset_debug (int _bdebug ) { - yy_flex_debug = bdebug ; + yy_flex_debug = _bdebug ; } static int yy_init_globals (void) @@ -1678,10 +1685,10 @@ static int yy_init_globals (void) * This function is called from yylex_destroy(), so don't allocate here. */ - (yy_buffer_stack) = 0; + (yy_buffer_stack) = NULL; (yy_buffer_stack_top) = 0; (yy_buffer_stack_max) = 0; - (yy_c_buf_p) = (char *) 0; + (yy_c_buf_p) = NULL; (yy_init) = 0; (yy_start) = 0; @@ -1690,8 +1697,8 @@ static int yy_init_globals (void) yyin = stdin; yyout = stdout; #else - yyin = (FILE *) 0; - yyout = (FILE *) 0; + yyin = NULL; + yyout = NULL; #endif /* For future reference: Set errno on error, since we are called by @@ -1706,7 +1713,7 @@ int yylex_destroy (void) /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ); + yy_delete_buffer( YY_CURRENT_BUFFER ); YY_CURRENT_BUFFER_LVALUE = NULL; yypop_buffer_state(); } @@ -1727,18 +1734,19 @@ int yylex_destroy (void) */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +static void yy_flex_strncpy (char* s1, const char * s2, int n ) { - register int i; + + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s ) +static int yy_flex_strlen (const char * s ) { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; @@ -1748,11 +1756,12 @@ static int yy_flex_strlen (yyconst char * s ) void *yyalloc (yy_size_t size ) { - return (void *) malloc( size ); + return malloc(size); } void *yyrealloc (void * ptr, yy_size_t size ) { + /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -1760,12 +1769,12 @@ void *yyrealloc (void * ptr, yy_size_t size ) * any pointer type to void*, and deal with argument conversions * as though doing an assignment. */ - return (void *) realloc( (char *) ptr, size ); + return realloc(ptr, size); } void yyfree (void * ptr ) { - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" @@ -1773,7 +1782,6 @@ void yyfree (void * ptr ) #line 68 "slc-lex.l" - void error_message (const char *format, ...) { diff --git a/lib/sqlite/Makefile.am b/lib/sqlite/Makefile.am index bd039692225f..a5de10c9f82c 100644 --- a/lib/sqlite/Makefile.am +++ b/lib/sqlite/Makefile.am @@ -3,9 +3,11 @@ include $(top_srcdir)/Makefile.am.common if ENABLE_PTHREAD_SUPPORT -AM_CPPFLAGS += -DSQLITE_THREADSAFE=1 +AM_CPPFLAGS += -DSQLITE_THREADSAFE=1 -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600 endif +AM_CFLAGS += -Wno-error + lib_LTLIBRARIES = libheimsqlite.la noinst_HEADERS = sqlite3.h sqlite3ext.h diff --git a/lib/sqlite/Makefile.in b/lib/sqlite/Makefile.in index cb43aca20595..a01a193b9cad 100644 --- a/lib/sqlite/Makefile.in +++ b/lib/sqlite/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -95,12 +95,11 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@ENABLE_PTHREAD_SUPPORT_TRUE@am__append_1 = -DSQLITE_THREADSAFE=1 +@ENABLE_PTHREAD_SUPPORT_TRUE@am__append_1 = -DSQLITE_THREADSAFE=1 -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600 subdir = lib/sqlite ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ $(top_srcdir)/cf/auth-modules.m4 \ - $(top_srcdir)/cf/broken-getaddrinfo.m4 \ $(top_srcdir)/cf/broken-glob.m4 \ $(top_srcdir)/cf/broken-realloc.m4 \ $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ @@ -200,7 +199,8 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/sqlite3.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -245,8 +245,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/Makefile.am.common \ $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/depcomp \ @@ -272,9 +270,12 @@ CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLANG_FORMAT = @CLANG_FORMAT@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DB1LIB = @DB1LIB@ DB3LIB = @DB3LIB@ @@ -292,8 +293,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GCD_MIG = @GCD_MIG@ GREP = @GREP@ GROFF = @GROFF@ @@ -402,6 +405,11 @@ PKG_CONFIG = @PKG_CONFIG@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LDADD = @PTHREAD_LDADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -461,9 +469,14 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -478,7 +491,7 @@ SUFFIXES = .et .h .pc.in .pc .x .z .hx .1 .3 .5 .7 .8 .cat1 .cat3 \ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include AM_CPPFLAGS = $(INCLUDES_roken) $(am__append_1) @do_roken_rename_TRUE@ROKEN_RENAME = -DROKEN_RENAME -AM_CFLAGS = $(WFLAGS) +AM_CFLAGS = $(WFLAGS) -Wno-error CP = cp buildinclude = $(top_builddir)/include LIB_XauReadAuth = @LIB_XauReadAuth@ @@ -530,8 +543,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty): @@ -588,7 +601,13 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sqlite3.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sqlite3.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -668,8 +687,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -746,7 +767,7 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/sqlite3.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -793,7 +814,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/sqlite3.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -815,8 +836,8 @@ uninstall-am: uninstall-libLTLIBRARIES $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: check-am install-am install-data-am install-strip uninstall-am -.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am \ - check-local clean clean-generic clean-libLTLIBRARIES \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \ + check-am check-local clean clean-generic clean-libLTLIBRARIES \ clean-libtool cscopelist-am ctags ctags-am dist-hook distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ @@ -913,11 +934,20 @@ check-local:: test "$$failed" -eq 0 || exit 1; \ fi +# It's useful for debugging to format generated sources. The default for all +# clang-format styles is to sort includes, but in many cases in-tree we really +# don't want to do that. .x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @if [ -z "$(CLANG_FORMAT)" ]; then \ + cmp -s $< $@ 2> /dev/null || cp $< $@; \ + else \ + cp $< $@.tmp.c; \ + $(CLANG_FORMAT) -style='{BasedOnStyle: Chromium, SortIncludes: false}' -i $@.tmp.c; \ + cmp -s $@.tmp.c $@ 2> /dev/null || mv $@.tmp.c $@; \ + fi .hx.h: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @cmp -s $< $@ 2> /dev/null || cp $< $@; #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ diff --git a/lib/sqlite/NTMakefile b/lib/sqlite/NTMakefile index f9e90fb77ff0..3a6a4c269797 100644 --- a/lib/sqlite/NTMakefile +++ b/lib/sqlite/NTMakefile @@ -37,6 +37,11 @@ INCFILES= \ $(INCDIR)\sqlite3.h \ $(INCDIR)\sqlite3ext.h +# pmode 0600 = _S_IREAD | _S_IWRITE +cdefines = $(cdefines) \ + -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600 \ + -DSQLITE_THREADSAFE=1 + $(LIBSQLITE): $(OBJ)\sqlite3.obj $(LIBCON) diff --git a/lib/vers/Makefile.in b/lib/vers/Makefile.in index 8c72abd5e7d0..c8c2101f2366 100644 --- a/lib/vers/Makefile.in +++ b/lib/vers/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -98,7 +98,6 @@ subdir = lib/vers ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ $(top_srcdir)/cf/auth-modules.m4 \ - $(top_srcdir)/cf/broken-getaddrinfo.m4 \ $(top_srcdir)/cf/broken-glob.m4 \ $(top_srcdir)/cf/broken-realloc.m4 \ $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ @@ -168,7 +167,8 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/print_version.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -212,8 +212,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in \ $(top_srcdir)/Makefile.am.common \ $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/depcomp \ @@ -239,9 +237,12 @@ CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLANG_FORMAT = @CLANG_FORMAT@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DB1LIB = @DB1LIB@ DB3LIB = @DB3LIB@ @@ -259,8 +260,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GCD_MIG = @GCD_MIG@ GREP = @GREP@ GROFF = @GROFF@ @@ -369,6 +372,11 @@ PKG_CONFIG = @PKG_CONFIG@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LDADD = @PTHREAD_LDADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -428,9 +436,14 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -497,8 +510,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty): @@ -531,7 +544,13 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print_version.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print_version.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -611,8 +630,10 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -686,7 +707,7 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/print_version.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -733,7 +754,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/print_version.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -755,8 +776,8 @@ uninstall-am: $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: check-am install-am install-data-am install-strip uninstall-am -.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am \ - check-local clean clean-generic clean-libtool \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \ + check-am check-local clean clean-generic clean-libtool \ clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am dist-hook \ distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ @@ -852,11 +873,20 @@ check-local:: test "$$failed" -eq 0 || exit 1; \ fi +# It's useful for debugging to format generated sources. The default for all +# clang-format styles is to sort includes, but in many cases in-tree we really +# don't want to do that. .x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @if [ -z "$(CLANG_FORMAT)" ]; then \ + cmp -s $< $@ 2> /dev/null || cp $< $@; \ + else \ + cp $< $@.tmp.c; \ + $(CLANG_FORMAT) -style='{BasedOnStyle: Chromium, SortIncludes: false}' -i $@.tmp.c; \ + cmp -s $@.tmp.c $@ 2> /dev/null || mv $@.tmp.c $@; \ + fi .hx.h: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @cmp -s $< $@ 2> /dev/null || cp $< $@; #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ diff --git a/lib/wind/Makefile.am b/lib/wind/Makefile.am index 0b493118b364..4a34496fcf0a 100644 --- a/lib/wind/Makefile.am +++ b/lib/wind/Makefile.am @@ -89,8 +89,6 @@ idn_lookup_SOURCES = idn-lookup.c LDADD = libwind.la $(LIB_roken) -PYTHON = python - if !MAINTAINER_MODE skip_python = test -f $@ || endif diff --git a/lib/wind/Makefile.in b/lib/wind/Makefile.in index d8fd4082f897..5b3de71bc0b1 100644 --- a/lib/wind/Makefile.in +++ b/lib/wind/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2017 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -105,7 +105,6 @@ subdir = lib/wind ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/cf/aix.m4 \ $(top_srcdir)/cf/auth-modules.m4 \ - $(top_srcdir)/cf/broken-getaddrinfo.m4 \ $(top_srcdir)/cf/broken-glob.m4 \ $(top_srcdir)/cf/broken-realloc.m4 \ $(top_srcdir)/cf/broken-snprintf.m4 $(top_srcdir)/cf/broken.m4 \ @@ -155,6 +154,9 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \ + "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" +PROGRAMS = $(bin_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -182,8 +184,6 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = am__objects_1 = bidi.lo combining.lo doxygen.lo errorlist.lo map.lo \ @@ -201,7 +201,6 @@ am__v_lt_1 = libwind_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libwind_la_LDFLAGS) $(LDFLAGS) -o $@ -PROGRAMS = $(bin_PROGRAMS) am_idn_lookup_OBJECTS = idn-lookup.$(OBJEXT) idn_lookup_OBJECTS = $(am_idn_lookup_OBJECTS) idn_lookup_LDADD = $(LDADD) @@ -252,7 +251,20 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/bidi.Plo ./$(DEPDIR)/bidi_table.Plo \ + ./$(DEPDIR)/combining.Plo ./$(DEPDIR)/combining_table.Plo \ + ./$(DEPDIR)/doxygen.Plo ./$(DEPDIR)/errorlist.Plo \ + ./$(DEPDIR)/errorlist_table.Plo ./$(DEPDIR)/idn-lookup.Po \ + ./$(DEPDIR)/ldap.Plo ./$(DEPDIR)/map.Plo \ + ./$(DEPDIR)/map_table.Plo ./$(DEPDIR)/normalize.Plo \ + ./$(DEPDIR)/normalize_table.Plo ./$(DEPDIR)/punycode.Plo \ + ./$(DEPDIR)/punycode_examples.Po ./$(DEPDIR)/stringprep.Plo \ + ./$(DEPDIR)/test-bidi.Po ./$(DEPDIR)/test-ldap.Po \ + ./$(DEPDIR)/test-map.Po ./$(DEPDIR)/test-normalize.Po \ + ./$(DEPDIR)/test-prohibited.Po ./$(DEPDIR)/test-punycode.Po \ + ./$(DEPDIR)/test-rw.Po ./$(DEPDIR)/test-utf8.Po \ + ./$(DEPDIR)/utf8.Plo ./$(DEPDIR)/wind_err.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -303,8 +315,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ am__color_tests=no @@ -460,6 +470,7 @@ am__set_TESTS_bases = \ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) AM_RECURSIVE_TARGETS = check recheck TEST_SUITE_LOG = test-suite.log @@ -507,9 +518,12 @@ CATMANEXT = @CATMANEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CLANG_FORMAT = @CLANG_FORMAT@ COMPILE_ET = @COMPILE_ET@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CYGPATH_W = @CYGPATH_W@ DB1LIB = @DB1LIB@ DB3LIB = @DB3LIB@ @@ -527,8 +541,10 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_AFS_STRING_TO_KEY = @ENABLE_AFS_STRING_TO_KEY@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ GCD_MIG = @GCD_MIG@ GREP = @GREP@ GROFF = @GROFF@ @@ -637,6 +653,11 @@ PKG_CONFIG = @PKG_CONFIG@ PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ PTHREAD_LDADD = @PTHREAD_LDADD@ PTHREAD_LIBADD = @PTHREAD_LIBADD@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -696,9 +717,14 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ pdfdir = @pdfdir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -795,7 +821,6 @@ test_punycode_SOURCES = \ idn_lookup_SOURCES = idn-lookup.c LDADD = libwind.la $(LIB_roken) -PYTHON = python @MAINTAINER_MODE_FALSE@skip_python = test -f $@ || EXTRA_DIST = \ NTMakefile \ @@ -852,8 +877,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(am__empty): @@ -865,44 +890,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): - -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -libwind.la: $(libwind_la_OBJECTS) $(libwind_la_DEPENDENCIES) $(EXTRA_libwind_la_DEPENDENCIES) - $(AM_V_CCLD)$(libwind_la_LINK) -rpath $(libdir) $(libwind_la_OBJECTS) $(libwind_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ @@ -962,6 +949,44 @@ clean-checkPROGRAMS: echo " rm -f" $$list; \ rm -f $$list +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + } + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libwind.la: $(libwind_la_OBJECTS) $(libwind_la_DEPENDENCIES) $(EXTRA_libwind_la_DEPENDENCIES) + $(AM_V_CCLD)$(libwind_la_LINK) -rpath $(libdir) $(libwind_la_OBJECTS) $(libwind_la_LIBADD) $(LIBS) + idn-lookup$(EXEEXT): $(idn_lookup_OBJECTS) $(idn_lookup_DEPENDENCIES) $(EXTRA_idn_lookup_DEPENDENCIES) @rm -f idn-lookup$(EXEEXT) $(AM_V_CCLD)$(LINK) $(idn_lookup_OBJECTS) $(idn_lookup_LDADD) $(LIBS) @@ -1004,32 +1029,38 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bidi.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bidi_table.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/combining.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/combining_table.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/doxygen.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errorlist.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errorlist_table.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idn-lookup.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/map.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/map_table.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/normalize.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/normalize_table.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/punycode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/punycode_examples.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stringprep.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-bidi.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ldap.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-map.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-normalize.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-prohibited.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-punycode.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-rw.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-utf8.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wind_err.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bidi.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bidi_table.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/combining.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/combining_table.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/doxygen.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errorlist.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errorlist_table.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idn-lookup.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/map.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/map_table.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/normalize.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/normalize_table.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/punycode.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/punycode_examples.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stringprep.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-bidi.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-ldap.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-map.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-normalize.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-prohibited.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-punycode.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-rw.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-utf8.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wind_err.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1259,7 +1290,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ @@ -1272,7 +1303,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS) fi; \ $$success || exit 1 -check-TESTS: +check-TESTS: $(check_PROGRAMS) @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -1363,8 +1394,10 @@ test-utf8.log: test-utf8$(EXEEXT) @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am -distdir: $(DISTFILES) +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1402,16 +1435,19 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) all-local +all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(HEADERS) all-local install-binPROGRAMS: install-libLTLIBRARIES +install-checkPROGRAMS: install-libLTLIBRARIES + installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am -install-exec: install-exec-am +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -1452,7 +1488,32 @@ clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ clean-libLTLIBRARIES clean-libtool mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/bidi.Plo + -rm -f ./$(DEPDIR)/bidi_table.Plo + -rm -f ./$(DEPDIR)/combining.Plo + -rm -f ./$(DEPDIR)/combining_table.Plo + -rm -f ./$(DEPDIR)/doxygen.Plo + -rm -f ./$(DEPDIR)/errorlist.Plo + -rm -f ./$(DEPDIR)/errorlist_table.Plo + -rm -f ./$(DEPDIR)/idn-lookup.Po + -rm -f ./$(DEPDIR)/ldap.Plo + -rm -f ./$(DEPDIR)/map.Plo + -rm -f ./$(DEPDIR)/map_table.Plo + -rm -f ./$(DEPDIR)/normalize.Plo + -rm -f ./$(DEPDIR)/normalize_table.Plo + -rm -f ./$(DEPDIR)/punycode.Plo + -rm -f ./$(DEPDIR)/punycode_examples.Po + -rm -f ./$(DEPDIR)/stringprep.Plo + -rm -f ./$(DEPDIR)/test-bidi.Po + -rm -f ./$(DEPDIR)/test-ldap.Po + -rm -f ./$(DEPDIR)/test-map.Po + -rm -f ./$(DEPDIR)/test-normalize.Po + -rm -f ./$(DEPDIR)/test-prohibited.Po + -rm -f ./$(DEPDIR)/test-punycode.Po + -rm -f ./$(DEPDIR)/test-rw.Po + -rm -f ./$(DEPDIR)/test-utf8.Po + -rm -f ./$(DEPDIR)/utf8.Plo + -rm -f ./$(DEPDIR)/wind_err.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1501,7 +1562,32 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/bidi.Plo + -rm -f ./$(DEPDIR)/bidi_table.Plo + -rm -f ./$(DEPDIR)/combining.Plo + -rm -f ./$(DEPDIR)/combining_table.Plo + -rm -f ./$(DEPDIR)/doxygen.Plo + -rm -f ./$(DEPDIR)/errorlist.Plo + -rm -f ./$(DEPDIR)/errorlist_table.Plo + -rm -f ./$(DEPDIR)/idn-lookup.Po + -rm -f ./$(DEPDIR)/ldap.Plo + -rm -f ./$(DEPDIR)/map.Plo + -rm -f ./$(DEPDIR)/map_table.Plo + -rm -f ./$(DEPDIR)/normalize.Plo + -rm -f ./$(DEPDIR)/normalize_table.Plo + -rm -f ./$(DEPDIR)/punycode.Plo + -rm -f ./$(DEPDIR)/punycode_examples.Po + -rm -f ./$(DEPDIR)/stringprep.Plo + -rm -f ./$(DEPDIR)/test-bidi.Po + -rm -f ./$(DEPDIR)/test-ldap.Po + -rm -f ./$(DEPDIR)/test-map.Po + -rm -f ./$(DEPDIR)/test-normalize.Po + -rm -f ./$(DEPDIR)/test-prohibited.Po + -rm -f ./$(DEPDIR)/test-punycode.Po + -rm -f ./$(DEPDIR)/test-rw.Po + -rm -f ./$(DEPDIR)/test-utf8.Po + -rm -f ./$(DEPDIR)/utf8.Plo + -rm -f ./$(DEPDIR)/wind_err.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1523,10 +1609,10 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_includeHEADERS \ @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: all check check-am install install-am install-data-am \ - install-strip uninstall-am + install-exec install-strip uninstall-am -.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-TESTS \ - check-am check-local clean clean-binPROGRAMS \ +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles check \ + check-TESTS check-am check-local clean clean-binPROGRAMS \ clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-libtool cscopelist-am ctags ctags-am dist-hook distclean \ distclean-compile distclean-generic distclean-libtool \ @@ -1627,11 +1713,20 @@ check-local:: test "$$failed" -eq 0 || exit 1; \ fi +# It's useful for debugging to format generated sources. The default for all +# clang-format styles is to sort includes, but in many cases in-tree we really +# don't want to do that. .x.c: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @if [ -z "$(CLANG_FORMAT)" ]; then \ + cmp -s $< $@ 2> /dev/null || cp $< $@; \ + else \ + cp $< $@.tmp.c; \ + $(CLANG_FORMAT) -style='{BasedOnStyle: Chromium, SortIncludes: false}' -i $@.tmp.c; \ + cmp -s $@.tmp.c $@ 2> /dev/null || mv $@.tmp.c $@; \ + fi .hx.h: - @cmp -s $< $@ 2> /dev/null || cp $< $@ + @cmp -s $< $@ 2> /dev/null || cp $< $@; #NROFF_MAN = nroff -man .1.cat1: $(NROFF_MAN) $< > $@ diff --git a/lib/wind/bidi_table.c b/lib/wind/bidi_table.c index 5628c3bd1c73..84720c280cf2 100644 --- a/lib/wind/bidi_table.c +++ b/lib/wind/bidi_table.c @@ -1,5 +1,5 @@ /* ./bidi_table.c */ -/* Automatically generated at 2019-06-07T02:26:41.397837 */ +/* Automatically generated at 2022-11-15T13:59:51.646346 */ #include "bidi_table.h" diff --git a/lib/wind/bidi_table.h b/lib/wind/bidi_table.h index f00ddb1b6763..1674b600cef1 100644 --- a/lib/wind/bidi_table.h +++ b/lib/wind/bidi_table.h @@ -1,5 +1,5 @@ /* ./bidi_table.h */ -/* Automatically generated at 2019-06-07T02:26:41.396770 */ +/* Automatically generated at 2022-11-15T13:59:51.646310 */ #ifndef BIDI_TABLE_H #define BIDI_TABLE_H 1 diff --git a/lib/wind/combining_table.c b/lib/wind/combining_table.c index 71218362fc35..abe42a45ea9d 100644 --- a/lib/wind/combining_table.c +++ b/lib/wind/combining_table.c @@ -1,5 +1,5 @@ /* ./combining_table.c */ -/* Automatically generated at 2019-06-07T02:26:41.530824 */ +/* Automatically generated at 2022-11-15T13:59:51.697203 */ #include "combining_table.h" diff --git a/lib/wind/combining_table.h b/lib/wind/combining_table.h index 023857adda64..c59d52c78f4a 100644 --- a/lib/wind/combining_table.h +++ b/lib/wind/combining_table.h @@ -1,5 +1,5 @@ /* ./combining_table.h */ -/* Automatically generated at 2019-06-07T02:26:41.530328 */ +/* Automatically generated at 2022-11-15T13:59:51.697168 */ #ifndef COMBINING_TABLE_H #define COMBINING_TABLE_H 1 diff --git a/lib/wind/errorlist_table.c b/lib/wind/errorlist_table.c index 241e39bb05f3..083573b123cb 100644 --- a/lib/wind/errorlist_table.c +++ b/lib/wind/errorlist_table.c @@ -1,5 +1,5 @@ /* ./errorlist_table.c */ -/* Automatically generated at 2019-06-07T02:26:41.399027 */ +/* Automatically generated at 2022-11-15T13:59:51.730725 */ #include "errorlist_table.h" diff --git a/lib/wind/errorlist_table.h b/lib/wind/errorlist_table.h index 546048fae751..94e77ec9367e 100644 --- a/lib/wind/errorlist_table.h +++ b/lib/wind/errorlist_table.h @@ -1,5 +1,5 @@ /* ./errorlist_table.h */ -/* Automatically generated at 2019-06-07T02:26:41.398369 */ +/* Automatically generated at 2022-11-15T13:59:51.730690 */ #ifndef ERRORLIST_TABLE_H #define ERRORLIST_TABLE_H 1 diff --git a/lib/wind/idn-lookup.c b/lib/wind/idn-lookup.c index 1bc63a33dd8a..378c912a392d 100644 --- a/lib/wind/idn-lookup.c +++ b/lib/wind/idn-lookup.c @@ -156,7 +156,9 @@ main(int argc, char **argv) if (argc == 0) usage(1); - for (i = 0; i < argc; ++i) - lookup(argv[i]); + for (i = 0; i < argc; ++i) { + if (argv[i][0]) /* Quiet lint */ + lookup(argv[i]); + } return 0; } diff --git a/lib/wind/map_table.c b/lib/wind/map_table.c index abce7bef5fb6..1facbd1f720d 100644 --- a/lib/wind/map_table.c +++ b/lib/wind/map_table.c @@ -1,5 +1,5 @@ /* ./map_table.c */ -/* Automatically generated at 2019-06-07T02:26:41.398537 */ +/* Automatically generated at 2022-11-15T13:59:51.761698 */ #include "map_table.h" diff --git a/lib/wind/map_table.h b/lib/wind/map_table.h index ae8e90356825..9b31d51c6c24 100644 --- a/lib/wind/map_table.h +++ b/lib/wind/map_table.h @@ -1,5 +1,5 @@ /* ./map_table.h */ -/* Automatically generated at 2019-06-07T02:26:41.397498 */ +/* Automatically generated at 2022-11-15T13:59:51.761662 */ #ifndef MAP_TABLE_H #define MAP_TABLE_H 1 diff --git a/lib/wind/normalize.c b/lib/wind/normalize.c index 20e8a4a04beb..8f3991d10ed8 100644 --- a/lib/wind/normalize.c +++ b/lib/wind/normalize.c @@ -227,9 +227,9 @@ find_composition(const uint32_t *in, unsigned in_len) unsigned i; if (n % 5 == 0) { - cur = *in++; if (in_len-- == 0) return c->val; + cur = *in++; } i = cur >> 16; diff --git a/lib/wind/normalize_table.c b/lib/wind/normalize_table.c index 0a11b0d29dd1..c5739a7f9f0c 100644 --- a/lib/wind/normalize_table.c +++ b/lib/wind/normalize_table.c @@ -1,5 +1,5 @@ /* ./normalize_table.c */ -/* Automatically generated at 2019-06-07T02:26:41.707824 */ +/* Automatically generated at 2022-11-15T13:59:51.864904 */ #include "normalize_table.h" @@ -10906,6173 +10906,5670 @@ const struct canon_node _wind_canon_table[] = { {0x0, 0, 3, 0}, {0x0, 0, 10, 3}, {0x0, 0, 16, 13}, - {0x0, 0, 15, 29}, - {0x0, 1, 14, 44}, - {0x2f993, 16, 16, 57}, - {0x0, 0, 16, 57}, - {0x0, 0, 16, 73}, - {0x0, 8, 16, 89}, - {0xf942, 16, 16, 97}, - {0x2f994, 16, 16, 97}, - {0x0, 0, 16, 97}, - {0x0, 9, 15, 113}, - {0x0, 5, 6, 119}, - {0x2f9ef, 16, 16, 120}, - {0x0, 0, 16, 120}, - {0x0, 0, 16, 136}, - {0x0, 0, 16, 152}, - {0x0, 0, 1, 168}, - {0x0, 0, 1, 169}, - {0x0, 3, 4, 170}, - {0x0, 4, 5, 171}, - {0x0, 5, 6, 172}, - {0x1f94, 16, 16, 173}, - {0x0, 0, 16, 173}, - {0x0, 0, 12, 189}, - {0x0, 10, 12, 201}, - {0x2f8f6, 16, 16, 203}, - {0xf970, 16, 16, 203}, - {0x0, 0, 16, 203}, - {0x0, 2, 14, 219}, - {0x0, 2, 6, 231}, - {0x0, 0, 1, 235}, - {0x0, 0, 1, 236}, - {0x0, 6, 7, 237}, - {0x0, 5, 6, 238}, - {0x0, 4, 5, 239}, - {0x6c0, 16, 16, 240}, - {0x0, 0, 16, 240}, - {0x0, 0, 13, 256}, - {0x0, 9, 10, 269}, - {0xf9ae, 16, 16, 270}, - {0x0, 0, 16, 270}, - {0x0, 2, 16, 286}, - {0x0, 15, 16, 300}, - {0xfa69, 16, 16, 301}, - {0x0, 0, 11, 301}, - {0x0, 1, 16, 312}, - {0x0, 3, 14, 327}, - {0x0, 6, 7, 338}, - {0x2f9a4, 16, 16, 339}, - {0x0, 4, 15, 339}, - {0x0, 9, 10, 350}, - {0xf9be, 16, 16, 351}, - {0x0, 1, 12, 351}, - {0x0, 7, 8, 362}, - {0x2f864, 16, 16, 363}, - {0x0, 0, 13, 363}, - {0x0, 0, 1, 376}, - {0x0, 0, 1, 377}, - {0x0, 3, 4, 378}, - {0x0, 4, 5, 379}, - {0x0, 5, 6, 380}, - {0x1fc2, 16, 16, 381}, - {0x0, 0, 16, 381}, - {0x0, 0, 16, 397}, - {0x0, 1, 16, 413}, - {0x0, 0, 1, 428}, - {0x0, 3, 4, 429}, - {0x0, 0, 1, 430}, - {0x0, 9, 10, 431}, - {0x0, 9, 10, 432}, - {0x3065, 16, 16, 433}, - {0x0, 0, 3, 433}, - {0x0, 0, 12, 436}, - {0x0, 3, 14, 448}, - {0x0, 0, 1, 459}, - {0x0, 0, 1, 460}, - {0x0, 3, 4, 461}, - {0x0, 3, 4, 462}, - {0x0, 8, 9, 463}, - {0x2244, 16, 16, 464}, - {0x0, 0, 15, 464}, - {0x0, 0, 12, 479}, - {0x0, 0, 1, 491}, + {0x0, 3, 16, 29}, + {0x0, 1, 16, 42}, + {0x0, 0, 1, 57}, + {0x0, 0, 1, 58}, + {0x0, 3, 4, 59}, + {0x0, 0, 3, 60}, + {0x0, 0, 16, 63}, + {0xc0, 16, 16, 79}, + {0xc1, 16, 16, 79}, + {0xc2, 16, 16, 79}, + {0xc3, 16, 16, 79}, + {0xc4, 16, 16, 79}, + {0xc5, 16, 16, 79}, + {0x0, 0, 1, 79}, + {0x0, 0, 1, 80}, + {0x0, 3, 4, 81}, + {0x0, 0, 3, 82}, + {0x0, 7, 8, 85}, + {0xc7, 16, 16, 86}, + {0x0, 0, 1, 86}, + {0x0, 0, 1, 87}, + {0x0, 3, 4, 88}, + {0x0, 0, 4, 89}, + {0x0, 0, 16, 93}, + {0xc8, 16, 16, 109}, + {0xc9, 16, 16, 109}, + {0xca, 16, 16, 109}, + {0xcb, 16, 16, 109}, + {0x0, 0, 1, 109}, + {0x0, 0, 1, 110}, + {0x0, 3, 4, 111}, + {0x0, 0, 4, 112}, + {0x0, 0, 16, 116}, + {0xcc, 16, 16, 132}, + {0xcd, 16, 16, 132}, + {0xce, 16, 16, 132}, + {0xcf, 16, 16, 132}, + {0x0, 0, 1, 132}, + {0x0, 0, 1, 133}, + {0x0, 3, 4, 134}, + {0x0, 0, 4, 135}, + {0x0, 0, 13, 139}, + {0xd1, 16, 16, 152}, + {0x0, 0, 1, 152}, + {0x0, 0, 1, 153}, + {0x0, 3, 4, 154}, + {0x0, 0, 3, 155}, + {0x0, 0, 16, 158}, + {0xd2, 16, 16, 174}, + {0xd3, 16, 16, 174}, + {0xd4, 16, 16, 174}, + {0xd5, 16, 16, 174}, + {0xd6, 16, 16, 174}, + {0x0, 0, 11, 174}, + {0x0, 0, 1, 185}, + {0x0, 0, 1, 186}, + {0x0, 3, 4, 187}, + {0x0, 0, 4, 188}, + {0x0, 0, 16, 192}, + {0xd9, 16, 16, 208}, + {0xda, 16, 16, 208}, + {0xdb, 16, 16, 208}, + {0xdc, 16, 16, 208}, + {0x0, 0, 1, 208}, + {0x0, 0, 1, 209}, + {0x0, 3, 4, 210}, + {0x0, 0, 3, 211}, + {0x0, 0, 10, 214}, + {0xdd, 16, 16, 224}, + {0x0, 0, 16, 224}, + {0x0, 0, 1, 240}, + {0x0, 0, 1, 241}, + {0x0, 3, 4, 242}, + {0x0, 0, 3, 243}, + {0x0, 0, 16, 246}, + {0xe0, 16, 16, 262}, + {0xe1, 16, 16, 262}, + {0xe2, 16, 16, 262}, + {0xe3, 16, 16, 262}, + {0xe4, 16, 16, 262}, + {0xe5, 16, 16, 262}, + {0x0, 0, 1, 262}, + {0x0, 0, 1, 263}, + {0x0, 3, 4, 264}, + {0x0, 0, 3, 265}, + {0x0, 7, 8, 268}, + {0xe7, 16, 16, 269}, + {0x0, 0, 1, 269}, + {0x0, 0, 1, 270}, + {0x0, 3, 4, 271}, + {0x0, 0, 4, 272}, + {0x0, 0, 16, 276}, + {0xe8, 16, 16, 292}, + {0xe9, 16, 16, 292}, + {0xea, 16, 16, 292}, + {0xeb, 16, 16, 292}, + {0x0, 0, 1, 292}, + {0x0, 0, 1, 293}, + {0x0, 3, 4, 294}, + {0x0, 0, 4, 295}, + {0x0, 0, 16, 299}, + {0xec, 16, 16, 315}, + {0xed, 16, 16, 315}, + {0xee, 16, 16, 315}, + {0xef, 16, 16, 315}, + {0x0, 0, 1, 315}, + {0x0, 0, 1, 316}, + {0x0, 3, 4, 317}, + {0x0, 0, 4, 318}, + {0x0, 0, 13, 322}, + {0xf1, 16, 16, 335}, + {0x0, 0, 1, 335}, + {0x0, 0, 1, 336}, + {0x0, 3, 4, 337}, + {0x0, 0, 3, 338}, + {0x0, 0, 16, 341}, + {0xf2, 16, 16, 357}, + {0xf3, 16, 16, 357}, + {0xf4, 16, 16, 357}, + {0xf5, 16, 16, 357}, + {0xf6, 16, 16, 357}, + {0x0, 0, 11, 357}, + {0x0, 0, 1, 368}, + {0x0, 0, 1, 369}, + {0x0, 3, 4, 370}, + {0x0, 0, 4, 371}, + {0x0, 0, 16, 375}, + {0xf9, 16, 16, 391}, + {0xfa, 16, 16, 391}, + {0xfb, 16, 16, 391}, + {0xfc, 16, 16, 391}, + {0x0, 0, 1, 391}, + {0x0, 0, 1, 392}, + {0x0, 3, 4, 393}, + {0x0, 0, 3, 394}, + {0x0, 0, 11, 397}, + {0xfd, 16, 16, 408}, + {0xff, 16, 16, 408}, + {0x100, 16, 16, 408}, + {0x101, 16, 16, 408}, + {0x102, 16, 16, 408}, + {0x103, 16, 16, 408}, + {0x0, 3, 9, 408}, + {0x104, 16, 16, 414}, + {0x0, 3, 9, 414}, + {0x105, 16, 16, 420}, + {0x0, 1, 13, 420}, + {0x106, 16, 16, 432}, + {0x0, 1, 13, 432}, + {0x107, 16, 16, 444}, + {0x108, 16, 16, 444}, + {0x109, 16, 16, 444}, + {0x10a, 16, 16, 444}, + {0x10b, 16, 16, 444}, + {0x10c, 16, 16, 444}, + {0x10d, 16, 16, 444}, + {0x0, 0, 1, 444}, + {0x0, 0, 1, 445}, + {0x0, 3, 4, 446}, + {0x0, 0, 4, 447}, + {0x0, 7, 13, 451}, + {0x10e, 16, 16, 457}, + {0x0, 0, 1, 457}, + {0x0, 0, 1, 458}, + {0x0, 3, 4, 459}, + {0x0, 0, 4, 460}, + {0x0, 7, 13, 464}, + {0x10f, 16, 16, 470}, + {0x112, 16, 16, 470}, + {0x113, 16, 16, 470}, + {0x114, 16, 16, 470}, + {0x115, 16, 16, 470}, + {0x116, 16, 16, 470}, + {0x117, 16, 16, 470}, + {0x0, 3, 14, 470}, + {0x118, 16, 16, 481}, + {0x0, 3, 14, 481}, + {0x119, 16, 16, 492}, + {0x11a, 16, 16, 492}, + {0x11b, 16, 16, 492}, {0x0, 0, 1, 492}, - {0x0, 3, 4, 493}, - {0x0, 0, 1, 494}, - {0x0, 8, 9, 495}, - {0x1e7b, 16, 16, 496}, - {0x0, 1, 16, 496}, + {0x0, 0, 1, 493}, + {0x0, 3, 4, 494}, + {0x0, 0, 3, 495}, + {0x0, 1, 13, 498}, + {0x11c, 16, 16, 510}, + {0x0, 0, 1, 510}, {0x0, 0, 1, 511}, {0x0, 3, 4, 512}, - {0x0, 0, 1, 513}, - {0x0, 9, 10, 514}, - {0x0, 9, 10, 515}, - {0x30ba, 16, 16, 516}, - {0x2f995, 16, 16, 516}, - {0x0, 0, 15, 516}, - {0x0, 0, 15, 531}, - {0x0, 0, 1, 546}, + {0x0, 0, 3, 513}, + {0x0, 1, 13, 516}, + {0x11d, 16, 16, 528}, + {0x11e, 16, 16, 528}, + {0x11f, 16, 16, 528}, + {0x120, 16, 16, 528}, + {0x121, 16, 16, 528}, + {0x0, 7, 8, 528}, + {0x122, 16, 16, 529}, + {0x0, 7, 8, 529}, + {0x123, 16, 16, 530}, + {0x0, 0, 1, 530}, + {0x0, 0, 1, 531}, + {0x0, 3, 4, 532}, + {0x0, 0, 3, 533}, + {0x0, 2, 13, 536}, + {0x124, 16, 16, 547}, {0x0, 0, 1, 547}, - {0x0, 3, 4, 548}, - {0x0, 0, 1, 549}, - {0x0, 8, 9, 550}, - {0x4df, 16, 16, 551}, - {0x0, 0, 16, 551}, - {0x0, 7, 8, 567}, - {0x2f9d7, 16, 16, 568}, - {0x0, 0, 16, 568}, - {0x0, 14, 15, 584}, - {0x2f86b, 16, 16, 585}, - {0xf94a, 16, 16, 585}, - {0x0, 4, 14, 585}, - {0x0, 9, 13, 595}, - {0x0, 0, 1, 599}, - {0x0, 0, 1, 600}, - {0x0, 13, 14, 601}, - {0x0, 12, 13, 602}, - {0x0, 10, 11, 603}, - {0xddd, 16, 16, 604}, - {0x0, 2, 16, 604}, - {0x0, 1, 15, 618}, - {0xf91a, 16, 16, 632}, - {0x0, 0, 16, 632}, - {0x0, 1, 4, 648}, - {0x0, 9, 10, 651}, - {0x2f943, 16, 16, 652}, - {0x0, 0, 16, 652}, - {0x0, 10, 11, 668}, - {0x0, 8, 9, 669}, - {0x2f9d3, 16, 16, 670}, - {0x0, 3, 16, 670}, - {0x0, 1, 16, 683}, - {0x0, 0, 1, 698}, - {0x0, 0, 1, 699}, - {0x0, 3, 4, 700}, - {0x0, 0, 3, 701}, - {0x0, 1, 13, 704}, - {0x10c, 16, 16, 716}, - {0x0, 1, 16, 716}, - {0x0, 1, 2, 731}, - {0xf958, 16, 16, 732}, - {0x0, 0, 1, 732}, - {0x0, 0, 1, 733}, - {0x0, 3, 4, 734}, - {0x0, 0, 1, 735}, - {0x0, 0, 9, 736}, - {0x4e5, 16, 16, 745}, - {0x439, 16, 16, 745}, - {0x4e3, 16, 16, 745}, - {0x0, 2, 15, 745}, - {0x0, 12, 13, 758}, - {0x2f8c7, 16, 16, 759}, - {0x0, 0, 1, 759}, - {0x0, 3, 4, 760}, - {0x0, 0, 1, 761}, - {0x0, 9, 10, 762}, - {0x0, 9, 10, 763}, - {0x30b4, 16, 16, 764}, - {0x45d, 16, 16, 764}, - {0x0, 0, 16, 764}, - {0x0, 0, 1, 780}, - {0x0, 0, 1, 781}, - {0x0, 3, 4, 782}, - {0x0, 0, 3, 783}, - {0x0, 0, 10, 786}, - {0x1ee8, 16, 16, 796}, - {0x0, 0, 16, 796}, - {0x0, 0, 1, 812}, - {0x0, 0, 1, 813}, - {0x0, 3, 4, 814}, - {0x0, 0, 4, 815}, - {0x0, 3, 14, 819}, - {0x1eb9, 16, 16, 830}, - {0x1eee, 16, 16, 830}, - {0x229, 16, 16, 830}, - {0x1eec, 16, 16, 830}, - {0x119, 16, 16, 830}, - {0x2fa07, 16, 16, 830}, - {0x10a, 16, 16, 830}, - {0x106, 16, 16, 830}, - {0x108, 16, 16, 830}, - {0x0, 1, 16, 830}, - {0x0, 9, 10, 845}, - {0x2f90e, 16, 16, 846}, - {0x0, 0, 14, 846}, - {0x0, 1, 16, 860}, - {0x0, 0, 1, 875}, - {0x0, 0, 1, 876}, - {0x0, 3, 4, 877}, - {0x0, 0, 2, 878}, - {0x0, 4, 5, 880}, - {0x1f59, 16, 16, 881}, - {0x0, 6, 12, 881}, - {0x0, 14, 15, 887}, - {0x2f9f8, 16, 16, 888}, - {0x0, 0, 11, 888}, - {0x0, 0, 1, 899}, - {0x0, 0, 1, 900}, - {0x0, 3, 4, 901}, - {0x0, 0, 4, 902}, - {0x0, 1, 2, 906}, - {0x212, 16, 16, 907}, - {0x0, 0, 1, 907}, - {0x0, 0, 1, 908}, - {0x0, 3, 4, 909}, - {0x0, 0, 3, 910}, - {0x0, 1, 12, 913}, - {0x20f, 16, 16, 924}, - {0x0, 2, 14, 924}, - {0x0, 0, 1, 936}, - {0x0, 0, 1, 937}, - {0x0, 3, 4, 938}, - {0x0, 3, 4, 939}, - {0x0, 8, 9, 940}, - {0x22e1, 16, 16, 941}, - {0x0, 0, 15, 941}, - {0x0, 13, 14, 956}, - {0xf967, 16, 16, 957}, - {0x1e19, 16, 16, 957}, - {0x0, 1, 16, 957}, - {0x0, 10, 11, 972}, - {0xf9f0, 16, 16, 973}, - {0x0, 0, 15, 973}, - {0x0, 2, 3, 988}, - {0x2f807, 16, 16, 989}, - {0x0, 3, 15, 989}, - {0x0, 13, 14, 1001}, - {0x2f8b9, 16, 16, 1002}, - {0x0, 0, 1, 1002}, - {0x0, 0, 1, 1003}, - {0x0, 3, 4, 1004}, - {0x0, 0, 4, 1005}, - {0x0, 0, 16, 1009}, - {0x1d0, 16, 16, 1025}, - {0x0, 0, 14, 1025}, - {0x0, 9, 10, 1039}, - {0x2f974, 16, 16, 1040}, - {0x0, 1, 12, 1040}, - {0x0, 1, 5, 1051}, - {0x0, 5, 6, 1055}, - {0x2f91b, 16, 16, 1056}, + {0x0, 0, 1, 548}, + {0x0, 3, 4, 549}, + {0x0, 0, 4, 550}, + {0x0, 2, 13, 554}, + {0x125, 16, 16, 565}, + {0x128, 16, 16, 565}, + {0x129, 16, 16, 565}, + {0x12a, 16, 16, 565}, + {0x12b, 16, 16, 565}, + {0x12c, 16, 16, 565}, + {0x12d, 16, 16, 565}, + {0x0, 3, 9, 565}, + {0x12e, 16, 16, 571}, + {0x0, 3, 9, 571}, + {0x12f, 16, 16, 577}, + {0x130, 16, 16, 577}, + {0x0, 0, 1, 577}, + {0x0, 0, 1, 578}, + {0x0, 3, 4, 579}, + {0x0, 0, 1, 580}, + {0x0, 2, 3, 581}, + {0x134, 16, 16, 582}, + {0x0, 0, 1, 582}, + {0x0, 0, 1, 583}, + {0x0, 3, 4, 584}, + {0x0, 0, 1, 585}, + {0x0, 2, 13, 586}, + {0x135, 16, 16, 597}, + {0x212a, 0, 1, 597}, + {0x0, 0, 1, 598}, + {0x0, 3, 4, 599}, + {0x0, 0, 4, 600}, + {0x0, 3, 8, 604}, + {0x136, 16, 16, 609}, + {0x0, 0, 1, 609}, + {0x0, 0, 1, 610}, + {0x0, 3, 4, 611}, + {0x0, 0, 4, 612}, + {0x0, 3, 8, 616}, + {0x137, 16, 16, 621}, + {0x0, 0, 1, 621}, + {0x0, 0, 1, 622}, + {0x0, 3, 4, 623}, + {0x0, 0, 4, 624}, + {0x0, 1, 13, 628}, + {0x139, 16, 16, 640}, + {0x0, 0, 1, 640}, + {0x0, 0, 1, 641}, + {0x0, 3, 4, 642}, + {0x0, 0, 4, 643}, + {0x0, 1, 13, 647}, + {0x13a, 16, 16, 659}, + {0x0, 3, 14, 659}, + {0x13b, 16, 16, 670}, + {0x0, 3, 14, 670}, + {0x13c, 16, 16, 681}, + {0x13d, 16, 16, 681}, + {0x13e, 16, 16, 681}, + {0x143, 16, 16, 681}, + {0x144, 16, 16, 681}, + {0x0, 3, 14, 681}, + {0x145, 16, 16, 692}, + {0x0, 3, 14, 692}, + {0x146, 16, 16, 703}, + {0x147, 16, 16, 703}, + {0x148, 16, 16, 703}, + {0x14c, 16, 16, 703}, + {0x14d, 16, 16, 703}, + {0x14e, 16, 16, 703}, + {0x14f, 16, 16, 703}, + {0x150, 16, 16, 703}, + {0x151, 16, 16, 703}, + {0x0, 0, 1, 703}, + {0x0, 0, 1, 704}, + {0x0, 3, 4, 705}, + {0x0, 0, 4, 706}, + {0x0, 1, 16, 710}, + {0x154, 16, 16, 725}, + {0x0, 0, 1, 725}, + {0x0, 0, 1, 726}, + {0x0, 3, 4, 727}, + {0x0, 0, 4, 728}, + {0x0, 1, 16, 732}, + {0x155, 16, 16, 747}, + {0x0, 3, 8, 747}, + {0x156, 16, 16, 752}, + {0x0, 3, 8, 752}, + {0x157, 16, 16, 757}, + {0x158, 16, 16, 757}, + {0x159, 16, 16, 757}, + {0x0, 0, 1, 757}, + {0x0, 0, 1, 758}, + {0x0, 3, 4, 759}, + {0x0, 0, 3, 760}, + {0x0, 1, 13, 763}, + {0x15a, 16, 16, 775}, + {0x0, 0, 1, 775}, + {0x0, 0, 1, 776}, + {0x0, 3, 4, 777}, + {0x0, 0, 3, 778}, + {0x0, 1, 13, 781}, + {0x15b, 16, 16, 793}, + {0x15c, 16, 16, 793}, + {0x15d, 16, 16, 793}, + {0x0, 3, 8, 793}, + {0x15e, 16, 16, 798}, + {0x0, 3, 8, 798}, + {0x15f, 16, 16, 803}, + {0x160, 16, 16, 803}, + {0x161, 16, 16, 803}, + {0x0, 0, 1, 803}, + {0x0, 0, 1, 804}, + {0x0, 3, 4, 805}, + {0x0, 0, 4, 806}, + {0x0, 3, 14, 810}, + {0x162, 16, 16, 821}, + {0x0, 0, 1, 821}, + {0x0, 0, 1, 822}, + {0x0, 3, 4, 823}, + {0x0, 0, 4, 824}, + {0x0, 3, 14, 828}, + {0x163, 16, 16, 839}, + {0x0, 7, 13, 839}, + {0x164, 16, 16, 845}, + {0x0, 7, 13, 845}, + {0x165, 16, 16, 851}, + {0x168, 16, 16, 851}, + {0x169, 16, 16, 851}, + {0x16a, 16, 16, 851}, + {0x16b, 16, 16, 851}, + {0x16c, 16, 16, 851}, + {0x16d, 16, 16, 851}, + {0x16e, 16, 16, 851}, + {0x16f, 16, 16, 851}, + {0x170, 16, 16, 851}, + {0x171, 16, 16, 851}, + {0x0, 3, 14, 851}, + {0x172, 16, 16, 862}, + {0x0, 3, 14, 862}, + {0x173, 16, 16, 873}, + {0x0, 0, 1, 873}, + {0x0, 0, 1, 874}, + {0x0, 3, 4, 875}, + {0x0, 0, 3, 876}, + {0x0, 0, 9, 879}, + {0x174, 16, 16, 888}, + {0x0, 0, 1, 888}, + {0x0, 0, 1, 889}, + {0x0, 3, 4, 890}, + {0x0, 0, 3, 891}, + {0x0, 0, 11, 894}, + {0x175, 16, 16, 905}, + {0x176, 16, 16, 905}, + {0x177, 16, 16, 905}, + {0x178, 16, 16, 905}, + {0x0, 0, 1, 905}, + {0x0, 0, 1, 906}, + {0x0, 3, 4, 907}, + {0x0, 0, 4, 908}, + {0x0, 1, 13, 912}, + {0x179, 16, 16, 924}, + {0x0, 0, 1, 924}, + {0x0, 0, 1, 925}, + {0x0, 3, 4, 926}, + {0x0, 0, 4, 927}, + {0x0, 1, 13, 931}, + {0x17a, 16, 16, 943}, + {0x17b, 16, 16, 943}, + {0x17c, 16, 16, 943}, + {0x17d, 16, 16, 943}, + {0x17e, 16, 16, 943}, + {0x0, 1, 12, 943}, + {0x1a0, 16, 16, 954}, + {0x0, 1, 12, 954}, + {0x1a1, 16, 16, 965}, + {0x0, 1, 12, 965}, + {0x1af, 16, 16, 976}, + {0x0, 1, 12, 976}, + {0x1b0, 16, 16, 987}, + {0x1cd, 16, 16, 987}, + {0x1ce, 16, 16, 987}, + {0x1cf, 16, 16, 987}, + {0x1d0, 16, 16, 987}, + {0x1d1, 16, 16, 987}, + {0x1d2, 16, 16, 987}, + {0x1d3, 16, 16, 987}, + {0x1d4, 16, 16, 987}, + {0x0, 4, 13, 987}, + {0x0, 0, 1, 996}, + {0x0, 0, 1, 997}, + {0x0, 3, 4, 998}, + {0x0, 0, 1, 999}, + {0x0, 0, 13, 1000}, + {0x1d5, 16, 16, 1013}, + {0x0, 4, 13, 1013}, + {0x0, 0, 1, 1022}, + {0x0, 0, 1, 1023}, + {0x0, 3, 4, 1024}, + {0x0, 0, 1, 1025}, + {0x0, 0, 13, 1026}, + {0x1d6, 16, 16, 1039}, + {0x1d7, 16, 16, 1039}, + {0x1d8, 16, 16, 1039}, + {0x1d9, 16, 16, 1039}, + {0x1da, 16, 16, 1039}, + {0x1db, 16, 16, 1039}, + {0x1dc, 16, 16, 1039}, + {0x0, 2, 16, 1039}, + {0x0, 0, 1, 1053}, + {0x0, 0, 1, 1054}, + {0x0, 3, 4, 1055}, {0x0, 0, 1, 1056}, - {0x0, 0, 1, 1057}, - {0x0, 3, 4, 1058}, - {0x0, 3, 4, 1059}, - {0x0, 8, 9, 1060}, - {0x22e0, 16, 16, 1061}, - {0x0, 0, 16, 1061}, - {0x0, 1, 11, 1077}, - {0x2f82e, 16, 16, 1087}, - {0x0, 0, 16, 1087}, + {0x0, 4, 5, 1057}, + {0x1de, 16, 16, 1058}, + {0x0, 2, 16, 1058}, + {0x0, 0, 1, 1072}, + {0x0, 0, 1, 1073}, + {0x0, 3, 4, 1074}, + {0x0, 0, 1, 1075}, + {0x0, 4, 5, 1076}, + {0x1df, 16, 16, 1077}, + {0x0, 2, 12, 1077}, + {0x0, 6, 16, 1087}, + {0x0, 0, 1, 1097}, + {0x0, 0, 1, 1098}, + {0x0, 3, 4, 1099}, + {0x0, 0, 1, 1100}, + {0x0, 4, 5, 1101}, + {0x1e0, 16, 16, 1102}, + {0x0, 0, 1, 1102}, {0x0, 0, 1, 1103}, - {0x0, 0, 1, 1104}, - {0x0, 3, 4, 1105}, - {0x0, 0, 2, 1106}, - {0x0, 3, 5, 1108}, - {0x1f19, 16, 16, 1110}, - {0x0, 0, 10, 1110}, - {0x0, 9, 10, 1120}, - {0x2f8ce, 16, 16, 1121}, - {0x1f18, 16, 16, 1121}, - {0x0, 1, 15, 1121}, - {0x1f7d, 0, 1, 1135}, - {0x0, 0, 1, 1136}, - {0x0, 3, 4, 1137}, - {0x0, 4, 5, 1138}, - {0x0, 5, 6, 1139}, - {0x1ff4, 16, 16, 1140}, - {0x0, 0, 16, 1140}, - {0x0, 9, 10, 1156}, - {0xf9dd, 16, 16, 1157}, - {0x0, 1, 14, 1157}, - {0x2f991, 16, 16, 1170}, - {0x0, 2, 16, 1170}, - {0x0, 3, 4, 1184}, - {0xfa0b, 16, 16, 1185}, - {0x0, 6, 16, 1185}, + {0x0, 3, 4, 1104}, + {0x0, 0, 1, 1105}, + {0x0, 4, 5, 1106}, + {0x1e1, 16, 16, 1107}, + {0x0, 0, 1, 1107}, + {0x0, 0, 1, 1108}, + {0x0, 3, 4, 1109}, + {0x0, 0, 1, 1110}, + {0x0, 1, 5, 1111}, + {0x1e2, 16, 16, 1115}, + {0x0, 0, 1, 1115}, + {0x0, 0, 1, 1116}, + {0x0, 3, 4, 1117}, + {0x0, 0, 1, 1118}, + {0x0, 1, 5, 1119}, + {0x1e3, 16, 16, 1123}, + {0x1e6, 16, 16, 1123}, + {0x1e7, 16, 16, 1123}, + {0x0, 1, 13, 1123}, + {0x1e8, 16, 16, 1135}, + {0x0, 1, 13, 1135}, + {0x1e9, 16, 16, 1147}, + {0x0, 3, 9, 1147}, + {0x1ea, 16, 16, 1153}, + {0x0, 3, 9, 1153}, + {0x1eb, 16, 16, 1159}, + {0x0, 0, 15, 1159}, + {0x0, 10, 12, 1174}, + {0x0, 0, 1, 1176}, + {0x0, 0, 1, 1177}, + {0x0, 3, 4, 1178}, + {0x0, 0, 1, 1179}, + {0x0, 4, 5, 1180}, + {0x1ec, 16, 16, 1181}, + {0x0, 0, 1, 1181}, + {0x0, 0, 1, 1182}, + {0x0, 3, 4, 1183}, + {0x0, 0, 1, 1184}, + {0x0, 4, 5, 1185}, + {0x1ed, 16, 16, 1186}, + {0x0, 0, 8, 1186}, + {0x0, 0, 1, 1194}, {0x0, 0, 1, 1195}, - {0x0, 0, 1, 1196}, - {0x0, 3, 4, 1197}, - {0x0, 0, 5, 1198}, - {0x0, 2, 3, 1203}, - {0x1fcf, 16, 16, 1204}, - {0x0, 0, 15, 1204}, - {0x0, 8, 9, 1219}, - {0x2f9bc, 16, 16, 1220}, - {0x0, 6, 7, 1220}, - {0x0, 3, 4, 1221}, - {0x2f838, 16, 16, 1222}, - {0x0, 0, 7, 1222}, - {0x0, 9, 10, 1229}, - {0x0, 2, 3, 1230}, - {0x2f88f, 16, 16, 1231}, - {0x0, 2, 6, 1231}, - {0x0, 0, 1, 1235}, + {0x0, 3, 4, 1196}, + {0x0, 0, 1, 1197}, + {0x0, 12, 13, 1198}, + {0x1ee, 16, 16, 1199}, + {0x0, 2, 3, 1199}, + {0x0, 0, 1, 1200}, + {0x0, 0, 1, 1201}, + {0x0, 3, 4, 1202}, + {0x0, 0, 1, 1203}, + {0x0, 12, 13, 1204}, + {0x1ef, 16, 16, 1205}, + {0x1f0, 16, 16, 1205}, + {0x1f4, 16, 16, 1205}, + {0x1f5, 16, 16, 1205}, + {0x1f8, 16, 16, 1205}, + {0x1f9, 16, 16, 1205}, + {0x212b, 0, 1, 1205}, + {0x0, 0, 1, 1206}, + {0x0, 3, 4, 1207}, + {0x0, 0, 1, 1208}, + {0x0, 1, 2, 1209}, + {0x1fa, 16, 16, 1210}, + {0x0, 0, 1, 1210}, + {0x0, 0, 1, 1211}, + {0x0, 3, 4, 1212}, + {0x0, 0, 1, 1213}, + {0x0, 1, 2, 1214}, + {0x1fb, 16, 16, 1215}, + {0x1fc, 16, 16, 1215}, + {0x1fd, 16, 16, 1215}, + {0x0, 0, 1, 1215}, + {0x0, 0, 1, 1216}, + {0x0, 3, 4, 1217}, + {0x0, 0, 1, 1218}, + {0x0, 1, 2, 1219}, + {0x1fe, 16, 16, 1220}, + {0x0, 0, 1, 1220}, + {0x0, 0, 1, 1221}, + {0x0, 3, 4, 1222}, + {0x0, 0, 1, 1223}, + {0x0, 1, 2, 1224}, + {0x1ff, 16, 16, 1225}, + {0x200, 16, 16, 1225}, + {0x201, 16, 16, 1225}, + {0x0, 1, 2, 1225}, + {0x202, 16, 16, 1226}, + {0x0, 1, 2, 1226}, + {0x203, 16, 16, 1227}, + {0x204, 16, 16, 1227}, + {0x205, 16, 16, 1227}, + {0x0, 1, 2, 1227}, + {0x206, 16, 16, 1228}, + {0x0, 1, 2, 1228}, + {0x207, 16, 16, 1229}, + {0x208, 16, 16, 1229}, + {0x209, 16, 16, 1229}, + {0x0, 1, 2, 1229}, + {0x20a, 16, 16, 1230}, + {0x0, 1, 2, 1230}, + {0x20b, 16, 16, 1231}, + {0x20c, 16, 16, 1231}, + {0x20d, 16, 16, 1231}, + {0x20e, 16, 16, 1231}, + {0x20f, 16, 16, 1231}, + {0x210, 16, 16, 1231}, + {0x211, 16, 16, 1231}, + {0x0, 1, 2, 1231}, + {0x212, 16, 16, 1232}, + {0x0, 1, 2, 1232}, + {0x213, 16, 16, 1233}, + {0x214, 16, 16, 1233}, + {0x215, 16, 16, 1233}, + {0x216, 16, 16, 1233}, + {0x217, 16, 16, 1233}, + {0x218, 16, 16, 1233}, + {0x219, 16, 16, 1233}, + {0x21a, 16, 16, 1233}, + {0x21b, 16, 16, 1233}, + {0x21e, 16, 16, 1233}, + {0x21f, 16, 16, 1233}, + {0x226, 16, 16, 1233}, + {0x227, 16, 16, 1233}, + {0x228, 16, 16, 1233}, + {0x229, 16, 16, 1233}, + {0x0, 0, 1, 1233}, + {0x0, 0, 1, 1234}, + {0x0, 3, 4, 1235}, {0x0, 0, 1, 1236}, - {0x0, 3, 4, 1237}, - {0x0, 3, 4, 1238}, - {0x0, 8, 9, 1239}, - {0x22ec, 16, 16, 1240}, - {0x0, 0, 7, 1240}, - {0x2f88d, 16, 16, 1247}, - {0x0, 4, 16, 1247}, - {0x0, 14, 15, 1259}, - {0xfa3f, 16, 16, 1260}, - {0x2f98f, 16, 16, 1260}, - {0x0, 8, 12, 1260}, - {0x0, 11, 12, 1264}, - {0x2f9ee, 16, 16, 1265}, - {0xfa35, 16, 16, 1265}, - {0x0, 0, 1, 1265}, - {0x0, 0, 1, 1266}, - {0x0, 3, 4, 1267}, - {0x0, 0, 3, 1268}, - {0x0, 1, 2, 1271}, - {0x203, 16, 16, 1272}, - {0x0, 6, 8, 1272}, - {0x0, 0, 1, 1274}, + {0x0, 4, 5, 1237}, + {0x22a, 16, 16, 1238}, + {0x0, 0, 1, 1238}, + {0x0, 0, 1, 1239}, + {0x0, 3, 4, 1240}, + {0x0, 0, 1, 1241}, + {0x0, 4, 5, 1242}, + {0x22b, 16, 16, 1243}, + {0x0, 0, 1, 1243}, + {0x0, 0, 1, 1244}, + {0x0, 3, 4, 1245}, + {0x0, 0, 1, 1246}, + {0x0, 1, 9, 1247}, + {0x22c, 16, 16, 1255}, + {0x0, 0, 1, 1255}, + {0x0, 0, 1, 1256}, + {0x0, 3, 4, 1257}, + {0x0, 0, 1, 1258}, + {0x0, 1, 9, 1259}, + {0x22d, 16, 16, 1267}, + {0x22e, 16, 16, 1267}, + {0x22f, 16, 16, 1267}, + {0x0, 0, 1, 1267}, + {0x0, 0, 1, 1268}, + {0x0, 3, 4, 1269}, + {0x0, 0, 1, 1270}, + {0x0, 4, 5, 1271}, + {0x230, 16, 16, 1272}, + {0x0, 0, 1, 1272}, + {0x0, 0, 1, 1273}, + {0x0, 3, 4, 1274}, {0x0, 0, 1, 1275}, - {0x0, 13, 14, 1276}, - {0x0, 3, 6, 1277}, - {0x0, 7, 8, 1280}, - {0xd4c, 16, 16, 1281}, - {0x0, 0, 15, 1281}, - {0x0, 2, 3, 1296}, - {0xfa20, 16, 16, 1297}, - {0x0, 3, 13, 1297}, - {0x0, 0, 2, 1307}, - {0x0, 0, 1, 1309}, - {0x0, 0, 1, 1310}, - {0x0, 3, 4, 1311}, + {0x0, 4, 5, 1276}, + {0x231, 16, 16, 1277}, + {0x232, 16, 16, 1277}, + {0x233, 16, 16, 1277}, + {0x0, 0, 14, 1277}, + {0x0, 0, 9, 1291}, + {0x340, 16, 16, 1300}, + {0x341, 16, 16, 1300}, + {0x0, 3, 4, 1300}, + {0x343, 16, 16, 1301}, + {0x0, 0, 1, 1301}, + {0x0, 0, 1, 1302}, + {0x0, 3, 4, 1303}, + {0x0, 0, 1, 1304}, + {0x0, 1, 2, 1305}, + {0x344, 16, 16, 1306}, + {0x0, 9, 10, 1306}, + {0x374, 16, 16, 1307}, + {0x0, 11, 15, 1307}, + {0x37e, 16, 16, 1311}, + {0x0, 8, 9, 1311}, {0x0, 0, 1, 1312}, - {0x0, 2, 7, 1313}, - {0x1eac, 16, 16, 1318}, - {0x0, 0, 16, 1318}, - {0x0, 3, 4, 1334}, - {0x2f874, 16, 16, 1335}, - {0x1eb6, 16, 16, 1335}, - {0x0, 0, 1, 1335}, - {0x0, 0, 1, 1336}, - {0x0, 3, 4, 1337}, - {0x0, 4, 5, 1338}, - {0x0, 5, 6, 1339}, - {0x1f9c, 16, 16, 1340}, - {0x0, 2, 12, 1340}, - {0x0, 6, 16, 1350}, - {0x0, 0, 1, 1360}, - {0x0, 0, 1, 1361}, - {0x0, 3, 4, 1362}, - {0x0, 0, 1, 1363}, - {0x0, 6, 7, 1364}, - {0x1e1d, 16, 16, 1365}, - {0x0, 1, 14, 1365}, - {0x0, 0, 14, 1378}, - {0x2f918, 16, 16, 1392}, - {0x0, 2, 14, 1392}, - {0x0, 9, 10, 1404}, - {0x2f975, 16, 16, 1405}, - {0x0, 1, 10, 1405}, - {0x0, 11, 12, 1414}, - {0xfa0a, 16, 16, 1415}, - {0x0, 0, 16, 1415}, - {0x0, 2, 4, 1431}, - {0xf992, 16, 16, 1433}, - {0xfa47, 16, 16, 1433}, - {0x0, 2, 15, 1433}, - {0x0, 13, 16, 1446}, - {0xfa53, 16, 16, 1449}, - {0xfa52, 16, 16, 1449}, - {0xfa1b, 16, 16, 1449}, + {0x0, 0, 1, 1313}, + {0x0, 3, 4, 1314}, + {0x0, 0, 5, 1315}, + {0x0, 0, 2, 1320}, + {0x385, 16, 16, 1322}, + {0x0, 0, 16, 1322}, + {0x0, 0, 1, 1338}, + {0x0, 0, 1, 1339}, + {0x0, 3, 4, 1340}, + {0x0, 0, 5, 1341}, + {0x0, 0, 7, 1346}, + {0x386, 16, 16, 1353}, + {0x0, 4, 8, 1353}, + {0x387, 16, 16, 1357}, + {0x0, 0, 1, 1357}, + {0x0, 0, 1, 1358}, + {0x0, 3, 4, 1359}, + {0x0, 0, 2, 1360}, + {0x0, 0, 2, 1362}, + {0x388, 16, 16, 1364}, + {0x0, 0, 1, 1364}, + {0x0, 0, 1, 1365}, + {0x0, 3, 4, 1366}, + {0x0, 0, 5, 1367}, + {0x0, 0, 2, 1372}, + {0x389, 16, 16, 1374}, + {0x0, 0, 1, 1374}, + {0x0, 0, 1, 1375}, + {0x0, 3, 4, 1376}, + {0x0, 0, 2, 1377}, + {0x0, 0, 9, 1379}, + {0x38a, 16, 16, 1388}, + {0x0, 0, 1, 1388}, + {0x0, 0, 1, 1389}, + {0x0, 3, 4, 1390}, + {0x0, 0, 2, 1391}, + {0x0, 0, 2, 1393}, + {0x38c, 16, 16, 1395}, + {0x0, 1, 16, 1395}, + {0x0, 0, 1, 1410}, + {0x0, 0, 1, 1411}, + {0x0, 3, 4, 1412}, + {0x0, 0, 2, 1413}, + {0x0, 0, 9, 1415}, + {0x38e, 16, 16, 1424}, + {0x2126, 0, 1, 1424}, + {0x0, 0, 1, 1425}, + {0x0, 3, 4, 1426}, + {0x0, 0, 5, 1427}, + {0x0, 0, 2, 1432}, + {0x38f, 16, 16, 1434}, + {0x0, 1, 15, 1434}, + {0x0, 0, 1, 1448}, {0x0, 0, 1, 1449}, {0x0, 3, 4, 1450}, - {0x0, 0, 1, 1451}, - {0x0, 9, 10, 1452}, - {0x0, 9, 10, 1453}, - {0x30b2, 16, 16, 1454}, - {0x0, 0, 1, 1454}, - {0x0, 0, 1, 1455}, - {0x0, 3, 4, 1456}, - {0x0, 0, 5, 1457}, - {0x0, 0, 2, 1462}, - {0x1fca, 16, 16, 1464}, - {0x389, 16, 16, 1464}, - {0x0, 1, 16, 1464}, - {0x0, 12, 13, 1479}, - {0x2f93e, 16, 16, 1480}, - {0x0, 3, 15, 1480}, - {0x0, 3, 9, 1492}, - {0x2f968, 16, 16, 1498}, - {0x0, 0, 1, 1498}, - {0x0, 0, 1, 1499}, - {0x0, 3, 4, 1500}, - {0x0, 0, 5, 1501}, - {0x0, 2, 6, 1506}, - {0x1f2e, 16, 16, 1510}, - {0x1f98, 16, 16, 1510}, - {0x0, 6, 12, 1510}, - {0x0, 0, 1, 1516}, - {0x2f804, 16, 16, 1517}, - {0x2f919, 16, 16, 1517}, - {0x2f835, 16, 16, 1517}, - {0x0, 1, 2, 1517}, - {0x0, 5, 6, 1518}, - {0x2f824, 16, 16, 1519}, - {0x0, 0, 16, 1519}, - {0x1fe3, 16, 16, 1535}, - {0x0, 2, 4, 1535}, - {0x0, 0, 1, 1537}, - {0x0, 0, 1, 1538}, - {0x0, 3, 4, 1539}, - {0x0, 0, 1, 1540}, - {0x0, 7, 8, 1541}, - {0x1e69, 16, 16, 1542}, - {0x1fbe, 0, 1, 1542}, - {0x0, 0, 16, 1543}, + {0x0, 0, 5, 1451}, + {0x0, 0, 2, 1456}, + {0x390, 16, 16, 1458}, + {0x3aa, 16, 16, 1458}, + {0x3ab, 16, 16, 1458}, + {0x0, 0, 16, 1458}, + {0x0, 0, 1, 1474}, + {0x0, 0, 1, 1475}, + {0x0, 3, 4, 1476}, + {0x0, 0, 5, 1477}, + {0x0, 0, 7, 1482}, + {0x3ac, 16, 16, 1489}, + {0x0, 0, 1, 1489}, + {0x0, 0, 1, 1490}, + {0x0, 3, 4, 1491}, + {0x0, 0, 2, 1492}, + {0x0, 0, 2, 1494}, + {0x3ad, 16, 16, 1496}, + {0x0, 0, 1, 1496}, + {0x0, 0, 1, 1497}, + {0x0, 3, 4, 1498}, + {0x0, 0, 5, 1499}, + {0x0, 0, 2, 1504}, + {0x3ae, 16, 16, 1506}, + {0x1fbe, 0, 1, 1506}, + {0x0, 0, 1, 1507}, + {0x0, 3, 4, 1508}, + {0x0, 0, 5, 1509}, + {0x0, 0, 9, 1514}, + {0x3af, 16, 16, 1523}, + {0x0, 0, 1, 1523}, + {0x0, 0, 1, 1524}, + {0x0, 3, 4, 1525}, + {0x0, 0, 5, 1526}, + {0x0, 0, 2, 1531}, + {0x3b0, 16, 16, 1533}, + {0x3ca, 16, 16, 1533}, + {0x0, 0, 1, 1533}, + {0x0, 0, 1, 1534}, + {0x0, 3, 4, 1535}, + {0x0, 0, 5, 1536}, + {0x0, 0, 9, 1541}, + {0x3cb, 16, 16, 1550}, + {0x0, 0, 1, 1550}, + {0x0, 0, 1, 1551}, + {0x0, 3, 4, 1552}, + {0x0, 0, 2, 1553}, + {0x0, 0, 2, 1555}, + {0x3cc, 16, 16, 1557}, + {0x3cd, 16, 16, 1557}, + {0x0, 0, 1, 1557}, + {0x0, 0, 1, 1558}, {0x0, 3, 4, 1559}, - {0x2f96c, 16, 16, 1560}, - {0x0, 0, 15, 1560}, - {0x0, 10, 11, 1575}, - {0x2f85d, 16, 16, 1576}, - {0x0, 3, 11, 1576}, - {0x2f836, 16, 16, 1584}, - {0x0, 12, 13, 1584}, - {0x2f92f, 16, 16, 1585}, - {0x0, 0, 10, 1585}, - {0x0, 0, 1, 1595}, - {0x0, 0, 1, 1596}, - {0x0, 3, 4, 1597}, - {0x0, 0, 5, 1598}, - {0x0, 2, 3, 1603}, - {0x1f5f, 16, 16, 1604}, - {0x0, 2, 3, 1604}, - {0x0, 15, 16, 1605}, - {0x2f9d8, 16, 16, 1606}, - {0x0, 1, 16, 1606}, - {0x0, 0, 12, 1621}, - {0xf932, 16, 16, 1633}, - {0x0, 0, 16, 1633}, - {0x0, 11, 12, 1649}, - {0xfa6a, 16, 16, 1650}, - {0x0, 2, 16, 1650}, - {0x0, 2, 4, 1664}, - {0xfa68, 16, 16, 1666}, - {0x0, 2, 16, 1666}, - {0x212b, 0, 1, 1680}, - {0x0, 0, 1, 1681}, - {0x0, 3, 4, 1682}, - {0x0, 0, 1, 1683}, - {0x0, 1, 2, 1684}, - {0x1fa, 16, 16, 1685}, - {0x0, 1, 16, 1685}, - {0x0, 0, 1, 1700}, - {0x0, 3, 4, 1701}, - {0x0, 0, 1, 1702}, - {0x0, 9, 10, 1703}, - {0x0, 9, 10, 1704}, - {0x30c9, 16, 16, 1705}, - {0xf9ea, 16, 16, 1705}, - {0x0, 2, 16, 1705}, + {0x0, 0, 5, 1560}, + {0x0, 0, 2, 1565}, + {0x3ce, 16, 16, 1567}, + {0x0, 2, 3, 1567}, + {0x0, 0, 1, 1568}, + {0x0, 0, 1, 1569}, + {0x0, 3, 4, 1570}, + {0x0, 0, 1, 1571}, + {0x0, 1, 9, 1572}, + {0x3d3, 16, 16, 1580}, + {0x3d4, 16, 16, 1580}, + {0x0, 0, 15, 1580}, + {0x0, 0, 15, 1595}, + {0x0, 0, 1, 1610}, + {0x0, 0, 1, 1611}, + {0x0, 3, 4, 1612}, + {0x0, 0, 1, 1613}, + {0x0, 0, 9, 1614}, + {0x400, 16, 16, 1623}, + {0x401, 16, 16, 1623}, + {0x0, 0, 1, 1623}, + {0x0, 0, 1, 1624}, + {0x0, 3, 4, 1625}, + {0x0, 0, 1, 1626}, + {0x0, 1, 2, 1627}, + {0x403, 16, 16, 1628}, + {0x0, 6, 7, 1628}, + {0x0, 0, 1, 1629}, + {0x0, 0, 1, 1630}, + {0x0, 3, 4, 1631}, + {0x0, 0, 1, 1632}, + {0x0, 8, 9, 1633}, + {0x407, 16, 16, 1634}, + {0x0, 0, 1, 1634}, + {0x0, 0, 1, 1635}, + {0x0, 3, 4, 1636}, + {0x0, 0, 1, 1637}, + {0x0, 1, 2, 1638}, + {0x40c, 16, 16, 1639}, + {0x0, 0, 1, 1639}, + {0x0, 0, 1, 1640}, + {0x0, 3, 4, 1641}, + {0x0, 0, 1, 1642}, + {0x0, 0, 9, 1643}, + {0x40d, 16, 16, 1652}, + {0x0, 3, 14, 1652}, + {0x0, 0, 1, 1663}, + {0x0, 0, 1, 1664}, + {0x0, 3, 4, 1665}, + {0x0, 0, 1, 1666}, + {0x0, 4, 12, 1667}, + {0x40e, 16, 16, 1675}, + {0x419, 16, 16, 1675}, + {0x0, 0, 15, 1675}, + {0x0, 0, 1, 1690}, + {0x0, 0, 1, 1691}, + {0x0, 3, 4, 1692}, + {0x0, 0, 1, 1693}, + {0x0, 0, 9, 1694}, + {0x439, 16, 16, 1703}, + {0x0, 0, 1, 1703}, + {0x0, 0, 1, 1704}, + {0x0, 3, 4, 1705}, + {0x0, 0, 1, 1706}, + {0x0, 0, 9, 1707}, + {0x450, 16, 16, 1716}, + {0x451, 16, 16, 1716}, + {0x0, 0, 1, 1716}, + {0x0, 0, 1, 1717}, + {0x0, 3, 4, 1718}, {0x0, 0, 1, 1719}, - {0x0, 0, 1, 1720}, - {0x0, 3, 4, 1721}, + {0x0, 1, 2, 1720}, + {0x453, 16, 16, 1721}, + {0x0, 6, 7, 1721}, {0x0, 0, 1, 1722}, - {0x0, 1, 2, 1723}, - {0x1e09, 16, 16, 1724}, - {0x0, 1, 11, 1724}, - {0x0, 2, 3, 1734}, - {0x2f8e1, 16, 16, 1735}, - {0x0, 0, 14, 1735}, - {0x0, 0, 1, 1749}, - {0x0, 3, 4, 1750}, - {0x0, 0, 1, 1751}, - {0x0, 9, 10, 1752}, - {0x0, 9, 10, 1753}, - {0x30f9, 16, 16, 1754}, - {0x0, 13, 14, 1754}, - {0xf986, 16, 16, 1755}, - {0x0, 0, 1, 1755}, - {0x0, 0, 1, 1756}, - {0x0, 3, 4, 1757}, - {0x0, 0, 4, 1758}, - {0x0, 7, 8, 1762}, - {0x1e03, 16, 16, 1763}, + {0x0, 0, 1, 1723}, + {0x0, 3, 4, 1724}, + {0x0, 0, 1, 1725}, + {0x0, 8, 9, 1726}, + {0x457, 16, 16, 1727}, + {0x0, 0, 1, 1727}, + {0x0, 0, 1, 1728}, + {0x0, 3, 4, 1729}, + {0x0, 0, 1, 1730}, + {0x0, 1, 2, 1731}, + {0x45c, 16, 16, 1732}, + {0x45d, 16, 16, 1732}, + {0x0, 3, 14, 1732}, + {0x0, 0, 1, 1743}, + {0x0, 0, 1, 1744}, + {0x0, 3, 4, 1745}, + {0x0, 0, 1, 1746}, + {0x0, 4, 12, 1747}, + {0x45e, 16, 16, 1755}, + {0x0, 4, 6, 1755}, + {0x0, 0, 1, 1757}, + {0x0, 0, 1, 1758}, + {0x0, 3, 4, 1759}, + {0x0, 0, 1, 1760}, + {0x0, 15, 16, 1761}, + {0x476, 16, 16, 1762}, + {0x0, 0, 1, 1762}, {0x0, 0, 1, 1763}, - {0x0, 0, 1, 1764}, - {0x0, 3, 4, 1765}, - {0x0, 0, 1, 1766}, - {0x0, 1, 5, 1767}, - {0x1fd, 16, 16, 1771}, - {0x0, 0, 1, 1771}, - {0x0, 0, 1, 1772}, - {0x0, 3, 4, 1773}, - {0x0, 3, 4, 1774}, - {0x0, 8, 9, 1775}, - {0x2281, 16, 16, 1776}, - {0x1e3, 16, 16, 1776}, - {0x0, 2, 12, 1776}, - {0x0, 0, 1, 1786}, - {0x0, 0, 1, 1787}, - {0x0, 3, 4, 1788}, - {0x0, 3, 4, 1789}, - {0x0, 8, 9, 1790}, - {0x22af, 16, 16, 1791}, - {0xf96b, 16, 16, 1791}, - {0x0, 2, 16, 1791}, - {0x0, 3, 10, 1805}, - {0x0, 2, 3, 1812}, - {0x2f937, 16, 16, 1813}, - {0x0, 2, 12, 1813}, - {0x0, 2, 3, 1823}, - {0xf98d, 16, 16, 1824}, - {0x0, 6, 16, 1824}, + {0x0, 3, 4, 1764}, + {0x0, 0, 1, 1765}, + {0x0, 15, 16, 1766}, + {0x477, 16, 16, 1767}, + {0x0, 0, 1, 1767}, + {0x0, 0, 1, 1768}, + {0x0, 3, 4, 1769}, + {0x0, 0, 1, 1770}, + {0x0, 6, 9, 1771}, + {0x4c1, 16, 16, 1774}, + {0x0, 0, 1, 1774}, + {0x0, 0, 1, 1775}, + {0x0, 3, 4, 1776}, + {0x0, 0, 1, 1777}, + {0x0, 6, 9, 1778}, + {0x4c2, 16, 16, 1781}, + {0x0, 0, 1, 1781}, + {0x0, 0, 1, 1782}, + {0x0, 3, 4, 1783}, + {0x0, 0, 1, 1784}, + {0x0, 6, 9, 1785}, + {0x4d0, 16, 16, 1788}, + {0x0, 0, 1, 1788}, + {0x0, 0, 1, 1789}, + {0x0, 3, 4, 1790}, + {0x0, 0, 1, 1791}, + {0x0, 6, 9, 1792}, + {0x4d1, 16, 16, 1795}, + {0x4d2, 16, 16, 1795}, + {0x4d3, 16, 16, 1795}, + {0x4d6, 16, 16, 1795}, + {0x4d7, 16, 16, 1795}, + {0x0, 8, 10, 1795}, + {0x0, 0, 1, 1797}, + {0x0, 0, 1, 1798}, + {0x0, 3, 4, 1799}, + {0x0, 0, 1, 1800}, + {0x0, 8, 9, 1801}, + {0x4da, 16, 16, 1802}, + {0x0, 0, 1, 1802}, + {0x0, 0, 1, 1803}, + {0x0, 3, 4, 1804}, + {0x0, 0, 1, 1805}, + {0x0, 8, 9, 1806}, + {0x4db, 16, 16, 1807}, + {0x4dc, 16, 16, 1807}, + {0x4dd, 16, 16, 1807}, + {0x0, 0, 1, 1807}, + {0x0, 0, 1, 1808}, + {0x0, 3, 4, 1809}, + {0x0, 0, 1, 1810}, + {0x0, 8, 9, 1811}, + {0x4de, 16, 16, 1812}, + {0x0, 0, 1, 1812}, + {0x0, 0, 1, 1813}, + {0x0, 3, 4, 1814}, + {0x0, 0, 1, 1815}, + {0x0, 8, 9, 1816}, + {0x4df, 16, 16, 1817}, + {0x4e2, 16, 16, 1817}, + {0x4e3, 16, 16, 1817}, + {0x4e4, 16, 16, 1817}, + {0x4e5, 16, 16, 1817}, + {0x0, 0, 1, 1817}, + {0x0, 0, 1, 1818}, + {0x0, 3, 4, 1819}, + {0x0, 0, 1, 1820}, + {0x0, 8, 9, 1821}, + {0x4e6, 16, 16, 1822}, + {0x0, 0, 1, 1822}, + {0x0, 0, 1, 1823}, + {0x0, 3, 4, 1824}, + {0x0, 0, 1, 1825}, + {0x0, 8, 9, 1826}, + {0x4e7, 16, 16, 1827}, + {0x0, 8, 10, 1827}, + {0x0, 0, 1, 1829}, + {0x0, 0, 1, 1830}, + {0x0, 3, 4, 1831}, + {0x0, 0, 1, 1832}, + {0x0, 8, 9, 1833}, + {0x4ea, 16, 16, 1834}, {0x0, 0, 1, 1834}, - {0x0, 3, 4, 1835}, - {0x0, 0, 1, 1836}, - {0x0, 9, 10, 1837}, - {0x0, 9, 10, 1838}, - {0x30b0, 16, 16, 1839}, + {0x0, 0, 1, 1835}, + {0x0, 3, 4, 1836}, + {0x0, 0, 1, 1837}, + {0x0, 8, 9, 1838}, + {0x4eb, 16, 16, 1839}, {0x0, 0, 1, 1839}, {0x0, 0, 1, 1840}, {0x0, 3, 4, 1841}, - {0x0, 0, 3, 1842}, - {0x0, 1, 8, 1845}, - {0x1e3e, 16, 16, 1852}, - {0x1e40, 16, 16, 1852}, - {0x0, 8, 9, 1852}, - {0xfa65, 16, 16, 1853}, - {0x0, 6, 16, 1853}, - {0x0, 10, 11, 1863}, - {0xf93a, 16, 16, 1864}, - {0x0, 0, 16, 1864}, - {0x0, 0, 1, 1880}, - {0x0, 0, 1, 1881}, - {0x0, 3, 4, 1882}, - {0x0, 4, 5, 1883}, - {0x0, 5, 6, 1884}, - {0x1faa, 16, 16, 1885}, - {0x0, 0, 1, 1885}, - {0x0, 2, 4, 1886}, - {0x2001, 16, 16, 1888}, - {0x2000, 16, 16, 1888}, - {0x0, 0, 16, 1888}, - {0x0, 11, 12, 1904}, - {0x0, 8, 9, 1905}, - {0x2f897, 16, 16, 1906}, - {0x0, 2, 15, 1906}, - {0x0, 4, 5, 1919}, - {0x2f934, 16, 16, 1920}, - {0x0, 1, 13, 1920}, - {0x0, 11, 12, 1932}, - {0x2f848, 16, 16, 1933}, - {0x0, 0, 16, 1933}, + {0x0, 0, 1, 1842}, + {0x0, 8, 9, 1843}, + {0x4ec, 16, 16, 1844}, + {0x0, 0, 1, 1844}, + {0x0, 0, 1, 1845}, + {0x0, 3, 4, 1846}, + {0x0, 0, 1, 1847}, + {0x0, 8, 9, 1848}, + {0x4ed, 16, 16, 1849}, + {0x4ee, 16, 16, 1849}, + {0x4ef, 16, 16, 1849}, + {0x4f0, 16, 16, 1849}, + {0x4f1, 16, 16, 1849}, + {0x4f2, 16, 16, 1849}, + {0x4f3, 16, 16, 1849}, + {0x0, 0, 1, 1849}, + {0x0, 0, 1, 1850}, + {0x0, 3, 4, 1851}, + {0x0, 0, 1, 1852}, + {0x0, 8, 9, 1853}, + {0x4f4, 16, 16, 1854}, + {0x0, 0, 1, 1854}, + {0x0, 0, 1, 1855}, + {0x0, 3, 4, 1856}, + {0x0, 0, 1, 1857}, + {0x0, 8, 9, 1858}, + {0x4f5, 16, 16, 1859}, + {0x0, 0, 1, 1859}, + {0x0, 0, 1, 1860}, + {0x0, 3, 4, 1861}, + {0x0, 0, 1, 1862}, + {0x0, 8, 9, 1863}, + {0x4f8, 16, 16, 1864}, + {0x0, 0, 1, 1864}, + {0x0, 0, 1, 1865}, + {0x0, 3, 4, 1866}, + {0x0, 0, 1, 1867}, + {0x0, 8, 9, 1868}, + {0x4f9, 16, 16, 1869}, + {0x0, 2, 14, 1869}, + {0x0, 7, 8, 1881}, + {0x0, 0, 1, 1882}, + {0x0, 0, 1, 1883}, + {0x0, 6, 7, 1884}, + {0x0, 5, 6, 1885}, + {0x0, 3, 6, 1886}, + {0x622, 16, 16, 1889}, + {0x623, 16, 16, 1889}, + {0x0, 8, 11, 1889}, + {0x0, 0, 1, 1892}, + {0x0, 0, 1, 1893}, + {0x0, 6, 7, 1894}, + {0x0, 5, 6, 1895}, + {0x0, 4, 5, 1896}, + {0x624, 16, 16, 1897}, + {0x625, 16, 16, 1897}, + {0x0, 0, 1, 1897}, + {0x0, 0, 1, 1898}, + {0x0, 6, 7, 1899}, + {0x0, 5, 6, 1900}, + {0x0, 4, 5, 1901}, + {0x626, 16, 16, 1902}, + {0x0, 2, 6, 1902}, + {0x0, 0, 1, 1906}, + {0x0, 0, 1, 1907}, + {0x0, 6, 7, 1908}, + {0x0, 5, 6, 1909}, + {0x0, 4, 5, 1910}, + {0x6c0, 16, 16, 1911}, + {0x0, 1, 2, 1911}, + {0x0, 0, 1, 1912}, + {0x0, 0, 1, 1913}, + {0x0, 6, 7, 1914}, + {0x0, 5, 6, 1915}, + {0x0, 4, 5, 1916}, + {0x6c2, 16, 16, 1917}, + {0x0, 0, 1, 1917}, + {0x0, 0, 1, 1918}, + {0x0, 6, 7, 1919}, + {0x0, 5, 6, 1920}, + {0x0, 4, 5, 1921}, + {0x6d3, 16, 16, 1922}, + {0x0, 2, 13, 1922}, + {0x0, 8, 9, 1933}, + {0x0, 0, 1, 1934}, + {0x0, 0, 1, 1935}, + {0x0, 9, 10, 1936}, + {0x0, 3, 4, 1937}, + {0x0, 12, 13, 1938}, + {0x929, 16, 16, 1939}, + {0x0, 0, 4, 1939}, + {0x0, 0, 1, 1943}, + {0x0, 0, 1, 1944}, + {0x0, 9, 10, 1945}, + {0x0, 3, 4, 1946}, + {0x0, 12, 13, 1947}, + {0x931, 16, 16, 1948}, + {0x0, 0, 1, 1948}, {0x0, 0, 1, 1949}, - {0x0, 0, 1, 1950}, + {0x0, 9, 10, 1950}, {0x0, 3, 4, 1951}, - {0x0, 0, 5, 1952}, - {0x0, 2, 6, 1957}, - {0x1f07, 16, 16, 1961}, - {0x1f81, 16, 16, 1961}, - {0x0, 0, 1, 1961}, - {0x0, 0, 1, 1962}, - {0x0, 3, 4, 1963}, - {0x0, 0, 4, 1964}, - {0x0, 7, 13, 1968}, - {0x1e0b, 16, 16, 1974}, - {0x0, 0, 1, 1974}, - {0x0, 0, 1, 1975}, - {0x0, 3, 4, 1976}, - {0x0, 4, 5, 1977}, - {0x0, 5, 6, 1978}, - {0x1f9b, 16, 16, 1979}, - {0x0, 0, 1, 1979}, - {0x0, 0, 1, 1980}, - {0x0, 3, 4, 1981}, - {0x0, 0, 3, 1982}, - {0x0, 3, 4, 1985}, - {0x1e43, 16, 16, 1986}, - {0x0, 8, 9, 1986}, - {0x0, 0, 1, 1987}, - {0x0, 0, 1, 1988}, - {0x0, 3, 4, 1989}, - {0x0, 0, 5, 1990}, - {0x0, 0, 2, 1995}, - {0x1fed, 16, 16, 1997}, - {0x385, 16, 16, 1997}, - {0x0, 2, 4, 1997}, - {0x0, 0, 1, 1999}, - {0x0, 0, 1, 2000}, - {0x0, 3, 4, 2001}, - {0x0, 0, 1, 2002}, - {0x0, 0, 2, 2003}, - {0x1e17, 16, 16, 2005}, - {0x0, 1, 15, 2005}, - {0x0, 14, 15, 2019}, - {0x2f95f, 16, 16, 2020}, - {0x0, 0, 1, 2020}, - {0x0, 0, 1, 2021}, - {0x0, 3, 4, 2022}, - {0x0, 0, 5, 2023}, - {0x0, 0, 2, 2028}, - {0x1f53, 16, 16, 2030}, - {0x1f55, 16, 16, 2030}, - {0x0, 0, 1, 2030}, - {0x0, 0, 1, 2031}, - {0x0, 3, 4, 2032}, - {0x0, 3, 4, 2033}, - {0x0, 8, 9, 2034}, - {0x22ad, 16, 16, 2035}, - {0x0, 2, 12, 2035}, - {0x0, 0, 1, 2045}, - {0x0, 3, 4, 2046}, - {0x0, 0, 1, 2047}, - {0x0, 9, 10, 2048}, - {0x0, 9, 11, 2049}, - {0x3079, 16, 16, 2051}, - {0x0, 0, 1, 2051}, - {0x0, 3, 4, 2052}, + {0x0, 12, 13, 1952}, + {0x934, 16, 16, 1953}, + {0x0, 7, 8, 1953}, + {0x0, 0, 1, 1954}, + {0x0, 0, 1, 1955}, + {0x0, 9, 10, 1956}, + {0x0, 11, 14, 1957}, + {0x0, 14, 15, 1960}, + {0x9cb, 16, 16, 1961}, + {0x0, 7, 8, 1961}, + {0x9cc, 16, 16, 1962}, + {0x0, 4, 13, 1962}, + {0x0, 7, 8, 1971}, + {0x0, 0, 1, 1972}, + {0x0, 0, 1, 1973}, + {0x0, 11, 12, 1974}, + {0x0, 3, 6, 1975}, + {0x0, 6, 8, 1978}, + {0xb48, 16, 16, 1980}, + {0x0, 14, 15, 1980}, + {0xb4b, 16, 16, 1981}, + {0xb4c, 16, 16, 1981}, + {0x0, 2, 3, 1981}, + {0x0, 0, 1, 1982}, + {0x0, 0, 1, 1983}, + {0x0, 11, 12, 1984}, + {0x0, 13, 14, 1985}, + {0x0, 7, 8, 1986}, + {0xb94, 16, 16, 1987}, + {0x0, 6, 8, 1987}, + {0x0, 0, 1, 1989}, + {0x0, 0, 1, 1990}, + {0x0, 11, 12, 1991}, + {0x0, 11, 14, 1992}, + {0x0, 14, 15, 1995}, + {0xbca, 16, 16, 1996}, + {0x0, 0, 1, 1996}, + {0x0, 0, 1, 1997}, + {0x0, 11, 12, 1998}, + {0x0, 11, 12, 1999}, + {0x0, 14, 15, 2000}, + {0xbcb, 16, 16, 2001}, + {0x0, 7, 8, 2001}, + {0xbcc, 16, 16, 2002}, + {0x0, 4, 13, 2002}, + {0x0, 6, 7, 2011}, + {0x0, 0, 1, 2012}, + {0x0, 0, 1, 2013}, + {0x0, 12, 13, 2014}, + {0x0, 5, 6, 2015}, + {0x0, 6, 7, 2016}, + {0xc48, 16, 16, 2017}, + {0x0, 15, 16, 2017}, + {0x0, 0, 1, 2018}, + {0x0, 0, 1, 2019}, + {0x0, 12, 13, 2020}, + {0x0, 13, 14, 2021}, + {0x0, 5, 6, 2022}, + {0xcc0, 16, 16, 2023}, + {0x0, 6, 11, 2023}, + {0x0, 0, 1, 2028}, + {0x0, 0, 1, 2029}, + {0x0, 12, 13, 2030}, + {0x0, 12, 14, 2031}, + {0x0, 5, 7, 2033}, + {0xcc7, 16, 16, 2035}, + {0xcc8, 16, 16, 2035}, + {0x0, 2, 3, 2035}, + {0xcca, 16, 16, 2036}, + {0x0, 0, 1, 2036}, + {0x0, 0, 1, 2037}, + {0x0, 12, 13, 2038}, + {0x0, 13, 14, 2039}, + {0x0, 5, 6, 2040}, + {0xccb, 16, 16, 2041}, + {0x0, 4, 14, 2041}, + {0x0, 6, 8, 2051}, {0x0, 0, 1, 2053}, - {0x0, 9, 10, 2054}, - {0x0, 9, 11, 2055}, - {0x307d, 16, 16, 2057}, - {0x0, 3, 8, 2057}, - {0x1e5a, 16, 16, 2062}, - {0x156, 16, 16, 2062}, - {0x0, 12, 13, 2062}, - {0xf982, 16, 16, 2063}, - {0x0, 10, 12, 2063}, - {0x0, 0, 1, 2065}, - {0x0, 0, 1, 2066}, - {0x0, 3, 4, 2067}, - {0x0, 0, 1, 2068}, - {0x0, 4, 5, 2069}, - {0x1ec, 16, 16, 2070}, - {0x0, 4, 14, 2070}, - {0x0, 3, 4, 2080}, - {0xfa64, 16, 16, 2081}, + {0x0, 0, 1, 2054}, + {0x0, 13, 14, 2055}, + {0x0, 3, 6, 2056}, + {0x0, 14, 15, 2059}, + {0xd4a, 16, 16, 2060}, + {0x0, 0, 1, 2060}, + {0x0, 0, 1, 2061}, + {0x0, 13, 14, 2062}, + {0x0, 3, 4, 2063}, + {0x0, 14, 15, 2064}, + {0xd4b, 16, 16, 2065}, + {0x0, 7, 8, 2065}, + {0xd4c, 16, 16, 2066}, + {0x0, 9, 13, 2066}, + {0x0, 0, 1, 2070}, + {0x0, 0, 1, 2071}, + {0x0, 13, 14, 2072}, + {0x0, 12, 14, 2073}, + {0x0, 10, 16, 2075}, + {0xdda, 16, 16, 2081}, + {0xddc, 16, 16, 2081}, {0x0, 0, 1, 2081}, {0x0, 0, 1, 2082}, - {0x0, 3, 4, 2083}, - {0x0, 4, 5, 2084}, - {0x0, 5, 6, 2085}, - {0x1f8e, 16, 16, 2086}, - {0x0, 7, 8, 2086}, - {0xf99c, 16, 16, 2087}, - {0x0, 0, 10, 2087}, + {0x0, 13, 14, 2083}, + {0x0, 12, 13, 2084}, + {0x0, 10, 11, 2085}, + {0xddd, 16, 16, 2086}, + {0x0, 15, 16, 2086}, + {0xdde, 16, 16, 2087}, + {0x0, 7, 8, 2087}, + {0x0, 1, 2, 2088}, + {0x0, 0, 1, 2089}, + {0x0, 0, 1, 2090}, + {0x0, 15, 16, 2091}, + {0x0, 7, 9, 2092}, + {0x0, 2, 5, 2094}, + {0xf73, 16, 16, 2097}, + {0xf75, 16, 16, 2097}, {0x0, 0, 1, 2097}, - {0x0, 0, 1, 2098}, - {0x0, 3, 4, 2099}, - {0x0, 0, 5, 2100}, - {0x0, 0, 2, 2105}, - {0x1f3d, 16, 16, 2107}, - {0x0, 0, 1, 2107}, - {0x0, 3, 4, 2108}, - {0x0, 0, 5, 2109}, + {0xf81, 16, 16, 2098}, + {0x0, 0, 16, 2098}, {0x0, 2, 3, 2114}, - {0x1fd6, 16, 16, 2115}, - {0x0, 6, 15, 2115}, - {0x0, 0, 1, 2124}, - {0x0, 0, 1, 2125}, - {0x0, 3, 4, 2126}, - {0x0, 0, 5, 2127}, - {0x0, 0, 2, 2132}, - {0x1fde, 16, 16, 2134}, - {0x1fdd, 16, 16, 2134}, - {0x0, 0, 1, 2134}, - {0x0, 0, 1, 2135}, - {0x0, 3, 4, 2136}, - {0x0, 4, 5, 2137}, - {0x0, 5, 6, 2138}, - {0x1f95, 16, 16, 2139}, - {0x0, 4, 8, 2139}, - {0xf90b, 16, 16, 2143}, - {0x2f846, 16, 16, 2143}, - {0x0, 3, 6, 2143}, + {0x0, 5, 6, 2115}, + {0x0, 0, 1, 2116}, + {0x0, 1, 2, 2117}, + {0x0, 0, 1, 2118}, + {0x0, 2, 3, 2119}, + {0x0, 14, 15, 2120}, + {0x1026, 16, 16, 2121}, + {0x1e00, 16, 16, 2121}, + {0x1e01, 16, 16, 2121}, + {0x0, 0, 1, 2121}, + {0x0, 0, 1, 2122}, + {0x0, 3, 4, 2123}, + {0x0, 0, 4, 2124}, + {0x0, 7, 8, 2128}, + {0x1e02, 16, 16, 2129}, + {0x0, 0, 1, 2129}, + {0x0, 0, 1, 2130}, + {0x0, 3, 4, 2131}, + {0x0, 0, 4, 2132}, + {0x0, 7, 8, 2136}, + {0x1e03, 16, 16, 2137}, + {0x0, 3, 4, 2137}, + {0x1e04, 16, 16, 2138}, + {0x0, 3, 4, 2138}, + {0x1e05, 16, 16, 2139}, + {0x0, 1, 2, 2139}, + {0x1e06, 16, 16, 2140}, + {0x0, 1, 2, 2140}, + {0x1e07, 16, 16, 2141}, + {0x0, 0, 1, 2141}, + {0x0, 0, 1, 2142}, + {0x0, 3, 4, 2143}, + {0x0, 0, 1, 2144}, + {0x0, 1, 2, 2145}, + {0x1e08, 16, 16, 2146}, {0x0, 0, 1, 2146}, {0x0, 0, 1, 2147}, {0x0, 3, 4, 2148}, - {0x0, 3, 4, 2149}, - {0x0, 8, 9, 2150}, - {0x2224, 16, 16, 2151}, - {0x0, 0, 16, 2151}, - {0x0, 12, 13, 2167}, - {0xfa08, 16, 16, 2168}, - {0x0, 5, 6, 2168}, - {0x2f905, 16, 16, 2169}, - {0x0, 10, 11, 2169}, - {0xf995, 16, 16, 2170}, - {0x0, 0, 1, 2170}, - {0x0, 3, 4, 2171}, - {0x0, 0, 1, 2172}, - {0x0, 9, 10, 2173}, - {0x0, 9, 10, 2174}, - {0x30c7, 16, 16, 2175}, - {0x0, 0, 1, 2175}, - {0x0, 0, 1, 2176}, - {0x0, 3, 4, 2177}, - {0x0, 0, 5, 2178}, - {0x0, 0, 2, 2183}, - {0x1f22, 16, 16, 2185}, - {0x0, 5, 11, 2185}, - {0xf97f, 16, 16, 2191}, - {0x0, 9, 10, 2191}, - {0x2fa00, 16, 16, 2192}, - {0x0, 7, 16, 2192}, - {0x0, 2, 11, 2201}, - {0xf9e6, 16, 16, 2210}, - {0x0, 1, 16, 2210}, - {0x0, 10, 11, 2225}, - {0xfa17, 16, 16, 2226}, - {0xfa5a, 16, 16, 2226}, - {0x0, 10, 12, 2226}, - {0x0, 0, 1, 2228}, - {0x0, 0, 1, 2229}, - {0x0, 3, 4, 2230}, - {0x0, 0, 1, 2231}, - {0x0, 4, 5, 2232}, - {0x1e5d, 16, 16, 2233}, - {0x0, 7, 10, 2233}, - {0x2f9b5, 16, 16, 2236}, - {0x2f9b6, 16, 16, 2236}, - {0x0, 0, 12, 2236}, - {0x0, 0, 16, 2248}, - {0xf997, 16, 16, 2264}, - {0x0, 1, 12, 2264}, - {0x0, 11, 12, 2275}, - {0x0, 6, 7, 2276}, - {0x2fa01, 16, 16, 2277}, - {0x0, 10, 16, 2277}, - {0x0, 8, 15, 2283}, - {0xfa22, 16, 16, 2290}, - {0x0, 0, 10, 2290}, - {0x0, 0, 1, 2300}, - {0x0, 0, 1, 2301}, - {0x0, 3, 4, 2302}, - {0x0, 0, 1, 2303}, - {0x0, 0, 2, 2304}, - {0x1f4a, 16, 16, 2306}, - {0x0, 4, 13, 2306}, - {0x0, 6, 7, 2315}, - {0x0, 0, 1, 2316}, + {0x0, 0, 1, 2149}, + {0x0, 1, 2, 2150}, + {0x1e09, 16, 16, 2151}, + {0x1e0a, 16, 16, 2151}, + {0x1e0b, 16, 16, 2151}, + {0x0, 3, 14, 2151}, + {0x1e0c, 16, 16, 2162}, + {0x0, 3, 14, 2162}, + {0x1e0d, 16, 16, 2173}, + {0x0, 1, 2, 2173}, + {0x1e0e, 16, 16, 2174}, + {0x0, 1, 2, 2174}, + {0x1e0f, 16, 16, 2175}, + {0x1e10, 16, 16, 2175}, + {0x1e11, 16, 16, 2175}, + {0x1e12, 16, 16, 2175}, + {0x1e13, 16, 16, 2175}, + {0x0, 2, 4, 2175}, + {0x0, 0, 1, 2177}, + {0x0, 0, 1, 2178}, + {0x0, 3, 4, 2179}, + {0x0, 0, 1, 2180}, + {0x0, 0, 2, 2181}, + {0x1e14, 16, 16, 2183}, + {0x0, 0, 1, 2183}, + {0x0, 0, 1, 2184}, + {0x0, 3, 4, 2185}, + {0x0, 0, 1, 2186}, + {0x0, 0, 2, 2187}, + {0x1e15, 16, 16, 2189}, + {0x1e16, 16, 16, 2189}, + {0x1e17, 16, 16, 2189}, + {0x1e18, 16, 16, 2189}, + {0x1e19, 16, 16, 2189}, + {0x0, 0, 1, 2189}, + {0x1e1a, 16, 16, 2190}, + {0x0, 0, 1, 2190}, + {0x1e1b, 16, 16, 2191}, + {0x0, 0, 1, 2191}, + {0x0, 0, 1, 2192}, + {0x0, 3, 4, 2193}, + {0x0, 0, 1, 2194}, + {0x0, 6, 7, 2195}, + {0x1e1c, 16, 16, 2196}, + {0x0, 0, 1, 2196}, + {0x0, 0, 1, 2197}, + {0x0, 3, 4, 2198}, + {0x0, 0, 1, 2199}, + {0x0, 6, 7, 2200}, + {0x1e1d, 16, 16, 2201}, + {0x0, 0, 1, 2201}, + {0x0, 0, 1, 2202}, + {0x0, 3, 4, 2203}, + {0x0, 0, 1, 2204}, + {0x0, 7, 8, 2205}, + {0x1e1e, 16, 16, 2206}, + {0x0, 0, 1, 2206}, + {0x0, 0, 1, 2207}, + {0x0, 3, 4, 2208}, + {0x0, 0, 1, 2209}, + {0x0, 7, 8, 2210}, + {0x1e1f, 16, 16, 2211}, + {0x1e20, 16, 16, 2211}, + {0x1e21, 16, 16, 2211}, + {0x1e22, 16, 16, 2211}, + {0x1e23, 16, 16, 2211}, + {0x0, 3, 15, 2211}, + {0x1e24, 16, 16, 2223}, + {0x0, 3, 15, 2223}, + {0x1e25, 16, 16, 2235}, + {0x1e26, 16, 16, 2235}, + {0x1e27, 16, 16, 2235}, + {0x1e28, 16, 16, 2235}, + {0x1e29, 16, 16, 2235}, + {0x1e2a, 16, 16, 2235}, + {0x1e2b, 16, 16, 2235}, + {0x0, 0, 1, 2235}, + {0x1e2c, 16, 16, 2236}, + {0x0, 0, 1, 2236}, + {0x1e2d, 16, 16, 2237}, + {0x0, 0, 1, 2237}, + {0x0, 0, 1, 2238}, + {0x0, 3, 4, 2239}, + {0x0, 0, 1, 2240}, + {0x0, 1, 2, 2241}, + {0x1e2e, 16, 16, 2242}, + {0x0, 0, 1, 2242}, + {0x0, 0, 1, 2243}, + {0x0, 3, 4, 2244}, + {0x0, 0, 1, 2245}, + {0x0, 1, 2, 2246}, + {0x1e2f, 16, 16, 2247}, + {0x1e30, 16, 16, 2247}, + {0x1e31, 16, 16, 2247}, + {0x1e32, 16, 16, 2247}, + {0x1e33, 16, 16, 2247}, + {0x0, 1, 2, 2247}, + {0x1e34, 16, 16, 2248}, + {0x0, 1, 2, 2248}, + {0x1e35, 16, 16, 2249}, + {0x1e36, 16, 16, 2249}, + {0x1e37, 16, 16, 2249}, + {0x0, 3, 13, 2249}, + {0x0, 6, 8, 2259}, + {0x0, 0, 1, 2261}, + {0x0, 0, 1, 2262}, + {0x0, 3, 4, 2263}, + {0x0, 0, 1, 2264}, + {0x0, 4, 5, 2265}, + {0x1e38, 16, 16, 2266}, + {0x0, 0, 1, 2266}, + {0x0, 0, 1, 2267}, + {0x0, 3, 4, 2268}, + {0x0, 0, 1, 2269}, + {0x0, 4, 5, 2270}, + {0x1e39, 16, 16, 2271}, + {0x0, 1, 2, 2271}, + {0x1e3a, 16, 16, 2272}, + {0x0, 1, 2, 2272}, + {0x1e3b, 16, 16, 2273}, + {0x1e3c, 16, 16, 2273}, + {0x1e3d, 16, 16, 2273}, + {0x0, 0, 1, 2273}, + {0x0, 0, 1, 2274}, + {0x0, 3, 4, 2275}, + {0x0, 0, 3, 2276}, + {0x0, 1, 8, 2279}, + {0x1e3e, 16, 16, 2286}, + {0x0, 0, 1, 2286}, + {0x0, 0, 1, 2287}, + {0x0, 3, 4, 2288}, + {0x0, 0, 3, 2289}, + {0x0, 1, 8, 2292}, + {0x1e3f, 16, 16, 2299}, + {0x1e40, 16, 16, 2299}, + {0x1e41, 16, 16, 2299}, + {0x0, 3, 4, 2299}, + {0x1e42, 16, 16, 2300}, + {0x0, 3, 4, 2300}, + {0x1e43, 16, 16, 2301}, + {0x1e44, 16, 16, 2301}, + {0x1e45, 16, 16, 2301}, + {0x1e46, 16, 16, 2301}, + {0x1e47, 16, 16, 2301}, + {0x0, 1, 2, 2301}, + {0x1e48, 16, 16, 2302}, + {0x0, 1, 2, 2302}, + {0x1e49, 16, 16, 2303}, + {0x1e4a, 16, 16, 2303}, + {0x1e4b, 16, 16, 2303}, + {0x1e4c, 16, 16, 2303}, + {0x1e4d, 16, 16, 2303}, + {0x1e4e, 16, 16, 2303}, + {0x1e4f, 16, 16, 2303}, + {0x0, 12, 14, 2303}, + {0x0, 0, 1, 2305}, + {0x0, 0, 1, 2306}, + {0x0, 3, 4, 2307}, + {0x0, 0, 1, 2308}, + {0x0, 0, 2, 2309}, + {0x1e50, 16, 16, 2311}, + {0x0, 0, 1, 2311}, + {0x0, 0, 1, 2312}, + {0x0, 3, 4, 2313}, + {0x0, 0, 1, 2314}, + {0x0, 0, 2, 2315}, + {0x1e51, 16, 16, 2317}, + {0x1e52, 16, 16, 2317}, + {0x1e53, 16, 16, 2317}, {0x0, 0, 1, 2317}, - {0x0, 12, 13, 2318}, - {0x0, 5, 6, 2319}, - {0x0, 6, 7, 2320}, - {0xc48, 16, 16, 2321}, - {0x2f976, 16, 16, 2321}, - {0x0, 15, 16, 2321}, - {0xf97c, 16, 16, 2322}, - {0x0, 2, 13, 2322}, - {0x0, 4, 5, 2333}, - {0xf930, 16, 16, 2334}, - {0x212a, 0, 1, 2334}, - {0x0, 0, 1, 2335}, - {0x0, 3, 4, 2336}, - {0x0, 0, 4, 2337}, - {0x0, 1, 2, 2341}, - {0x1e34, 16, 16, 2342}, - {0x0, 2, 11, 2342}, - {0x0, 3, 4, 2351}, - {0x2f97c, 16, 16, 2352}, - {0x0, 2, 3, 2352}, - {0x2f85f, 16, 16, 2353}, - {0x0, 0, 1, 2353}, - {0x0, 0, 1, 2354}, - {0x0, 3, 4, 2355}, + {0x0, 0, 1, 2318}, + {0x0, 3, 4, 2319}, + {0x0, 0, 1, 2320}, + {0x0, 1, 8, 2321}, + {0x1e54, 16, 16, 2328}, + {0x0, 0, 1, 2328}, + {0x0, 0, 1, 2329}, + {0x0, 3, 4, 2330}, + {0x0, 0, 1, 2331}, + {0x0, 1, 8, 2332}, + {0x1e55, 16, 16, 2339}, + {0x1e56, 16, 16, 2339}, + {0x1e57, 16, 16, 2339}, + {0x1e58, 16, 16, 2339}, + {0x1e59, 16, 16, 2339}, + {0x1e5a, 16, 16, 2339}, + {0x1e5b, 16, 16, 2339}, + {0x0, 10, 12, 2339}, + {0x0, 0, 1, 2341}, + {0x0, 0, 1, 2342}, + {0x0, 3, 4, 2343}, + {0x0, 0, 1, 2344}, + {0x0, 4, 5, 2345}, + {0x1e5c, 16, 16, 2346}, + {0x0, 0, 1, 2346}, + {0x0, 0, 1, 2347}, + {0x0, 3, 4, 2348}, + {0x0, 0, 1, 2349}, + {0x0, 4, 5, 2350}, + {0x1e5d, 16, 16, 2351}, + {0x0, 1, 2, 2351}, + {0x1e5e, 16, 16, 2352}, + {0x0, 1, 2, 2352}, + {0x1e5f, 16, 16, 2353}, + {0x1e60, 16, 16, 2353}, + {0x1e61, 16, 16, 2353}, + {0x1e62, 16, 16, 2353}, + {0x1e63, 16, 16, 2353}, + {0x0, 10, 12, 2353}, + {0x0, 0, 1, 2355}, {0x0, 0, 1, 2356}, - {0x0, 6, 9, 2357}, - {0x4d1, 16, 16, 2360}, - {0x0, 1, 2, 2360}, - {0xfa55, 16, 16, 2361}, - {0x0, 5, 14, 2361}, - {0x0, 15, 16, 2370}, - {0x0, 10, 11, 2371}, - {0x2f9ed, 16, 16, 2372}, - {0x2f97d, 16, 16, 2372}, - {0x0, 9, 10, 2372}, - {0xf90e, 16, 16, 2373}, - {0x0, 0, 1, 2373}, - {0x0, 0, 1, 2374}, - {0x0, 3, 4, 2375}, - {0x0, 0, 5, 2376}, - {0x0, 0, 2, 2381}, - {0x1f0a, 16, 16, 2383}, - {0x1f0c, 16, 16, 2383}, + {0x0, 3, 4, 2357}, + {0x0, 0, 1, 2358}, + {0x0, 7, 8, 2359}, + {0x1e64, 16, 16, 2360}, + {0x0, 0, 1, 2360}, + {0x0, 0, 1, 2361}, + {0x0, 3, 4, 2362}, + {0x0, 0, 1, 2363}, + {0x0, 7, 8, 2364}, + {0x1e65, 16, 16, 2365}, + {0x0, 0, 12, 2365}, + {0x0, 0, 1, 2377}, + {0x0, 0, 1, 2378}, + {0x0, 3, 4, 2379}, + {0x0, 0, 1, 2380}, + {0x0, 7, 8, 2381}, + {0x1e66, 16, 16, 2382}, + {0x0, 0, 1, 2382}, {0x0, 0, 1, 2383}, - {0x0, 0, 1, 2384}, - {0x0, 3, 4, 2385}, - {0x0, 0, 5, 2386}, - {0x0, 2, 6, 2391}, - {0x1f67, 16, 16, 2395}, + {0x0, 3, 4, 2384}, + {0x0, 0, 1, 2385}, + {0x0, 7, 8, 2386}, + {0x1e67, 16, 16, 2387}, + {0x0, 2, 4, 2387}, + {0x0, 0, 1, 2389}, + {0x0, 0, 1, 2390}, + {0x0, 3, 4, 2391}, + {0x0, 0, 1, 2392}, + {0x0, 7, 8, 2393}, + {0x1e68, 16, 16, 2394}, + {0x0, 0, 1, 2394}, {0x0, 0, 1, 2395}, - {0x0, 0, 1, 2396}, - {0x0, 3, 4, 2397}, - {0x0, 0, 3, 2398}, - {0x0, 7, 8, 2401}, - {0xe7, 16, 16, 2402}, - {0x1fa1, 16, 16, 2402}, - {0x1eea, 16, 16, 2402}, - {0x0, 5, 11, 2402}, - {0x2f978, 16, 16, 2408}, - {0x0, 2, 3, 2408}, + {0x0, 3, 4, 2396}, + {0x0, 0, 1, 2397}, + {0x0, 7, 8, 2398}, + {0x1e69, 16, 16, 2399}, + {0x1e6a, 16, 16, 2399}, + {0x1e6b, 16, 16, 2399}, + {0x1e6c, 16, 16, 2399}, + {0x1e6d, 16, 16, 2399}, + {0x0, 1, 2, 2399}, + {0x1e6e, 16, 16, 2400}, + {0x0, 1, 2, 2400}, + {0x1e6f, 16, 16, 2401}, + {0x1e70, 16, 16, 2401}, + {0x1e71, 16, 16, 2401}, + {0x1e72, 16, 16, 2401}, + {0x1e73, 16, 16, 2401}, + {0x0, 0, 1, 2401}, + {0x1e74, 16, 16, 2402}, + {0x0, 0, 1, 2402}, + {0x1e75, 16, 16, 2403}, + {0x1e76, 16, 16, 2403}, + {0x1e77, 16, 16, 2403}, + {0x0, 0, 1, 2403}, + {0x0, 0, 1, 2404}, + {0x0, 3, 4, 2405}, + {0x0, 0, 1, 2406}, + {0x0, 1, 2, 2407}, + {0x1e78, 16, 16, 2408}, + {0x0, 0, 1, 2408}, {0x0, 0, 1, 2409}, - {0x0, 0, 1, 2410}, - {0x0, 3, 4, 2411}, - {0x0, 0, 1, 2412}, - {0x0, 1, 9, 2413}, - {0x3d4, 16, 16, 2421}, - {0x0, 4, 14, 2421}, - {0x0, 12, 13, 2431}, - {0x2f91e, 16, 16, 2432}, - {0x3d3, 16, 16, 2432}, - {0x0, 3, 14, 2432}, - {0x0, 7, 9, 2443}, - {0x2f9e9, 16, 16, 2445}, - {0x0, 0, 1, 2445}, - {0x0, 0, 1, 2446}, - {0x0, 3, 4, 2447}, - {0x0, 0, 3, 2448}, - {0x0, 0, 10, 2451}, - {0x176, 16, 16, 2461}, - {0xdd, 16, 16, 2461}, - {0x1ef2, 16, 16, 2461}, - {0x1e8e, 16, 16, 2461}, - {0x232, 16, 16, 2461}, - {0x0, 6, 16, 2461}, - {0x0, 0, 1, 2471}, - {0x0, 3, 4, 2472}, - {0x0, 0, 1, 2473}, - {0x0, 9, 10, 2474}, - {0x0, 9, 10, 2475}, - {0x3094, 16, 16, 2476}, - {0x1ef6, 16, 16, 2476}, - {0x178, 16, 16, 2476}, - {0x0, 0, 1, 2476}, - {0x0, 0, 1, 2477}, - {0x0, 3, 4, 2478}, + {0x0, 3, 4, 2410}, + {0x0, 0, 1, 2411}, + {0x0, 1, 2, 2412}, + {0x1e79, 16, 16, 2413}, + {0x0, 0, 1, 2413}, + {0x0, 0, 1, 2414}, + {0x0, 3, 4, 2415}, + {0x0, 0, 1, 2416}, + {0x0, 8, 9, 2417}, + {0x1e7a, 16, 16, 2418}, + {0x0, 0, 1, 2418}, + {0x0, 0, 1, 2419}, + {0x0, 3, 4, 2420}, + {0x0, 0, 1, 2421}, + {0x0, 8, 9, 2422}, + {0x1e7b, 16, 16, 2423}, + {0x0, 0, 1, 2423}, + {0x0, 0, 1, 2424}, + {0x0, 3, 4, 2425}, + {0x0, 0, 3, 2426}, + {0x0, 3, 4, 2429}, + {0x1e7c, 16, 16, 2430}, + {0x0, 0, 1, 2430}, + {0x0, 0, 1, 2431}, + {0x0, 3, 4, 2432}, + {0x0, 0, 3, 2433}, + {0x0, 3, 4, 2436}, + {0x1e7d, 16, 16, 2437}, + {0x0, 3, 4, 2437}, + {0x1e7e, 16, 16, 2438}, + {0x0, 3, 4, 2438}, + {0x1e7f, 16, 16, 2439}, + {0x1e80, 16, 16, 2439}, + {0x1e81, 16, 16, 2439}, + {0x1e82, 16, 16, 2439}, + {0x1e83, 16, 16, 2439}, + {0x1e84, 16, 16, 2439}, + {0x1e85, 16, 16, 2439}, + {0x1e86, 16, 16, 2439}, + {0x1e87, 16, 16, 2439}, + {0x0, 3, 4, 2439}, + {0x1e88, 16, 16, 2440}, + {0x0, 3, 4, 2440}, + {0x1e89, 16, 16, 2441}, + {0x0, 0, 1, 2441}, + {0x0, 0, 1, 2442}, + {0x0, 3, 4, 2443}, + {0x0, 0, 1, 2444}, + {0x0, 7, 9, 2445}, + {0x1e8a, 16, 16, 2447}, + {0x0, 0, 1, 2447}, + {0x0, 0, 1, 2448}, + {0x0, 3, 4, 2449}, + {0x0, 0, 1, 2450}, + {0x0, 7, 9, 2451}, + {0x1e8b, 16, 16, 2453}, + {0x1e8c, 16, 16, 2453}, + {0x1e8d, 16, 16, 2453}, + {0x1e8e, 16, 16, 2453}, + {0x1e8f, 16, 16, 2453}, + {0x1e90, 16, 16, 2453}, + {0x1e91, 16, 16, 2453}, + {0x0, 3, 4, 2453}, + {0x1e92, 16, 16, 2454}, + {0x0, 3, 4, 2454}, + {0x1e93, 16, 16, 2455}, + {0x0, 1, 2, 2455}, + {0x1e94, 16, 16, 2456}, + {0x0, 1, 2, 2456}, + {0x1e95, 16, 16, 2457}, + {0x0, 1, 2, 2457}, + {0x1e96, 16, 16, 2458}, + {0x1e97, 16, 16, 2458}, + {0x1e98, 16, 16, 2458}, + {0x1e99, 16, 16, 2458}, + {0x0, 15, 16, 2458}, + {0x0, 0, 1, 2459}, + {0x0, 0, 1, 2460}, + {0x0, 3, 4, 2461}, + {0x0, 0, 1, 2462}, + {0x0, 7, 8, 2463}, + {0x1e9b, 16, 16, 2464}, + {0x1ea0, 16, 16, 2464}, + {0x1ea1, 16, 16, 2464}, + {0x1ea2, 16, 16, 2464}, + {0x1ea3, 16, 16, 2464}, + {0x0, 0, 1, 2464}, + {0x0, 0, 1, 2465}, + {0x0, 3, 4, 2466}, + {0x0, 0, 1, 2467}, + {0x0, 0, 10, 2468}, + {0x1ea4, 16, 16, 2478}, + {0x0, 0, 1, 2478}, {0x0, 0, 1, 2479}, - {0x0, 7, 8, 2480}, - {0x1e68, 16, 16, 2481}, - {0x2f9e8, 16, 16, 2481}, - {0x0, 13, 14, 2481}, - {0x2f999, 16, 16, 2482}, - {0x0, 0, 1, 2482}, - {0x0, 0, 1, 2483}, - {0x0, 3, 4, 2484}, - {0x0, 0, 3, 2485}, - {0x0, 0, 9, 2488}, - {0x1e82, 16, 16, 2497}, - {0x0, 4, 16, 2497}, - {0x0, 14, 15, 2509}, - {0x2f94e, 16, 16, 2510}, - {0x174, 16, 16, 2510}, - {0x1e86, 16, 16, 2510}, - {0x0, 0, 1, 2510}, - {0x0, 0, 1, 2511}, - {0x0, 3, 4, 2512}, - {0x0, 0, 1, 2513}, - {0x0, 4, 5, 2514}, - {0x1de, 16, 16, 2515}, - {0xf9af, 16, 16, 2515}, - {0x0, 2, 15, 2515}, - {0x0, 3, 4, 2528}, - {0x2f89b, 16, 16, 2529}, - {0x0, 3, 5, 2529}, - {0x1f28, 16, 16, 2531}, - {0x1f29, 16, 16, 2531}, - {0x0, 8, 16, 2531}, - {0x0, 10, 11, 2539}, - {0x2f8f9, 16, 16, 2540}, - {0x0, 10, 11, 2540}, - {0x2f89c, 16, 16, 2541}, - {0x0, 1, 2, 2541}, - {0x1e07, 16, 16, 2542}, + {0x0, 3, 4, 2480}, + {0x0, 0, 1, 2481}, + {0x0, 0, 10, 2482}, + {0x1ea5, 16, 16, 2492}, + {0x1ea6, 16, 16, 2492}, + {0x1ea7, 16, 16, 2492}, + {0x1ea8, 16, 16, 2492}, + {0x1ea9, 16, 16, 2492}, + {0x1eaa, 16, 16, 2492}, + {0x1eab, 16, 16, 2492}, + {0x0, 0, 2, 2492}, + {0x0, 0, 1, 2494}, + {0x0, 0, 1, 2495}, + {0x0, 3, 4, 2496}, + {0x0, 0, 1, 2497}, + {0x0, 2, 7, 2498}, + {0x1eac, 16, 16, 2503}, + {0x0, 0, 1, 2503}, + {0x0, 0, 1, 2504}, + {0x0, 3, 4, 2505}, + {0x0, 0, 1, 2506}, + {0x0, 2, 7, 2507}, + {0x1ead, 16, 16, 2512}, + {0x0, 2, 4, 2512}, + {0x0, 0, 1, 2514}, + {0x0, 0, 1, 2515}, + {0x0, 3, 4, 2516}, + {0x0, 0, 1, 2517}, + {0x0, 0, 10, 2518}, + {0x1eae, 16, 16, 2528}, + {0x0, 0, 1, 2528}, + {0x0, 0, 1, 2529}, + {0x0, 3, 4, 2530}, + {0x0, 0, 1, 2531}, + {0x0, 0, 10, 2532}, + {0x1eaf, 16, 16, 2542}, + {0x1eb0, 16, 16, 2542}, + {0x1eb1, 16, 16, 2542}, + {0x1eb2, 16, 16, 2542}, + {0x1eb3, 16, 16, 2542}, + {0x1eb4, 16, 16, 2542}, + {0x1eb5, 16, 16, 2542}, + {0x1eb6, 16, 16, 2542}, + {0x1eb7, 16, 16, 2542}, + {0x1eb8, 16, 16, 2542}, + {0x1eb9, 16, 16, 2542}, + {0x1eba, 16, 16, 2542}, + {0x1ebb, 16, 16, 2542}, + {0x1ebc, 16, 16, 2542}, + {0x1ebd, 16, 16, 2542}, {0x0, 0, 1, 2542}, - {0x0, 3, 4, 2543}, - {0x0, 0, 1, 2544}, - {0x0, 9, 10, 2545}, - {0x0, 9, 11, 2546}, - {0x30d0, 16, 16, 2548}, - {0x0, 11, 12, 2548}, - {0x2f9d6, 16, 16, 2549}, - {0x0, 0, 13, 2549}, - {0x0, 0, 15, 2562}, - {0xfa3c, 16, 16, 2577}, - {0x0, 7, 8, 2577}, - {0x2f92e, 16, 16, 2578}, + {0x0, 0, 1, 2543}, + {0x0, 3, 4, 2544}, + {0x0, 0, 1, 2545}, + {0x0, 0, 10, 2546}, + {0x1ebe, 16, 16, 2556}, + {0x0, 0, 1, 2556}, + {0x0, 0, 1, 2557}, + {0x0, 3, 4, 2558}, + {0x0, 0, 1, 2559}, + {0x0, 0, 10, 2560}, + {0x1ebf, 16, 16, 2570}, + {0x1ec0, 16, 16, 2570}, + {0x1ec1, 16, 16, 2570}, + {0x1ec2, 16, 16, 2570}, + {0x1ec3, 16, 16, 2570}, + {0x1ec4, 16, 16, 2570}, + {0x1ec5, 16, 16, 2570}, + {0x0, 8, 10, 2570}, + {0x0, 0, 1, 2572}, + {0x0, 0, 1, 2573}, + {0x0, 3, 4, 2574}, + {0x0, 0, 1, 2575}, + {0x0, 2, 3, 2576}, + {0x1ec6, 16, 16, 2577}, + {0x0, 0, 1, 2577}, {0x0, 0, 1, 2578}, {0x0, 3, 4, 2579}, {0x0, 0, 1, 2580}, - {0x0, 9, 10, 2581}, - {0x0, 9, 10, 2582}, - {0x30ae, 16, 16, 2583}, - {0x0, 1, 16, 2583}, - {0x0, 0, 1, 2598}, - {0x0, 3, 4, 2599}, - {0x0, 0, 1, 2600}, - {0x0, 9, 10, 2601}, - {0x0, 9, 10, 2602}, - {0x3058, 16, 16, 2603}, - {0x0, 0, 1, 2603}, - {0x0, 0, 1, 2604}, - {0x0, 3, 4, 2605}, - {0x0, 0, 4, 2606}, - {0x0, 0, 16, 2610}, - {0xcb, 16, 16, 2626}, - {0x1eba, 16, 16, 2626}, - {0xca, 16, 16, 2626}, - {0x1ebc, 16, 16, 2626}, - {0xc8, 16, 16, 2626}, - {0xc9, 16, 16, 2626}, - {0x114, 16, 16, 2626}, - {0x116, 16, 16, 2626}, - {0x112, 16, 16, 2626}, - {0xf94b, 16, 16, 2626}, - {0x2f877, 16, 16, 2626}, - {0xf9df, 16, 16, 2626}, - {0xfa3b, 16, 16, 2626}, - {0x0, 0, 1, 2626}, - {0x0, 0, 1, 2627}, - {0x0, 3, 4, 2628}, - {0x0, 0, 1, 2629}, - {0x0, 6, 7, 2630}, - {0x1e1c, 16, 16, 2631}, - {0x0, 4, 16, 2631}, - {0x0, 4, 5, 2643}, - {0x2f93d, 16, 16, 2644}, - {0x0, 0, 1, 2644}, - {0x0, 0, 1, 2645}, - {0x0, 3, 4, 2646}, - {0x0, 0, 1, 2647}, - {0x0, 1, 2, 2648}, - {0x1fb, 16, 16, 2649}, - {0x0, 6, 7, 2649}, - {0x0, 13, 14, 2650}, - {0x2f8e3, 16, 16, 2651}, - {0x0, 2, 8, 2651}, - {0x2f85b, 16, 16, 2657}, - {0x2f85a, 16, 16, 2657}, - {0x307c, 16, 16, 2657}, - {0x0, 0, 1, 2657}, - {0x0, 0, 1, 2658}, - {0x0, 3, 4, 2659}, - {0x0, 0, 5, 2660}, - {0x0, 2, 6, 2665}, - {0x1f06, 16, 16, 2669}, - {0x11a, 16, 16, 2669}, - {0x204, 16, 16, 2669}, - {0x1f80, 16, 16, 2669}, - {0x307a, 16, 16, 2669}, - {0x0, 0, 1, 2669}, - {0x0, 8, 9, 2670}, - {0x2f923, 16, 16, 2671}, + {0x0, 2, 3, 2581}, + {0x1ec7, 16, 16, 2582}, + {0x1ec8, 16, 16, 2582}, + {0x1ec9, 16, 16, 2582}, + {0x1eca, 16, 16, 2582}, + {0x1ecb, 16, 16, 2582}, + {0x1ecc, 16, 16, 2582}, + {0x1ecd, 16, 16, 2582}, + {0x1ece, 16, 16, 2582}, + {0x1ecf, 16, 16, 2582}, + {0x0, 0, 1, 2582}, + {0x0, 0, 1, 2583}, + {0x0, 3, 4, 2584}, + {0x0, 0, 1, 2585}, + {0x0, 0, 10, 2586}, + {0x1ed0, 16, 16, 2596}, + {0x0, 0, 1, 2596}, + {0x0, 0, 1, 2597}, + {0x0, 3, 4, 2598}, + {0x0, 0, 1, 2599}, + {0x0, 0, 10, 2600}, + {0x1ed1, 16, 16, 2610}, + {0x1ed2, 16, 16, 2610}, + {0x1ed3, 16, 16, 2610}, + {0x1ed4, 16, 16, 2610}, + {0x1ed5, 16, 16, 2610}, + {0x1ed6, 16, 16, 2610}, + {0x1ed7, 16, 16, 2610}, + {0x0, 12, 14, 2610}, + {0x0, 0, 1, 2612}, + {0x0, 0, 1, 2613}, + {0x0, 3, 4, 2614}, + {0x0, 0, 1, 2615}, + {0x0, 2, 3, 2616}, + {0x1ed8, 16, 16, 2617}, + {0x0, 0, 1, 2617}, + {0x0, 0, 1, 2618}, + {0x0, 3, 4, 2619}, + {0x0, 0, 1, 2620}, + {0x0, 2, 3, 2621}, + {0x1ed9, 16, 16, 2622}, + {0x0, 0, 16, 2622}, + {0x0, 0, 1, 2638}, + {0x0, 0, 1, 2639}, + {0x0, 3, 4, 2640}, + {0x0, 0, 3, 2641}, + {0x0, 0, 10, 2644}, + {0x1eda, 16, 16, 2654}, + {0x0, 0, 1, 2654}, + {0x0, 0, 1, 2655}, + {0x0, 3, 4, 2656}, + {0x0, 0, 3, 2657}, + {0x0, 0, 10, 2660}, + {0x1edb, 16, 16, 2670}, + {0x1edc, 16, 16, 2670}, + {0x1edd, 16, 16, 2670}, + {0x1ede, 16, 16, 2670}, + {0x1edf, 16, 16, 2670}, + {0x1ee0, 16, 16, 2670}, + {0x1ee1, 16, 16, 2670}, + {0x0, 3, 4, 2670}, + {0x1ee2, 16, 16, 2671}, {0x0, 3, 4, 2671}, - {0x2f944, 16, 16, 2672}, - {0x0, 10, 11, 2672}, - {0xf94d, 16, 16, 2673}, - {0x0, 3, 4, 2673}, - {0x1ef0, 16, 16, 2674}, - {0x0, 11, 12, 2674}, - {0xf9d4, 16, 16, 2675}, - {0x0, 0, 16, 2675}, - {0x113, 16, 16, 2691}, - {0x115, 16, 16, 2691}, - {0x117, 16, 16, 2691}, - {0xe8, 16, 16, 2691}, - {0xe9, 16, 16, 2691}, - {0xea, 16, 16, 2691}, - {0x1ebd, 16, 16, 2691}, - {0x0, 0, 1, 2691}, - {0x0, 0, 1, 2692}, - {0x0, 3, 4, 2693}, - {0x0, 0, 1, 2694}, - {0x0, 1, 2, 2695}, - {0x1e08, 16, 16, 2696}, - {0xeb, 16, 16, 2696}, - {0x1ebb, 16, 16, 2696}, - {0x0, 12, 14, 2696}, - {0x0, 0, 1, 2698}, - {0x0, 0, 1, 2699}, - {0x0, 3, 4, 2700}, - {0x0, 0, 1, 2701}, - {0x0, 0, 2, 2702}, - {0x1e52, 16, 16, 2704}, - {0x0, 9, 14, 2704}, - {0x0, 0, 5, 2709}, - {0x0, 0, 1, 2714}, - {0x0, 0, 1, 2715}, - {0x0, 3, 4, 2716}, - {0x0, 3, 4, 2717}, - {0x0, 8, 9, 2718}, - {0x21cf, 16, 16, 2719}, - {0x0, 0, 1, 2719}, - {0x0, 0, 1, 2720}, - {0x0, 3, 4, 2721}, - {0x0, 0, 1, 2722}, - {0x0, 2, 3, 2723}, - {0x134, 16, 16, 2724}, - {0x0, 0, 1, 2724}, - {0x0, 0, 1, 2725}, - {0x0, 3, 4, 2726}, - {0x0, 0, 5, 2727}, - {0x0, 0, 2, 2732}, - {0x1f54, 16, 16, 2734}, - {0x1f52, 16, 16, 2734}, - {0x0, 1, 2, 2734}, - {0x1e5e, 16, 16, 2735}, - {0x0, 8, 9, 2735}, - {0xf99f, 16, 16, 2736}, - {0x0, 1, 5, 2736}, - {0x0, 14, 15, 2740}, - {0x2f8f2, 16, 16, 2741}, - {0x205, 16, 16, 2741}, - {0x11b, 16, 16, 2741}, - {0x2f88b, 16, 16, 2741}, - {0x2f88c, 16, 16, 2741}, - {0x0, 3, 8, 2741}, - {0x2f81e, 16, 16, 2746}, - {0x0, 0, 1, 2746}, - {0x0, 0, 1, 2747}, - {0x0, 3, 4, 2748}, - {0x0, 0, 5, 2749}, - {0x0, 3, 5, 2754}, - {0x1f01, 16, 16, 2756}, - {0xfa00, 16, 16, 2756}, - {0x0, 3, 16, 2756}, - {0x2f830, 16, 16, 2769}, - {0x0, 2, 13, 2769}, - {0x0, 0, 4, 2780}, - {0x0, 0, 1, 2784}, - {0x0, 0, 1, 2785}, - {0x0, 9, 10, 2786}, - {0x0, 3, 4, 2787}, - {0x0, 12, 13, 2788}, - {0x931, 16, 16, 2789}, - {0x2f833, 16, 16, 2789}, - {0x0, 0, 1, 2789}, - {0x0, 0, 1, 2790}, - {0x0, 3, 4, 2791}, - {0x0, 0, 1, 2792}, - {0x0, 8, 9, 2793}, - {0x1e7a, 16, 16, 2794}, - {0x0, 14, 15, 2794}, - {0xf9d0, 16, 16, 2795}, - {0x0, 9, 14, 2795}, - {0x2f847, 16, 16, 2800}, - {0x0, 13, 14, 2800}, - {0x0, 2, 3, 2801}, - {0x2f9b1, 16, 16, 2802}, - {0x0, 4, 13, 2802}, - {0x0, 7, 8, 2811}, + {0x1ee3, 16, 16, 2672}, + {0x1ee4, 16, 16, 2672}, + {0x1ee5, 16, 16, 2672}, + {0x1ee6, 16, 16, 2672}, + {0x1ee7, 16, 16, 2672}, + {0x0, 0, 1, 2672}, + {0x0, 0, 1, 2673}, + {0x0, 3, 4, 2674}, + {0x0, 0, 3, 2675}, + {0x0, 0, 10, 2678}, + {0x1ee8, 16, 16, 2688}, + {0x0, 0, 1, 2688}, + {0x0, 0, 1, 2689}, + {0x0, 3, 4, 2690}, + {0x0, 0, 3, 2691}, + {0x0, 0, 10, 2694}, + {0x1ee9, 16, 16, 2704}, + {0x1eea, 16, 16, 2704}, + {0x1eeb, 16, 16, 2704}, + {0x1eec, 16, 16, 2704}, + {0x1eed, 16, 16, 2704}, + {0x1eee, 16, 16, 2704}, + {0x1eef, 16, 16, 2704}, + {0x0, 3, 4, 2704}, + {0x1ef0, 16, 16, 2705}, + {0x0, 3, 4, 2705}, + {0x1ef1, 16, 16, 2706}, + {0x1ef2, 16, 16, 2706}, + {0x1ef3, 16, 16, 2706}, + {0x0, 3, 4, 2706}, + {0x1ef4, 16, 16, 2707}, + {0x0, 3, 4, 2707}, + {0x1ef5, 16, 16, 2708}, + {0x1ef6, 16, 16, 2708}, + {0x1ef7, 16, 16, 2708}, + {0x1ef8, 16, 16, 2708}, + {0x1ef9, 16, 16, 2708}, + {0x0, 3, 5, 2708}, + {0x1f00, 16, 16, 2710}, + {0x1f01, 16, 16, 2710}, + {0x0, 0, 16, 2710}, + {0x0, 0, 16, 2726}, + {0x0, 0, 1, 2742}, + {0x0, 0, 1, 2743}, + {0x0, 3, 4, 2744}, + {0x0, 0, 5, 2745}, + {0x0, 0, 2, 2750}, + {0x1f02, 16, 16, 2752}, + {0x0, 0, 1, 2752}, + {0x0, 0, 1, 2753}, + {0x0, 3, 4, 2754}, + {0x0, 0, 5, 2755}, + {0x0, 0, 2, 2760}, + {0x1f03, 16, 16, 2762}, + {0x1f04, 16, 16, 2762}, + {0x1f05, 16, 16, 2762}, + {0x0, 2, 6, 2762}, + {0x1f06, 16, 16, 2766}, + {0x0, 2, 6, 2766}, + {0x1f07, 16, 16, 2770}, + {0x0, 3, 5, 2770}, + {0x1f08, 16, 16, 2772}, + {0x1f09, 16, 16, 2772}, + {0x0, 0, 1, 2772}, + {0x0, 0, 1, 2773}, + {0x0, 3, 4, 2774}, + {0x0, 0, 5, 2775}, + {0x0, 0, 2, 2780}, + {0x1f0a, 16, 16, 2782}, + {0x0, 0, 1, 2782}, + {0x0, 0, 1, 2783}, + {0x0, 3, 4, 2784}, + {0x0, 0, 5, 2785}, + {0x0, 0, 2, 2790}, + {0x1f0b, 16, 16, 2792}, + {0x1f0c, 16, 16, 2792}, + {0x1f0d, 16, 16, 2792}, + {0x0, 2, 6, 2792}, + {0x1f0e, 16, 16, 2796}, + {0x0, 2, 6, 2796}, + {0x1f0f, 16, 16, 2800}, + {0x0, 3, 5, 2800}, + {0x1f10, 16, 16, 2802}, + {0x1f11, 16, 16, 2802}, + {0x0, 0, 10, 2802}, {0x0, 0, 1, 2812}, {0x0, 0, 1, 2813}, - {0x0, 11, 12, 2814}, - {0x0, 3, 6, 2815}, - {0x0, 14, 15, 2818}, - {0xb4b, 16, 16, 2819}, - {0x0, 6, 8, 2819}, + {0x0, 3, 4, 2814}, + {0x0, 0, 1, 2815}, + {0x0, 0, 2, 2816}, + {0x1f12, 16, 16, 2818}, + {0x0, 0, 1, 2818}, + {0x0, 0, 1, 2819}, + {0x0, 3, 4, 2820}, {0x0, 0, 1, 2821}, - {0x0, 0, 1, 2822}, - {0x0, 3, 4, 2823}, - {0x0, 0, 1, 2824}, - {0x0, 4, 5, 2825}, - {0x1e39, 16, 16, 2826}, + {0x0, 0, 2, 2822}, + {0x1f13, 16, 16, 2824}, + {0x1f14, 16, 16, 2824}, + {0x1f15, 16, 16, 2824}, + {0x0, 3, 5, 2824}, + {0x1f18, 16, 16, 2826}, + {0x1f19, 16, 16, 2826}, {0x0, 0, 1, 2826}, {0x0, 0, 1, 2827}, {0x0, 3, 4, 2828}, {0x0, 0, 1, 2829}, - {0x0, 2, 13, 2830}, - {0x135, 16, 16, 2841}, - {0x0, 13, 14, 2841}, - {0x2f9d0, 16, 16, 2842}, - {0x0, 4, 14, 2842}, - {0x0, 0, 15, 2852}, - {0x0, 4, 7, 2867}, - {0x2f87d, 16, 16, 2870}, - {0x2f87b, 16, 16, 2870}, - {0x0, 7, 8, 2870}, - {0x0, 0, 1, 2871}, - {0x0, 0, 1, 2872}, - {0x0, 9, 10, 2873}, - {0x0, 11, 14, 2874}, - {0x0, 14, 15, 2877}, - {0x9cb, 16, 16, 2878}, - {0x0, 1, 6, 2878}, - {0x0, 0, 1, 2883}, - {0x0, 0, 1, 2884}, - {0x0, 3, 4, 2885}, - {0x0, 3, 4, 2886}, - {0x0, 8, 9, 2887}, - {0x2270, 16, 16, 2888}, - {0x0, 5, 9, 2888}, - {0xf959, 16, 16, 2892}, - {0xfa36, 16, 16, 2892}, - {0x0, 0, 1, 2892}, - {0x0, 0, 1, 2893}, - {0x0, 3, 4, 2894}, - {0x0, 3, 4, 2895}, - {0x0, 8, 9, 2896}, - {0x2271, 16, 16, 2897}, - {0x0, 9, 10, 2897}, - {0xfa5e, 16, 16, 2898}, - {0x0, 0, 1, 2898}, - {0x0, 0, 1, 2899}, - {0x0, 3, 4, 2900}, - {0x0, 0, 1, 2901}, - {0x0, 1, 2, 2902}, - {0x453, 16, 16, 2903}, - {0xf9d3, 16, 16, 2903}, - {0x0, 12, 14, 2903}, - {0x0, 0, 1, 2905}, - {0x0, 0, 1, 2906}, - {0x0, 3, 4, 2907}, - {0x0, 0, 1, 2908}, - {0x0, 2, 3, 2909}, - {0x1ed8, 16, 16, 2910}, - {0x0, 2, 16, 2910}, - {0xf9e7, 16, 16, 2924}, - {0xf91c, 16, 16, 2924}, - {0x0, 1, 16, 2924}, - {0x0, 4, 9, 2939}, - {0xf901, 16, 16, 2944}, - {0x2f82f, 16, 16, 2944}, - {0x0, 15, 16, 2944}, - {0x2f883, 16, 16, 2945}, - {0x0, 0, 5, 2945}, + {0x0, 0, 2, 2830}, + {0x1f1a, 16, 16, 2832}, + {0x0, 0, 1, 2832}, + {0x0, 0, 1, 2833}, + {0x0, 3, 4, 2834}, + {0x0, 0, 1, 2835}, + {0x0, 0, 2, 2836}, + {0x1f1b, 16, 16, 2838}, + {0x1f1c, 16, 16, 2838}, + {0x1f1d, 16, 16, 2838}, + {0x0, 3, 5, 2838}, + {0x1f20, 16, 16, 2840}, + {0x1f21, 16, 16, 2840}, + {0x0, 0, 16, 2840}, + {0x0, 0, 1, 2856}, + {0x0, 0, 1, 2857}, + {0x0, 3, 4, 2858}, + {0x0, 0, 5, 2859}, + {0x0, 0, 2, 2864}, + {0x1f22, 16, 16, 2866}, + {0x0, 0, 1, 2866}, + {0x0, 0, 1, 2867}, + {0x0, 3, 4, 2868}, + {0x0, 0, 5, 2869}, + {0x0, 0, 2, 2874}, + {0x1f23, 16, 16, 2876}, + {0x1f24, 16, 16, 2876}, + {0x1f25, 16, 16, 2876}, + {0x0, 2, 6, 2876}, + {0x1f26, 16, 16, 2880}, + {0x0, 2, 6, 2880}, + {0x1f27, 16, 16, 2884}, + {0x0, 3, 5, 2884}, + {0x1f28, 16, 16, 2886}, + {0x1f29, 16, 16, 2886}, + {0x0, 0, 1, 2886}, + {0x0, 0, 1, 2887}, + {0x0, 3, 4, 2888}, + {0x0, 0, 5, 2889}, + {0x0, 0, 2, 2894}, + {0x1f2a, 16, 16, 2896}, + {0x0, 0, 1, 2896}, + {0x0, 0, 1, 2897}, + {0x0, 3, 4, 2898}, + {0x0, 0, 5, 2899}, + {0x0, 0, 2, 2904}, + {0x1f2b, 16, 16, 2906}, + {0x1f2c, 16, 16, 2906}, + {0x1f2d, 16, 16, 2906}, + {0x0, 2, 6, 2906}, + {0x1f2e, 16, 16, 2910}, + {0x0, 2, 6, 2910}, + {0x1f2f, 16, 16, 2914}, + {0x0, 3, 5, 2914}, + {0x1f30, 16, 16, 2916}, + {0x1f31, 16, 16, 2916}, + {0x0, 0, 10, 2916}, + {0x0, 0, 1, 2926}, + {0x0, 0, 1, 2927}, + {0x0, 3, 4, 2928}, + {0x0, 0, 5, 2929}, + {0x0, 0, 2, 2934}, + {0x1f32, 16, 16, 2936}, + {0x0, 0, 1, 2936}, + {0x0, 0, 1, 2937}, + {0x0, 3, 4, 2938}, + {0x0, 0, 5, 2939}, + {0x0, 0, 2, 2944}, + {0x1f33, 16, 16, 2946}, + {0x1f34, 16, 16, 2946}, + {0x1f35, 16, 16, 2946}, + {0x0, 2, 3, 2946}, + {0x1f36, 16, 16, 2947}, + {0x0, 2, 3, 2947}, + {0x1f37, 16, 16, 2948}, + {0x0, 3, 5, 2948}, + {0x1f38, 16, 16, 2950}, + {0x1f39, 16, 16, 2950}, {0x0, 0, 1, 2950}, {0x0, 0, 1, 2951}, {0x0, 3, 4, 2952}, - {0x0, 3, 4, 2953}, - {0x0, 8, 9, 2954}, - {0x21ae, 16, 16, 2955}, - {0x0, 11, 12, 2955}, - {0x0, 12, 13, 2956}, - {0x2f8fb, 16, 16, 2957}, - {0x0, 0, 1, 2957}, - {0x0, 0, 1, 2958}, - {0x0, 3, 4, 2959}, - {0x0, 0, 5, 2960}, - {0x0, 3, 5, 2965}, - {0x1f21, 16, 16, 2967}, - {0x1f0, 16, 16, 2967}, - {0x1f20, 16, 16, 2967}, - {0x0, 0, 11, 2967}, - {0x0, 0, 1, 2978}, - {0x2f967, 16, 16, 2979}, - {0x0, 3, 9, 2979}, - {0x12f, 16, 16, 2985}, - {0x0, 7, 15, 2985}, - {0x2f9c7, 16, 16, 2993}, - {0x1ecb, 16, 16, 2993}, - {0x0, 2, 12, 2993}, - {0x0, 0, 1, 3003}, - {0x0, 3, 4, 3004}, + {0x0, 0, 5, 2953}, + {0x0, 0, 2, 2958}, + {0x1f3a, 16, 16, 2960}, + {0x0, 0, 1, 2960}, + {0x0, 0, 1, 2961}, + {0x0, 3, 4, 2962}, + {0x0, 0, 5, 2963}, + {0x0, 0, 2, 2968}, + {0x1f3b, 16, 16, 2970}, + {0x1f3c, 16, 16, 2970}, + {0x1f3d, 16, 16, 2970}, + {0x0, 2, 3, 2970}, + {0x1f3e, 16, 16, 2971}, + {0x0, 2, 3, 2971}, + {0x1f3f, 16, 16, 2972}, + {0x0, 3, 5, 2972}, + {0x1f40, 16, 16, 2974}, + {0x1f41, 16, 16, 2974}, + {0x0, 0, 10, 2974}, + {0x0, 0, 1, 2984}, + {0x0, 0, 1, 2985}, + {0x0, 3, 4, 2986}, + {0x0, 0, 1, 2987}, + {0x0, 0, 2, 2988}, + {0x1f42, 16, 16, 2990}, + {0x0, 0, 1, 2990}, + {0x0, 0, 1, 2991}, + {0x0, 3, 4, 2992}, + {0x0, 0, 1, 2993}, + {0x0, 0, 2, 2994}, + {0x1f43, 16, 16, 2996}, + {0x1f44, 16, 16, 2996}, + {0x1f45, 16, 16, 2996}, + {0x0, 3, 5, 2996}, + {0x1f48, 16, 16, 2998}, + {0x1f49, 16, 16, 2998}, + {0x0, 0, 1, 2998}, + {0x0, 0, 1, 2999}, + {0x0, 3, 4, 3000}, + {0x0, 0, 1, 3001}, + {0x0, 0, 2, 3002}, + {0x1f4a, 16, 16, 3004}, + {0x0, 0, 1, 3004}, {0x0, 0, 1, 3005}, - {0x0, 9, 10, 3006}, - {0x0, 9, 11, 3007}, - {0x30dc, 16, 16, 3009}, - {0x0, 6, 11, 3009}, - {0x0, 0, 1, 3014}, - {0x0, 0, 1, 3015}, - {0x0, 12, 13, 3016}, - {0x0, 13, 14, 3017}, - {0x0, 5, 6, 3018}, - {0xccb, 16, 16, 3019}, - {0x0, 4, 9, 3019}, - {0x2f9e7, 16, 16, 3024}, - {0x0, 3, 8, 3024}, - {0x1e32, 16, 16, 3029}, - {0x0, 0, 1, 3029}, - {0x0, 0, 1, 3030}, - {0x0, 3, 4, 3031}, - {0x0, 0, 5, 3032}, - {0x0, 2, 3, 3037}, - {0x1f36, 16, 16, 3038}, - {0x0, 3, 14, 3038}, - {0x0, 0, 1, 3049}, - {0x0, 0, 1, 3050}, - {0x0, 3, 4, 3051}, - {0x0, 0, 1, 3052}, - {0x0, 4, 12, 3053}, - {0x45e, 16, 16, 3061}, - {0x136, 16, 16, 3061}, - {0x0, 6, 8, 3061}, - {0x0, 0, 1, 3063}, - {0x0, 0, 1, 3064}, - {0x0, 11, 12, 3065}, - {0x0, 11, 14, 3066}, - {0x0, 7, 8, 3069}, - {0xbcc, 16, 16, 3070}, - {0x0, 3, 4, 3070}, - {0xf981, 16, 16, 3071}, - {0x0, 0, 1, 3071}, - {0x0, 0, 1, 3072}, - {0x0, 3, 4, 3073}, - {0x0, 0, 4, 3074}, - {0x0, 0, 16, 3078}, - {0x1ec8, 16, 16, 3094}, - {0x0, 3, 4, 3094}, - {0x343, 16, 16, 3095}, - {0x12c, 16, 16, 3095}, - {0x0, 3, 16, 3095}, - {0x2f870, 16, 16, 3108}, - {0xf9b1, 16, 16, 3108}, - {0x0, 0, 15, 3108}, - {0x2f97f, 16, 16, 3123}, - {0x2f8cc, 16, 16, 3123}, - {0x0, 0, 1, 3123}, - {0x0, 0, 1, 3124}, - {0x0, 3, 4, 3125}, - {0x0, 0, 1, 3126}, - {0x0, 4, 5, 3127}, - {0x1ed, 16, 16, 3128}, - {0x30dd, 16, 16, 3128}, - {0x0, 0, 7, 3128}, - {0x0, 11, 12, 3135}, - {0x2f984, 16, 16, 3136}, - {0x0, 1, 12, 3136}, - {0x0, 13, 14, 3147}, + {0x0, 3, 4, 3006}, + {0x0, 0, 1, 3007}, + {0x0, 0, 2, 3008}, + {0x1f4b, 16, 16, 3010}, + {0x1f4c, 16, 16, 3010}, + {0x1f4d, 16, 16, 3010}, + {0x0, 3, 5, 3010}, + {0x1f50, 16, 16, 3012}, + {0x1f51, 16, 16, 3012}, + {0x0, 0, 10, 3012}, + {0x0, 0, 1, 3022}, + {0x0, 0, 1, 3023}, + {0x0, 3, 4, 3024}, + {0x0, 0, 5, 3025}, + {0x0, 0, 2, 3030}, + {0x1f52, 16, 16, 3032}, + {0x0, 0, 1, 3032}, + {0x0, 0, 1, 3033}, + {0x0, 3, 4, 3034}, + {0x0, 0, 5, 3035}, + {0x0, 0, 2, 3040}, + {0x1f53, 16, 16, 3042}, + {0x1f54, 16, 16, 3042}, + {0x1f55, 16, 16, 3042}, + {0x0, 2, 3, 3042}, + {0x1f56, 16, 16, 3043}, + {0x0, 2, 3, 3043}, + {0x1f57, 16, 16, 3044}, + {0x0, 4, 5, 3044}, + {0x1f59, 16, 16, 3045}, + {0x0, 0, 1, 3045}, + {0x0, 0, 1, 3046}, + {0x0, 3, 4, 3047}, + {0x0, 0, 5, 3048}, + {0x0, 0, 2, 3053}, + {0x1f5b, 16, 16, 3055}, + {0x1f5d, 16, 16, 3055}, + {0x0, 2, 3, 3055}, + {0x1f5f, 16, 16, 3056}, + {0x0, 3, 5, 3056}, + {0x1f60, 16, 16, 3058}, + {0x1f61, 16, 16, 3058}, + {0x0, 0, 16, 3058}, + {0x0, 0, 1, 3074}, + {0x0, 0, 1, 3075}, + {0x0, 3, 4, 3076}, + {0x0, 0, 5, 3077}, + {0x0, 0, 2, 3082}, + {0x1f62, 16, 16, 3084}, + {0x0, 0, 1, 3084}, + {0x0, 0, 1, 3085}, + {0x0, 3, 4, 3086}, + {0x0, 0, 5, 3087}, + {0x0, 0, 2, 3092}, + {0x1f63, 16, 16, 3094}, + {0x1f64, 16, 16, 3094}, + {0x1f65, 16, 16, 3094}, + {0x0, 2, 6, 3094}, + {0x1f66, 16, 16, 3098}, + {0x0, 2, 6, 3098}, + {0x1f67, 16, 16, 3102}, + {0x0, 3, 5, 3102}, + {0x1f68, 16, 16, 3104}, + {0x1f69, 16, 16, 3104}, + {0x0, 0, 1, 3104}, + {0x0, 0, 1, 3105}, + {0x0, 3, 4, 3106}, + {0x0, 0, 5, 3107}, + {0x0, 0, 2, 3112}, + {0x1f6a, 16, 16, 3114}, + {0x0, 0, 1, 3114}, + {0x0, 0, 1, 3115}, + {0x0, 3, 4, 3116}, + {0x0, 0, 5, 3117}, + {0x0, 0, 2, 3122}, + {0x1f6b, 16, 16, 3124}, + {0x1f6c, 16, 16, 3124}, + {0x1f6d, 16, 16, 3124}, + {0x0, 2, 6, 3124}, + {0x1f6e, 16, 16, 3128}, + {0x0, 2, 6, 3128}, + {0x1f6f, 16, 16, 3132}, + {0x1f70, 16, 16, 3132}, + {0x1f71, 0, 1, 3132}, + {0x1f72, 16, 16, 3133}, + {0x1f73, 16, 16, 3133}, + {0x1f74, 16, 16, 3133}, + {0x1f75, 0, 1, 3133}, + {0x1f76, 16, 16, 3134}, + {0x1f77, 16, 16, 3134}, + {0x1f78, 16, 16, 3134}, + {0x1f79, 16, 16, 3134}, + {0x1f7a, 16, 16, 3134}, + {0x1f7b, 16, 16, 3134}, + {0x1f7c, 16, 16, 3134}, + {0x1f7d, 0, 1, 3134}, + {0x1f80, 16, 16, 3135}, + {0x1f81, 16, 16, 3135}, + {0x0, 0, 1, 3135}, + {0x0, 0, 1, 3136}, + {0x0, 3, 4, 3137}, + {0x0, 4, 5, 3138}, + {0x0, 5, 6, 3139}, + {0x1f82, 16, 16, 3140}, + {0x0, 0, 1, 3140}, + {0x0, 0, 1, 3141}, + {0x0, 3, 4, 3142}, + {0x0, 4, 5, 3143}, + {0x0, 5, 6, 3144}, + {0x1f83, 16, 16, 3145}, + {0x0, 0, 1, 3145}, + {0x0, 0, 1, 3146}, + {0x0, 3, 4, 3147}, {0x0, 4, 5, 3148}, - {0x2f8a4, 16, 16, 3149}, - {0x2f9c6, 16, 16, 3149}, - {0x2f872, 16, 16, 3149}, - {0x0, 2, 16, 3149}, - {0x0, 12, 13, 3163}, - {0xf9c3, 16, 16, 3164}, - {0xf945, 16, 16, 3164}, + {0x0, 5, 6, 3149}, + {0x1f84, 16, 16, 3150}, + {0x0, 0, 1, 3150}, + {0x0, 0, 1, 3151}, + {0x0, 3, 4, 3152}, + {0x0, 4, 5, 3153}, + {0x0, 5, 6, 3154}, + {0x1f85, 16, 16, 3155}, + {0x0, 0, 1, 3155}, + {0x0, 0, 1, 3156}, + {0x0, 3, 4, 3157}, + {0x0, 4, 5, 3158}, + {0x0, 5, 6, 3159}, + {0x1f86, 16, 16, 3160}, + {0x0, 0, 1, 3160}, + {0x0, 0, 1, 3161}, + {0x0, 3, 4, 3162}, + {0x0, 4, 5, 3163}, {0x0, 5, 6, 3164}, - {0xf90f, 16, 16, 3165}, - {0x0, 1, 16, 3165}, - {0x0, 13, 14, 3180}, - {0x2f884, 16, 16, 3181}, + {0x1f87, 16, 16, 3165}, + {0x1f88, 16, 16, 3165}, + {0x1f89, 16, 16, 3165}, + {0x0, 0, 1, 3165}, + {0x0, 0, 1, 3166}, + {0x0, 3, 4, 3167}, + {0x0, 4, 5, 3168}, + {0x0, 5, 6, 3169}, + {0x1f8a, 16, 16, 3170}, + {0x0, 0, 1, 3170}, + {0x0, 0, 1, 3171}, + {0x0, 3, 4, 3172}, + {0x0, 4, 5, 3173}, + {0x0, 5, 6, 3174}, + {0x1f8b, 16, 16, 3175}, + {0x0, 0, 1, 3175}, + {0x0, 0, 1, 3176}, + {0x0, 3, 4, 3177}, + {0x0, 4, 5, 3178}, + {0x0, 5, 6, 3179}, + {0x1f8c, 16, 16, 3180}, + {0x0, 0, 1, 3180}, {0x0, 0, 1, 3181}, - {0x0, 0, 1, 3182}, - {0x0, 3, 4, 3183}, - {0x0, 0, 1, 3184}, - {0x0, 8, 9, 3185}, - {0x4f9, 16, 16, 3186}, - {0x0, 5, 6, 3186}, - {0x2f921, 16, 16, 3187}, - {0x0, 8, 10, 3187}, - {0xfa4d, 16, 16, 3189}, - {0xfa4e, 16, 16, 3189}, - {0x0, 1, 16, 3189}, - {0x0, 11, 12, 3204}, - {0x2fa15, 16, 16, 3205}, - {0x0, 7, 16, 3205}, - {0xf988, 16, 16, 3214}, - {0x0, 11, 12, 3214}, - {0x2f863, 16, 16, 3215}, - {0x0, 0, 5, 3215}, - {0x0, 7, 8, 3220}, - {0xf950, 16, 16, 3221}, - {0x0, 0, 16, 3221}, - {0x0, 9, 16, 3237}, - {0xf95b, 16, 16, 3244}, - {0x0, 0, 1, 3244}, + {0x0, 3, 4, 3182}, + {0x0, 4, 5, 3183}, + {0x0, 5, 6, 3184}, + {0x1f8d, 16, 16, 3185}, + {0x0, 0, 1, 3185}, + {0x0, 0, 1, 3186}, + {0x0, 3, 4, 3187}, + {0x0, 4, 5, 3188}, + {0x0, 5, 6, 3189}, + {0x1f8e, 16, 16, 3190}, + {0x0, 0, 1, 3190}, + {0x0, 0, 1, 3191}, + {0x0, 3, 4, 3192}, + {0x0, 4, 5, 3193}, + {0x0, 5, 6, 3194}, + {0x1f8f, 16, 16, 3195}, + {0x1f90, 16, 16, 3195}, + {0x1f91, 16, 16, 3195}, + {0x0, 0, 1, 3195}, + {0x0, 0, 1, 3196}, + {0x0, 3, 4, 3197}, + {0x0, 4, 5, 3198}, + {0x0, 5, 6, 3199}, + {0x1f92, 16, 16, 3200}, + {0x0, 0, 1, 3200}, + {0x0, 0, 1, 3201}, + {0x0, 3, 4, 3202}, + {0x0, 4, 5, 3203}, + {0x0, 5, 6, 3204}, + {0x1f93, 16, 16, 3205}, + {0x0, 0, 1, 3205}, + {0x0, 0, 1, 3206}, + {0x0, 3, 4, 3207}, + {0x0, 4, 5, 3208}, + {0x0, 5, 6, 3209}, + {0x1f94, 16, 16, 3210}, + {0x0, 0, 1, 3210}, + {0x0, 0, 1, 3211}, + {0x0, 3, 4, 3212}, + {0x0, 4, 5, 3213}, + {0x0, 5, 6, 3214}, + {0x1f95, 16, 16, 3215}, + {0x0, 0, 1, 3215}, + {0x0, 0, 1, 3216}, + {0x0, 3, 4, 3217}, + {0x0, 4, 5, 3218}, + {0x0, 5, 6, 3219}, + {0x1f96, 16, 16, 3220}, + {0x0, 0, 1, 3220}, + {0x0, 0, 1, 3221}, + {0x0, 3, 4, 3222}, + {0x0, 4, 5, 3223}, + {0x0, 5, 6, 3224}, + {0x1f97, 16, 16, 3225}, + {0x1f98, 16, 16, 3225}, + {0x1f99, 16, 16, 3225}, + {0x0, 0, 1, 3225}, + {0x0, 0, 1, 3226}, + {0x0, 3, 4, 3227}, + {0x0, 4, 5, 3228}, + {0x0, 5, 6, 3229}, + {0x1f9a, 16, 16, 3230}, + {0x0, 0, 1, 3230}, + {0x0, 0, 1, 3231}, + {0x0, 3, 4, 3232}, + {0x0, 4, 5, 3233}, + {0x0, 5, 6, 3234}, + {0x1f9b, 16, 16, 3235}, + {0x0, 0, 1, 3235}, + {0x0, 0, 1, 3236}, + {0x0, 3, 4, 3237}, + {0x0, 4, 5, 3238}, + {0x0, 5, 6, 3239}, + {0x1f9c, 16, 16, 3240}, + {0x0, 0, 1, 3240}, + {0x0, 0, 1, 3241}, + {0x0, 3, 4, 3242}, + {0x0, 4, 5, 3243}, + {0x0, 5, 6, 3244}, + {0x1f9d, 16, 16, 3245}, {0x0, 0, 1, 3245}, - {0x0, 3, 4, 3246}, - {0x0, 0, 1, 3247}, - {0x0, 7, 9, 3248}, - {0x1e8a, 16, 16, 3250}, + {0x0, 0, 1, 3246}, + {0x0, 3, 4, 3247}, + {0x0, 4, 5, 3248}, + {0x0, 5, 6, 3249}, + {0x1f9e, 16, 16, 3250}, {0x0, 0, 1, 3250}, {0x0, 0, 1, 3251}, {0x0, 3, 4, 3252}, - {0x0, 0, 5, 3253}, - {0x0, 0, 2, 3258}, - {0x3b0, 16, 16, 3260}, - {0x1fe2, 16, 16, 3260}, - {0x0, 1, 15, 3260}, - {0x0, 2, 3, 3274}, - {0x2f8e8, 16, 16, 3275}, - {0xf9f3, 16, 16, 3275}, - {0x1e8c, 16, 16, 3275}, + {0x0, 4, 5, 3253}, + {0x0, 5, 6, 3254}, + {0x1f9f, 16, 16, 3255}, + {0x1fa0, 16, 16, 3255}, + {0x1fa1, 16, 16, 3255}, + {0x0, 0, 1, 3255}, + {0x0, 0, 1, 3256}, + {0x0, 3, 4, 3257}, + {0x0, 4, 5, 3258}, + {0x0, 5, 6, 3259}, + {0x1fa2, 16, 16, 3260}, + {0x0, 0, 1, 3260}, + {0x0, 0, 1, 3261}, + {0x0, 3, 4, 3262}, + {0x0, 4, 5, 3263}, + {0x0, 5, 6, 3264}, + {0x1fa3, 16, 16, 3265}, + {0x0, 0, 1, 3265}, + {0x0, 0, 1, 3266}, + {0x0, 3, 4, 3267}, + {0x0, 4, 5, 3268}, + {0x0, 5, 6, 3269}, + {0x1fa4, 16, 16, 3270}, + {0x0, 0, 1, 3270}, + {0x0, 0, 1, 3271}, + {0x0, 3, 4, 3272}, + {0x0, 4, 5, 3273}, + {0x0, 5, 6, 3274}, + {0x1fa5, 16, 16, 3275}, {0x0, 0, 1, 3275}, - {0x0, 3, 4, 3276}, - {0x0, 0, 1, 3277}, - {0x0, 9, 10, 3278}, - {0x0, 9, 10, 3279}, - {0x30bc, 16, 16, 3280}, + {0x0, 0, 1, 3276}, + {0x0, 3, 4, 3277}, + {0x0, 4, 5, 3278}, + {0x0, 5, 6, 3279}, + {0x1fa6, 16, 16, 3280}, {0x0, 0, 1, 3280}, {0x0, 0, 1, 3281}, {0x0, 3, 4, 3282}, - {0x0, 0, 1, 3283}, - {0x0, 4, 5, 3284}, - {0x1e38, 16, 16, 3285}, - {0x0, 9, 10, 3285}, - {0xf966, 16, 16, 3286}, - {0x0, 2, 3, 3286}, - {0x0, 14, 15, 3287}, - {0x2f9e5, 16, 16, 3288}, - {0x0, 1, 2, 3288}, - {0x206, 16, 16, 3289}, - {0x0, 5, 16, 3289}, - {0x1fcb, 16, 16, 3300}, - {0x0, 3, 4, 3300}, - {0x1e42, 16, 16, 3301}, - {0x0, 4, 16, 3301}, - {0x0, 0, 1, 3313}, - {0x2fa0b, 16, 16, 3314}, - {0x0, 13, 14, 3314}, - {0x2f89d, 16, 16, 3315}, - {0x0, 1, 15, 3315}, - {0xfa44, 16, 16, 3329}, - {0x0, 8, 13, 3329}, - {0xfa3a, 16, 16, 3334}, - {0x0, 1, 15, 3334}, - {0x0, 2, 13, 3348}, - {0xf960, 16, 16, 3359}, - {0x0, 1, 2, 3359}, - {0x0, 13, 14, 3360}, - {0x2f94d, 16, 16, 3361}, - {0x0, 13, 14, 3361}, - {0xf923, 16, 16, 3362}, - {0x0, 4, 5, 3362}, - {0xf91d, 16, 16, 3363}, - {0x0, 12, 13, 3363}, - {0x0, 14, 15, 3364}, - {0x2fa10, 16, 16, 3365}, - {0x0, 0, 1, 3365}, - {0x0, 0, 1, 3366}, - {0x0, 3, 4, 3367}, - {0x0, 0, 5, 3368}, - {0x0, 0, 2, 3373}, - {0x1f33, 16, 16, 3375}, - {0x0, 0, 1, 3375}, - {0x0, 0, 1, 3376}, - {0x0, 3, 4, 3377}, + {0x0, 4, 5, 3283}, + {0x0, 5, 6, 3284}, + {0x1fa7, 16, 16, 3285}, + {0x1fa8, 16, 16, 3285}, + {0x1fa9, 16, 16, 3285}, + {0x0, 0, 1, 3285}, + {0x0, 0, 1, 3286}, + {0x0, 3, 4, 3287}, + {0x0, 4, 5, 3288}, + {0x0, 5, 6, 3289}, + {0x1faa, 16, 16, 3290}, + {0x0, 0, 1, 3290}, + {0x0, 0, 1, 3291}, + {0x0, 3, 4, 3292}, + {0x0, 4, 5, 3293}, + {0x0, 5, 6, 3294}, + {0x1fab, 16, 16, 3295}, + {0x0, 0, 1, 3295}, + {0x0, 0, 1, 3296}, + {0x0, 3, 4, 3297}, + {0x0, 4, 5, 3298}, + {0x0, 5, 6, 3299}, + {0x1fac, 16, 16, 3300}, + {0x0, 0, 1, 3300}, + {0x0, 0, 1, 3301}, + {0x0, 3, 4, 3302}, + {0x0, 4, 5, 3303}, + {0x0, 5, 6, 3304}, + {0x1fad, 16, 16, 3305}, + {0x0, 0, 1, 3305}, + {0x0, 0, 1, 3306}, + {0x0, 3, 4, 3307}, + {0x0, 4, 5, 3308}, + {0x0, 5, 6, 3309}, + {0x1fae, 16, 16, 3310}, + {0x0, 0, 1, 3310}, + {0x0, 0, 1, 3311}, + {0x0, 3, 4, 3312}, + {0x0, 4, 5, 3313}, + {0x0, 5, 6, 3314}, + {0x1faf, 16, 16, 3315}, + {0x1fb0, 16, 16, 3315}, + {0x1fb1, 16, 16, 3315}, + {0x0, 0, 13, 3315}, + {0x0, 0, 1, 3328}, + {0x0, 0, 1, 3329}, + {0x0, 3, 4, 3330}, + {0x0, 4, 5, 3331}, + {0x0, 5, 6, 3332}, + {0x1fb2, 16, 16, 3333}, + {0x0, 2, 6, 3333}, + {0x1fb3, 16, 16, 3337}, + {0x0, 0, 1, 3337}, + {0x0, 3, 4, 3338}, + {0x0, 4, 5, 3339}, + {0x0, 5, 6, 3340}, + {0x1fb4, 16, 16, 3341}, + {0x1fb6, 16, 16, 3341}, + {0x0, 6, 16, 3341}, + {0x0, 0, 1, 3351}, + {0x0, 0, 1, 3352}, + {0x0, 3, 4, 3353}, + {0x0, 4, 5, 3354}, + {0x0, 5, 6, 3355}, + {0x1fb7, 16, 16, 3356}, + {0x1fb8, 16, 16, 3356}, + {0x1fb9, 16, 16, 3356}, + {0x1fba, 16, 16, 3356}, + {0x0, 5, 16, 3356}, + {0x1fbb, 16, 16, 3367}, + {0x0, 5, 6, 3367}, + {0x1fbc, 16, 16, 3368}, + {0x0, 2, 3, 3368}, + {0x1fc1, 16, 16, 3369}, + {0x0, 0, 1, 3369}, + {0x0, 0, 1, 3370}, + {0x0, 3, 4, 3371}, + {0x0, 4, 5, 3372}, + {0x0, 5, 6, 3373}, + {0x1fc2, 16, 16, 3374}, + {0x0, 2, 6, 3374}, + {0x1fc3, 16, 16, 3378}, {0x0, 0, 1, 3378}, - {0x0, 7, 8, 3379}, - {0x1e1e, 16, 16, 3380}, - {0x1f35, 16, 16, 3380}, - {0x0, 15, 16, 3380}, - {0xfa41, 16, 16, 3381}, - {0xf9ac, 16, 16, 3381}, - {0x2f858, 16, 16, 3381}, - {0x0, 0, 1, 3381}, - {0x0, 0, 1, 3382}, - {0x0, 3, 4, 3383}, - {0x0, 4, 5, 3384}, - {0x0, 5, 6, 3385}, - {0x1f82, 16, 16, 3386}, - {0x0, 11, 12, 3386}, - {0xf9d8, 16, 16, 3387}, - {0x0, 0, 15, 3387}, - {0x0, 0, 1, 3402}, - {0x0, 0, 1, 3403}, - {0x0, 3, 4, 3404}, - {0x0, 0, 1, 3405}, - {0x0, 0, 9, 3406}, - {0x4d6, 16, 16, 3415}, - {0x0, 5, 6, 3415}, - {0xf983, 16, 16, 3416}, - {0x400, 16, 16, 3416}, - {0x0, 0, 1, 3416}, - {0x0, 0, 1, 3417}, - {0x0, 3, 4, 3418}, - {0x0, 0, 5, 3419}, - {0x0, 0, 2, 3424}, - {0x1f0d, 16, 16, 3426}, - {0x1f0b, 16, 16, 3426}, - {0x401, 16, 16, 3426}, - {0x0, 10, 14, 3426}, - {0x2f8c5, 16, 16, 3430}, - {0xf991, 16, 16, 3430}, - {0x0, 1, 2, 3430}, - {0x207, 16, 16, 3431}, - {0x0, 10, 12, 3431}, - {0x0, 0, 1, 3433}, - {0x0, 0, 1, 3434}, - {0x0, 3, 4, 3435}, + {0x0, 3, 4, 3379}, + {0x0, 4, 5, 3380}, + {0x0, 5, 6, 3381}, + {0x1fc4, 16, 16, 3382}, + {0x1fc6, 16, 16, 3382}, + {0x0, 6, 7, 3382}, + {0x0, 0, 1, 3383}, + {0x0, 0, 1, 3384}, + {0x0, 3, 4, 3385}, + {0x0, 4, 5, 3386}, + {0x0, 5, 6, 3387}, + {0x1fc7, 16, 16, 3388}, + {0x1fc8, 16, 16, 3388}, + {0x1fc9, 16, 16, 3388}, + {0x1fca, 16, 16, 3388}, + {0x1fcb, 16, 16, 3388}, + {0x0, 5, 6, 3388}, + {0x1fcc, 16, 16, 3389}, + {0x0, 0, 1, 3389}, + {0x0, 0, 1, 3390}, + {0x0, 3, 4, 3391}, + {0x0, 0, 5, 3392}, + {0x0, 0, 2, 3397}, + {0x1fcd, 16, 16, 3399}, + {0x1fce, 16, 16, 3399}, + {0x0, 2, 3, 3399}, + {0x1fcf, 16, 16, 3400}, + {0x1fd0, 16, 16, 3400}, + {0x1fd1, 16, 16, 3400}, + {0x1fd2, 16, 16, 3400}, + {0x1fd3, 16, 16, 3400}, + {0x0, 2, 3, 3400}, + {0x1fd6, 16, 16, 3401}, + {0x0, 2, 3, 3401}, + {0x1fd7, 16, 16, 3402}, + {0x1fd8, 16, 16, 3402}, + {0x1fd9, 16, 16, 3402}, + {0x1fda, 16, 16, 3402}, + {0x1fdb, 16, 16, 3402}, + {0x0, 6, 15, 3402}, + {0x0, 0, 1, 3411}, + {0x0, 0, 1, 3412}, + {0x0, 3, 4, 3413}, + {0x0, 0, 5, 3414}, + {0x0, 0, 2, 3419}, + {0x1fdd, 16, 16, 3421}, + {0x1fde, 16, 16, 3421}, + {0x0, 2, 3, 3421}, + {0x1fdf, 16, 16, 3422}, + {0x1fe0, 16, 16, 3422}, + {0x1fe1, 16, 16, 3422}, + {0x1fe2, 16, 16, 3422}, + {0x1fe3, 16, 16, 3422}, + {0x0, 0, 1, 3422}, + {0x0, 0, 1, 3423}, + {0x0, 3, 4, 3424}, + {0x0, 1, 2, 3425}, + {0x0, 3, 5, 3426}, + {0x1fe4, 16, 16, 3428}, + {0x1fe5, 16, 16, 3428}, + {0x0, 2, 3, 3428}, + {0x1fe6, 16, 16, 3429}, + {0x0, 2, 3, 3429}, + {0x1fe7, 16, 16, 3430}, + {0x1fe8, 16, 16, 3430}, + {0x1fe9, 16, 16, 3430}, + {0x1fea, 16, 16, 3430}, + {0x1feb, 16, 16, 3430}, + {0x0, 0, 1, 3430}, + {0x0, 0, 1, 3431}, + {0x0, 3, 4, 3432}, + {0x0, 1, 2, 3433}, + {0x0, 4, 5, 3434}, + {0x1fec, 16, 16, 3435}, + {0x1fed, 16, 16, 3435}, + {0x1fee, 16, 16, 3435}, + {0x1fef, 16, 16, 3435}, + {0x0, 0, 1, 3435}, {0x0, 0, 1, 3436}, - {0x0, 7, 8, 3437}, - {0x1e64, 16, 16, 3438}, - {0x0, 5, 6, 3438}, - {0x2f9a6, 16, 16, 3439}, - {0x0, 4, 8, 3439}, - {0x387, 16, 16, 3443}, - {0x1ffd, 16, 16, 3443}, - {0x0, 9, 11, 3443}, - {0xf928, 16, 16, 3445}, - {0x0, 0, 1, 3445}, - {0x0, 0, 1, 3446}, - {0x0, 3, 4, 3447}, - {0x0, 0, 3, 3448}, - {0x0, 3, 4, 3451}, - {0x1ee2, 16, 16, 3452}, - {0x0, 4, 16, 3452}, - {0x0, 4, 14, 3464}, - {0xf9d1, 16, 16, 3474}, - {0x0, 1, 14, 3474}, - {0x0, 1, 12, 3487}, - {0x2f9e6, 16, 16, 3498}, - {0x0, 13, 14, 3498}, - {0x2fa0c, 16, 16, 3499}, - {0x0, 0, 1, 3499}, + {0x0, 3, 4, 3437}, + {0x0, 4, 5, 3438}, + {0x0, 5, 6, 3439}, + {0x1ff2, 16, 16, 3440}, + {0x0, 2, 6, 3440}, + {0x1ff3, 16, 16, 3444}, + {0x0, 0, 1, 3444}, + {0x0, 3, 4, 3445}, + {0x0, 4, 5, 3446}, + {0x0, 5, 6, 3447}, + {0x1ff4, 16, 16, 3448}, + {0x1ff6, 16, 16, 3448}, + {0x0, 0, 1, 3448}, + {0x0, 0, 1, 3449}, + {0x0, 3, 4, 3450}, + {0x0, 4, 5, 3451}, + {0x0, 5, 6, 3452}, + {0x1ff7, 16, 16, 3453}, + {0x1ff8, 16, 16, 3453}, + {0x1ff9, 16, 16, 3453}, + {0x1ffa, 16, 16, 3453}, + {0x1ffb, 16, 16, 3453}, + {0x0, 5, 6, 3453}, + {0x1ffc, 16, 16, 3454}, + {0x1ffd, 16, 16, 3454}, + {0x0, 0, 3, 3454}, + {0x0, 0, 1, 3457}, + {0x0, 2, 4, 3458}, + {0x2000, 16, 16, 3460}, + {0x2001, 16, 16, 3460}, + {0x0, 9, 14, 3460}, + {0x0, 0, 5, 3465}, + {0x0, 0, 1, 3470}, + {0x0, 0, 1, 3471}, + {0x0, 3, 4, 3472}, + {0x0, 3, 4, 3473}, + {0x0, 8, 9, 3474}, + {0x219a, 16, 16, 3475}, + {0x0, 0, 1, 3475}, + {0x0, 0, 1, 3476}, + {0x0, 3, 4, 3477}, + {0x0, 3, 4, 3478}, + {0x0, 8, 9, 3479}, + {0x219b, 16, 16, 3480}, + {0x0, 0, 1, 3480}, + {0x0, 0, 1, 3481}, + {0x0, 3, 4, 3482}, + {0x0, 3, 4, 3483}, + {0x0, 8, 9, 3484}, + {0x21ae, 16, 16, 3485}, + {0x0, 0, 5, 3485}, + {0x0, 0, 1, 3490}, + {0x0, 0, 1, 3491}, + {0x0, 3, 4, 3492}, + {0x0, 3, 4, 3493}, + {0x0, 8, 9, 3494}, + {0x21cd, 16, 16, 3495}, + {0x0, 0, 1, 3495}, + {0x0, 0, 1, 3496}, + {0x0, 3, 4, 3497}, + {0x0, 3, 4, 3498}, + {0x0, 8, 9, 3499}, + {0x21ce, 16, 16, 3500}, {0x0, 0, 1, 3500}, - {0x0, 3, 4, 3501}, - {0x0, 0, 1, 3502}, - {0x0, 4, 5, 3503}, - {0x230, 16, 16, 3504}, - {0x0, 0, 1, 3504}, - {0x0, 0, 1, 3505}, - {0x0, 3, 4, 3506}, - {0x0, 4, 5, 3507}, - {0x0, 5, 6, 3508}, - {0x1faf, 16, 16, 3509}, - {0x0, 14, 15, 3509}, - {0xf9a6, 16, 16, 3510}, - {0x0, 13, 14, 3510}, - {0x2f87a, 16, 16, 3511}, - {0x0, 0, 7, 3511}, - {0x3ac, 16, 16, 3518}, - {0x1f70, 16, 16, 3518}, - {0x0, 7, 8, 3518}, - {0x0, 0, 1, 3519}, - {0x0, 0, 1, 3520}, - {0x0, 6, 7, 3521}, - {0x0, 5, 6, 3522}, - {0x0, 3, 6, 3523}, - {0x623, 16, 16, 3526}, - {0x625, 16, 16, 3526}, - {0x1fb1, 16, 16, 3526}, - {0x1fb0, 16, 16, 3526}, - {0xf9a2, 16, 16, 3526}, - {0x0, 10, 11, 3526}, - {0xf9d6, 16, 16, 3527}, - {0x0, 3, 4, 3527}, - {0x2f844, 16, 16, 3528}, - {0x0, 1, 2, 3528}, - {0x1e0f, 16, 16, 3529}, - {0x0, 14, 15, 3529}, - {0xf9c0, 16, 16, 3530}, - {0x0, 6, 7, 3530}, - {0xf9dc, 16, 16, 3531}, - {0x2f810, 16, 16, 3531}, - {0x2f814, 16, 16, 3531}, - {0xf978, 16, 16, 3531}, - {0x2f9e4, 16, 16, 3531}, - {0x0, 0, 16, 3531}, - {0x0, 13, 14, 3547}, - {0xf9ed, 16, 16, 3548}, - {0x0, 0, 1, 3548}, - {0x0, 3, 4, 3549}, + {0x0, 0, 1, 3501}, + {0x0, 3, 4, 3502}, + {0x0, 3, 4, 3503}, + {0x0, 8, 9, 3504}, + {0x21cf, 16, 16, 3505}, + {0x0, 0, 12, 3505}, + {0x0, 3, 12, 3517}, + {0x0, 0, 1, 3526}, + {0x0, 0, 1, 3527}, + {0x0, 3, 4, 3528}, + {0x0, 3, 4, 3529}, + {0x0, 8, 9, 3530}, + {0x2204, 16, 16, 3531}, + {0x0, 0, 1, 3531}, + {0x0, 0, 1, 3532}, + {0x0, 3, 4, 3533}, + {0x0, 3, 4, 3534}, + {0x0, 8, 9, 3535}, + {0x2209, 16, 16, 3536}, + {0x0, 0, 1, 3536}, + {0x0, 0, 1, 3537}, + {0x0, 3, 4, 3538}, + {0x0, 3, 4, 3539}, + {0x0, 8, 9, 3540}, + {0x220c, 16, 16, 3541}, + {0x0, 3, 6, 3541}, + {0x0, 0, 1, 3544}, + {0x0, 0, 1, 3545}, + {0x0, 3, 4, 3546}, + {0x0, 3, 4, 3547}, + {0x0, 8, 9, 3548}, + {0x2224, 16, 16, 3549}, + {0x0, 0, 1, 3549}, {0x0, 0, 1, 3550}, - {0x0, 9, 10, 3551}, - {0x0, 9, 11, 3552}, - {0x3071, 16, 16, 3554}, - {0x0, 2, 16, 3554}, - {0x0, 1, 12, 3568}, - {0x2f9af, 16, 16, 3579}, - {0x0, 0, 1, 3579}, - {0x0, 0, 1, 3580}, - {0x0, 3, 4, 3581}, - {0x0, 0, 4, 3582}, - {0x0, 3, 14, 3586}, - {0x1e4b, 16, 16, 3597}, + {0x0, 3, 4, 3551}, + {0x0, 3, 4, 3552}, + {0x0, 8, 9, 3553}, + {0x2226, 16, 16, 3554}, + {0x0, 12, 13, 3554}, + {0x0, 0, 1, 3555}, + {0x0, 0, 1, 3556}, + {0x0, 3, 4, 3557}, + {0x0, 3, 4, 3558}, + {0x0, 8, 9, 3559}, + {0x2241, 16, 16, 3560}, + {0x0, 3, 14, 3560}, + {0x0, 0, 1, 3571}, + {0x0, 0, 1, 3572}, + {0x0, 3, 4, 3573}, + {0x0, 3, 4, 3574}, + {0x0, 8, 9, 3575}, + {0x2244, 16, 16, 3576}, + {0x0, 0, 1, 3576}, + {0x0, 0, 1, 3577}, + {0x0, 3, 4, 3578}, + {0x0, 3, 4, 3579}, + {0x0, 8, 9, 3580}, + {0x2247, 16, 16, 3581}, + {0x0, 0, 1, 3581}, + {0x0, 0, 1, 3582}, + {0x0, 3, 4, 3583}, + {0x0, 3, 4, 3584}, + {0x0, 8, 9, 3585}, + {0x2249, 16, 16, 3586}, + {0x0, 0, 1, 3586}, + {0x0, 0, 1, 3587}, + {0x0, 3, 4, 3588}, + {0x0, 3, 4, 3589}, + {0x0, 8, 9, 3590}, + {0x2260, 16, 16, 3591}, + {0x0, 1, 6, 3591}, + {0x0, 0, 1, 3596}, {0x0, 0, 1, 3597}, - {0x0, 0, 1, 3598}, + {0x0, 3, 4, 3598}, {0x0, 3, 4, 3599}, - {0x0, 4, 5, 3600}, - {0x0, 5, 6, 3601}, - {0x1f9a, 16, 16, 3602}, - {0x0, 5, 7, 3602}, - {0x2f829, 16, 16, 3604}, - {0x2f82a, 16, 16, 3604}, - {0x0, 3, 16, 3604}, - {0x0, 14, 15, 3617}, - {0xf999, 16, 16, 3618}, - {0x0, 7, 15, 3618}, - {0xf9bc, 16, 16, 3626}, - {0x0, 0, 1, 3626}, - {0x0, 0, 1, 3627}, - {0x0, 3, 4, 3628}, - {0x0, 3, 4, 3629}, - {0x0, 8, 9, 3630}, - {0x21cd, 16, 16, 3631}, - {0x0, 0, 1, 3631}, - {0x0, 0, 1, 3632}, - {0x0, 3, 4, 3633}, - {0x0, 3, 4, 3634}, - {0x0, 8, 9, 3635}, - {0x2262, 16, 16, 3636}, - {0x0, 0, 2, 3636}, - {0x3ae, 16, 16, 3638}, - {0x1f74, 16, 16, 3638}, + {0x0, 8, 9, 3600}, + {0x2262, 16, 16, 3601}, + {0x0, 0, 1, 3601}, + {0x0, 0, 1, 3602}, + {0x0, 3, 4, 3603}, + {0x0, 3, 4, 3604}, + {0x0, 8, 9, 3605}, + {0x226d, 16, 16, 3606}, + {0x0, 0, 1, 3606}, + {0x0, 0, 1, 3607}, + {0x0, 3, 4, 3608}, + {0x0, 3, 4, 3609}, + {0x0, 8, 9, 3610}, + {0x226e, 16, 16, 3611}, + {0x0, 0, 1, 3611}, + {0x0, 0, 1, 3612}, + {0x0, 3, 4, 3613}, + {0x0, 3, 4, 3614}, + {0x0, 8, 9, 3615}, + {0x226f, 16, 16, 3616}, + {0x0, 0, 1, 3616}, + {0x0, 0, 1, 3617}, + {0x0, 3, 4, 3618}, + {0x0, 3, 4, 3619}, + {0x0, 8, 9, 3620}, + {0x2270, 16, 16, 3621}, + {0x0, 0, 1, 3621}, + {0x0, 0, 1, 3622}, + {0x0, 3, 4, 3623}, + {0x0, 3, 4, 3624}, + {0x0, 8, 9, 3625}, + {0x2271, 16, 16, 3626}, + {0x0, 2, 14, 3626}, {0x0, 0, 1, 3638}, {0x0, 0, 1, 3639}, {0x0, 3, 4, 3640}, - {0x0, 0, 4, 3641}, - {0x0, 1, 2, 3645}, - {0x1e96, 16, 16, 3646}, - {0x0, 0, 1, 3646}, - {0x0, 3, 4, 3647}, + {0x0, 3, 4, 3641}, + {0x0, 8, 9, 3642}, + {0x2274, 16, 16, 3643}, + {0x0, 0, 1, 3643}, + {0x0, 0, 1, 3644}, + {0x0, 3, 4, 3645}, + {0x0, 3, 4, 3646}, + {0x0, 8, 9, 3647}, + {0x2275, 16, 16, 3648}, {0x0, 0, 1, 3648}, - {0x0, 9, 10, 3649}, - {0x0, 9, 10, 3650}, - {0x30b8, 16, 16, 3651}, - {0x0, 2, 7, 3651}, - {0xf97d, 16, 16, 3656}, - {0xf941, 16, 16, 3656}, - {0x1e47, 16, 16, 3656}, - {0x146, 16, 16, 3656}, - {0x0, 0, 1, 3656}, - {0x1e2d, 16, 16, 3657}, - {0x2f9b2, 16, 16, 3657}, - {0x0, 0, 1, 3657}, - {0xf9fa, 16, 16, 3658}, - {0x3070, 16, 16, 3658}, - {0x0, 8, 9, 3658}, - {0xf90c, 16, 16, 3659}, + {0x0, 0, 1, 3649}, + {0x0, 3, 4, 3650}, + {0x0, 3, 4, 3651}, + {0x0, 8, 9, 3652}, + {0x2278, 16, 16, 3653}, + {0x0, 0, 1, 3653}, + {0x0, 0, 1, 3654}, + {0x0, 3, 4, 3655}, + {0x0, 3, 4, 3656}, + {0x0, 8, 9, 3657}, + {0x2279, 16, 16, 3658}, + {0x0, 0, 1, 3658}, {0x0, 0, 1, 3659}, - {0x0, 0, 1, 3660}, + {0x0, 3, 4, 3660}, {0x0, 3, 4, 3661}, - {0x0, 0, 1, 3662}, - {0x0, 0, 10, 3663}, - {0x1ea6, 16, 16, 3673}, - {0x1ea4, 16, 16, 3673}, - {0x1eaa, 16, 16, 3673}, - {0x0, 14, 15, 3673}, - {0xf92c, 16, 16, 3674}, - {0x1ea8, 16, 16, 3674}, + {0x0, 8, 9, 3662}, + {0x2280, 16, 16, 3663}, + {0x0, 0, 1, 3663}, + {0x0, 0, 1, 3664}, + {0x0, 3, 4, 3665}, + {0x0, 3, 4, 3666}, + {0x0, 8, 9, 3667}, + {0x2281, 16, 16, 3668}, + {0x0, 2, 8, 3668}, {0x0, 0, 1, 3674}, - {0x0, 3, 4, 3675}, - {0x0, 0, 1, 3676}, - {0x0, 9, 10, 3677}, - {0x0, 9, 10, 3678}, - {0x30c2, 16, 16, 3679}, - {0x0, 0, 9, 3679}, - {0x340, 16, 16, 3688}, - {0x341, 16, 16, 3688}, - {0x0, 0, 15, 3688}, - {0x0, 6, 7, 3703}, - {0x2f94c, 16, 16, 3704}, - {0x0, 3, 4, 3704}, - {0x2f8e9, 16, 16, 3705}, - {0x0, 6, 7, 3705}, - {0xf9fe, 16, 16, 3706}, - {0x0, 8, 9, 3706}, - {0x0, 0, 1, 3707}, - {0x2f965, 16, 16, 3708}, - {0x0, 12, 13, 3708}, + {0x0, 0, 1, 3675}, + {0x0, 3, 4, 3676}, + {0x0, 3, 4, 3677}, + {0x0, 8, 9, 3678}, + {0x2284, 16, 16, 3679}, + {0x0, 0, 1, 3679}, + {0x0, 0, 1, 3680}, + {0x0, 3, 4, 3681}, + {0x0, 3, 4, 3682}, + {0x0, 8, 9, 3683}, + {0x2285, 16, 16, 3684}, + {0x0, 0, 1, 3684}, + {0x0, 0, 1, 3685}, + {0x0, 3, 4, 3686}, + {0x0, 3, 4, 3687}, + {0x0, 8, 9, 3688}, + {0x2288, 16, 16, 3689}, + {0x0, 0, 1, 3689}, + {0x0, 0, 1, 3690}, + {0x0, 3, 4, 3691}, + {0x0, 3, 4, 3692}, + {0x0, 8, 9, 3693}, + {0x2289, 16, 16, 3694}, + {0x0, 2, 12, 3694}, + {0x0, 0, 1, 3704}, + {0x0, 0, 1, 3705}, + {0x0, 3, 4, 3706}, + {0x0, 3, 4, 3707}, + {0x0, 8, 9, 3708}, + {0x22ac, 16, 16, 3709}, {0x0, 0, 1, 3709}, {0x0, 0, 1, 3710}, {0x0, 3, 4, 3711}, {0x0, 3, 4, 3712}, {0x0, 8, 9, 3713}, - {0x2241, 16, 16, 3714}, - {0x1f75, 0, 1, 3714}, + {0x22ad, 16, 16, 3714}, + {0x0, 0, 1, 3714}, {0x0, 0, 1, 3715}, {0x0, 3, 4, 3716}, - {0x0, 4, 5, 3717}, - {0x0, 5, 6, 3718}, - {0x1fc4, 16, 16, 3719}, - {0x0, 8, 9, 3719}, - {0x0, 1, 2, 3720}, - {0x2f876, 16, 16, 3721}, - {0x0, 0, 15, 3721}, - {0xfa19, 16, 16, 3736}, - {0x0, 15, 16, 3736}, + {0x0, 3, 4, 3717}, + {0x0, 8, 9, 3718}, + {0x22ae, 16, 16, 3719}, + {0x0, 0, 1, 3719}, + {0x0, 0, 1, 3720}, + {0x0, 3, 4, 3721}, + {0x0, 3, 4, 3722}, + {0x0, 8, 9, 3723}, + {0x22af, 16, 16, 3724}, + {0x0, 0, 1, 3724}, + {0x0, 0, 1, 3725}, + {0x0, 3, 4, 3726}, + {0x0, 3, 4, 3727}, + {0x0, 8, 9, 3728}, + {0x22e0, 16, 16, 3729}, + {0x0, 0, 1, 3729}, + {0x0, 0, 1, 3730}, + {0x0, 3, 4, 3731}, + {0x0, 3, 4, 3732}, + {0x0, 8, 9, 3733}, + {0x22e1, 16, 16, 3734}, + {0x0, 1, 3, 3734}, + {0x0, 0, 1, 3736}, {0x0, 0, 1, 3737}, {0x0, 3, 4, 3738}, - {0x0, 0, 1, 3739}, - {0x0, 9, 10, 3740}, - {0x0, 9, 10, 3741}, - {0x30f7, 16, 16, 3742}, - {0x0, 1, 2, 3742}, - {0xf9e8, 16, 16, 3743}, - {0x0, 1, 16, 3743}, - {0x154, 16, 16, 3758}, - {0x0, 7, 8, 3758}, - {0x0, 12, 13, 3759}, - {0x2f95c, 16, 16, 3760}, - {0x0, 7, 8, 3760}, - {0xf933, 16, 16, 3761}, - {0x0, 0, 16, 3761}, - {0x0, 3, 11, 3777}, - {0x2f8df, 16, 16, 3785}, - {0xfa50, 16, 16, 3785}, - {0xfa4f, 16, 16, 3785}, - {0x0, 8, 12, 3785}, - {0x2f920, 16, 16, 3789}, - {0x0, 3, 4, 3789}, - {0x1e88, 16, 16, 3790}, - {0x0, 0, 1, 3790}, - {0x0, 3, 4, 3791}, - {0x0, 0, 1, 3792}, - {0x0, 9, 10, 3793}, - {0x0, 9, 11, 3794}, - {0x3077, 16, 16, 3796}, - {0x0, 10, 11, 3796}, - {0x2f917, 16, 16, 3797}, - {0x0, 14, 16, 3797}, - {0x0, 12, 13, 3799}, - {0x2f868, 16, 16, 3800}, - {0x0, 1, 7, 3800}, - {0x0, 2, 3, 3806}, - {0x2fa0a, 16, 16, 3807}, - {0x0, 0, 1, 3807}, - {0x0, 0, 1, 3808}, - {0x0, 3, 4, 3809}, - {0x0, 4, 5, 3810}, - {0x0, 5, 6, 3811}, - {0x1f86, 16, 16, 3812}, - {0x0, 1, 6, 3812}, - {0xfa59, 16, 16, 3817}, - {0x2f970, 16, 16, 3817}, + {0x0, 3, 4, 3739}, + {0x0, 8, 9, 3740}, + {0x22e2, 16, 16, 3741}, + {0x0, 0, 1, 3741}, + {0x0, 0, 1, 3742}, + {0x0, 3, 4, 3743}, + {0x0, 3, 4, 3744}, + {0x0, 8, 9, 3745}, + {0x22e3, 16, 16, 3746}, + {0x0, 2, 6, 3746}, + {0x0, 0, 1, 3750}, + {0x0, 0, 1, 3751}, + {0x0, 3, 4, 3752}, + {0x0, 3, 4, 3753}, + {0x0, 8, 9, 3754}, + {0x22ea, 16, 16, 3755}, + {0x0, 0, 1, 3755}, + {0x0, 0, 1, 3756}, + {0x0, 3, 4, 3757}, + {0x0, 3, 4, 3758}, + {0x0, 8, 9, 3759}, + {0x22eb, 16, 16, 3760}, + {0x0, 0, 1, 3760}, + {0x0, 0, 1, 3761}, + {0x0, 3, 4, 3762}, + {0x0, 3, 4, 3763}, + {0x0, 8, 9, 3764}, + {0x22ec, 16, 16, 3765}, + {0x0, 0, 1, 3765}, + {0x0, 0, 1, 3766}, + {0x0, 3, 4, 3767}, + {0x0, 3, 4, 3768}, + {0x0, 8, 9, 3769}, + {0x22ed, 16, 16, 3770}, + {0x0, 0, 16, 3770}, + {0x0, 0, 16, 3786}, + {0x0, 8, 10, 3802}, + {0x2329, 16, 16, 3804}, + {0x232a, 16, 16, 3804}, + {0x0, 6, 16, 3804}, + {0x0, 0, 1, 3814}, + {0x0, 3, 4, 3815}, + {0x0, 0, 1, 3816}, {0x0, 9, 10, 3817}, - {0x2f887, 16, 16, 3818}, - {0x0, 0, 9, 3818}, - {0x0, 8, 9, 3827}, - {0xf9fc, 16, 16, 3828}, - {0x0, 7, 8, 3828}, - {0xf9f4, 16, 16, 3829}, - {0x0, 8, 10, 3829}, - {0x0, 0, 1, 3831}, - {0x0, 0, 1, 3832}, - {0x0, 3, 4, 3833}, - {0x0, 0, 1, 3834}, - {0x0, 8, 9, 3835}, - {0x4da, 16, 16, 3836}, - {0x0, 1, 2, 3836}, - {0xf9b9, 16, 16, 3837}, - {0x0, 3, 13, 3837}, - {0x0, 14, 15, 3847}, - {0x2f9cd, 16, 16, 3848}, - {0x0, 6, 7, 3848}, - {0x2f866, 16, 16, 3849}, - {0x0, 8, 10, 3849}, + {0x0, 9, 10, 3818}, + {0x304c, 16, 16, 3819}, + {0x0, 0, 1, 3819}, + {0x0, 3, 4, 3820}, + {0x0, 0, 1, 3821}, + {0x0, 9, 10, 3822}, + {0x0, 9, 10, 3823}, + {0x304e, 16, 16, 3824}, + {0x0, 0, 1, 3824}, + {0x0, 3, 4, 3825}, + {0x0, 0, 1, 3826}, + {0x0, 9, 10, 3827}, + {0x0, 9, 10, 3828}, + {0x3050, 16, 16, 3829}, + {0x0, 1, 16, 3829}, + {0x0, 0, 1, 3844}, + {0x0, 3, 4, 3845}, + {0x0, 0, 1, 3846}, + {0x0, 9, 10, 3847}, + {0x0, 9, 10, 3848}, + {0x3052, 16, 16, 3849}, + {0x0, 0, 1, 3849}, + {0x0, 3, 4, 3850}, {0x0, 0, 1, 3851}, - {0x0, 0, 1, 3852}, - {0x0, 3, 4, 3853}, + {0x0, 9, 10, 3852}, + {0x0, 9, 10, 3853}, + {0x3054, 16, 16, 3854}, {0x0, 0, 1, 3854}, - {0x0, 2, 3, 3855}, - {0x1ec7, 16, 16, 3856}, - {0x0, 14, 15, 3856}, - {0x2f867, 16, 16, 3857}, - {0x0, 3, 14, 3857}, - {0x118, 16, 16, 3868}, - {0x0, 0, 1, 3868}, + {0x0, 3, 4, 3855}, + {0x0, 0, 1, 3856}, + {0x0, 9, 10, 3857}, + {0x0, 9, 10, 3858}, + {0x3056, 16, 16, 3859}, + {0x0, 0, 1, 3859}, + {0x0, 3, 4, 3860}, + {0x0, 0, 1, 3861}, + {0x0, 9, 10, 3862}, + {0x0, 9, 10, 3863}, + {0x3058, 16, 16, 3864}, + {0x0, 0, 1, 3864}, + {0x0, 3, 4, 3865}, + {0x0, 0, 1, 3866}, + {0x0, 9, 10, 3867}, + {0x0, 9, 10, 3868}, + {0x305a, 16, 16, 3869}, {0x0, 0, 1, 3869}, {0x0, 3, 4, 3870}, - {0x0, 0, 5, 3871}, - {0x0, 0, 2, 3876}, - {0x1f2d, 16, 16, 3878}, - {0x228, 16, 16, 3878}, - {0x0, 4, 15, 3878}, - {0x0, 7, 8, 3889}, - {0x2f8fe, 16, 16, 3890}, - {0x1eb8, 16, 16, 3890}, - {0x0, 2, 13, 3890}, + {0x0, 0, 1, 3871}, + {0x0, 9, 10, 3872}, + {0x0, 9, 10, 3873}, + {0x305c, 16, 16, 3874}, + {0x0, 0, 1, 3874}, + {0x0, 3, 4, 3875}, + {0x0, 0, 1, 3876}, + {0x0, 9, 10, 3877}, + {0x0, 9, 10, 3878}, + {0x305e, 16, 16, 3879}, + {0x0, 0, 1, 3879}, + {0x0, 3, 4, 3880}, + {0x0, 0, 1, 3881}, + {0x0, 9, 10, 3882}, + {0x0, 9, 10, 3883}, + {0x3060, 16, 16, 3884}, + {0x0, 1, 16, 3884}, + {0x0, 0, 1, 3899}, + {0x0, 3, 4, 3900}, {0x0, 0, 1, 3901}, - {0xf9f8, 16, 16, 3902}, - {0x0, 14, 15, 3902}, - {0xf989, 16, 16, 3903}, - {0x0, 2, 8, 3903}, - {0x2f8f3, 16, 16, 3909}, - {0x0, 6, 7, 3909}, - {0x2f873, 16, 16, 3910}, - {0x0, 0, 16, 3910}, - {0x0, 1, 2, 3926}, - {0x2f8be, 16, 16, 3927}, - {0x0, 12, 15, 3927}, - {0xfa18, 16, 16, 3930}, - {0x0, 8, 9, 3930}, - {0xf969, 16, 16, 3931}, - {0x0, 5, 13, 3931}, - {0x0, 3, 13, 3939}, - {0x2f98a, 16, 16, 3949}, - {0x0, 9, 10, 3949}, - {0xf9cd, 16, 16, 3950}, - {0x1e18, 16, 16, 3950}, - {0x0, 0, 1, 3950}, - {0x0, 0, 1, 3951}, - {0x0, 3, 4, 3952}, + {0x0, 9, 10, 3902}, + {0x0, 9, 10, 3903}, + {0x3062, 16, 16, 3904}, + {0x0, 0, 1, 3904}, + {0x0, 3, 4, 3905}, + {0x0, 0, 1, 3906}, + {0x0, 9, 10, 3907}, + {0x0, 9, 10, 3908}, + {0x3065, 16, 16, 3909}, + {0x0, 0, 1, 3909}, + {0x0, 3, 4, 3910}, + {0x0, 0, 1, 3911}, + {0x0, 9, 10, 3912}, + {0x0, 9, 10, 3913}, + {0x3067, 16, 16, 3914}, + {0x0, 0, 1, 3914}, + {0x0, 3, 4, 3915}, + {0x0, 0, 1, 3916}, + {0x0, 9, 10, 3917}, + {0x0, 9, 10, 3918}, + {0x3069, 16, 16, 3919}, + {0x0, 0, 1, 3919}, + {0x0, 3, 4, 3920}, + {0x0, 0, 1, 3921}, + {0x0, 9, 10, 3922}, + {0x0, 9, 11, 3923}, + {0x3070, 16, 16, 3925}, + {0x3071, 16, 16, 3925}, + {0x0, 2, 12, 3925}, + {0x0, 0, 1, 3935}, + {0x0, 3, 4, 3936}, + {0x0, 0, 1, 3937}, + {0x0, 9, 10, 3938}, + {0x0, 9, 11, 3939}, + {0x3073, 16, 16, 3941}, + {0x3074, 16, 16, 3941}, + {0x0, 0, 1, 3941}, + {0x0, 3, 4, 3942}, + {0x0, 0, 1, 3943}, + {0x0, 9, 10, 3944}, + {0x0, 9, 11, 3945}, + {0x3076, 16, 16, 3947}, + {0x3077, 16, 16, 3947}, + {0x0, 0, 1, 3947}, + {0x0, 3, 4, 3948}, + {0x0, 0, 1, 3949}, + {0x0, 9, 10, 3950}, + {0x0, 9, 11, 3951}, + {0x3079, 16, 16, 3953}, + {0x307a, 16, 16, 3953}, {0x0, 0, 1, 3953}, - {0x0, 4, 5, 3954}, - {0x1e5c, 16, 16, 3955}, - {0xf98c, 16, 16, 3955}, - {0x0, 12, 16, 3955}, - {0x0, 13, 14, 3959}, - {0x2fa0e, 16, 16, 3960}, - {0x0, 9, 14, 3960}, - {0x0, 15, 16, 3965}, - {0x2f81f, 16, 16, 3966}, - {0x0, 2, 13, 3966}, - {0x0, 6, 7, 3977}, - {0x2f952, 16, 16, 3978}, - {0x0, 0, 1, 3978}, - {0x0, 0, 1, 3979}, - {0x0, 3, 4, 3980}, - {0x0, 0, 3, 3981}, - {0x0, 1, 13, 3984}, - {0x160, 16, 16, 3996}, - {0x0, 0, 1, 3996}, - {0x0, 3, 4, 3997}, - {0x0, 0, 1, 3998}, - {0x0, 9, 10, 3999}, - {0x0, 9, 10, 4000}, - {0x30ac, 16, 16, 4001}, - {0x0, 9, 10, 4001}, - {0xf9d5, 16, 16, 4002}, - {0x0, 0, 1, 4002}, - {0x0, 0, 1, 4003}, - {0x0, 3, 4, 4004}, - {0x0, 0, 5, 4005}, - {0x0, 0, 2, 4010}, - {0x3ce, 16, 16, 4012}, - {0x0, 11, 12, 4012}, - {0x2f8f8, 16, 16, 4013}, - {0x0, 0, 1, 4013}, - {0x0, 0, 1, 4014}, - {0x0, 3, 4, 4015}, - {0x0, 0, 1, 4016}, - {0x0, 0, 9, 4017}, - {0x451, 16, 16, 4026}, - {0x450, 16, 16, 4026}, - {0x0, 3, 13, 4026}, + {0x0, 3, 4, 3954}, + {0x0, 0, 1, 3955}, + {0x0, 9, 10, 3956}, + {0x0, 9, 11, 3957}, + {0x307c, 16, 16, 3959}, + {0x307d, 16, 16, 3959}, + {0x0, 0, 1, 3959}, + {0x0, 3, 4, 3960}, + {0x0, 0, 1, 3961}, + {0x0, 9, 10, 3962}, + {0x0, 9, 10, 3963}, + {0x3094, 16, 16, 3964}, + {0x0, 13, 14, 3964}, + {0x0, 0, 1, 3965}, + {0x0, 3, 4, 3966}, + {0x0, 0, 1, 3967}, + {0x0, 9, 10, 3968}, + {0x0, 9, 10, 3969}, + {0x309e, 16, 16, 3970}, + {0x0, 6, 16, 3970}, + {0x0, 0, 1, 3980}, + {0x0, 3, 4, 3981}, + {0x0, 0, 1, 3982}, + {0x0, 9, 10, 3983}, + {0x0, 9, 10, 3984}, + {0x30ac, 16, 16, 3985}, + {0x0, 0, 1, 3985}, + {0x0, 3, 4, 3986}, + {0x0, 0, 1, 3987}, + {0x0, 9, 10, 3988}, + {0x0, 9, 10, 3989}, + {0x30ae, 16, 16, 3990}, + {0x0, 0, 1, 3990}, + {0x0, 3, 4, 3991}, + {0x0, 0, 1, 3992}, + {0x0, 9, 10, 3993}, + {0x0, 9, 10, 3994}, + {0x30b0, 16, 16, 3995}, + {0x0, 1, 16, 3995}, + {0x0, 0, 1, 4010}, + {0x0, 3, 4, 4011}, + {0x0, 0, 1, 4012}, + {0x0, 9, 10, 4013}, + {0x0, 9, 10, 4014}, + {0x30b2, 16, 16, 4015}, + {0x0, 0, 1, 4015}, + {0x0, 3, 4, 4016}, + {0x0, 0, 1, 4017}, + {0x0, 9, 10, 4018}, + {0x0, 9, 10, 4019}, + {0x30b4, 16, 16, 4020}, + {0x0, 0, 1, 4020}, + {0x0, 3, 4, 4021}, + {0x0, 0, 1, 4022}, + {0x0, 9, 10, 4023}, + {0x0, 9, 10, 4024}, + {0x30b6, 16, 16, 4025}, + {0x0, 0, 1, 4025}, + {0x0, 3, 4, 4026}, + {0x0, 0, 1, 4027}, + {0x0, 9, 10, 4028}, + {0x0, 9, 10, 4029}, + {0x30b8, 16, 16, 4030}, + {0x0, 0, 1, 4030}, + {0x0, 3, 4, 4031}, + {0x0, 0, 1, 4032}, + {0x0, 9, 10, 4033}, + {0x0, 9, 10, 4034}, + {0x30ba, 16, 16, 4035}, + {0x0, 0, 1, 4035}, {0x0, 3, 4, 4036}, - {0x2fa03, 16, 16, 4037}, - {0x4d7, 16, 16, 4037}, - {0xf9c9, 16, 16, 4037}, - {0x1e60, 16, 16, 4037}, - {0x15a, 16, 16, 4037}, - {0x15c, 16, 16, 4037}, - {0xf91e, 16, 16, 4037}, {0x0, 0, 1, 4037}, - {0x0, 0, 1, 4038}, - {0x0, 3, 4, 4039}, + {0x0, 9, 10, 4038}, + {0x0, 9, 10, 4039}, + {0x30bc, 16, 16, 4040}, {0x0, 0, 1, 4040}, - {0x0, 0, 10, 4041}, - {0x1eab, 16, 16, 4051}, - {0x1ea7, 16, 16, 4051}, - {0x1ea5, 16, 16, 4051}, - {0x1ea9, 16, 16, 4051}, - {0x0, 2, 14, 4051}, - {0x0, 10, 11, 4063}, - {0xfa16, 16, 16, 4064}, - {0x0, 11, 12, 4064}, - {0xf9a4, 16, 16, 4065}, + {0x0, 3, 4, 4041}, + {0x0, 0, 1, 4042}, + {0x0, 9, 10, 4043}, + {0x0, 9, 10, 4044}, + {0x30be, 16, 16, 4045}, + {0x0, 0, 1, 4045}, + {0x0, 3, 4, 4046}, + {0x0, 0, 1, 4047}, + {0x0, 9, 10, 4048}, + {0x0, 9, 10, 4049}, + {0x30c0, 16, 16, 4050}, + {0x0, 1, 16, 4050}, {0x0, 0, 1, 4065}, - {0x0, 0, 1, 4066}, - {0x0, 3, 4, 4067}, - {0x0, 3, 4, 4068}, - {0x0, 8, 9, 4069}, - {0x226d, 16, 16, 4070}, + {0x0, 3, 4, 4066}, + {0x0, 0, 1, 4067}, + {0x0, 9, 10, 4068}, + {0x0, 9, 10, 4069}, + {0x30c2, 16, 16, 4070}, {0x0, 0, 1, 4070}, - {0x0, 0, 1, 4071}, - {0x0, 3, 4, 4072}, - {0x0, 4, 5, 4073}, - {0x0, 5, 6, 4074}, - {0x1f9f, 16, 16, 4075}, + {0x0, 3, 4, 4071}, + {0x0, 0, 1, 4072}, + {0x0, 9, 10, 4073}, + {0x0, 9, 10, 4074}, + {0x30c5, 16, 16, 4075}, {0x0, 0, 1, 4075}, - {0x0, 0, 1, 4076}, - {0x0, 3, 4, 4077}, - {0x0, 4, 5, 4078}, - {0x0, 5, 6, 4079}, - {0x1fad, 16, 16, 4080}, + {0x0, 3, 4, 4076}, + {0x0, 0, 1, 4077}, + {0x0, 9, 10, 4078}, + {0x0, 9, 10, 4079}, + {0x30c7, 16, 16, 4080}, {0x0, 0, 1, 4080}, - {0x0, 0, 1, 4081}, - {0x0, 3, 4, 4082}, - {0x0, 0, 3, 4083}, + {0x0, 3, 4, 4081}, + {0x0, 0, 1, 4082}, + {0x0, 9, 10, 4083}, + {0x0, 9, 10, 4084}, + {0x30c9, 16, 16, 4085}, + {0x0, 0, 1, 4085}, {0x0, 3, 4, 4086}, - {0x1ee3, 16, 16, 4087}, - {0x0, 13, 14, 4087}, - {0x2f9ae, 16, 16, 4088}, - {0x0, 3, 15, 4088}, - {0x1e2b, 16, 16, 4100}, - {0x0, 12, 13, 4100}, - {0x2f9ea, 16, 16, 4101}, - {0x0, 12, 13, 4101}, - {0x0, 10, 11, 4102}, - {0x2f9ab, 16, 16, 4103}, + {0x0, 0, 1, 4087}, + {0x0, 9, 10, 4088}, + {0x0, 9, 11, 4089}, + {0x30d0, 16, 16, 4091}, + {0x30d1, 16, 16, 4091}, + {0x0, 2, 12, 4091}, + {0x0, 0, 1, 4101}, + {0x0, 3, 4, 4102}, {0x0, 0, 1, 4103}, - {0x0, 0, 1, 4104}, - {0x0, 3, 4, 4105}, - {0x0, 0, 5, 4106}, - {0x0, 0, 7, 4111}, - {0x1fba, 16, 16, 4118}, - {0x386, 16, 16, 4118}, - {0x1fb8, 16, 16, 4118}, - {0x0, 7, 8, 4118}, - {0x2f811, 16, 16, 4119}, - {0x1fb9, 16, 16, 4119}, - {0x0, 1, 14, 4119}, - {0x0, 14, 15, 4132}, - {0x2f909, 16, 16, 4133}, - {0x0, 0, 13, 4133}, - {0xf936, 16, 16, 4146}, - {0x0, 6, 7, 4146}, - {0x0, 0, 1, 4147}, - {0x0, 0, 1, 4148}, - {0x0, 3, 4, 4149}, - {0x0, 4, 5, 4150}, - {0x0, 5, 6, 4151}, - {0x1fc7, 16, 16, 4152}, - {0x0, 0, 11, 4152}, - {0x0, 0, 1, 4163}, - {0x0, 0, 1, 4164}, - {0x0, 3, 4, 4165}, - {0x0, 0, 1, 4166}, - {0x0, 7, 9, 4167}, - {0x1e8b, 16, 16, 4169}, - {0x0, 1, 8, 4169}, - {0x1e3f, 16, 16, 4176}, - {0x1e41, 16, 16, 4176}, - {0x0, 0, 16, 4176}, - {0x0, 4, 5, 4192}, - {0xf93f, 16, 16, 4193}, - {0x0, 7, 8, 4193}, - {0x2f964, 16, 16, 4194}, - {0x0, 6, 7, 4194}, - {0x2f9be, 16, 16, 4195}, - {0x1e8d, 16, 16, 4195}, - {0x0, 0, 1, 4195}, - {0x0, 0, 1, 4196}, - {0x0, 3, 4, 4197}, - {0x0, 0, 1, 4198}, - {0x0, 0, 2, 4199}, - {0x1e14, 16, 16, 4201}, - {0x0, 7, 8, 4201}, - {0xfa31, 16, 16, 4202}, - {0x0, 0, 1, 4202}, - {0x0, 0, 1, 4203}, - {0x0, 3, 4, 4204}, - {0x0, 0, 1, 4205}, - {0x0, 1, 2, 4206}, - {0x1e2f, 16, 16, 4207}, - {0x0, 7, 8, 4207}, - {0xf963, 16, 16, 4208}, - {0x2f9b3, 16, 16, 4208}, - {0x0, 0, 1, 4208}, - {0x0, 0, 1, 4209}, - {0x0, 3, 4, 4210}, - {0x0, 0, 5, 4211}, - {0x0, 2, 3, 4216}, - {0x1f3e, 16, 16, 4217}, - {0x0, 0, 1, 4217}, - {0x0, 0, 1, 4218}, - {0x0, 3, 4, 4219}, - {0x0, 0, 1, 4220}, - {0x0, 1, 2, 4221}, - {0x1e2e, 16, 16, 4222}, - {0x1e29, 16, 16, 4222}, - {0x0, 0, 1, 4222}, - {0x0, 0, 1, 4223}, - {0x0, 3, 4, 4224}, - {0x0, 0, 4, 4225}, - {0x0, 1, 2, 4229}, - {0x1e06, 16, 16, 4230}, - {0x1e25, 16, 16, 4230}, - {0xec, 16, 16, 4230}, - {0xed, 16, 16, 4230}, - {0xee, 16, 16, 4230}, - {0x129, 16, 16, 4230}, - {0x12b, 16, 16, 4230}, - {0x12d, 16, 16, 4230}, - {0xef, 16, 16, 4230}, - {0x1ec9, 16, 16, 4230}, - {0x0, 6, 16, 4230}, - {0x2f83b, 16, 16, 4240}, - {0x0, 1, 2, 4240}, - {0xf909, 16, 16, 4241}, - {0x2f969, 16, 16, 4241}, - {0x0, 8, 11, 4241}, - {0x2f9c9, 16, 16, 4244}, - {0x0, 1, 13, 4244}, - {0x1e30, 16, 16, 4256}, - {0x1a1, 16, 16, 4256}, - {0x0, 3, 12, 4256}, - {0x0, 0, 1, 4265}, - {0x0, 0, 1, 4266}, - {0x0, 3, 4, 4267}, - {0x0, 3, 4, 4268}, - {0x0, 8, 9, 4269}, - {0x2209, 16, 16, 4270}, - {0x0, 13, 14, 4270}, - {0xf918, 16, 16, 4271}, - {0xf97b, 16, 16, 4271}, - {0x0, 1, 13, 4271}, - {0x2f9a9, 16, 16, 4283}, - {0x2f9a8, 16, 16, 4283}, - {0x0, 8, 9, 4283}, - {0x2f86e, 16, 16, 4284}, - {0x0, 4, 5, 4284}, - {0x2f9e2, 16, 16, 4285}, - {0xf9de, 16, 16, 4285}, - {0x1e8, 16, 16, 4285}, - {0x0, 3, 4, 4285}, - {0x2f99c, 16, 16, 4286}, - {0x0, 6, 7, 4286}, - {0x2f94b, 16, 16, 4287}, - {0x209, 16, 16, 4287}, - {0x0, 2, 3, 4287}, - {0xfa4a, 16, 16, 4288}, - {0xf9c2, 16, 16, 4288}, - {0x0, 0, 1, 4288}, - {0x0, 0, 1, 4289}, - {0x0, 3, 4, 4290}, - {0x0, 0, 1, 4291}, - {0x0, 8, 9, 4292}, - {0x4db, 16, 16, 4293}, - {0x0, 5, 6, 4293}, - {0xfa1a, 16, 16, 4294}, - {0x0, 4, 15, 4294}, - {0x2f8a9, 16, 16, 4305}, - {0x0, 3, 14, 4305}, - {0x0, 0, 1, 4316}, - {0x0, 0, 1, 4317}, - {0x0, 3, 4, 4318}, - {0x0, 0, 1, 4319}, - {0x0, 4, 12, 4320}, - {0x4f0, 16, 16, 4328}, - {0x0, 5, 10, 4328}, - {0xf993, 16, 16, 4333}, - {0x2f8a8, 16, 16, 4333}, - {0x2f91c, 16, 16, 4333}, - {0x40e, 16, 16, 4333}, - {0x4ee, 16, 16, 4333}, - {0x0, 5, 6, 4333}, - {0x2f986, 16, 16, 4334}, - {0x0, 11, 12, 4334}, - {0xf922, 16, 16, 4335}, - {0x0, 5, 6, 4335}, - {0x1fcc, 16, 16, 4336}, - {0x0, 0, 1, 4336}, - {0x0, 3, 4, 4337}, - {0x0, 0, 1, 4338}, - {0x0, 9, 10, 4339}, - {0x0, 9, 10, 4340}, - {0x3056, 16, 16, 4341}, - {0x0, 7, 16, 4341}, - {0xf9da, 16, 16, 4350}, - {0x0, 7, 8, 4350}, - {0x2f96e, 16, 16, 4351}, - {0xf9d9, 16, 16, 4351}, - {0x4f2, 16, 16, 4351}, - {0x2f8a6, 16, 16, 4351}, - {0x0, 8, 9, 4351}, - {0x2f869, 16, 16, 4352}, - {0x0, 8, 9, 4352}, - {0xf9ef, 16, 16, 4353}, - {0x0, 5, 6, 4353}, - {0x2f8e0, 16, 16, 4354}, - {0x0, 0, 9, 4354}, - {0x0, 11, 12, 4363}, - {0x2f94a, 16, 16, 4364}, - {0x0, 0, 10, 4364}, - {0x0, 13, 14, 4374}, - {0xf9c4, 16, 16, 4375}, - {0x2f8e5, 16, 16, 4375}, - {0x0, 0, 1, 4375}, - {0x1e1a, 16, 16, 4376}, - {0x0, 10, 11, 4376}, - {0x0, 11, 12, 4377}, - {0x2f91f, 16, 16, 4378}, - {0x0, 0, 1, 4378}, - {0x0, 0, 1, 4379}, - {0x0, 3, 4, 4380}, - {0x0, 0, 3, 4381}, - {0x0, 0, 16, 4384}, - {0x200, 16, 16, 4400}, - {0x1cd, 16, 16, 4400}, - {0xc5, 16, 16, 4400}, - {0x0, 13, 14, 4400}, - {0x2f8d6, 16, 16, 4401}, - {0x0, 5, 6, 4401}, - {0xf976, 16, 16, 4402}, - {0x0, 6, 12, 4402}, - {0xf9b5, 16, 16, 4408}, - {0x0, 0, 1, 4408}, - {0x0, 0, 1, 4409}, - {0x0, 3, 4, 4410}, - {0x0, 0, 4, 4411}, - {0x0, 3, 14, 4415}, - {0x21a, 16, 16, 4426}, - {0x162, 16, 16, 4426}, - {0x1e6c, 16, 16, 4426}, - {0x0, 0, 2, 4426}, - {0x1f05, 16, 16, 4428}, - {0x1f03, 16, 16, 4428}, - {0x0, 1, 2, 4428}, - {0x2f8ef, 16, 16, 4429}, - {0x0, 7, 8, 4429}, - {0x2f9ce, 16, 16, 4430}, - {0xf92d, 16, 16, 4430}, - {0x0, 10, 15, 4430}, - {0x0, 8, 9, 4435}, - {0x2f860, 16, 16, 4436}, - {0x1e70, 16, 16, 4436}, - {0x0, 4, 5, 4436}, - {0xfa2d, 16, 16, 4437}, - {0x0, 12, 13, 4437}, - {0x2f8c9, 16, 16, 4438}, - {0x102, 16, 16, 4438}, - {0x226, 16, 16, 4438}, - {0x100, 16, 16, 4438}, - {0xc2, 16, 16, 4438}, - {0xc3, 16, 16, 4438}, - {0xc0, 16, 16, 4438}, - {0xc1, 16, 16, 4438}, - {0x0, 2, 3, 4438}, - {0x2fa06, 16, 16, 4439}, - {0x0, 2, 3, 4439}, - {0x1f57, 16, 16, 4440}, - {0x0, 5, 6, 4440}, - {0x2f9d2, 16, 16, 4441}, - {0xc4, 16, 16, 4441}, - {0x1ea2, 16, 16, 4441}, - {0x0, 8, 9, 4441}, - {0x2f8bb, 16, 16, 4442}, - {0x0, 15, 16, 4442}, - {0xf910, 16, 16, 4443}, - {0x0, 0, 1, 4443}, - {0x0, 0, 1, 4444}, - {0x0, 3, 4, 4445}, - {0x0, 0, 1, 4446}, - {0x0, 1, 8, 4447}, - {0x1e57, 16, 16, 4454}, - {0x1e55, 16, 16, 4454}, - {0x0, 3, 4, 4454}, - {0xf9e0, 16, 16, 4455}, - {0x0, 0, 1, 4455}, - {0x0, 0, 1, 4456}, - {0x0, 3, 4, 4457}, - {0x0, 0, 3, 4458}, - {0x0, 0, 16, 4461}, - {0xd5, 16, 16, 4477}, - {0x0, 0, 10, 4477}, - {0x1ee0, 16, 16, 4487}, - {0x1eda, 16, 16, 4487}, - {0x1edc, 16, 16, 4487}, - {0x0, 0, 1, 4487}, - {0x0, 0, 1, 4488}, - {0x0, 3, 4, 4489}, - {0x0, 3, 4, 4490}, - {0x0, 8, 9, 4491}, - {0x22ea, 16, 16, 4492}, - {0x1ede, 16, 16, 4492}, - {0x0, 1, 16, 4492}, - {0x0, 14, 15, 4507}, - {0x2f852, 16, 16, 4508}, - {0x0, 0, 12, 4508}, - {0x2f8b2, 16, 16, 4520}, - {0x0, 12, 14, 4520}, - {0x0, 4, 5, 4522}, - {0x2f9de, 16, 16, 4523}, - {0x0, 12, 13, 4523}, - {0x2f88a, 16, 16, 4524}, - {0x0, 0, 14, 4524}, - {0xfa32, 16, 16, 4538}, - {0x0, 0, 1, 4538}, - {0x0, 0, 1, 4539}, - {0x0, 3, 4, 4540}, - {0x0, 0, 1, 4541}, - {0x0, 7, 8, 4542}, - {0x1e67, 16, 16, 4543}, - {0x0, 8, 9, 4543}, - {0x2f9b8, 16, 16, 4544}, - {0x0, 9, 10, 4544}, - {0x2f8de, 16, 16, 4545}, - {0x1f7c, 16, 16, 4545}, - {0x0, 2, 3, 4545}, - {0x1fdf, 16, 16, 4546}, - {0x0, 6, 7, 4546}, - {0x0, 11, 12, 4547}, - {0x2f9a5, 16, 16, 4548}, - {0x0, 6, 7, 4548}, - {0xfa01, 16, 16, 4549}, - {0x0, 9, 10, 4549}, - {0x2f809, 16, 16, 4550}, - {0x0, 4, 14, 4550}, - {0x0, 15, 16, 4560}, - {0x2f81c, 16, 16, 4561}, - {0x0, 9, 10, 4561}, - {0x2f9b7, 16, 16, 4562}, - {0x0, 12, 15, 4562}, - {0xf973, 16, 16, 4565}, - {0x0, 0, 1, 4565}, - {0x0, 3, 4, 4566}, - {0x0, 0, 1, 4567}, - {0x0, 9, 10, 4568}, - {0x0, 9, 10, 4569}, - {0x30c0, 16, 16, 4570}, - {0x0, 3, 5, 4570}, - {0x1f08, 16, 16, 4572}, - {0x2f8b3, 16, 16, 4572}, - {0x1f09, 16, 16, 4572}, - {0x2f8ba, 16, 16, 4572}, - {0x0, 0, 1, 4572}, - {0x0, 0, 1, 4573}, - {0x0, 3, 4, 4574}, - {0x0, 0, 5, 4575}, - {0x0, 0, 2, 4580}, - {0x1fd2, 16, 16, 4582}, - {0x390, 16, 16, 4582}, - {0xfa0c, 16, 16, 4582}, - {0x0, 0, 1, 4582}, - {0x0, 0, 1, 4583}, - {0x0, 3, 4, 4584}, - {0x0, 0, 1, 4585}, - {0x0, 1, 2, 4586}, - {0x1e79, 16, 16, 4587}, - {0x0, 4, 16, 4587}, - {0x2f8ad, 16, 16, 4599}, - {0x0, 2, 3, 4599}, - {0x0, 15, 16, 4600}, - {0x2f958, 16, 16, 4601}, - {0x0, 5, 8, 4601}, - {0x2f81b, 16, 16, 4604}, - {0x0, 0, 1, 4604}, - {0x0, 0, 1, 4605}, - {0x0, 3, 4, 4606}, - {0x0, 3, 4, 4607}, - {0x0, 8, 9, 4608}, - {0x2275, 16, 16, 4609}, - {0x0, 0, 13, 4609}, - {0x148, 16, 16, 4622}, - {0x0, 0, 15, 4622}, - {0x0, 14, 15, 4637}, - {0x2f985, 16, 16, 4638}, - {0x0, 0, 7, 4638}, - {0xfa66, 16, 16, 4645}, - {0xf971, 16, 16, 4645}, - {0x0, 1, 2, 4645}, - {0x20b, 16, 16, 4646}, - {0x0, 0, 1, 4646}, - {0x0, 0, 1, 4647}, - {0x0, 3, 4, 4648}, - {0x0, 0, 5, 4649}, - {0x0, 2, 3, 4654}, - {0x1fe6, 16, 16, 4655}, - {0x0, 2, 3, 4655}, - {0x1f3f, 16, 16, 4656}, - {0x0, 7, 8, 4656}, - {0x0, 1, 2, 4657}, - {0x0, 0, 1, 4658}, - {0x0, 0, 1, 4659}, - {0x0, 15, 16, 4660}, - {0x0, 7, 9, 4661}, - {0x0, 0, 1, 4663}, - {0xf81, 16, 16, 4664}, - {0x0, 0, 1, 4664}, - {0x0, 0, 1, 4665}, - {0x0, 3, 4, 4666}, - {0x0, 4, 5, 4667}, - {0x0, 5, 6, 4668}, - {0x1fb2, 16, 16, 4669}, - {0x0, 3, 4, 4669}, - {0x1e04, 16, 16, 4670}, - {0x0, 1, 2, 4670}, - {0x2f96d, 16, 16, 4671}, - {0x0, 0, 16, 4671}, - {0x2f95b, 16, 16, 4687}, - {0x2f95a, 16, 16, 4687}, - {0x1e45, 16, 16, 4687}, - {0x1f9, 16, 16, 4687}, - {0x144, 16, 16, 4687}, - {0x0, 9, 10, 4687}, - {0x2f9eb, 16, 16, 4688}, - {0xf1, 16, 16, 4688}, - {0x0, 0, 1, 4688}, - {0x0, 0, 1, 4689}, - {0x0, 3, 4, 4690}, - {0x0, 0, 1, 4691}, - {0x0, 2, 7, 4692}, - {0x1ead, 16, 16, 4697}, - {0x0, 9, 10, 4697}, - {0x2f913, 16, 16, 4698}, - {0x1eb7, 16, 16, 4698}, - {0x0, 0, 1, 4698}, - {0x0, 0, 1, 4699}, - {0x0, 3, 4, 4700}, - {0x0, 0, 4, 4701}, - {0x0, 0, 13, 4705}, - {0x147, 16, 16, 4718}, - {0x0, 11, 14, 4718}, - {0xfa09, 16, 16, 4721}, - {0x0, 8, 9, 4721}, - {0x2f83d, 16, 16, 4722}, - {0x0, 10, 12, 4722}, - {0x0, 7, 8, 4724}, - {0x2f987, 16, 16, 4725}, - {0x0, 3, 4, 4725}, - {0x2f951, 16, 16, 4726}, - {0x0, 5, 9, 4726}, - {0x0, 14, 15, 4730}, - {0x2f910, 16, 16, 4731}, - {0xfa54, 16, 16, 4731}, - {0x0, 10, 11, 4731}, - {0xfa46, 16, 16, 4732}, - {0x0, 3, 4, 4732}, - {0x2f86d, 16, 16, 4733}, - {0x0, 0, 16, 4733}, - {0x1ecf, 16, 16, 4749}, - {0xf6, 16, 16, 4749}, - {0x14d, 16, 16, 4749}, - {0x0, 3, 4, 4749}, - {0x2f9a0, 16, 16, 4750}, - {0x14f, 16, 16, 4750}, - {0xf3, 16, 16, 4750}, - {0xf2, 16, 16, 4750}, - {0xf5, 16, 16, 4750}, - {0xf4, 16, 16, 4750}, - {0x0, 5, 6, 4750}, - {0x2f8c0, 16, 16, 4751}, - {0x0, 6, 7, 4751}, - {0x2f841, 16, 16, 4752}, - {0x0, 0, 1, 4752}, - {0x0, 0, 1, 4753}, - {0x0, 3, 4, 4754}, - {0x0, 4, 5, 4755}, - {0x0, 5, 6, 4756}, - {0x1f9d, 16, 16, 4757}, - {0x0, 15, 16, 4757}, - {0xf93c, 16, 16, 4758}, - {0x0, 0, 13, 4758}, - {0xf9fd, 16, 16, 4771}, - {0x0, 0, 2, 4771}, - {0x1f65, 16, 16, 4773}, - {0x1f63, 16, 16, 4773}, - {0x2f8ae, 16, 16, 4773}, - {0x0, 0, 1, 4773}, - {0x0, 0, 1, 4774}, - {0x0, 3, 4, 4775}, - {0x0, 0, 1, 4776}, - {0x0, 4, 5, 4777}, - {0x231, 16, 16, 4778}, - {0x0, 2, 4, 4778}, - {0x2f942, 16, 16, 4780}, - {0x2f941, 16, 16, 4780}, - {0xf951, 16, 16, 4780}, - {0x0, 8, 9, 4780}, - {0x2f8ee, 16, 16, 4781}, - {0x2f819, 16, 16, 4781}, - {0x20d, 16, 16, 4781}, - {0x1d2, 16, 16, 4781}, - {0x151, 16, 16, 4781}, - {0x0, 0, 1, 4781}, - {0x0, 0, 1, 4782}, - {0x0, 3, 4, 4783}, - {0x0, 0, 3, 4784}, - {0x0, 3, 4, 4787}, - {0x1e7f, 16, 16, 4788}, - {0x0, 14, 15, 4788}, - {0x2f80c, 16, 16, 4789}, - {0x2f828, 16, 16, 4789}, - {0x0, 15, 16, 4789}, - {0x2f980, 16, 16, 4790}, - {0x0, 5, 10, 4790}, - {0x2f931, 16, 16, 4795}, - {0x0, 14, 15, 4795}, - {0x2f98d, 16, 16, 4796}, - {0x0, 9, 10, 4796}, - {0xfa63, 16, 16, 4797}, - {0xf994, 16, 16, 4797}, - {0x0, 14, 16, 4797}, - {0x2f947, 16, 16, 4799}, - {0x0, 2, 8, 4799}, - {0x0, 0, 1, 4805}, - {0x0, 0, 1, 4806}, - {0x0, 3, 4, 4807}, - {0x0, 3, 4, 4808}, - {0x0, 8, 9, 4809}, - {0x2289, 16, 16, 4810}, - {0x0, 13, 14, 4810}, - {0x0, 1, 2, 4811}, - {0x2f90d, 16, 16, 4812}, - {0x0, 7, 8, 4812}, - {0x2f8a5, 16, 16, 4813}, - {0x0, 5, 11, 4813}, - {0xf9a7, 16, 16, 4819}, - {0x0, 9, 12, 4819}, - {0x2f813, 16, 16, 4822}, - {0x0, 8, 10, 4822}, - {0x0, 15, 16, 4824}, - {0x2f939, 16, 16, 4825}, - {0x0, 0, 1, 4825}, - {0x0, 0, 1, 4826}, - {0x0, 3, 4, 4827}, - {0x0, 0, 1, 4828}, - {0x0, 0, 10, 4829}, - {0x1ec1, 16, 16, 4839}, - {0x0, 10, 11, 4839}, - {0xf911, 16, 16, 4840}, - {0x2f928, 16, 16, 4840}, - {0x0, 11, 12, 4840}, - {0xf9c8, 16, 16, 4841}, - {0x0, 0, 1, 4841}, - {0xf962, 16, 16, 4842}, - {0x0, 14, 15, 4842}, - {0xf957, 16, 16, 4843}, - {0x0, 0, 1, 4843}, - {0x0, 0, 1, 4844}, - {0x0, 3, 4, 4845}, - {0x0, 0, 1, 4846}, - {0x0, 4, 5, 4847}, - {0x1e1, 16, 16, 4848}, - {0x0, 1, 2, 4848}, - {0x1e6e, 16, 16, 4849}, - {0x0, 10, 11, 4849}, - {0x2f8aa, 16, 16, 4850}, - {0x0, 8, 9, 4850}, - {0xf9c5, 16, 16, 4851}, - {0x0, 0, 1, 4851}, - {0x0, 0, 1, 4852}, - {0x0, 3, 4, 4853}, - {0x0, 0, 1, 4854}, - {0x0, 4, 5, 4855}, - {0x1df, 16, 16, 4856}, - {0x0, 0, 2, 4856}, - {0x1f02, 16, 16, 4858}, - {0x1f04, 16, 16, 4858}, - {0x0, 14, 15, 4858}, - {0xf984, 16, 16, 4859}, - {0x0, 2, 3, 4859}, - {0x0, 5, 6, 4860}, - {0x0, 0, 1, 4861}, - {0x0, 1, 2, 4862}, - {0x0, 0, 1, 4863}, - {0x0, 2, 3, 4864}, - {0x0, 14, 15, 4865}, - {0x1026, 16, 16, 4866}, - {0x0, 14, 15, 4866}, - {0x2f8fa, 16, 16, 4867}, - {0x2f9ca, 16, 16, 4867}, - {0x0, 0, 1, 4867}, - {0x0, 0, 1, 4868}, - {0x0, 3, 4, 4869}, - {0x0, 0, 5, 4870}, - {0x0, 0, 2, 4875}, - {0x1f25, 16, 16, 4877}, - {0x0, 11, 16, 4877}, - {0x2f806, 16, 16, 4882}, - {0x0, 1, 2, 4882}, - {0x202, 16, 16, 4883}, - {0x0, 0, 1, 4883}, - {0x2f8b7, 16, 16, 4884}, - {0x0, 2, 3, 4884}, - {0x2f982, 16, 16, 4885}, - {0x0, 8, 10, 4885}, - {0x0, 0, 1, 4887}, - {0x0, 0, 1, 4888}, - {0x0, 3, 4, 4889}, - {0x0, 0, 1, 4890}, - {0x0, 8, 9, 4891}, - {0x4ea, 16, 16, 4892}, - {0x0, 0, 1, 4892}, - {0xf98f, 16, 16, 4893}, - {0x0, 13, 15, 4893}, - {0x0, 13, 14, 4895}, - {0x2f9e1, 16, 16, 4896}, - {0x0, 0, 1, 4896}, - {0x0, 0, 1, 4897}, - {0x0, 3, 4, 4898}, - {0x0, 0, 2, 4899}, - {0x0, 0, 2, 4901}, - {0x38c, 16, 16, 4903}, - {0x0, 2, 7, 4903}, - {0xf90d, 16, 16, 4908}, - {0x0, 2, 3, 4908}, - {0x2f875, 16, 16, 4909}, - {0x0, 14, 15, 4909}, - {0xf9d2, 16, 16, 4910}, - {0x0, 10, 11, 4910}, - {0xf902, 16, 16, 4911}, - {0x22f, 16, 16, 4911}, - {0x0, 2, 3, 4911}, - {0x1f56, 16, 16, 4912}, - {0x0, 3, 8, 4912}, - {0x15e, 16, 16, 4917}, - {0x218, 16, 16, 4917}, - {0x1e62, 16, 16, 4917}, - {0x0, 2, 7, 4917}, - {0xf9ba, 16, 16, 4922}, - {0xf91b, 16, 16, 4922}, - {0x0, 3, 10, 4922}, - {0x0, 6, 7, 4929}, - {0x2f916, 16, 16, 4930}, - {0x0, 0, 1, 4930}, - {0x0, 0, 1, 4931}, - {0x0, 3, 4, 4932}, - {0x0, 3, 4, 4933}, - {0x0, 8, 9, 4934}, - {0x22ae, 16, 16, 4935}, - {0x0, 7, 8, 4935}, - {0x2f973, 16, 16, 4936}, - {0x0, 0, 1, 4936}, - {0x0, 0, 1, 4937}, - {0x0, 3, 4, 4938}, - {0x0, 4, 5, 4939}, - {0x0, 5, 6, 4940}, - {0x1fa6, 16, 16, 4941}, - {0x0, 0, 1, 4941}, - {0x0, 0, 1, 4942}, - {0x0, 3, 4, 4943}, - {0x0, 0, 1, 4944}, - {0x0, 0, 2, 4945}, - {0x1f42, 16, 16, 4947}, - {0x1f44, 16, 16, 4947}, - {0x0, 3, 4, 4947}, - {0x2f843, 16, 16, 4948}, - {0x0, 10, 11, 4948}, - {0x0, 3, 4, 4949}, - {0x2f8ec, 16, 16, 4950}, - {0x0, 0, 10, 4950}, - {0x1edd, 16, 16, 4960}, - {0x1edb, 16, 16, 4960}, - {0x0, 15, 16, 4960}, - {0xf9eb, 16, 16, 4961}, - {0x1ee1, 16, 16, 4961}, - {0x1edf, 16, 16, 4961}, - {0x622, 16, 16, 4961}, - {0x0, 0, 1, 4961}, - {0x0, 3, 4, 4962}, - {0x0, 0, 1, 4963}, - {0x0, 9, 10, 4964}, - {0x0, 9, 11, 4965}, - {0x30d3, 16, 16, 4967}, - {0x0, 1, 4, 4967}, - {0x0, 12, 13, 4970}, - {0x2f8a2, 16, 16, 4971}, - {0x0, 0, 1, 4971}, - {0xf944, 16, 16, 4972}, - {0x0, 0, 1, 4972}, - {0x1e2c, 16, 16, 4973}, - {0x0, 0, 1, 4973}, - {0x0, 0, 1, 4974}, - {0x0, 3, 4, 4975}, - {0x0, 0, 4, 4976}, - {0x0, 3, 8, 4980}, - {0x1e33, 16, 16, 4985}, - {0x0, 2, 3, 4985}, - {0x2f888, 16, 16, 4986}, - {0x0, 4, 5, 4986}, - {0x2f80f, 16, 16, 4987}, - {0x0, 0, 10, 4987}, - {0x0, 14, 15, 4997}, - {0x2fa13, 16, 16, 4998}, - {0x0, 2, 3, 4998}, - {0x2f960, 16, 16, 4999}, - {0x0, 8, 9, 4999}, - {0x0, 0, 1, 5000}, - {0x0, 0, 1, 5001}, - {0x0, 9, 10, 5002}, - {0x0, 3, 4, 5003}, - {0x0, 12, 13, 5004}, - {0x929, 16, 16, 5005}, - {0x0, 0, 1, 5005}, - {0x0, 10, 11, 5006}, - {0x2f8ca, 16, 16, 5007}, - {0x0, 0, 1, 5007}, - {0x0, 0, 1, 5008}, - {0x0, 3, 4, 5009}, - {0x0, 0, 5, 5010}, - {0x0, 2, 6, 5015}, - {0x1fa8, 16, 16, 5019}, - {0x0, 0, 1, 5019}, - {0x0, 0, 1, 5020}, - {0x0, 3, 4, 5021}, - {0x0, 4, 5, 5022}, - {0x0, 5, 6, 5023}, - {0x1f9e, 16, 16, 5024}, - {0x0, 0, 1, 5024}, - {0x0, 3, 4, 5025}, - {0x0, 0, 1, 5026}, - {0x0, 9, 10, 5027}, - {0x0, 9, 10, 5028}, - {0x30fe, 16, 16, 5029}, - {0x0, 2, 13, 5029}, - {0x1e27, 16, 16, 5040}, - {0x1e23, 16, 16, 5040}, - {0x125, 16, 16, 5040}, - {0x0, 4, 5, 5040}, - {0x2f8f1, 16, 16, 5041}, - {0x0, 3, 5, 5041}, - {0x1f60, 16, 16, 5043}, - {0x0, 4, 5, 5043}, - {0x2f971, 16, 16, 5044}, - {0x30d4, 16, 16, 5044}, - {0x1f61, 16, 16, 5044}, - {0x0, 0, 1, 5044}, - {0x0, 3, 4, 5045}, - {0x0, 0, 1, 5046}, - {0x0, 9, 10, 5047}, - {0x0, 9, 10, 5048}, - {0x304c, 16, 16, 5049}, - {0x0, 0, 1, 5049}, - {0x0, 0, 1, 5050}, - {0x0, 3, 4, 5051}, - {0x0, 0, 1, 5052}, - {0x0, 1, 2, 5053}, - {0x1e78, 16, 16, 5054}, - {0x0, 0, 1, 5054}, - {0x0, 3, 4, 5055}, - {0x0, 0, 1, 5056}, - {0x0, 9, 10, 5057}, - {0x0, 9, 11, 5058}, - {0x30d9, 16, 16, 5060}, - {0x0, 8, 9, 5060}, - {0xf9b3, 16, 16, 5061}, - {0x0, 11, 15, 5061}, - {0x2f914, 16, 16, 5065}, - {0x0, 8, 14, 5065}, - {0xfa5c, 16, 16, 5071}, - {0x0, 0, 2, 5071}, - {0x1f34, 16, 16, 5073}, - {0x2f915, 16, 16, 5073}, - {0x0, 0, 1, 5073}, - {0x0, 0, 1, 5074}, - {0x0, 3, 4, 5075}, - {0x0, 4, 5, 5076}, - {0x0, 5, 6, 5077}, - {0x1f85, 16, 16, 5078}, - {0x0, 4, 15, 5078}, - {0x2f907, 16, 16, 5089}, - {0x0, 2, 3, 5089}, - {0x2f8bf, 16, 16, 5090}, - {0x0, 15, 16, 5090}, - {0xf937, 16, 16, 5091}, - {0x2126, 0, 1, 5091}, - {0x0, 0, 1, 5092}, - {0x0, 3, 4, 5093}, - {0x0, 0, 5, 5094}, - {0x0, 0, 2, 5099}, - {0x1ffa, 16, 16, 5101}, - {0x38f, 16, 16, 5101}, - {0x0, 4, 13, 5101}, - {0x0, 0, 1, 5110}, - {0x0, 0, 1, 5111}, - {0x0, 3, 4, 5112}, - {0x0, 0, 1, 5113}, - {0x0, 1, 2, 5114}, - {0x1ff, 16, 16, 5115}, - {0x0, 0, 1, 5115}, - {0x0, 0, 1, 5116}, - {0x0, 3, 4, 5117}, - {0x0, 4, 5, 5118}, - {0x0, 5, 6, 5119}, - {0x1f84, 16, 16, 5120}, - {0xf9f6, 16, 16, 5120}, - {0x0, 8, 10, 5120}, - {0x2329, 16, 16, 5122}, - {0x232a, 16, 16, 5122}, - {0x0, 0, 1, 5122}, - {0x0, 0, 1, 5123}, - {0x0, 3, 4, 5124}, - {0x0, 3, 4, 5125}, - {0x0, 8, 9, 5126}, - {0x2274, 16, 16, 5127}, - {0x30da, 16, 16, 5127}, - {0x0, 4, 13, 5127}, - {0x0, 0, 1, 5136}, - {0x0, 0, 1, 5137}, - {0x0, 3, 4, 5138}, - {0x0, 0, 1, 5139}, - {0x0, 0, 10, 5140}, - {0x1ed4, 16, 16, 5150}, - {0x0, 4, 5, 5150}, - {0xfa34, 16, 16, 5151}, - {0x1ed0, 16, 16, 5151}, - {0x1ed2, 16, 16, 5151}, - {0x1ed6, 16, 16, 5151}, - {0x2f900, 16, 16, 5151}, - {0x0, 4, 5, 5151}, - {0x2f940, 16, 16, 5152}, - {0x0, 0, 1, 5152}, - {0x0, 0, 1, 5153}, - {0x0, 3, 4, 5154}, - {0x0, 0, 1, 5155}, - {0x0, 1, 9, 5156}, - {0x1e4e, 16, 16, 5164}, - {0x1e4c, 16, 16, 5164}, - {0x22c, 16, 16, 5164}, - {0x0, 9, 15, 5164}, - {0x2fa18, 16, 16, 5170}, - {0x0, 12, 13, 5170}, - {0x0, 8, 9, 5171}, - {0x2f86c, 16, 16, 5172}, - {0x0, 7, 8, 5172}, - {0x2fa0f, 16, 16, 5173}, - {0x0, 1, 3, 5173}, - {0x0, 0, 1, 5175}, - {0x0, 0, 1, 5176}, - {0x0, 3, 4, 5177}, - {0x0, 3, 4, 5178}, - {0x0, 8, 9, 5179}, - {0x22e2, 16, 16, 5180}, - {0x0, 4, 5, 5180}, - {0xfa06, 16, 16, 5181}, - {0x0, 0, 1, 5181}, - {0x0, 0, 1, 5182}, - {0x0, 3, 4, 5183}, - {0x0, 0, 4, 5184}, - {0x0, 1, 16, 5188}, - {0x155, 16, 16, 5203}, - {0x0, 8, 9, 5203}, - {0xfa3e, 16, 16, 5204}, - {0x0, 0, 1, 5204}, - {0xf93d, 16, 16, 5205}, - {0x0, 0, 8, 5205}, - {0x0, 0, 1, 5213}, - {0x0, 0, 1, 5214}, - {0x0, 3, 4, 5215}, - {0x0, 0, 3, 5216}, - {0x0, 3, 4, 5219}, - {0x1ef1, 16, 16, 5220}, - {0x0, 6, 7, 5220}, - {0x2f935, 16, 16, 5221}, - {0x2fa17, 16, 16, 5221}, - {0x0, 14, 15, 5221}, - {0xfa48, 16, 16, 5222}, - {0x0, 15, 16, 5222}, - {0xf939, 16, 16, 5223}, - {0x0, 0, 1, 5223}, - {0x0, 0, 1, 5224}, - {0x0, 3, 4, 5225}, - {0x0, 0, 1, 5226}, - {0x0, 12, 13, 5227}, - {0x1ee, 16, 16, 5228}, - {0x0, 8, 9, 5228}, - {0x2fa11, 16, 16, 5229}, - {0x0, 8, 9, 5229}, - {0x2f97e, 16, 16, 5230}, - {0x0, 4, 5, 5230}, - {0xfa12, 16, 16, 5231}, - {0x0, 0, 1, 5231}, - {0x0, 3, 4, 5232}, - {0x0, 0, 1, 5233}, - {0x0, 9, 10, 5234}, - {0x0, 9, 10, 5235}, - {0x305c, 16, 16, 5236}, - {0x0, 10, 11, 5236}, - {0x2f954, 16, 16, 5237}, - {0x0, 7, 13, 5237}, - {0x1e6a, 16, 16, 5243}, - {0x0, 0, 1, 5243}, - {0x0, 0, 1, 5244}, - {0x0, 3, 4, 5245}, - {0x0, 0, 1, 5246}, - {0x0, 1, 2, 5247}, - {0x344, 16, 16, 5248}, - {0x0, 0, 1, 5248}, - {0x0, 0, 1, 5249}, - {0x0, 3, 4, 5250}, - {0x0, 0, 1, 5251}, - {0x0, 0, 2, 5252}, - {0x1f45, 16, 16, 5254}, - {0x1f43, 16, 16, 5254}, - {0x0, 0, 1, 5254}, - {0x0, 0, 1, 5255}, - {0x0, 3, 4, 5256}, - {0x0, 0, 4, 5257}, - {0x0, 1, 2, 5261}, - {0x1e94, 16, 16, 5262}, - {0x0, 15, 16, 5262}, - {0xf9bd, 16, 16, 5263}, - {0x0, 1, 13, 5263}, - {0xfa43, 16, 16, 5275}, - {0x0, 0, 1, 5275}, - {0x0, 0, 1, 5276}, - {0x0, 3, 4, 5277}, - {0x0, 0, 1, 5278}, - {0x0, 0, 2, 5279}, - {0x1e51, 16, 16, 5281}, - {0x1e53, 16, 16, 5281}, - {0x0, 3, 4, 5281}, - {0x2f889, 16, 16, 5282}, - {0x0, 3, 9, 5282}, - {0x104, 16, 16, 5288}, - {0x164, 16, 16, 5288}, - {0x0, 7, 8, 5288}, - {0x2fa05, 16, 16, 5289}, - {0x1ea0, 16, 16, 5289}, - {0x1e00, 16, 16, 5289}, - {0x0, 13, 14, 5289}, - {0x0, 0, 1, 5290}, - {0x0, 3, 4, 5291}, - {0x0, 0, 1, 5292}, - {0x0, 9, 10, 5293}, - {0x0, 9, 10, 5294}, - {0x309e, 16, 16, 5295}, - {0x0, 2, 3, 5295}, - {0x2f840, 16, 16, 5296}, - {0x0, 10, 11, 5296}, - {0x2f948, 16, 16, 5297}, - {0x2f8d5, 16, 16, 5297}, - {0x0, 11, 12, 5297}, - {0xf9f7, 16, 16, 5298}, - {0x0, 0, 1, 5298}, - {0x0, 0, 1, 5299}, - {0x0, 3, 4, 5300}, - {0x0, 0, 1, 5301}, - {0x0, 6, 9, 5302}, - {0x4c1, 16, 16, 5305}, - {0x1f24, 16, 16, 5305}, - {0x0, 0, 1, 5305}, - {0x0, 0, 1, 5306}, - {0x0, 3, 4, 5307}, - {0x0, 0, 5, 5308}, - {0x0, 2, 6, 5313}, - {0x1f6f, 16, 16, 5317}, - {0x4dc, 16, 16, 5317}, - {0x0, 0, 1, 5317}, - {0x0, 0, 1, 5318}, - {0x0, 3, 4, 5319}, - {0x0, 0, 1, 5320}, - {0x0, 1, 2, 5321}, - {0x1fe, 16, 16, 5322}, - {0x1fa9, 16, 16, 5322}, - {0x0, 13, 14, 5322}, - {0x2f99b, 16, 16, 5323}, - {0x0, 0, 1, 5323}, - {0x0, 0, 1, 5324}, - {0x0, 3, 4, 5325}, - {0x0, 3, 4, 5326}, - {0x0, 8, 9, 5327}, - {0x2204, 16, 16, 5328}, - {0x0, 10, 12, 5328}, - {0x0, 8, 9, 5330}, - {0x2f92d, 16, 16, 5331}, - {0x0, 0, 1, 5331}, - {0x0, 0, 1, 5332}, - {0x0, 3, 4, 5333}, - {0x0, 0, 1, 5334}, - {0x0, 0, 10, 5335}, - {0x1ec2, 16, 16, 5345}, - {0x1ebe, 16, 16, 5345}, - {0x1ec0, 16, 16, 5345}, - {0x1ec4, 16, 16, 5345}, - {0x0, 2, 3, 5345}, - {0x2f9e0, 16, 16, 5346}, - {0x0, 2, 3, 5346}, - {0x0, 12, 13, 5347}, - {0x2f834, 16, 16, 5348}, - {0x0, 7, 9, 5348}, - {0x2f904, 16, 16, 5350}, - {0x0, 6, 7, 5350}, - {0x0, 0, 1, 5351}, - {0x0, 0, 1, 5352}, - {0x0, 3, 4, 5353}, - {0x0, 0, 1, 5354}, - {0x0, 8, 9, 5355}, - {0x457, 16, 16, 5356}, - {0x0, 0, 1, 5356}, - {0x0, 0, 1, 5357}, - {0x0, 3, 4, 5358}, - {0x0, 0, 2, 5359}, - {0x0, 0, 2, 5361}, - {0x3ad, 16, 16, 5363}, - {0x0, 0, 14, 5363}, - {0x0, 8, 9, 5377}, - {0x2f8eb, 16, 16, 5378}, - {0x0, 0, 1, 5378}, - {0x0, 0, 1, 5379}, - {0x0, 3, 4, 5380}, - {0x0, 0, 3, 5381}, - {0x0, 3, 8, 5384}, - {0x1e63, 16, 16, 5389}, - {0x15f, 16, 16, 5389}, - {0x219, 16, 16, 5389}, - {0x0, 0, 1, 5389}, - {0x0, 0, 1, 5390}, - {0x0, 3, 4, 5391}, - {0x0, 3, 4, 5392}, - {0x0, 8, 9, 5393}, - {0x2285, 16, 16, 5394}, - {0x4ef, 16, 16, 5394}, - {0xcf, 16, 16, 5394}, - {0x0, 0, 1, 5394}, - {0x0, 0, 1, 5395}, - {0x0, 13, 14, 5396}, - {0x0, 12, 14, 5397}, - {0x0, 15, 16, 5399}, - {0xdde, 16, 16, 5400}, - {0x4f1, 16, 16, 5400}, - {0x130, 16, 16, 5400}, - {0x12a, 16, 16, 5400}, - {0xce, 16, 16, 5400}, - {0x128, 16, 16, 5400}, - {0xcc, 16, 16, 5400}, - {0xcd, 16, 16, 5400}, - {0x0, 10, 11, 5400}, - {0x2f8ea, 16, 16, 5401}, - {0x0, 2, 6, 5401}, - {0x1fc3, 16, 16, 5405}, - {0x0, 7, 8, 5405}, - {0x1e02, 16, 16, 5406}, - {0x1fc6, 16, 16, 5406}, - {0x0, 2, 4, 5406}, - {0x0, 0, 1, 5408}, - {0x0, 0, 1, 5409}, - {0x0, 3, 4, 5410}, - {0x0, 0, 1, 5411}, - {0x0, 0, 10, 5412}, - {0x1eaf, 16, 16, 5422}, - {0x0, 2, 16, 5422}, - {0x2fa02, 16, 16, 5436}, - {0x0, 2, 6, 5436}, - {0x1fb3, 16, 16, 5440}, - {0x0, 0, 1, 5440}, - {0x0, 0, 1, 5441}, - {0x0, 3, 4, 5442}, - {0x0, 0, 1, 5443}, - {0x0, 8, 9, 5444}, - {0x4f4, 16, 16, 5445}, - {0x1fb6, 16, 16, 5445}, - {0x0, 6, 7, 5445}, - {0xfa1c, 16, 16, 5446}, - {0x0, 2, 3, 5446}, - {0x1f37, 16, 16, 5447}, - {0x0, 13, 14, 5447}, - {0x2f815, 16, 16, 5448}, - {0x0, 11, 12, 5448}, - {0x2f855, 16, 16, 5449}, - {0x0, 12, 14, 5449}, - {0x2f8fd, 16, 16, 5451}, - {0x4f3, 16, 16, 5451}, - {0xf968, 16, 16, 5451}, - {0x208, 16, 16, 5451}, - {0x0, 1, 2, 5451}, - {0xf90a, 16, 16, 5452}, - {0x1cf, 16, 16, 5452}, - {0x0, 14, 15, 5452}, - {0xf9c6, 16, 16, 5453}, - {0xfa2a, 16, 16, 5453}, - {0x0, 3, 5, 5453}, - {0x1f68, 16, 16, 5455}, - {0x1f69, 16, 16, 5455}, - {0x0, 1, 5, 5455}, - {0x2f98c, 16, 16, 5459}, - {0x2f893, 16, 16, 5459}, - {0x0, 8, 9, 5459}, - {0xf926, 16, 16, 5460}, - {0x0, 3, 9, 5460}, - {0x1ecd, 16, 16, 5466}, - {0x0, 0, 1, 5466}, - {0x0, 3, 4, 5467}, - {0x0, 0, 1, 5468}, - {0x0, 9, 10, 5469}, - {0x0, 9, 10, 5470}, - {0x3052, 16, 16, 5471}, - {0x1eb, 16, 16, 5471}, - {0x0, 0, 10, 5471}, - {0xf975, 16, 16, 5481}, - {0x2f8c1, 16, 16, 5481}, - {0x0, 0, 1, 5481}, - {0x0, 0, 1, 5482}, - {0x0, 3, 4, 5483}, - {0x0, 0, 4, 5484}, - {0x0, 7, 13, 5488}, - {0x1e0a, 16, 16, 5494}, - {0x0, 0, 1, 5494}, - {0x2f9dc, 16, 16, 5495}, - {0x0, 0, 1, 5495}, - {0x1e1b, 16, 16, 5496}, - {0x0, 2, 15, 5496}, - {0xf952, 16, 16, 5509}, - {0x0, 13, 14, 5509}, - {0xfa1e, 16, 16, 5510}, - {0x0, 4, 5, 5510}, - {0x2f8d1, 16, 16, 5511}, - {0x10e, 16, 16, 5511}, - {0x0, 14, 15, 5511}, - {0xf977, 16, 16, 5512}, - {0x0, 0, 1, 5512}, - {0xfa60, 16, 16, 5513}, - {0x0, 10, 12, 5513}, - {0x0, 1, 2, 5515}, - {0x2f93b, 16, 16, 5516}, - {0x0, 3, 4, 5516}, - {0x1e7d, 16, 16, 5517}, - {0x0, 0, 1, 5517}, - {0x0, 0, 1, 5518}, - {0x0, 3, 4, 5519}, - {0x0, 4, 5, 5520}, - {0x0, 5, 6, 5521}, - {0x1fac, 16, 16, 5522}, - {0x0, 1, 2, 5522}, - {0x0, 8, 9, 5523}, - {0x2f871, 16, 16, 5524}, - {0x0, 10, 13, 5524}, - {0xf947, 16, 16, 5527}, - {0x2f950, 16, 16, 5527}, - {0x0, 0, 1, 5527}, - {0x0, 0, 1, 5528}, - {0x0, 3, 4, 5529}, - {0x0, 4, 5, 5530}, - {0x0, 5, 6, 5531}, - {0x1ff7, 16, 16, 5532}, - {0x0, 10, 15, 5532}, - {0xf96c, 16, 16, 5537}, - {0x0, 0, 1, 5537}, - {0x0, 0, 1, 5538}, - {0x0, 3, 4, 5539}, - {0x0, 0, 1, 5540}, - {0x0, 8, 9, 5541}, - {0x4ec, 16, 16, 5542}, - {0xfa10, 16, 16, 5542}, - {0x0, 0, 10, 5542}, - {0x0, 10, 11, 5552}, - {0x2f9fb, 16, 16, 5553}, - {0xf92f, 16, 16, 5553}, - {0x0, 6, 7, 5553}, - {0xf98b, 16, 16, 5554}, - {0x0, 4, 5, 5554}, - {0x2f8e6, 16, 16, 5555}, - {0x0, 0, 1, 5555}, - {0x0, 0, 1, 5556}, - {0x0, 3, 4, 5557}, - {0x0, 4, 5, 5558}, - {0x0, 5, 6, 5559}, - {0x1fab, 16, 16, 5560}, - {0x0, 7, 8, 5560}, - {0x0, 7, 8, 5561}, - {0x2f9f1, 16, 16, 5562}, - {0x0, 0, 1, 5562}, - {0x0, 0, 1, 5563}, - {0x0, 3, 4, 5564}, - {0x0, 0, 1, 5565}, - {0x0, 4, 5, 5566}, - {0x22a, 16, 16, 5567}, - {0x0, 0, 1, 5567}, - {0x0, 0, 1, 5568}, - {0x0, 3, 4, 5569}, - {0x0, 3, 4, 5570}, - {0x0, 8, 9, 5571}, - {0x219a, 16, 16, 5572}, - {0xf92e, 16, 16, 5572}, - {0xf965, 16, 16, 5572}, - {0x0, 0, 1, 5572}, - {0x0, 0, 1, 5573}, - {0x0, 3, 4, 5574}, - {0x0, 0, 4, 5575}, - {0x0, 7, 13, 5579}, - {0x165, 16, 16, 5585}, - {0x0, 2, 6, 5585}, - {0x1f99, 16, 16, 5589}, - {0x1f2f, 16, 16, 5589}, - {0x0, 0, 1, 5589}, - {0x0, 0, 1, 5590}, - {0x0, 3, 4, 5591}, - {0x0, 0, 1, 5592}, - {0x0, 8, 9, 5593}, - {0x4de, 16, 16, 5594}, - {0x0, 14, 15, 5594}, - {0xfa1d, 16, 16, 5595}, - {0x1ec3, 16, 16, 5595}, - {0x0, 0, 1, 5595}, - {0x0, 0, 1, 5596}, - {0x0, 3, 4, 5597}, - {0x0, 0, 2, 5598}, - {0x0, 0, 2, 5600}, - {0x1f78, 16, 16, 5602}, - {0x3cc, 16, 16, 5602}, - {0x1ec5, 16, 16, 5602}, - {0x1ebf, 16, 16, 5602}, - {0x0, 11, 12, 5602}, - {0x2fa1c, 16, 16, 5603}, - {0x0, 3, 15, 5603}, - {0x2f8db, 16, 16, 5615}, - {0x0, 1, 2, 5615}, - {0xf904, 16, 16, 5616}, - {0x0, 3, 4, 5616}, - {0x1e92, 16, 16, 5617}, - {0x0, 1, 2, 5617}, - {0x2f9c1, 16, 16, 5618}, - {0x1e6b, 16, 16, 5618}, - {0x1e97, 16, 16, 5618}, - {0x0, 0, 1, 5618}, - {0x0, 0, 1, 5619}, - {0x0, 3, 4, 5620}, - {0x0, 4, 5, 5621}, - {0x0, 5, 6, 5622}, - {0x1ff2, 16, 16, 5623}, - {0x0, 0, 1, 5623}, - {0x0, 0, 1, 5624}, - {0x0, 3, 4, 5625}, - {0x0, 0, 2, 5626}, - {0x0, 0, 9, 5628}, - {0x3aa, 16, 16, 5637}, - {0x0, 0, 1, 5637}, - {0x0, 0, 1, 5638}, - {0x0, 3, 4, 5639}, - {0x0, 0, 1, 5640}, - {0x0, 6, 9, 5641}, - {0x4c2, 16, 16, 5644}, - {0x4dd, 16, 16, 5644}, - {0x0, 8, 9, 5644}, - {0x2f885, 16, 16, 5645}, - {0x1fda, 16, 16, 5645}, - {0x38a, 16, 16, 5645}, - {0x1fd8, 16, 16, 5645}, - {0x1fd9, 16, 16, 5645}, - {0x0, 5, 10, 5645}, - {0xf9a3, 16, 16, 5650}, - {0x0, 0, 1, 5650}, - {0xf921, 16, 16, 5651}, - {0x2f89f, 16, 16, 5651}, - {0x0, 0, 1, 5651}, - {0x0, 0, 1, 5652}, - {0x0, 3, 4, 5653}, - {0x0, 3, 4, 5654}, - {0x0, 8, 9, 5655}, - {0x2288, 16, 16, 5656}, - {0x0, 0, 1, 5656}, - {0x0, 0, 1, 5657}, - {0x0, 3, 4, 5658}, - {0x0, 0, 4, 5659}, - {0x0, 1, 12, 5663}, - {0x1b0, 16, 16, 5674}, - {0xf9aa, 16, 16, 5674}, - {0x0, 2, 3, 5674}, - {0x0, 0, 1, 5675}, - {0x0, 0, 1, 5676}, - {0x0, 3, 4, 5677}, - {0x0, 0, 1, 5678}, - {0x0, 12, 13, 5679}, - {0x1ef, 16, 16, 5680}, - {0x217, 16, 16, 5680}, - {0x0, 11, 12, 5680}, - {0x2f9bd, 16, 16, 5681}, - {0x0, 0, 1, 5681}, - {0x0, 0, 1, 5682}, - {0x0, 3, 4, 5683}, - {0x0, 0, 4, 5684}, - {0x0, 0, 1, 5688}, - {0x1e74, 16, 16, 5689}, - {0x0, 0, 1, 5689}, - {0x0, 0, 1, 5690}, - {0x0, 3, 4, 5691}, - {0x0, 0, 1, 5692}, - {0x0, 0, 10, 5693}, - {0x1eb0, 16, 16, 5703}, - {0x1eae, 16, 16, 5703}, - {0x1eb4, 16, 16, 5703}, - {0x1eb2, 16, 16, 5703}, - {0x0, 8, 9, 5703}, - {0x2f972, 16, 16, 5704}, - {0x0, 15, 16, 5704}, - {0x2f837, 16, 16, 5705}, - {0x0, 0, 1, 5705}, - {0x0, 0, 1, 5706}, - {0x0, 3, 4, 5707}, - {0x0, 4, 5, 5708}, - {0x0, 5, 6, 5709}, - {0x1fa7, 16, 16, 5710}, - {0x0, 0, 1, 5710}, - {0x0, 3, 4, 5711}, - {0x0, 0, 1, 5712}, - {0x0, 9, 10, 5713}, - {0x0, 9, 10, 5714}, - {0x305a, 16, 16, 5715}, - {0x0, 1, 13, 5715}, - {0x1e9, 16, 16, 5727}, - {0x0, 15, 16, 5727}, - {0x2f908, 16, 16, 5728}, - {0x0, 15, 16, 5728}, - {0x2f8fc, 16, 16, 5729}, - {0xfa51, 16, 16, 5729}, - {0x0, 13, 14, 5729}, - {0x2f8e7, 16, 16, 5730}, - {0x0, 5, 6, 5730}, - {0x1fbc, 16, 16, 5731}, - {0x0, 10, 11, 5731}, - {0x2f8a1, 16, 16, 5732}, - {0x0, 1, 14, 5732}, - {0xfa26, 16, 16, 5745}, - {0x0, 11, 15, 5745}, - {0x0, 0, 1, 5749}, - {0x0, 0, 1, 5750}, - {0x0, 3, 4, 5751}, - {0x0, 3, 4, 5752}, - {0x0, 8, 9, 5753}, - {0x2260, 16, 16, 5754}, - {0x0, 3, 4, 5754}, - {0x0, 12, 13, 5755}, - {0x2f997, 16, 16, 5756}, - {0x0, 4, 5, 5756}, - {0x2f853, 16, 16, 5757}, - {0x3076, 16, 16, 5757}, - {0x0, 12, 13, 5757}, - {0xf92b, 16, 16, 5758}, - {0x0, 2, 3, 5758}, - {0x0, 2, 3, 5759}, - {0x2f803, 16, 16, 5760}, - {0x0, 1, 2, 5760}, - {0x20a, 16, 16, 5761}, - {0x0, 0, 1, 5761}, - {0x0, 0, 1, 5762}, - {0x0, 12, 13, 5763}, - {0x0, 12, 14, 5764}, - {0x0, 2, 3, 5766}, - {0xcca, 16, 16, 5767}, - {0x0, 8, 9, 5767}, - {0x2f865, 16, 16, 5768}, - {0x1e31, 16, 16, 5768}, - {0x0, 3, 4, 5768}, - {0x0, 10, 11, 5769}, - {0x2f80d, 16, 16, 5770}, - {0x0, 2, 8, 5770}, - {0x2f817, 16, 16, 5776}, - {0x2f8d2, 16, 16, 5776}, - {0x2f9e3, 16, 16, 5776}, - {0x0, 0, 2, 5776}, - {0x1f3c, 16, 16, 5778}, - {0x1f3a, 16, 16, 5778}, - {0x0, 6, 8, 5778}, - {0xb48, 16, 16, 5780}, - {0xb4c, 16, 16, 5780}, - {0x0, 0, 1, 5780}, - {0x0, 0, 1, 5781}, - {0x0, 3, 4, 5782}, - {0x0, 3, 4, 5783}, - {0x0, 8, 9, 5784}, - {0x2280, 16, 16, 5785}, - {0x0, 0, 1, 5785}, - {0x0, 3, 4, 5786}, - {0x0, 0, 1, 5787}, - {0x0, 9, 10, 5788}, - {0x0, 9, 10, 5789}, - {0x30f4, 16, 16, 5790}, - {0x0, 6, 8, 5790}, - {0xf9b2, 16, 16, 5792}, - {0x0, 3, 8, 5792}, - {0x1e5b, 16, 16, 5797}, - {0x0, 0, 1, 5797}, - {0x0, 0, 1, 5798}, - {0x0, 3, 4, 5799}, - {0x0, 0, 1, 5800}, - {0x0, 8, 9, 5801}, - {0x4f5, 16, 16, 5802}, - {0x157, 16, 16, 5802}, - {0x0, 9, 10, 5802}, - {0x2f9c2, 16, 16, 5803}, - {0x0, 5, 6, 5803}, - {0x2f988, 16, 16, 5804}, - {0x0, 0, 1, 5804}, - {0x0, 0, 1, 5805}, - {0x0, 3, 4, 5806}, - {0x0, 0, 1, 5807}, - {0x0, 0, 9, 5808}, - {0x40d, 16, 16, 5817}, - {0x0, 0, 1, 5817}, - {0x0, 0, 1, 5818}, - {0x0, 3, 4, 5819}, - {0x0, 0, 1, 5820}, - {0x0, 1, 8, 5821}, - {0x1e56, 16, 16, 5828}, - {0x1e54, 16, 16, 5828}, - {0x0, 2, 9, 5828}, - {0x2f83e, 16, 16, 5835}, - {0x0, 0, 1, 5835}, - {0x0, 0, 1, 5836}, - {0x0, 3, 4, 5837}, - {0x0, 4, 5, 5838}, - {0x0, 5, 6, 5839}, - {0x1fa2, 16, 16, 5840}, - {0xf980, 16, 16, 5840}, - {0x0, 10, 11, 5840}, - {0x0, 7, 8, 5841}, - {0x2f8f0, 16, 16, 5842}, - {0x0, 14, 15, 5842}, - {0xd4a, 16, 16, 5843}, - {0x0, 6, 15, 5843}, - {0x2f8ff, 16, 16, 5852}, - {0x0, 0, 1, 5852}, - {0x0, 0, 1, 5853}, - {0x0, 3, 4, 5854}, - {0x0, 0, 3, 5855}, - {0x0, 3, 4, 5858}, - {0x1e89, 16, 16, 5859}, - {0x0, 0, 1, 5859}, - {0x0, 0, 1, 5860}, - {0x0, 9, 10, 5861}, - {0x0, 3, 4, 5862}, - {0x0, 12, 13, 5863}, - {0x934, 16, 16, 5864}, - {0x0, 2, 3, 5864}, - {0x2f8ac, 16, 16, 5865}, - {0x0, 4, 5, 5865}, - {0x2f9ac, 16, 16, 5866}, - {0x0, 11, 12, 5866}, - {0x2f816, 16, 16, 5867}, - {0x0, 14, 15, 5867}, - {0x2f911, 16, 16, 5868}, - {0x0, 8, 9, 5868}, - {0x0, 6, 7, 5869}, - {0x2f96b, 16, 16, 5870}, - {0x1e15, 16, 16, 5870}, - {0x0, 3, 4, 5870}, - {0x1e05, 16, 16, 5871}, - {0x0, 8, 9, 5871}, - {0x2f93f, 16, 16, 5872}, - {0x0, 8, 9, 5872}, - {0x2f8d0, 16, 16, 5873}, - {0x0, 0, 1, 5873}, - {0x0, 0, 1, 5874}, - {0x0, 6, 7, 5875}, - {0x0, 5, 6, 5876}, - {0x0, 4, 5, 5877}, - {0x6d3, 16, 16, 5878}, - {0x0, 1, 2, 5878}, - {0x1e0e, 16, 16, 5879}, - {0x0, 7, 10, 5879}, - {0xfa33, 16, 16, 5882}, - {0x0, 0, 1, 5882}, - {0x0, 0, 1, 5883}, - {0x0, 3, 4, 5884}, - {0x0, 3, 4, 5885}, - {0x0, 8, 9, 5886}, - {0x2279, 16, 16, 5887}, - {0x0, 2, 12, 5887}, - {0x0, 1, 2, 5897}, - {0x2f9b0, 16, 16, 5898}, - {0x0, 0, 1, 5898}, - {0xfa39, 16, 16, 5899}, - {0x2f825, 16, 16, 5899}, - {0x0, 3, 4, 5899}, - {0x2f983, 16, 16, 5900}, - {0xfa05, 16, 16, 5900}, - {0x0, 9, 10, 5900}, - {0xf916, 16, 16, 5901}, - {0xf915, 16, 16, 5901}, - {0x0, 12, 13, 5901}, - {0xf908, 16, 16, 5902}, - {0x0, 9, 13, 5902}, - {0xf955, 16, 16, 5906}, - {0x0, 14, 15, 5906}, - {0xf9e1, 16, 16, 5907}, - {0x2f8d3, 16, 16, 5907}, + {0x0, 9, 10, 4104}, + {0x0, 9, 11, 4105}, + {0x30d3, 16, 16, 4107}, + {0x30d4, 16, 16, 4107}, + {0x0, 0, 1, 4107}, + {0x0, 3, 4, 4108}, + {0x0, 0, 1, 4109}, + {0x0, 9, 10, 4110}, + {0x0, 9, 11, 4111}, + {0x30d6, 16, 16, 4113}, + {0x30d7, 16, 16, 4113}, + {0x0, 0, 1, 4113}, + {0x0, 3, 4, 4114}, + {0x0, 0, 1, 4115}, + {0x0, 9, 10, 4116}, + {0x0, 9, 11, 4117}, + {0x30d9, 16, 16, 4119}, + {0x30da, 16, 16, 4119}, + {0x0, 0, 1, 4119}, + {0x0, 3, 4, 4120}, + {0x0, 0, 1, 4121}, + {0x0, 9, 10, 4122}, + {0x0, 9, 11, 4123}, + {0x30dc, 16, 16, 4125}, + {0x30dd, 16, 16, 4125}, + {0x0, 0, 1, 4125}, + {0x0, 3, 4, 4126}, + {0x0, 0, 1, 4127}, + {0x0, 9, 10, 4128}, + {0x0, 9, 10, 4129}, + {0x30f4, 16, 16, 4130}, + {0x0, 15, 16, 4130}, + {0x0, 0, 1, 4131}, + {0x0, 3, 4, 4132}, + {0x0, 0, 1, 4133}, + {0x0, 9, 10, 4134}, + {0x0, 9, 10, 4135}, + {0x30f7, 16, 16, 4136}, + {0x0, 0, 14, 4136}, + {0x0, 0, 1, 4150}, + {0x0, 3, 4, 4151}, + {0x0, 0, 1, 4152}, + {0x0, 9, 10, 4153}, + {0x0, 9, 10, 4154}, + {0x30f8, 16, 16, 4155}, + {0x0, 0, 1, 4155}, + {0x0, 3, 4, 4156}, + {0x0, 0, 1, 4157}, + {0x0, 9, 10, 4158}, + {0x0, 9, 10, 4159}, + {0x30f9, 16, 16, 4160}, + {0x0, 0, 1, 4160}, + {0x0, 3, 4, 4161}, + {0x0, 0, 1, 4162}, + {0x0, 9, 10, 4163}, + {0x0, 9, 10, 4164}, + {0x30fa, 16, 16, 4165}, + {0x0, 0, 1, 4165}, + {0x0, 3, 4, 4166}, + {0x0, 0, 1, 4167}, + {0x0, 9, 10, 4168}, + {0x0, 9, 10, 4169}, + {0x30fe, 16, 16, 4170}, + {0x0, 0, 16, 4170}, + {0x0, 4, 14, 4186}, + {0x0, 8, 9, 4196}, + {0xf900, 16, 16, 4197}, + {0x0, 0, 16, 4197}, + {0x0, 1, 16, 4213}, + {0x0, 4, 9, 4228}, + {0xf901, 16, 16, 4233}, + {0x0, 12, 14, 4233}, + {0x0, 10, 11, 4235}, + {0xf902, 16, 16, 4236}, + {0x0, 1, 9, 4236}, + {0xf903, 16, 16, 4244}, + {0x0, 1, 14, 4244}, + {0x0, 1, 2, 4257}, + {0xf904, 16, 16, 4258}, + {0x0, 0, 16, 4258}, + {0x0, 0, 15, 4274}, + {0x0, 2, 14, 4289}, + {0xf905, 16, 16, 4301}, + {0x0, 0, 16, 4301}, + {0x0, 0, 16, 4317}, + {0x0, 5, 12, 4333}, + {0xf906, 16, 16, 4340}, + {0x0, 0, 16, 4340}, + {0x0, 0, 10, 4356}, + {0x0, 12, 13, 4366}, + {0xf908, 16, 16, 4367}, + {0x0, 0, 15, 4367}, + {0x0, 1, 2, 4382}, + {0xf909, 16, 16, 4383}, + {0x0, 1, 14, 4383}, + {0x0, 1, 2, 4396}, + {0xf90a, 16, 16, 4397}, + {0x0, 1, 13, 4397}, + {0x0, 4, 8, 4409}, + {0xf90b, 16, 16, 4413}, + {0x0, 8, 9, 4413}, + {0xf90c, 16, 16, 4414}, + {0x0, 4, 16, 4414}, + {0x0, 2, 7, 4426}, + {0x2f8b1, 16, 16, 4431}, + {0x0, 0, 16, 4431}, + {0x0, 1, 16, 4447}, + {0x0, 9, 10, 4462}, + {0xf90e, 16, 16, 4463}, + {0x0, 7, 16, 4463}, + {0x0, 5, 6, 4472}, + {0xf90f, 16, 16, 4473}, + {0x0, 0, 15, 4473}, + {0x0, 15, 16, 4488}, + {0xf910, 16, 16, 4489}, + {0x0, 0, 15, 4489}, + {0x0, 10, 11, 4504}, + {0xf911, 16, 16, 4505}, + {0x0, 0, 16, 4505}, + {0x0, 8, 11, 4521}, + {0xf912, 16, 16, 4524}, + {0x0, 2, 16, 4524}, + {0x0, 15, 16, 4538}, + {0xf913, 16, 16, 4539}, + {0x0, 0, 14, 4539}, + {0x0, 2, 3, 4553}, + {0xf9bf, 16, 16, 4554}, + {0x0, 1, 16, 4554}, + {0x0, 6, 15, 4569}, + {0xf915, 16, 16, 4578}, + {0x0, 1, 14, 4578}, + {0x0, 9, 10, 4591}, + {0xf916, 16, 16, 4592}, + {0x0, 2, 14, 4592}, + {0x0, 14, 15, 4604}, + {0xf917, 16, 16, 4605}, + {0x0, 3, 16, 4605}, + {0x0, 13, 14, 4618}, + {0xf918, 16, 16, 4619}, + {0x0, 10, 11, 4619}, + {0xf919, 16, 16, 4620}, + {0x0, 2, 16, 4620}, + {0x0, 1, 15, 4634}, + {0xf91a, 16, 16, 4648}, + {0x0, 2, 7, 4648}, + {0xf91b, 16, 16, 4653}, + {0x0, 3, 16, 4653}, + {0xf91c, 16, 16, 4666}, + {0x0, 0, 12, 4666}, + {0x0, 4, 5, 4678}, + {0xf91d, 16, 16, 4679}, + {0x0, 1, 16, 4679}, + {0x0, 0, 12, 4694}, + {0xf91e, 16, 16, 4706}, + {0x0, 13, 14, 4706}, + {0xf91f, 16, 16, 4707}, + {0x0, 1, 16, 4707}, + {0x0, 14, 15, 4722}, + {0xf920, 16, 16, 4723}, + {0x0, 1, 16, 4723}, + {0x0, 0, 1, 4738}, + {0xf921, 16, 16, 4739}, + {0x0, 0, 16, 4739}, + {0x0, 11, 12, 4755}, + {0xf922, 16, 16, 4756}, + {0x0, 1, 16, 4756}, + {0x0, 13, 14, 4771}, + {0xf923, 16, 16, 4772}, + {0x0, 1, 10, 4772}, + {0x0, 4, 5, 4781}, + {0xf924, 16, 16, 4782}, + {0x0, 0, 16, 4782}, + {0x0, 9, 16, 4798}, + {0xf925, 16, 16, 4805}, + {0x0, 0, 15, 4805}, + {0x0, 8, 9, 4820}, + {0xf926, 16, 16, 4821}, + {0x0, 15, 16, 4821}, + {0xf927, 16, 16, 4822}, + {0x0, 2, 16, 4822}, + {0x0, 9, 11, 4836}, + {0x2f88e, 16, 16, 4838}, + {0x0, 0, 16, 4838}, + {0x0, 7, 12, 4854}, + {0x2f8d8, 16, 16, 4859}, + {0x0, 9, 11, 4859}, + {0xf92a, 16, 16, 4861}, + {0x0, 12, 13, 4861}, + {0xf92b, 16, 16, 4862}, + {0x0, 14, 15, 4862}, + {0xf92c, 16, 16, 4863}, + {0x0, 6, 12, 4863}, + {0x0, 6, 12, 4869}, + {0xf92d, 16, 16, 4875}, + {0x0, 4, 16, 4875}, + {0x0, 5, 8, 4887}, + {0xf92e, 16, 16, 4890}, + {0x0, 0, 16, 4890}, + {0x0, 2, 15, 4906}, + {0xf92f, 16, 16, 4919}, + {0x0, 2, 13, 4919}, + {0x0, 4, 5, 4930}, + {0xf930, 16, 16, 4931}, + {0x0, 3, 12, 4931}, + {0xf931, 16, 16, 4940}, + {0xf932, 16, 16, 4940}, + {0x0, 7, 8, 4940}, + {0xf933, 16, 16, 4941}, + {0x0, 0, 12, 4941}, + {0x0, 1, 6, 4953}, + {0xf934, 16, 16, 4958}, + {0x0, 6, 7, 4958}, + {0xf935, 16, 16, 4959}, + {0x0, 0, 13, 4959}, + {0x2f9b4, 16, 16, 4972}, + {0x0, 0, 16, 4972}, + {0x0, 15, 16, 4988}, + {0xf937, 16, 16, 4989}, + {0x0, 2, 16, 4989}, + {0x0, 2, 3, 5003}, + {0xf938, 16, 16, 5004}, + {0x0, 1, 7, 5004}, + {0x0, 15, 16, 5010}, + {0xf939, 16, 16, 5011}, + {0x0, 6, 16, 5011}, + {0x0, 10, 11, 5021}, + {0xf93a, 16, 16, 5022}, + {0x0, 4, 16, 5022}, + {0x0, 12, 13, 5034}, + {0x2f94f, 16, 16, 5035}, + {0x0, 2, 15, 5035}, + {0x0, 15, 16, 5048}, + {0xf93c, 16, 16, 5049}, + {0x0, 0, 16, 5049}, + {0x0, 0, 1, 5065}, + {0xf93d, 16, 16, 5066}, + {0x0, 1, 16, 5066}, + {0x0, 9, 13, 5081}, + {0xf93e, 16, 16, 5085}, + {0x0, 0, 16, 5085}, + {0x0, 4, 5, 5101}, + {0xf93f, 16, 16, 5102}, + {0x0, 15, 16, 5102}, + {0xf940, 16, 16, 5103}, + {0x0, 10, 16, 5103}, + {0x0, 2, 7, 5109}, + {0xf941, 16, 16, 5114}, + {0x0, 0, 16, 5114}, + {0x0, 8, 16, 5130}, + {0xf942, 16, 16, 5138}, + {0x0, 0, 16, 5138}, + {0x0, 4, 5, 5154}, + {0xf943, 16, 16, 5155}, + {0x0, 3, 15, 5155}, + {0x0, 0, 1, 5167}, + {0xf944, 16, 16, 5168}, + {0x0, 0, 15, 5168}, + {0xf945, 16, 16, 5183}, + {0x0, 2, 3, 5183}, + {0xf946, 16, 16, 5184}, + {0x0, 10, 13, 5184}, + {0xf947, 16, 16, 5187}, + {0xf948, 16, 16, 5187}, + {0x0, 2, 16, 5187}, + {0x0, 6, 8, 5201}, + {0xf949, 16, 16, 5203}, + {0xf94a, 16, 16, 5203}, + {0x0, 0, 13, 5203}, + {0x0, 0, 15, 5216}, + {0xf94b, 16, 16, 5231}, + {0x0, 3, 4, 5231}, + {0xf94c, 16, 16, 5232}, + {0x0, 10, 11, 5232}, + {0xf94d, 16, 16, 5233}, + {0x0, 15, 16, 5233}, + {0xf94e, 16, 16, 5234}, + {0x0, 2, 16, 5234}, + {0xf94f, 16, 16, 5248}, + {0x0, 0, 5, 5248}, + {0x0, 7, 8, 5253}, + {0xf950, 16, 16, 5254}, + {0x0, 11, 14, 5254}, + {0xf951, 16, 16, 5257}, + {0xf952, 16, 16, 5257}, + {0x0, 11, 12, 5257}, + {0xf953, 16, 16, 5258}, + {0x0, 12, 15, 5258}, + {0xf954, 16, 16, 5261}, + {0x0, 9, 13, 5261}, + {0xf955, 16, 16, 5265}, + {0x0, 1, 15, 5265}, + {0x0, 12, 13, 5279}, + {0xf956, 16, 16, 5280}, + {0x0, 14, 15, 5280}, + {0xf957, 16, 16, 5281}, + {0x0, 1, 2, 5281}, + {0xf958, 16, 16, 5282}, + {0x0, 5, 9, 5282}, + {0xf959, 16, 16, 5286}, + {0x0, 0, 9, 5286}, + {0x0, 0, 11, 5295}, + {0xf95a, 16, 16, 5306}, + {0xf95b, 16, 16, 5306}, + {0x0, 8, 15, 5306}, + {0xf95d, 16, 16, 5313}, + {0xf95e, 16, 16, 5313}, + {0x0, 0, 16, 5313}, + {0x0, 7, 15, 5329}, + {0x2f86f, 16, 16, 5337}, + {0x0, 1, 15, 5337}, + {0x0, 2, 13, 5351}, + {0xf960, 16, 16, 5362}, + {0x0, 7, 12, 5362}, + {0xf9db, 16, 16, 5367}, + {0x0, 2, 15, 5367}, + {0x0, 0, 1, 5380}, + {0x2f938, 16, 16, 5381}, + {0x0, 7, 8, 5381}, + {0x2f82b, 16, 16, 5382}, + {0x0, 11, 12, 5382}, + {0xf964, 16, 16, 5383}, + {0x0, 11, 16, 5383}, + {0xf965, 16, 16, 5388}, + {0x0, 9, 10, 5388}, + {0xf966, 16, 16, 5389}, + {0x0, 13, 14, 5389}, + {0xf967, 16, 16, 5390}, + {0x0, 4, 15, 5390}, + {0x0, 12, 14, 5401}, + {0xf968, 16, 16, 5403}, + {0x0, 4, 15, 5403}, + {0x0, 8, 9, 5414}, + {0xf969, 16, 16, 5415}, + {0xf96a, 16, 16, 5415}, + {0x0, 3, 11, 5415}, + {0xf96b, 16, 16, 5423}, + {0x0, 10, 15, 5423}, + {0xf96c, 16, 16, 5428}, + {0x0, 0, 9, 5428}, + {0x0, 1, 2, 5437}, + {0xf96d, 16, 16, 5438}, + {0x0, 9, 10, 5438}, + {0xf96e, 16, 16, 5439}, + {0x0, 0, 11, 5439}, + {0xf9a1, 16, 16, 5450}, + {0x0, 10, 12, 5450}, + {0x2f8f5, 16, 16, 5452}, + {0x0, 2, 12, 5452}, + {0x0, 0, 7, 5462}, + {0xf971, 16, 16, 5469}, + {0x0, 8, 9, 5469}, + {0xf972, 16, 16, 5470}, + {0x0, 12, 15, 5470}, + {0xf973, 16, 16, 5473}, + {0x0, 0, 15, 5473}, + {0x0, 5, 7, 5488}, + {0x2f998, 16, 16, 5490}, + {0x0, 3, 15, 5490}, + {0x0, 0, 10, 5502}, + {0xf975, 16, 16, 5512}, + {0x0, 5, 6, 5512}, + {0xf976, 16, 16, 5513}, + {0x0, 14, 15, 5513}, + {0xf977, 16, 16, 5514}, + {0x0, 4, 14, 5514}, + {0xf978, 16, 16, 5524}, + {0xf979, 16, 16, 5524}, + {0x0, 1, 11, 5524}, + {0x0, 1, 15, 5534}, + {0xf97a, 16, 16, 5548}, + {0x0, 3, 9, 5548}, + {0xf97b, 16, 16, 5554}, + {0x0, 15, 16, 5554}, + {0xf97c, 16, 16, 5555}, + {0xf97d, 16, 16, 5555}, + {0x0, 12, 16, 5555}, + {0xf97e, 16, 16, 5559}, + {0x0, 5, 11, 5559}, + {0xf97f, 16, 16, 5565}, + {0x0, 0, 16, 5565}, + {0x0, 2, 9, 5581}, + {0xf980, 16, 16, 5588}, + {0x0, 3, 4, 5588}, + {0xf981, 16, 16, 5589}, + {0x0, 12, 13, 5589}, + {0xf982, 16, 16, 5590}, + {0x0, 5, 6, 5590}, + {0xf983, 16, 16, 5591}, + {0x0, 14, 15, 5591}, + {0xf984, 16, 16, 5592}, + {0x0, 10, 11, 5592}, + {0xf985, 16, 16, 5593}, + {0x0, 8, 12, 5593}, + {0x0, 13, 14, 5597}, + {0xf986, 16, 16, 5598}, + {0x0, 6, 7, 5598}, + {0x0, 10, 11, 5599}, + {0xf987, 16, 16, 5600}, + {0x0, 7, 16, 5600}, + {0xf988, 16, 16, 5609}, + {0x0, 14, 15, 5609}, + {0xf989, 16, 16, 5610}, + {0x0, 11, 12, 5610}, + {0xf98a, 16, 16, 5611}, + {0x0, 6, 7, 5611}, + {0xf98b, 16, 16, 5612}, + {0x0, 2, 8, 5612}, + {0xf98c, 16, 16, 5618}, + {0x0, 2, 3, 5618}, + {0xf98d, 16, 16, 5619}, + {0x0, 4, 5, 5619}, + {0xf98e, 16, 16, 5620}, + {0x0, 0, 1, 5620}, + {0xf98f, 16, 16, 5621}, + {0x0, 0, 1, 5621}, + {0xf990, 16, 16, 5622}, + {0x0, 10, 14, 5622}, + {0xf991, 16, 16, 5626}, + {0x0, 2, 4, 5626}, + {0xf992, 16, 16, 5628}, + {0x0, 4, 14, 5628}, + {0x0, 5, 10, 5638}, + {0xf993, 16, 16, 5643}, + {0x0, 0, 13, 5643}, + {0x0, 5, 10, 5656}, + {0xf994, 16, 16, 5661}, + {0x0, 10, 11, 5661}, + {0xf995, 16, 16, 5662}, + {0x0, 4, 5, 5662}, + {0xfa57, 16, 16, 5663}, + {0x0, 0, 16, 5663}, + {0xf997, 16, 16, 5679}, + {0x0, 6, 11, 5679}, + {0xf998, 16, 16, 5684}, + {0x0, 14, 15, 5684}, + {0xf999, 16, 16, 5685}, + {0x0, 3, 4, 5685}, + {0xf99a, 16, 16, 5686}, + {0x0, 10, 11, 5686}, + {0xf99b, 16, 16, 5687}, + {0x0, 7, 8, 5687}, + {0xf99c, 16, 16, 5688}, + {0x0, 3, 4, 5688}, + {0xf99d, 16, 16, 5689}, + {0x0, 13, 14, 5689}, + {0xf99e, 16, 16, 5690}, + {0x0, 8, 9, 5690}, + {0xf99f, 16, 16, 5691}, + {0x0, 2, 16, 5691}, + {0xf9a0, 16, 16, 5705}, + {0xf9a2, 16, 16, 5705}, + {0x0, 5, 10, 5705}, + {0xf9a3, 16, 16, 5710}, + {0x0, 11, 12, 5710}, + {0xf9a4, 16, 16, 5711}, + {0x0, 14, 15, 5711}, + {0xf9a5, 16, 16, 5712}, + {0x0, 14, 15, 5712}, + {0xf9a6, 16, 16, 5713}, + {0x0, 5, 11, 5713}, + {0xf9a7, 16, 16, 5719}, + {0x0, 4, 5, 5719}, + {0xf9a8, 16, 16, 5720}, + {0x0, 0, 16, 5720}, + {0x0, 9, 10, 5736}, + {0xf9a9, 16, 16, 5737}, + {0x0, 2, 11, 5737}, + {0xf9ab, 16, 16, 5746}, + {0xf9ac, 16, 16, 5746}, + {0x0, 2, 3, 5746}, + {0xf9ad, 16, 16, 5747}, + {0x0, 9, 10, 5747}, + {0xf9ae, 16, 16, 5748}, + {0x0, 5, 11, 5748}, + {0xf9af, 16, 16, 5754}, + {0x0, 6, 7, 5754}, + {0xf9b0, 16, 16, 5755}, + {0x0, 3, 14, 5755}, + {0x0, 4, 9, 5766}, + {0xf9b1, 16, 16, 5771}, + {0xf9b2, 16, 16, 5771}, + {0x0, 8, 9, 5771}, + {0xf9b3, 16, 16, 5772}, + {0x0, 0, 16, 5772}, + {0x0, 8, 9, 5788}, + {0xf9b4, 16, 16, 5789}, + {0xf9b5, 16, 16, 5789}, + {0x0, 14, 15, 5789}, + {0xf9b6, 16, 16, 5790}, + {0x0, 4, 5, 5790}, + {0xf9b7, 16, 16, 5791}, + {0x0, 8, 9, 5791}, + {0xf9b8, 16, 16, 5792}, + {0x0, 1, 2, 5792}, + {0xf9b9, 16, 16, 5793}, + {0xf9ba, 16, 16, 5793}, + {0x0, 0, 15, 5793}, + {0x0, 10, 11, 5808}, + {0xf9bb, 16, 16, 5809}, + {0xf9bc, 16, 16, 5809}, + {0x0, 15, 16, 5809}, + {0xf9bd, 16, 16, 5810}, + {0x0, 9, 10, 5810}, + {0xf9be, 16, 16, 5811}, + {0x0, 14, 15, 5811}, + {0xf9c0, 16, 16, 5812}, + {0x0, 2, 3, 5812}, + {0xf9c1, 16, 16, 5813}, + {0x0, 1, 13, 5813}, + {0xf9c2, 16, 16, 5825}, + {0x0, 12, 13, 5825}, + {0xf9c3, 16, 16, 5826}, + {0x0, 13, 14, 5826}, + {0xf9c4, 16, 16, 5827}, + {0x0, 8, 9, 5827}, + {0xf9c5, 16, 16, 5828}, + {0x0, 14, 15, 5828}, + {0xf9c6, 16, 16, 5829}, + {0x0, 9, 10, 5829}, + {0xf9c7, 16, 16, 5830}, + {0x0, 11, 12, 5830}, + {0xf9c8, 16, 16, 5831}, + {0x0, 3, 11, 5831}, + {0xf9c9, 16, 16, 5839}, + {0x0, 1, 2, 5839}, + {0x2f902, 16, 16, 5840}, + {0x0, 12, 13, 5840}, + {0xf9cb, 16, 16, 5841}, + {0x0, 6, 10, 5841}, + {0xf9cc, 16, 16, 5845}, + {0x0, 9, 10, 5845}, + {0xf9cd, 16, 16, 5846}, + {0x0, 11, 12, 5846}, + {0xf9ce, 16, 16, 5847}, + {0x0, 0, 1, 5847}, + {0xf9cf, 16, 16, 5848}, + {0x0, 14, 15, 5848}, + {0xf9d0, 16, 16, 5849}, + {0xf9d1, 16, 16, 5849}, + {0x0, 14, 15, 5849}, + {0xf9d2, 16, 16, 5850}, + {0xf9d3, 16, 16, 5850}, + {0x0, 11, 12, 5850}, + {0xf9d4, 16, 16, 5851}, + {0x0, 9, 10, 5851}, + {0xf9d5, 16, 16, 5852}, + {0x0, 10, 11, 5852}, + {0xf9d6, 16, 16, 5853}, + {0xf9d7, 16, 16, 5853}, + {0x0, 11, 12, 5853}, + {0xf9d8, 16, 16, 5854}, + {0x0, 4, 15, 5854}, + {0xf9d9, 16, 16, 5865}, + {0x0, 7, 16, 5865}, + {0xf9da, 16, 16, 5874}, + {0x0, 6, 7, 5874}, + {0xf9dc, 16, 16, 5875}, + {0x0, 9, 10, 5875}, + {0xf9dd, 16, 16, 5876}, + {0x0, 6, 16, 5876}, + {0xf9de, 16, 16, 5886}, + {0xf9df, 16, 16, 5886}, + {0x0, 3, 4, 5886}, + {0xf9e0, 16, 16, 5887}, + {0x0, 14, 15, 5887}, + {0xf9e1, 16, 16, 5888}, + {0x0, 8, 9, 5888}, + {0xf9e2, 16, 16, 5889}, + {0x0, 5, 6, 5889}, + {0xf9e3, 16, 16, 5890}, + {0xf9e4, 16, 16, 5890}, + {0x0, 2, 3, 5890}, + {0xf9e5, 16, 16, 5891}, + {0x0, 2, 11, 5891}, + {0xf9e6, 16, 16, 5900}, + {0xf9e7, 16, 16, 5900}, + {0x0, 1, 2, 5900}, + {0xf9e8, 16, 16, 5901}, + {0xf9e9, 16, 16, 5901}, + {0x0, 2, 4, 5901}, + {0xf9ea, 16, 16, 5903}, + {0x0, 15, 16, 5903}, + {0xf9eb, 16, 16, 5904}, + {0x0, 10, 11, 5904}, + {0xf9ec, 16, 16, 5905}, + {0x0, 13, 14, 5905}, + {0xf9ed, 16, 16, 5906}, + {0x0, 0, 1, 5906}, + {0xf9ee, 16, 16, 5907}, {0x0, 8, 9, 5907}, - {0x2f93c, 16, 16, 5908}, - {0x0, 0, 1, 5908}, - {0x0, 0, 1, 5909}, - {0x0, 3, 4, 5910}, - {0x0, 0, 3, 5911}, - {0x0, 2, 13, 5914}, - {0x21e, 16, 16, 5925}, - {0x0, 0, 1, 5925}, - {0x0, 0, 1, 5926}, - {0x0, 3, 4, 5927}, - {0x0, 0, 1, 5928}, - {0x0, 6, 9, 5929}, - {0x4d0, 16, 16, 5932}, - {0x0, 6, 7, 5932}, - {0x0, 6, 7, 5933}, - {0x2f9cc, 16, 16, 5934}, - {0x0, 10, 11, 5934}, - {0xf985, 16, 16, 5935}, - {0x4d2, 16, 16, 5935}, - {0x0, 3, 4, 5935}, - {0x2f99a, 16, 16, 5936}, - {0x1fd3, 16, 16, 5936}, - {0x0, 4, 6, 5936}, - {0x0, 0, 1, 5938}, - {0x0, 0, 1, 5939}, - {0x0, 3, 4, 5940}, - {0x0, 0, 1, 5941}, - {0x0, 15, 16, 5942}, - {0x477, 16, 16, 5943}, - {0x1e26, 16, 16, 5943}, - {0x1e22, 16, 16, 5943}, - {0x124, 16, 16, 5943}, - {0xf979, 16, 16, 5943}, + {0xf9ef, 16, 16, 5908}, + {0x0, 10, 11, 5908}, + {0xf9f0, 16, 16, 5909}, + {0x0, 3, 4, 5909}, + {0xf9f1, 16, 16, 5910}, + {0x0, 4, 16, 5910}, + {0x0, 7, 8, 5922}, + {0xf9f2, 16, 16, 5923}, + {0xf9f3, 16, 16, 5923}, + {0x0, 7, 8, 5923}, + {0xf9f4, 16, 16, 5924}, + {0x0, 11, 12, 5924}, + {0xf9f5, 16, 16, 5925}, + {0x0, 8, 14, 5925}, + {0xf9f6, 16, 16, 5931}, + {0x0, 11, 12, 5931}, + {0xf9f7, 16, 16, 5932}, + {0x0, 2, 13, 5932}, {0x0, 0, 1, 5943}, - {0x2f93a, 16, 16, 5944}, - {0xfa49, 16, 16, 5944}, - {0x0, 8, 9, 5944}, - {0xf900, 16, 16, 5945}, - {0x0, 4, 5, 5945}, - {0xf924, 16, 16, 5946}, - {0x1f23, 16, 16, 5946}, - {0x0, 5, 6, 5946}, - {0x2f925, 16, 16, 5947}, - {0x0, 4, 13, 5947}, - {0x2f818, 16, 16, 5956}, - {0x0, 10, 11, 5956}, - {0x2f979, 16, 16, 5957}, - {0x0, 0, 1, 5957}, - {0x0, 0, 1, 5958}, - {0x0, 3, 4, 5959}, - {0x0, 0, 1, 5960}, - {0x0, 2, 3, 5961}, - {0x1ec6, 16, 16, 5962}, - {0x0, 2, 3, 5962}, - {0x2f895, 16, 16, 5963}, - {0x0, 6, 7, 5963}, - {0x0, 0, 1, 5964}, - {0x0, 0, 1, 5965}, - {0x0, 3, 4, 5966}, - {0x0, 0, 1, 5967}, - {0x0, 8, 9, 5968}, - {0x407, 16, 16, 5969}, - {0xf949, 16, 16, 5969}, - {0x0, 0, 10, 5969}, - {0x1eed, 16, 16, 5979}, - {0x0, 5, 12, 5979}, - {0x2f839, 16, 16, 5986}, - {0x1eeb, 16, 16, 5986}, - {0x1ee9, 16, 16, 5986}, - {0x0, 3, 5, 5986}, - {0x1f38, 16, 16, 5988}, - {0x1eef, 16, 16, 5988}, - {0x1f39, 16, 16, 5988}, - {0x0, 0, 10, 5988}, - {0x2f962, 16, 16, 5998}, - {0xfa56, 16, 16, 5998}, - {0x0, 3, 4, 5998}, - {0x2f87c, 16, 16, 5999}, - {0x2f963, 16, 16, 5999}, - {0x0, 0, 1, 5999}, - {0x0, 0, 1, 6000}, - {0x0, 3, 4, 6001}, - {0x0, 0, 1, 6002}, - {0x0, 1, 5, 6003}, - {0x1e2, 16, 16, 6007}, - {0x1fc, 16, 16, 6007}, - {0x0, 7, 8, 6007}, - {0xf9f2, 16, 16, 6008}, - {0xf906, 16, 16, 6008}, - {0x0, 13, 14, 6008}, - {0x2f886, 16, 16, 6009}, - {0x0, 15, 16, 6009}, - {0xf927, 16, 16, 6010}, - {0x0, 12, 13, 6010}, - {0x2f92a, 16, 16, 6011}, - {0x0, 3, 5, 6011}, - {0x1f40, 16, 16, 6013}, - {0x1f41, 16, 16, 6013}, - {0x0, 0, 16, 6013}, - {0xfa, 16, 16, 6029}, - {0xf9, 16, 16, 6029}, - {0x169, 16, 16, 6029}, - {0xfb, 16, 16, 6029}, - {0x16b, 16, 16, 6029}, - {0x0, 3, 14, 6029}, - {0x1ee4, 16, 16, 6040}, - {0x16d, 16, 16, 6040}, - {0x1ee7, 16, 16, 6040}, - {0xfc, 16, 16, 6040}, - {0x0, 0, 1, 6040}, - {0x0, 3, 4, 6041}, - {0x0, 0, 1, 6042}, - {0x0, 9, 10, 6043}, - {0x0, 9, 10, 6044}, - {0x3062, 16, 16, 6045}, - {0x172, 16, 16, 6045}, - {0x0, 0, 1, 6045}, - {0x0, 0, 1, 6046}, - {0x0, 3, 4, 6047}, - {0x0, 0, 1, 6048}, - {0x0, 7, 8, 6049}, - {0x1e65, 16, 16, 6050}, - {0x0, 1, 13, 6050}, - {0x161, 16, 16, 6062}, - {0x0, 9, 13, 6062}, - {0x2f9a1, 16, 16, 6066}, - {0x0, 0, 1, 6066}, - {0x0, 0, 1, 6067}, - {0x0, 3, 4, 6068}, - {0x0, 0, 1, 6069}, - {0x0, 0, 13, 6070}, - {0x1da, 16, 16, 6083}, - {0x0, 0, 1, 6083}, - {0x0, 0, 1, 6084}, - {0x0, 3, 4, 6085}, - {0x0, 0, 4, 6086}, - {0x0, 1, 13, 6090}, - {0x13a, 16, 16, 6102}, - {0x16f, 16, 16, 6102}, - {0x1e76, 16, 16, 6102}, - {0x0, 0, 1, 6102}, - {0x0, 0, 1, 6103}, - {0x0, 3, 4, 6104}, - {0x0, 3, 4, 6105}, - {0x0, 8, 9, 6106}, - {0x219b, 16, 16, 6107}, - {0x171, 16, 16, 6107}, - {0x215, 16, 16, 6107}, - {0x0, 0, 1, 6107}, - {0x0, 3, 4, 6108}, - {0x0, 0, 1, 6109}, - {0x0, 9, 10, 6110}, - {0x0, 9, 10, 6111}, - {0x3050, 16, 16, 6112}, - {0x0, 10, 11, 6112}, - {0x0, 7, 8, 6113}, - {0x2f95e, 16, 16, 6114}, - {0x0, 2, 3, 6114}, - {0x2f9ba, 16, 16, 6115}, - {0x0, 14, 15, 6115}, - {0xfa30, 16, 16, 6116}, - {0x0, 10, 11, 6116}, - {0x2f861, 16, 16, 6117}, - {0x13e, 16, 16, 6117}, - {0x1dc, 16, 16, 6117}, - {0x1d8, 16, 16, 6117}, - {0x1d6, 16, 16, 6117}, - {0x0, 2, 3, 6117}, - {0x1fd7, 16, 16, 6118}, - {0x0, 1, 2, 6118}, - {0x0, 4, 5, 6119}, - {0x2f927, 16, 16, 6120}, - {0x15d, 16, 16, 6120}, - {0x15b, 16, 16, 6120}, - {0x1e61, 16, 16, 6120}, - {0x0, 3, 5, 6120}, - {0x1f49, 16, 16, 6122}, - {0x0, 0, 1, 6122}, - {0x0, 3, 4, 6123}, - {0x0, 0, 1, 6124}, - {0x0, 9, 10, 6125}, - {0x0, 9, 10, 6126}, - {0x30c5, 16, 16, 6127}, - {0xf93e, 16, 16, 6127}, - {0x0, 0, 14, 6127}, - {0x0, 4, 5, 6141}, - {0x2f9d9, 16, 16, 6142}, - {0x0, 13, 14, 6142}, - {0x2f8b4, 16, 16, 6143}, - {0x1f48, 16, 16, 6143}, - {0x0, 8, 9, 6143}, - {0xf9e2, 16, 16, 6144}, - {0x0, 3, 9, 6144}, - {0x1eca, 16, 16, 6150}, - {0x12e, 16, 16, 6150}, - {0x0, 0, 9, 6150}, - {0x1f7a, 16, 16, 6159}, - {0x3cd, 16, 16, 6159}, - {0x1fe1, 16, 16, 6159}, - {0x0, 1, 2, 6159}, - {0x1e35, 16, 16, 6160}, - {0x1fe0, 16, 16, 6160}, - {0x0, 0, 1, 6160}, - {0x0, 3, 4, 6161}, - {0x0, 0, 1, 6162}, + {0xf9f8, 16, 16, 5944}, + {0x0, 2, 3, 5944}, + {0xf9f9, 16, 16, 5945}, + {0x0, 0, 1, 5945}, + {0xf9fa, 16, 16, 5946}, + {0x0, 9, 10, 5946}, + {0xf9fb, 16, 16, 5947}, + {0x0, 8, 9, 5947}, + {0xf9fc, 16, 16, 5948}, + {0x0, 0, 13, 5948}, + {0xf9fd, 16, 16, 5961}, + {0x0, 6, 7, 5961}, + {0xf9fe, 16, 16, 5962}, + {0x0, 10, 12, 5962}, + {0xf9ff, 16, 16, 5964}, + {0x0, 3, 8, 5964}, + {0x2f850, 16, 16, 5969}, + {0x0, 6, 7, 5969}, + {0xfa01, 16, 16, 5970}, + {0x0, 3, 5, 5970}, + {0xfa02, 16, 16, 5972}, + {0x0, 2, 7, 5972}, + {0xfa03, 16, 16, 5977}, + {0x0, 5, 6, 5977}, + {0xfa04, 16, 16, 5978}, + {0xfa05, 16, 16, 5978}, + {0x0, 4, 5, 5978}, + {0xfa06, 16, 16, 5979}, + {0x0, 8, 12, 5979}, + {0xfa07, 16, 16, 5983}, + {0x0, 12, 13, 5983}, + {0xfa08, 16, 16, 5984}, + {0xfa09, 16, 16, 5984}, + {0x0, 11, 12, 5984}, + {0xfa0a, 16, 16, 5985}, + {0x0, 3, 4, 5985}, + {0xfa0b, 16, 16, 5986}, + {0x0, 0, 14, 5986}, + {0xfa0c, 16, 16, 6000}, + {0x0, 0, 3, 6000}, + {0xfa0d, 16, 16, 6003}, + {0xfa10, 16, 16, 6003}, + {0x0, 4, 5, 6003}, + {0xfa12, 16, 16, 6004}, + {0xfa15, 16, 16, 6004}, + {0x0, 10, 11, 6004}, + {0xfa16, 16, 16, 6005}, + {0x0, 10, 11, 6005}, + {0xfa17, 16, 16, 6006}, + {0x0, 12, 15, 6006}, + {0xfa18, 16, 16, 6009}, + {0x0, 0, 15, 6009}, + {0xfa19, 16, 16, 6024}, + {0x0, 5, 6, 6024}, + {0xfa1a, 16, 16, 6025}, + {0x0, 13, 16, 6025}, + {0x2f956, 16, 16, 6028}, + {0x0, 6, 7, 6028}, + {0xfa1c, 16, 16, 6029}, + {0x0, 14, 15, 6029}, + {0xfa1d, 16, 16, 6030}, + {0x0, 13, 14, 6030}, + {0xfa1e, 16, 16, 6031}, + {0x0, 2, 3, 6031}, + {0xfa20, 16, 16, 6032}, + {0xfa22, 16, 16, 6032}, + {0x0, 8, 9, 6032}, + {0xfa67, 16, 16, 6033}, + {0x0, 1, 14, 6033}, + {0xfa26, 16, 16, 6046}, + {0x0, 2, 16, 6046}, + {0xfa2a, 16, 16, 6060}, + {0x0, 12, 13, 6060}, + {0xfa2b, 16, 16, 6061}, + {0x0, 8, 10, 6061}, + {0xfa2c, 16, 16, 6063}, + {0x0, 4, 5, 6063}, + {0xfa2d, 16, 16, 6064}, + {0x0, 14, 15, 6064}, + {0x2f805, 16, 16, 6065}, + {0x0, 7, 8, 6065}, + {0x2f80a, 16, 16, 6066}, + {0x2f80e, 16, 16, 6066}, + {0x0, 7, 10, 6066}, + {0x2f826, 16, 16, 6069}, + {0x0, 4, 5, 6069}, + {0x2f827, 16, 16, 6070}, + {0x0, 1, 11, 6070}, + {0x2f82d, 16, 16, 6080}, + {0x0, 9, 14, 6080}, + {0xfa36, 16, 16, 6085}, + {0x0, 6, 7, 6085}, + {0x2f84c, 16, 16, 6086}, + {0x0, 8, 9, 6086}, + {0xfa38, 16, 16, 6087}, + {0x0, 0, 1, 6087}, + {0xfa39, 16, 16, 6088}, + {0x0, 8, 13, 6088}, + {0xfa3a, 16, 16, 6093}, + {0xfa3b, 16, 16, 6093}, + {0x2f878, 16, 16, 6093}, + {0x0, 4, 5, 6093}, + {0x2f8a3, 16, 16, 6094}, + {0x0, 8, 9, 6094}, + {0xfa3e, 16, 16, 6095}, + {0x0, 14, 15, 6095}, + {0x2f8ab, 16, 16, 6096}, + {0x2f8b0, 16, 16, 6096}, + {0x0, 15, 16, 6096}, + {0x2f8c8, 16, 16, 6097}, + {0x0, 2, 4, 6097}, + {0xfa42, 16, 16, 6099}, + {0x0, 1, 13, 6099}, + {0x2f8cf, 16, 16, 6111}, + {0x2f8e2, 16, 16, 6111}, + {0x0, 7, 9, 6111}, + {0x2f901, 16, 16, 6113}, + {0x0, 10, 11, 6113}, + {0xfa46, 16, 16, 6114}, + {0xfa47, 16, 16, 6114}, + {0x0, 14, 15, 6114}, + {0xfa48, 16, 16, 6115}, + {0x0, 8, 12, 6115}, + {0xfa49, 16, 16, 6119}, + {0x0, 2, 3, 6119}, + {0xfa4a, 16, 16, 6120}, + {0x0, 1, 2, 6120}, + {0xfa4b, 16, 16, 6121}, + {0xfa4c, 16, 16, 6121}, + {0x0, 8, 10, 6121}, + {0xfa4d, 16, 16, 6123}, + {0xfa4e, 16, 16, 6123}, + {0xfa4f, 16, 16, 6123}, + {0x2f953, 16, 16, 6123}, + {0xfa51, 16, 16, 6123}, + {0xfa52, 16, 16, 6123}, + {0xfa53, 16, 16, 6123}, + {0x0, 0, 16, 6123}, + {0x2f959, 16, 16, 6139}, + {0x0, 1, 2, 6139}, + {0xfa55, 16, 16, 6140}, + {0x0, 0, 10, 6140}, + {0xfa56, 16, 16, 6150}, + {0x0, 2, 10, 6150}, + {0xfa58, 16, 16, 6158}, + {0x0, 1, 6, 6158}, + {0xfa59, 16, 16, 6163}, + {0xfa5a, 16, 16, 6163}, + {0x2f97a, 16, 16, 6163}, + {0xfa5c, 16, 16, 6163}, {0x0, 9, 10, 6163}, - {0x0, 9, 11, 6164}, - {0x3074, 16, 16, 6166}, - {0x3cb, 16, 16, 6166}, - {0x0, 3, 4, 6166}, - {0xf99d, 16, 16, 6167}, - {0x0, 0, 1, 6167}, - {0x0, 0, 1, 6168}, + {0xfa5e, 16, 16, 6164}, + {0x0, 7, 8, 6164}, + {0x2f99f, 16, 16, 6165}, + {0x0, 0, 1, 6165}, + {0xfa60, 16, 16, 6166}, + {0x0, 6, 7, 6166}, + {0xfa61, 16, 16, 6167}, + {0x0, 1, 2, 6167}, + {0xfa62, 16, 16, 6168}, + {0x0, 9, 10, 6168}, + {0xfa63, 16, 16, 6169}, {0x0, 3, 4, 6169}, - {0x0, 0, 1, 6170}, - {0x0, 8, 9, 6171}, - {0x4e7, 16, 16, 6172}, - {0x1f3b, 16, 16, 6172}, - {0x0, 0, 1, 6172}, - {0x0, 0, 1, 6173}, - {0x0, 3, 4, 6174}, - {0x0, 4, 5, 6175}, - {0x0, 5, 6, 6176}, - {0x1f92, 16, 16, 6177}, - {0x0, 2, 4, 6177}, - {0xfa42, 16, 16, 6179}, - {0x0, 1, 2, 6179}, - {0x1e5f, 16, 16, 6180}, - {0x0, 0, 1, 6180}, - {0x0, 0, 1, 6181}, - {0x0, 3, 4, 6182}, - {0x0, 3, 4, 6183}, - {0x0, 8, 9, 6184}, - {0x22ed, 16, 16, 6185}, - {0x0, 2, 6, 6185}, - {0x1ff6, 16, 16, 6189}, - {0x1ff3, 16, 16, 6189}, - {0x0, 9, 11, 6189}, - {0xf92a, 16, 16, 6191}, - {0x0, 0, 1, 6191}, - {0x0, 0, 1, 6192}, - {0x0, 3, 4, 6193}, - {0x0, 0, 5, 6194}, - {0x0, 2, 6, 6199}, - {0x1fa0, 16, 16, 6203}, - {0x0, 4, 5, 6203}, - {0xf9b7, 16, 16, 6204}, - {0x1f66, 16, 16, 6204}, - {0x3073, 16, 16, 6204}, - {0x0, 2, 8, 6204}, - {0x2f823, 16, 16, 6210}, - {0x0, 12, 13, 6210}, - {0x2f862, 16, 16, 6211}, - {0x2f822, 16, 16, 6211}, - {0x0, 2, 3, 6211}, - {0xf9e5, 16, 16, 6212}, - {0x2f903, 16, 16, 6212}, - {0x0, 11, 12, 6212}, - {0x2f957, 16, 16, 6213}, - {0x0, 11, 12, 6213}, - {0xf98a, 16, 16, 6214}, - {0x0, 9, 10, 6214}, - {0x2f9bb, 16, 16, 6215}, - {0x0, 0, 1, 6215}, - {0x0, 0, 1, 6216}, - {0x0, 3, 4, 6217}, - {0x0, 0, 1, 6218}, - {0x0, 15, 16, 6219}, - {0x476, 16, 16, 6220}, - {0x0, 0, 1, 6220}, - {0x0, 0, 1, 6221}, - {0x0, 3, 4, 6222}, - {0x0, 0, 1, 6223}, - {0x0, 8, 9, 6224}, - {0x4eb, 16, 16, 6225}, - {0x0, 1, 6, 6225}, - {0xfa5b, 16, 16, 6230}, - {0xf934, 16, 16, 6230}, - {0x0, 0, 10, 6230}, - {0x0, 0, 1, 6240}, - {0x0, 0, 1, 6241}, - {0x0, 3, 4, 6242}, - {0x0, 0, 1, 6243}, - {0x0, 0, 2, 6244}, - {0x1f14, 16, 16, 6246}, - {0x1f12, 16, 16, 6246}, - {0x0, 3, 14, 6246}, - {0x1e0c, 16, 16, 6257}, - {0x1e10, 16, 16, 6257}, - {0x1ffb, 16, 16, 6257}, - {0x1feb, 16, 16, 6257}, - {0x1ff9, 16, 16, 6257}, - {0x1fdb, 16, 16, 6257}, - {0x0, 3, 4, 6257}, - {0x2f992, 16, 16, 6258}, - {0x0, 0, 1, 6258}, - {0x0, 3, 4, 6259}, - {0x0, 0, 1, 6260}, - {0x0, 9, 10, 6261}, - {0x0, 9, 10, 6262}, - {0x30b6, 16, 16, 6263}, - {0x0, 0, 1, 6263}, - {0x0, 0, 1, 6264}, - {0x0, 3, 4, 6265}, - {0x0, 0, 4, 6266}, - {0x0, 3, 14, 6270}, - {0x1e36, 16, 16, 6281}, - {0x13b, 16, 16, 6281}, - {0x1e12, 16, 16, 6281}, - {0x0, 1, 2, 6281}, - {0x0, 14, 15, 6282}, - {0x2f906, 16, 16, 6283}, - {0x0, 0, 1, 6283}, - {0x0, 0, 1, 6284}, - {0x0, 3, 4, 6285}, - {0x0, 0, 1, 6286}, - {0x0, 8, 9, 6287}, - {0x4ed, 16, 16, 6288}, - {0x2f8dc, 16, 16, 6288}, - {0x0, 6, 7, 6288}, - {0x0, 3, 4, 6289}, - {0x2f91d, 16, 16, 6290}, - {0x1e3c, 16, 16, 6290}, - {0x1fbb, 16, 16, 6290}, - {0x1fee, 16, 16, 6290}, - {0x0, 14, 15, 6290}, - {0x2fa08, 16, 16, 6291}, - {0x1fc9, 16, 16, 6291}, - {0x0, 0, 1, 6291}, - {0x0, 0, 1, 6292}, - {0x0, 13, 14, 6293}, - {0x0, 3, 4, 6294}, - {0x0, 14, 15, 6295}, - {0xd4b, 16, 16, 6296}, - {0x0, 6, 7, 6296}, - {0x2fa1b, 16, 16, 6297}, - {0x0, 7, 8, 6297}, - {0x2f896, 16, 16, 6298}, - {0xf97a, 16, 16, 6298}, - {0x0, 1, 13, 6298}, - {0x17d, 16, 16, 6310}, - {0x0, 4, 5, 6310}, - {0xfa57, 16, 16, 6311}, - {0x0, 8, 9, 6311}, - {0xf972, 16, 16, 6312}, - {0x0, 0, 1, 6312}, - {0x0, 0, 1, 6313}, - {0x0, 3, 4, 6314}, - {0x0, 3, 4, 6315}, - {0x0, 8, 9, 6316}, - {0x226f, 16, 16, 6317}, - {0x0, 0, 1, 6317}, - {0x0, 0, 1, 6318}, - {0x0, 3, 4, 6319}, - {0x0, 0, 1, 6320}, - {0x0, 0, 13, 6321}, - {0x1d5, 16, 16, 6334}, - {0x0, 6, 7, 6334}, - {0x0, 7, 8, 6335}, - {0x2f9c5, 16, 16, 6336}, - {0x0, 0, 1, 6336}, - {0x0, 0, 1, 6337}, - {0x0, 3, 4, 6338}, - {0x0, 4, 5, 6339}, - {0x0, 5, 6, 6340}, - {0x1fb7, 16, 16, 6341}, - {0x1db, 16, 16, 6341}, - {0x1d7, 16, 16, 6341}, - {0x0, 3, 14, 6341}, - {0x1e71, 16, 16, 6352}, - {0x0, 0, 1, 6352}, - {0x2f924, 16, 16, 6353}, - {0x0, 0, 1, 6353}, - {0x0, 0, 1, 6354}, - {0x0, 3, 4, 6355}, - {0x0, 3, 4, 6356}, + {0xfa64, 16, 16, 6170}, + {0x0, 8, 9, 6170}, + {0xfa65, 16, 16, 6171}, + {0xfa66, 16, 16, 6171}, + {0xfa68, 16, 16, 6171}, + {0x0, 15, 16, 6171}, + {0xfa69, 16, 16, 6172}, + {0x0, 11, 12, 6172}, + {0xfa6a, 16, 16, 6173}, + {0x2f800, 16, 16, 6173}, + {0x2f801, 16, 16, 6173}, + {0x0, 1, 2, 6173}, + {0x2f802, 16, 16, 6174}, + {0x0, 0, 11, 6174}, + {0x0, 1, 12, 6185}, + {0x0, 2, 3, 6196}, + {0x0, 2, 3, 6197}, + {0x2f803, 16, 16, 6198}, + {0x0, 0, 1, 6198}, + {0x2f804, 16, 16, 6199}, + {0x2f806, 16, 16, 6199}, + {0x0, 2, 3, 6199}, + {0x2f807, 16, 16, 6200}, + {0x0, 10, 11, 6200}, + {0x2f808, 16, 16, 6201}, + {0x0, 9, 10, 6201}, + {0x2f809, 16, 16, 6202}, + {0x0, 15, 16, 6202}, + {0x2f80b, 16, 16, 6203}, + {0x0, 9, 14, 6203}, + {0x0, 14, 15, 6208}, + {0x2f80c, 16, 16, 6209}, + {0x0, 3, 4, 6209}, + {0x0, 10, 11, 6210}, + {0x2f80d, 16, 16, 6211}, + {0x0, 4, 5, 6211}, + {0x2f80f, 16, 16, 6212}, + {0x2f810, 16, 16, 6212}, + {0x0, 7, 8, 6212}, + {0x2f811, 16, 16, 6213}, + {0x0, 1, 5, 6213}, + {0x0, 12, 13, 6217}, + {0x2f812, 16, 16, 6218}, + {0x0, 9, 12, 6218}, + {0x2f813, 16, 16, 6221}, + {0x2f814, 16, 16, 6221}, + {0x0, 13, 14, 6221}, + {0x2f815, 16, 16, 6222}, + {0x0, 11, 12, 6222}, + {0x2f816, 16, 16, 6223}, + {0x0, 2, 8, 6223}, + {0x2f817, 16, 16, 6229}, + {0x0, 4, 13, 6229}, + {0x2f818, 16, 16, 6238}, + {0x2f819, 16, 16, 6238}, + {0x2f81a, 16, 16, 6238}, + {0x2f81b, 16, 16, 6238}, + {0x0, 1, 12, 6238}, + {0x0, 4, 14, 6249}, + {0x0, 15, 16, 6259}, + {0x2f81c, 16, 16, 6260}, + {0x0, 5, 6, 6260}, + {0x2f81d, 16, 16, 6261}, + {0x2f81e, 16, 16, 6261}, + {0x0, 15, 16, 6261}, + {0x2f81f, 16, 16, 6262}, + {0x2f820, 16, 16, 6262}, + {0x0, 6, 7, 6262}, + {0x2f821, 16, 16, 6263}, + {0x0, 2, 8, 6263}, + {0x2f822, 16, 16, 6269}, + {0x2f823, 16, 16, 6269}, + {0x0, 1, 2, 6269}, + {0x0, 5, 6, 6270}, + {0x2f824, 16, 16, 6271}, + {0x2f825, 16, 16, 6271}, + {0x2f828, 16, 16, 6271}, + {0x0, 5, 7, 6271}, + {0x2f829, 16, 16, 6273}, + {0x2f82a, 16, 16, 6273}, + {0x0, 9, 10, 6273}, + {0x2f82c, 16, 16, 6274}, + {0x2f82e, 16, 16, 6274}, + {0x2f82f, 16, 16, 6274}, + {0x2f830, 16, 16, 6274}, + {0x2f833, 16, 16, 6274}, + {0x0, 2, 3, 6274}, + {0x0, 12, 13, 6275}, + {0x2f834, 16, 16, 6276}, + {0x0, 0, 14, 6276}, + {0x2f835, 16, 16, 6290}, + {0x2f836, 16, 16, 6290}, + {0x0, 15, 16, 6290}, + {0x2f837, 16, 16, 6291}, + {0x0, 6, 7, 6291}, + {0x0, 3, 4, 6292}, + {0x2f838, 16, 16, 6293}, + {0x2f839, 16, 16, 6293}, + {0x0, 1, 2, 6293}, + {0x2f83a, 16, 16, 6294}, + {0x2f83b, 16, 16, 6294}, + {0x0, 14, 15, 6294}, + {0x2f83c, 16, 16, 6295}, + {0x0, 8, 9, 6295}, + {0x2f83d, 16, 16, 6296}, + {0x2f83e, 16, 16, 6296}, + {0x0, 8, 9, 6296}, + {0x2f83f, 16, 16, 6297}, + {0x0, 2, 3, 6297}, + {0x2f840, 16, 16, 6298}, + {0x0, 6, 7, 6298}, + {0x2f841, 16, 16, 6299}, + {0x0, 0, 1, 6299}, + {0x2f842, 16, 16, 6300}, + {0x0, 3, 4, 6300}, + {0x2f843, 16, 16, 6301}, + {0x0, 3, 4, 6301}, + {0x2f844, 16, 16, 6302}, + {0x2f846, 16, 16, 6302}, + {0x2f847, 16, 16, 6302}, + {0x0, 11, 12, 6302}, + {0x2f848, 16, 16, 6303}, + {0x0, 3, 4, 6303}, + {0x2f849, 16, 16, 6304}, + {0x2f84a, 16, 16, 6304}, + {0x0, 1, 16, 6304}, + {0x0, 6, 8, 6319}, + {0x2f84b, 16, 16, 6321}, + {0x2f84d, 16, 16, 6321}, + {0x0, 1, 2, 6321}, + {0x2f84e, 16, 16, 6322}, + {0x0, 4, 5, 6322}, + {0x2f84f, 16, 16, 6323}, + {0x0, 14, 15, 6323}, + {0x2f851, 16, 16, 6324}, + {0x0, 14, 15, 6324}, + {0x2f852, 16, 16, 6325}, + {0x0, 4, 5, 6325}, + {0x2f853, 16, 16, 6326}, + {0x0, 13, 14, 6326}, + {0x2f854, 16, 16, 6327}, + {0x0, 11, 12, 6327}, + {0x2f855, 16, 16, 6328}, + {0x0, 1, 3, 6328}, + {0x2f856, 16, 16, 6330}, + {0x2f857, 16, 16, 6330}, + {0x2f858, 16, 16, 6330}, + {0x0, 4, 14, 6330}, + {0x0, 14, 15, 6340}, + {0x0, 4, 5, 6341}, + {0x2f859, 16, 16, 6342}, + {0x0, 2, 8, 6342}, + {0x2f85a, 16, 16, 6348}, + {0x2f85b, 16, 16, 6348}, + {0x0, 6, 7, 6348}, + {0x2f85c, 16, 16, 6349}, + {0x0, 10, 11, 6349}, + {0x2f85d, 16, 16, 6350}, + {0x0, 2, 3, 6350}, + {0x2f85e, 16, 16, 6351}, + {0x0, 2, 3, 6351}, + {0x2f85f, 16, 16, 6352}, + {0x0, 10, 15, 6352}, {0x0, 8, 9, 6357}, - {0x2247, 16, 16, 6358}, - {0x0, 5, 6, 6358}, - {0x0, 6, 7, 6359}, - {0x2fa16, 16, 16, 6360}, - {0x0, 0, 1, 6360}, - {0x0, 0, 1, 6361}, - {0x0, 3, 4, 6362}, - {0x0, 4, 5, 6363}, - {0x0, 5, 6, 6364}, - {0x1f8a, 16, 16, 6365}, - {0x0, 14, 15, 6365}, - {0x2fa0d, 16, 16, 6366}, - {0x0, 1, 2, 6366}, - {0x2f8a0, 16, 16, 6367}, - {0x2f8e4, 16, 16, 6367}, - {0x0, 9, 10, 6367}, - {0x2f8cd, 16, 16, 6368}, - {0x0, 5, 10, 6368}, - {0x2f8d7, 16, 16, 6373}, - {0x1e90, 16, 16, 6373}, - {0x179, 16, 16, 6373}, - {0x2f981, 16, 16, 6373}, - {0x17b, 16, 16, 6373}, - {0x21b, 16, 16, 6373}, - {0x163, 16, 16, 6373}, - {0xfa4c, 16, 16, 6373}, - {0x1e6d, 16, 16, 6373}, - {0x37e, 16, 16, 6373}, - {0x1d9, 16, 16, 6373}, - {0x0, 0, 1, 6373}, - {0x0, 3, 4, 6374}, - {0x0, 0, 1, 6375}, - {0x0, 9, 10, 6376}, - {0x0, 9, 11, 6377}, - {0x30d7, 16, 16, 6379}, - {0x0, 0, 1, 6379}, - {0x0, 3, 4, 6380}, - {0x0, 0, 1, 6381}, - {0x0, 9, 10, 6382}, - {0x0, 9, 10, 6383}, - {0x3060, 16, 16, 6384}, - {0x0, 2, 6, 6384}, - {0x1f91, 16, 16, 6388}, - {0x1e16, 16, 16, 6388}, - {0x1f27, 16, 16, 6388}, - {0x0, 7, 8, 6388}, - {0x2f89e, 16, 16, 6389}, - {0x0, 9, 10, 6389}, - {0x2f8c3, 16, 16, 6390}, - {0x0, 1, 2, 6390}, - {0x2f83a, 16, 16, 6391}, - {0x0, 12, 13, 6391}, - {0x2f880, 16, 16, 6392}, - {0x2f989, 16, 16, 6392}, - {0xd1, 16, 16, 6392}, - {0x1f8, 16, 16, 6392}, - {0x143, 16, 16, 6392}, - {0x1e44, 16, 16, 6392}, - {0x0, 11, 12, 6392}, - {0x2f98e, 16, 16, 6393}, - {0x0, 11, 12, 6393}, - {0x2f933, 16, 16, 6394}, - {0x0, 10, 11, 6394}, - {0xf99b, 16, 16, 6395}, - {0x0, 0, 1, 6395}, - {0x1e75, 16, 16, 6396}, - {0x0, 0, 1, 6396}, - {0x0, 0, 1, 6397}, - {0x0, 3, 4, 6398}, - {0x0, 4, 5, 6399}, - {0x0, 5, 6, 6400}, - {0x1f8d, 16, 16, 6401}, - {0x30d6, 16, 16, 6401}, - {0x1f2b, 16, 16, 6401}, - {0x0, 2, 3, 6401}, - {0xf9ad, 16, 16, 6402}, - {0xf95d, 16, 16, 6402}, - {0x0, 0, 1, 6402}, - {0x0, 0, 1, 6403}, - {0x0, 3, 4, 6404}, - {0x0, 0, 3, 6405}, - {0x0, 3, 4, 6408}, - {0x1e7c, 16, 16, 6409}, - {0x0, 3, 4, 6409}, - {0x0, 14, 15, 6410}, - {0x2f977, 16, 16, 6411}, - {0x0, 0, 1, 6411}, - {0x0, 3, 4, 6412}, - {0x0, 0, 1, 6413}, - {0x0, 9, 10, 6414}, - {0x0, 9, 10, 6415}, - {0x305e, 16, 16, 6416}, - {0x0, 0, 1, 6416}, - {0x2f842, 16, 16, 6417}, - {0x0, 3, 4, 6417}, - {0x2f90a, 16, 16, 6418}, - {0x0, 0, 9, 6418}, - {0x38e, 16, 16, 6427}, - {0x0, 0, 1, 6427}, - {0xf9ee, 16, 16, 6428}, - {0x0, 15, 16, 6428}, - {0x2f80b, 16, 16, 6429}, - {0x0, 10, 11, 6429}, - {0xf919, 16, 16, 6430}, - {0xf912, 16, 16, 6430}, - {0x0, 13, 14, 6430}, - {0x0, 10, 11, 6431}, - {0x2f898, 16, 16, 6432}, - {0x211, 16, 16, 6432}, - {0x159, 16, 16, 6432}, - {0x0, 12, 13, 6432}, - {0xfa2b, 16, 16, 6433}, - {0x0, 10, 11, 6433}, - {0xf9bb, 16, 16, 6434}, - {0x0, 0, 1, 6434}, - {0x0, 0, 1, 6435}, - {0x0, 3, 4, 6436}, - {0x0, 4, 5, 6437}, - {0x0, 5, 6, 6438}, - {0x1f83, 16, 16, 6439}, - {0x1ff8, 16, 16, 6439}, - {0x0, 11, 12, 6439}, - {0x2f9d4, 16, 16, 6440}, - {0x0, 1, 12, 6440}, - {0x216, 16, 16, 6451}, - {0x0, 0, 1, 6451}, - {0x0, 0, 1, 6452}, - {0x0, 3, 4, 6453}, - {0x0, 0, 1, 6454}, - {0x0, 4, 5, 6455}, - {0x1e0, 16, 16, 6456}, - {0x0, 0, 16, 6456}, - {0x0, 6, 7, 6472}, - {0xfa37, 16, 16, 6473}, - {0x0, 0, 1, 6473}, - {0x0, 0, 1, 6474}, - {0x0, 3, 4, 6475}, - {0x0, 3, 4, 6476}, - {0x0, 8, 9, 6477}, - {0x22e3, 16, 16, 6478}, - {0x0, 0, 2, 6478}, - {0x1f6a, 16, 16, 6480}, - {0x1f6c, 16, 16, 6480}, - {0x137, 16, 16, 6480}, - {0x0, 3, 5, 6480}, - {0x1f51, 16, 16, 6482}, - {0x1f50, 16, 16, 6482}, - {0x0, 1, 2, 6482}, - {0x0, 5, 6, 6483}, - {0x2f9ec, 16, 16, 6484}, - {0x0, 14, 15, 6484}, - {0x2f8c2, 16, 16, 6485}, - {0x0, 13, 14, 6485}, - {0x2f99d, 16, 16, 6486}, - {0x1af, 16, 16, 6486}, - {0x0, 9, 10, 6486}, - {0xf9c7, 16, 16, 6487}, - {0x1e59, 16, 16, 6487}, - {0x4d3, 16, 16, 6487}, - {0x0, 0, 1, 6487}, - {0x0, 0, 1, 6488}, - {0x0, 3, 4, 6489}, - {0x0, 0, 1, 6490}, + {0x2f860, 16, 16, 6358}, + {0x0, 10, 11, 6358}, + {0x2f861, 16, 16, 6359}, + {0x0, 12, 13, 6359}, + {0x2f862, 16, 16, 6360}, + {0x0, 1, 12, 6360}, + {0x0, 11, 12, 6371}, + {0x2f863, 16, 16, 6372}, + {0x0, 7, 8, 6372}, + {0x2f864, 16, 16, 6373}, + {0x0, 8, 9, 6373}, + {0x2f865, 16, 16, 6374}, + {0x0, 6, 7, 6374}, + {0x2f866, 16, 16, 6375}, + {0x0, 14, 16, 6375}, + {0x0, 14, 15, 6377}, + {0x2f867, 16, 16, 6378}, + {0x0, 12, 13, 6378}, + {0x2f868, 16, 16, 6379}, + {0x0, 8, 9, 6379}, + {0x2f869, 16, 16, 6380}, + {0x0, 14, 15, 6380}, + {0x2f86b, 16, 16, 6381}, + {0x0, 12, 13, 6381}, + {0x0, 8, 9, 6382}, + {0x2f86c, 16, 16, 6383}, + {0x0, 3, 4, 6383}, + {0x2f86d, 16, 16, 6384}, + {0x0, 8, 9, 6384}, + {0x2f86e, 16, 16, 6385}, + {0x0, 3, 16, 6385}, + {0x2f870, 16, 16, 6398}, + {0x0, 1, 2, 6398}, + {0x0, 8, 9, 6399}, + {0x2f871, 16, 16, 6400}, + {0x2f872, 16, 16, 6400}, + {0x0, 6, 7, 6400}, + {0x2f873, 16, 16, 6401}, + {0x0, 3, 4, 6401}, + {0x2f874, 16, 16, 6402}, + {0x0, 2, 3, 6402}, + {0x2f875, 16, 16, 6403}, + {0x0, 8, 9, 6403}, + {0x0, 1, 2, 6404}, + {0x2f876, 16, 16, 6405}, + {0x2f877, 16, 16, 6405}, + {0x0, 0, 1, 6405}, + {0x2f879, 16, 16, 6406}, + {0x0, 13, 14, 6406}, + {0x2f87a, 16, 16, 6407}, + {0x0, 0, 15, 6407}, + {0x0, 4, 7, 6422}, + {0x2f87b, 16, 16, 6425}, + {0x0, 3, 4, 6425}, + {0x2f87c, 16, 16, 6426}, + {0x2f87d, 16, 16, 6426}, + {0x0, 11, 15, 6426}, + {0x2f87e, 16, 16, 6430}, + {0x2f87f, 16, 16, 6430}, + {0x0, 12, 13, 6430}, + {0x2f880, 16, 16, 6431}, + {0x0, 1, 3, 6431}, + {0x2f881, 16, 16, 6433}, + {0x2f882, 16, 16, 6433}, + {0x0, 2, 15, 6433}, + {0x0, 15, 16, 6446}, + {0x2f883, 16, 16, 6447}, + {0x0, 13, 14, 6447}, + {0x2f884, 16, 16, 6448}, + {0x0, 8, 9, 6448}, + {0x2f885, 16, 16, 6449}, + {0x0, 13, 14, 6449}, + {0x2f886, 16, 16, 6450}, + {0x0, 9, 10, 6450}, + {0x2f887, 16, 16, 6451}, + {0x0, 2, 3, 6451}, + {0x2f888, 16, 16, 6452}, + {0x0, 1, 12, 6452}, + {0x0, 8, 10, 6463}, + {0x0, 3, 4, 6465}, + {0x2f889, 16, 16, 6466}, + {0x0, 12, 13, 6466}, + {0x2f88a, 16, 16, 6467}, + {0x0, 0, 7, 6467}, + {0x2f88b, 16, 16, 6474}, + {0x2f88c, 16, 16, 6474}, + {0x2f88d, 16, 16, 6474}, + {0x0, 0, 7, 6474}, + {0x0, 9, 10, 6481}, + {0x0, 2, 3, 6482}, + {0x2f88f, 16, 16, 6483}, + {0x0, 14, 15, 6483}, + {0x2f890, 16, 16, 6484}, + {0x0, 3, 4, 6484}, + {0x0, 1, 2, 6485}, + {0x2f892, 16, 16, 6486}, + {0x0, 1, 5, 6486}, + {0x2f98b, 16, 16, 6490}, + {0x0, 2, 3, 6490}, + {0x2f895, 16, 16, 6491}, {0x0, 7, 8, 6491}, - {0x1e1f, 16, 16, 6492}, - {0x0, 7, 8, 6492}, - {0x2f9bf, 16, 16, 6493}, - {0x0, 2, 5, 6493}, - {0xf73, 16, 16, 6496}, - {0xf75, 16, 16, 6496}, - {0x0, 8, 9, 6496}, - {0x2f83f, 16, 16, 6497}, - {0x0, 3, 5, 6497}, - {0x1f30, 16, 16, 6499}, - {0x1f31, 16, 16, 6499}, - {0x0, 15, 16, 6499}, - {0xf913, 16, 16, 6500}, - {0x0, 0, 11, 6500}, - {0x1e87, 16, 16, 6511}, - {0x0, 0, 2, 6511}, - {0x1fcd, 16, 16, 6513}, - {0x1fce, 16, 16, 6513}, - {0x175, 16, 16, 6513}, - {0x1e83, 16, 16, 6513}, - {0x1e81, 16, 16, 6513}, - {0x0, 12, 13, 6513}, - {0x2f8b8, 16, 16, 6514}, - {0x0, 5, 6, 6514}, - {0x1ffc, 16, 16, 6515}, - {0xfa45, 16, 16, 6515}, - {0x1e85, 16, 16, 6515}, - {0x0, 3, 9, 6515}, - {0x1ecc, 16, 16, 6521}, - {0x0, 0, 1, 6521}, - {0x0, 0, 1, 6522}, - {0x0, 11, 12, 6523}, - {0x0, 11, 12, 6524}, - {0x0, 14, 15, 6525}, - {0xbcb, 16, 16, 6526}, - {0x1ea, 16, 16, 6526}, - {0x0, 0, 1, 6526}, - {0x0, 0, 1, 6527}, - {0x0, 3, 4, 6528}, - {0x0, 3, 4, 6529}, - {0x0, 8, 9, 6530}, - {0x22ac, 16, 16, 6531}, - {0x0, 1, 2, 6531}, - {0x0, 10, 11, 6532}, - {0x2f9f7, 16, 16, 6533}, - {0x0, 12, 13, 6533}, - {0xf956, 16, 16, 6534}, - {0x0, 0, 1, 6534}, - {0x0, 0, 1, 6535}, - {0x0, 3, 4, 6536}, - {0x0, 0, 1, 6537}, - {0x0, 8, 9, 6538}, - {0x4f8, 16, 16, 6539}, - {0x0, 12, 16, 6539}, - {0xf9e9, 16, 16, 6543}, - {0xf97e, 16, 16, 6543}, - {0x0, 14, 15, 6543}, - {0x2f8af, 16, 16, 6544}, - {0x21f, 16, 16, 6544}, - {0x1e98, 16, 16, 6544}, - {0x0, 1, 2, 6544}, - {0x1e3a, 16, 16, 6545}, - {0x0, 7, 8, 6545}, - {0x9cc, 16, 16, 6546}, - {0x0, 3, 15, 6546}, - {0x1e2a, 16, 16, 6558}, - {0x0, 5, 16, 6558}, - {0x2fa1a, 16, 16, 6569}, - {0x2f81a, 16, 16, 6569}, - {0x0, 7, 12, 6569}, - {0x2f929, 16, 16, 6574}, - {0x0, 2, 16, 6574}, - {0xf94f, 16, 16, 6588}, - {0x0, 14, 15, 6588}, - {0xf920, 16, 16, 6589}, - {0x0, 10, 11, 6589}, - {0x0, 14, 15, 6590}, - {0x2f9cb, 16, 16, 6591}, - {0xf9a0, 16, 16, 6591}, - {0x1e28, 16, 16, 6591}, - {0x0, 1, 2, 6591}, - {0x2f8da, 16, 16, 6592}, - {0x1e24, 16, 16, 6592}, - {0x2fa19, 16, 16, 6592}, - {0xf9db, 16, 16, 6592}, - {0x0, 0, 1, 6592}, - {0x0, 0, 1, 6593}, - {0x0, 3, 4, 6594}, - {0x0, 0, 3, 6595}, - {0x0, 7, 8, 6598}, - {0x122, 16, 16, 6599}, - {0x0, 0, 2, 6599}, - {0x1f2a, 16, 16, 6601}, - {0x1f2c, 16, 16, 6601}, - {0x0, 0, 1, 6601}, - {0x0, 0, 1, 6602}, - {0x0, 3, 4, 6603}, - {0x0, 4, 5, 6604}, - {0x0, 5, 6, 6605}, - {0x1f93, 16, 16, 6606}, - {0x0, 14, 15, 6606}, - {0xbca, 16, 16, 6607}, - {0x0, 6, 7, 6607}, - {0x2f912, 16, 16, 6608}, - {0x0, 5, 6, 6608}, - {0x2f9f6, 16, 16, 6609}, - {0x0, 3, 4, 6609}, - {0x2f8dd, 16, 16, 6610}, - {0xf96a, 16, 16, 6610}, - {0x0, 14, 15, 6610}, - {0x2f90f, 16, 16, 6611}, - {0x0, 9, 10, 6611}, - {0x374, 16, 16, 6612}, - {0x0, 6, 11, 6612}, - {0xf998, 16, 16, 6617}, - {0x0, 4, 5, 6617}, - {0xfa3d, 16, 16, 6618}, - {0x0, 2, 6, 6618}, - {0x1f26, 16, 16, 6622}, - {0x0, 7, 15, 6622}, - {0x2f8c4, 16, 16, 6630}, - {0x0, 0, 1, 6630}, - {0x2f922, 16, 16, 6631}, - {0x0, 1, 2, 6631}, - {0xf96d, 16, 16, 6632}, - {0x0, 1, 2, 6632}, - {0x1e6f, 16, 16, 6633}, - {0x0, 0, 1, 6633}, - {0x0, 0, 1, 6634}, - {0x0, 3, 4, 6635}, - {0x0, 4, 5, 6636}, - {0x0, 5, 6, 6637}, - {0x1fa4, 16, 16, 6638}, - {0x0, 0, 1, 6638}, - {0x0, 0, 1, 6639}, - {0x0, 3, 4, 6640}, - {0x0, 0, 4, 6641}, - {0x0, 1, 13, 6645}, - {0x17e, 16, 16, 6657}, - {0x1f90, 16, 16, 6657}, - {0x0, 0, 2, 6657}, - {0x1f5b, 16, 16, 6659}, - {0x1f5d, 16, 16, 6659}, - {0x0, 5, 6, 6659}, - {0xfa04, 16, 16, 6660}, - {0x1f6e, 16, 16, 6660}, - {0x0, 0, 1, 6660}, - {0x0, 0, 1, 6661}, - {0x0, 3, 4, 6662}, - {0x0, 0, 3, 6663}, - {0x0, 1, 13, 6666}, - {0x11f, 16, 16, 6678}, - {0x121, 16, 16, 6678}, - {0x1e21, 16, 16, 6678}, - {0x11d, 16, 16, 6678}, - {0x1f5, 16, 16, 6678}, - {0x0, 3, 4, 6678}, - {0x2f8bc, 16, 16, 6679}, - {0x17c, 16, 16, 6679}, - {0x17a, 16, 16, 6679}, - {0x1e91, 16, 16, 6679}, - {0x0, 1, 2, 6679}, - {0x2f8b5, 16, 16, 6680}, - {0xf9d7, 16, 16, 6680}, - {0x2f8c6, 16, 16, 6680}, - {0x1e7, 16, 16, 6680}, - {0x0, 4, 5, 6680}, - {0xf943, 16, 16, 6681}, - {0x0, 0, 1, 6681}, - {0x0, 0, 1, 6682}, - {0x0, 3, 4, 6683}, - {0x0, 0, 1, 6684}, - {0x0, 0, 10, 6685}, - {0x1ed7, 16, 16, 6695}, - {0x0, 0, 1, 6695}, - {0x0, 0, 1, 6696}, - {0x0, 3, 4, 6697}, - {0x0, 4, 5, 6698}, - {0x0, 5, 6, 6699}, - {0x1f8f, 16, 16, 6700}, - {0x1ed1, 16, 16, 6700}, - {0x1ed3, 16, 16, 6700}, - {0x0, 2, 14, 6700}, - {0xf95e, 16, 16, 6712}, - {0x2f801, 16, 16, 6712}, - {0x1ed5, 16, 16, 6712}, - {0xf905, 16, 16, 6712}, - {0x0, 0, 2, 6712}, - {0x1f6d, 16, 16, 6714}, - {0x1f6b, 16, 16, 6714}, - {0x0, 10, 11, 6714}, - {0x2f808, 16, 16, 6715}, - {0x0, 15, 16, 6715}, - {0x0, 0, 1, 6716}, - {0x0, 0, 1, 6717}, - {0x0, 12, 13, 6718}, - {0x0, 13, 14, 6719}, - {0x0, 5, 6, 6720}, - {0xcc0, 16, 16, 6721}, - {0x0, 0, 16, 6721}, - {0x214, 16, 16, 6737}, - {0x0, 11, 12, 6737}, - {0xf953, 16, 16, 6738}, - {0x1d3, 16, 16, 6738}, - {0x170, 16, 16, 6738}, - {0x16e, 16, 16, 6738}, - {0x0, 3, 14, 6738}, - {0x1e77, 16, 16, 6749}, - {0x0, 3, 14, 6749}, - {0x13c, 16, 16, 6760}, - {0x1e37, 16, 16, 6760}, - {0x0, 0, 1, 6760}, - {0x0, 0, 1, 6761}, - {0x0, 3, 4, 6762}, - {0x0, 1, 2, 6763}, - {0x0, 4, 5, 6764}, - {0x1fec, 16, 16, 6765}, - {0x0, 14, 15, 6765}, - {0x0, 4, 5, 6766}, - {0x2f859, 16, 16, 6767}, - {0x2f800, 16, 16, 6767}, - {0x1e3d, 16, 16, 6767}, - {0x0, 0, 1, 6767}, - {0x0, 3, 4, 6768}, - {0x0, 0, 1, 6769}, - {0x0, 9, 10, 6770}, - {0x0, 9, 10, 6771}, - {0x304e, 16, 16, 6772}, - {0x0, 11, 15, 6772}, - {0x2f87e, 16, 16, 6776}, - {0x2f8cb, 16, 16, 6776}, - {0x1e84, 16, 16, 6776}, - {0x0, 0, 1, 6776}, - {0x0, 0, 1, 6777}, - {0x0, 3, 4, 6778}, - {0x0, 0, 1, 6779}, - {0x0, 1, 2, 6780}, - {0x403, 16, 16, 6781}, - {0x173, 16, 16, 6781}, - {0x1ee6, 16, 16, 6781}, - {0xdc, 16, 16, 6781}, - {0x1ee5, 16, 16, 6781}, - {0x16c, 16, 16, 6781}, - {0x16a, 16, 16, 6781}, - {0x168, 16, 16, 6781}, - {0xdb, 16, 16, 6781}, - {0x0, 8, 11, 6781}, - {0x0, 0, 1, 6784}, - {0x0, 0, 1, 6785}, - {0x0, 6, 7, 6786}, - {0x0, 5, 6, 6787}, - {0x0, 4, 5, 6788}, - {0x626, 16, 16, 6789}, - {0x1e73, 16, 16, 6789}, - {0x0, 5, 7, 6789}, - {0xcc7, 16, 16, 6791}, - {0x0, 0, 1, 6791}, - {0x0, 0, 1, 6792}, - {0x0, 3, 4, 6793}, - {0x0, 0, 3, 6794}, - {0x0, 0, 11, 6797}, - {0x233, 16, 16, 6808}, - {0x1e8f, 16, 16, 6808}, - {0xcc8, 16, 16, 6808}, - {0xfd, 16, 16, 6808}, - {0x1ef3, 16, 16, 6808}, - {0x1ef9, 16, 16, 6808}, - {0x177, 16, 16, 6808}, - {0x0, 12, 13, 6808}, - {0x2f812, 16, 16, 6809}, - {0x1ef7, 16, 16, 6809}, - {0xff, 16, 16, 6809}, - {0x1e80, 16, 16, 6809}, - {0x0, 14, 15, 6809}, - {0x2f83c, 16, 16, 6810}, - {0x0, 2, 3, 6810}, + {0x2f896, 16, 16, 6492}, + {0x0, 0, 16, 6492}, + {0x0, 11, 12, 6508}, + {0x0, 8, 9, 6509}, + {0x2f897, 16, 16, 6510}, + {0x0, 1, 16, 6510}, + {0x0, 13, 14, 6525}, + {0x0, 10, 11, 6526}, + {0x2f898, 16, 16, 6527}, + {0x0, 2, 12, 6527}, + {0x2f899, 16, 16, 6537}, + {0x2f89a, 16, 16, 6537}, + {0x0, 3, 4, 6537}, + {0x2f89b, 16, 16, 6538}, + {0x0, 10, 11, 6538}, + {0x2f89c, 16, 16, 6539}, + {0x0, 13, 14, 6539}, + {0x2f89d, 16, 16, 6540}, + {0x0, 7, 8, 6540}, + {0x2f89e, 16, 16, 6541}, + {0x2f89f, 16, 16, 6541}, + {0x0, 1, 2, 6541}, + {0x2f8a0, 16, 16, 6542}, + {0x0, 1, 4, 6542}, + {0x0, 10, 11, 6545}, + {0x2f8a1, 16, 16, 6546}, + {0x0, 12, 13, 6546}, + {0x2f8a2, 16, 16, 6547}, + {0x0, 13, 14, 6547}, + {0x0, 4, 5, 6548}, + {0x2f8a4, 16, 16, 6549}, + {0x0, 7, 8, 6549}, + {0x2f8a5, 16, 16, 6550}, + {0x2f8a6, 16, 16, 6550}, + {0x2f8a9, 16, 16, 6550}, + {0x2f8a8, 16, 16, 6550}, + {0x0, 10, 11, 6550}, + {0x2f8aa, 16, 16, 6551}, + {0x0, 2, 3, 6551}, + {0x2f8ac, 16, 16, 6552}, + {0x0, 4, 16, 6552}, + {0x2f8ad, 16, 16, 6564}, + {0x2f8ae, 16, 16, 6564}, + {0x0, 14, 15, 6564}, + {0x2f8af, 16, 16, 6565}, + {0x0, 0, 12, 6565}, + {0x2f8b2, 16, 16, 6577}, + {0x2f8b3, 16, 16, 6577}, + {0x0, 13, 14, 6577}, + {0x2f8b4, 16, 16, 6578}, + {0x0, 1, 2, 6578}, + {0x2f8b5, 16, 16, 6579}, + {0x2f8b6, 16, 16, 6579}, + {0x0, 0, 1, 6579}, + {0x2f8b7, 16, 16, 6580}, + {0x0, 0, 16, 6580}, + {0x0, 12, 13, 6596}, + {0x2f8b8, 16, 16, 6597}, + {0x0, 13, 14, 6597}, + {0x2f8b9, 16, 16, 6598}, + {0x2f8ba, 16, 16, 6598}, + {0x0, 8, 9, 6598}, + {0x2f8bb, 16, 16, 6599}, + {0x0, 3, 4, 6599}, + {0x2f8bc, 16, 16, 6600}, + {0x0, 4, 5, 6600}, + {0x2f8bd, 16, 16, 6601}, + {0x0, 1, 2, 6601}, + {0x2f8be, 16, 16, 6602}, + {0x0, 2, 3, 6602}, + {0x2f8bf, 16, 16, 6603}, + {0x0, 5, 6, 6603}, + {0x2f8c0, 16, 16, 6604}, + {0x2f8c1, 16, 16, 6604}, + {0x0, 2, 15, 6604}, + {0x0, 14, 15, 6617}, + {0x2f8c2, 16, 16, 6618}, + {0x0, 9, 10, 6618}, + {0x2f8c3, 16, 16, 6619}, + {0x0, 7, 15, 6619}, + {0x2f8c4, 16, 16, 6627}, + {0x2f8c5, 16, 16, 6627}, + {0x2f8c6, 16, 16, 6627}, + {0x0, 12, 13, 6627}, + {0x2f8c7, 16, 16, 6628}, + {0x0, 12, 13, 6628}, + {0x2f8c9, 16, 16, 6629}, + {0x0, 0, 1, 6629}, + {0x0, 10, 11, 6630}, + {0x2f8ca, 16, 16, 6631}, + {0x2f8cb, 16, 16, 6631}, + {0x2f8cc, 16, 16, 6631}, + {0x0, 9, 10, 6631}, + {0x2f8cd, 16, 16, 6632}, + {0x0, 0, 10, 6632}, + {0x0, 9, 10, 6642}, + {0x2f8ce, 16, 16, 6643}, + {0x0, 8, 9, 6643}, + {0x2f8d0, 16, 16, 6644}, + {0x0, 4, 5, 6644}, + {0x2f8d1, 16, 16, 6645}, + {0x2f8d2, 16, 16, 6645}, + {0x2f8d3, 16, 16, 6645}, + {0x0, 0, 1, 6645}, + {0x2f8d4, 16, 16, 6646}, + {0x2f8d5, 16, 16, 6646}, + {0x0, 13, 14, 6646}, + {0x2f8d6, 16, 16, 6647}, + {0x0, 0, 14, 6647}, + {0x0, 5, 10, 6661}, + {0x2f8d7, 16, 16, 6666}, + {0x2f8d9, 16, 16, 6666}, + {0x0, 1, 2, 6666}, + {0x2f8da, 16, 16, 6667}, + {0x0, 3, 15, 6667}, + {0x2f8db, 16, 16, 6679}, + {0x2f8dc, 16, 16, 6679}, + {0x0, 5, 13, 6679}, + {0x0, 3, 4, 6687}, + {0x2f8dd, 16, 16, 6688}, + {0x0, 9, 10, 6688}, + {0x2f8de, 16, 16, 6689}, + {0x2f8df, 16, 16, 6689}, + {0x0, 5, 6, 6689}, + {0x2f8e0, 16, 16, 6690}, + {0x0, 2, 3, 6690}, + {0x2f8e1, 16, 16, 6691}, + {0x0, 6, 7, 6691}, + {0x0, 13, 14, 6692}, + {0x2f8e3, 16, 16, 6693}, + {0x2f8e4, 16, 16, 6693}, + {0x2f8e5, 16, 16, 6693}, + {0x0, 1, 15, 6693}, + {0x0, 4, 5, 6707}, + {0x2f8e6, 16, 16, 6708}, + {0x0, 13, 14, 6708}, + {0x2f8e7, 16, 16, 6709}, + {0x0, 2, 3, 6709}, + {0x2f8e8, 16, 16, 6710}, + {0x0, 3, 4, 6710}, + {0x2f8e9, 16, 16, 6711}, + {0x0, 10, 11, 6711}, + {0x2f8ea, 16, 16, 6712}, + {0x0, 8, 9, 6712}, + {0x2f8eb, 16, 16, 6713}, + {0x0, 10, 11, 6713}, + {0x0, 3, 4, 6714}, + {0x2f8ec, 16, 16, 6715}, + {0x2f8ed, 16, 16, 6715}, + {0x0, 1, 5, 6715}, + {0x0, 8, 9, 6719}, + {0x2f8ee, 16, 16, 6720}, + {0x0, 1, 2, 6720}, + {0x2f8ef, 16, 16, 6721}, + {0x0, 10, 11, 6721}, + {0x0, 7, 8, 6722}, + {0x2f8f0, 16, 16, 6723}, + {0x0, 4, 5, 6723}, + {0x2f8f1, 16, 16, 6724}, + {0x0, 14, 15, 6724}, + {0x2f8f2, 16, 16, 6725}, + {0x2f8f3, 16, 16, 6725}, + {0x0, 15, 16, 6725}, + {0x2f8f4, 16, 16, 6726}, + {0x2f8f6, 16, 16, 6726}, + {0x0, 8, 16, 6726}, + {0x0, 13, 14, 6734}, + {0x2f8f7, 16, 16, 6735}, + {0x0, 11, 12, 6735}, + {0x2f8f8, 16, 16, 6736}, + {0x0, 10, 11, 6736}, + {0x2f8f9, 16, 16, 6737}, + {0x0, 14, 15, 6737}, + {0x2f8fa, 16, 16, 6738}, + {0x0, 11, 12, 6738}, + {0x0, 12, 13, 6739}, + {0x2f8fb, 16, 16, 6740}, + {0x0, 15, 16, 6740}, + {0x2f8fc, 16, 16, 6741}, + {0x2f8fd, 16, 16, 6741}, + {0x0, 7, 8, 6741}, + {0x2f8fe, 16, 16, 6742}, + {0x2f8ff, 16, 16, 6742}, + {0x0, 4, 15, 6742}, + {0x2f900, 16, 16, 6753}, + {0x2f903, 16, 16, 6753}, + {0x2f904, 16, 16, 6753}, + {0x0, 5, 6, 6753}, + {0x2f905, 16, 16, 6754}, + {0x0, 1, 2, 6754}, + {0x0, 14, 15, 6755}, + {0x2f906, 16, 16, 6756}, + {0x2f907, 16, 16, 6756}, + {0x0, 15, 16, 6756}, + {0x2f908, 16, 16, 6757}, + {0x0, 14, 15, 6757}, + {0x2f909, 16, 16, 6758}, + {0x0, 3, 10, 6758}, + {0x0, 3, 4, 6765}, + {0x2f90a, 16, 16, 6766}, + {0x0, 7, 12, 6766}, + {0x2f90b, 16, 16, 6771}, + {0x2f90c, 16, 16, 6771}, + {0x0, 13, 14, 6771}, + {0x0, 1, 2, 6772}, + {0x2f90d, 16, 16, 6773}, + {0x0, 9, 10, 6773}, + {0x2f90e, 16, 16, 6774}, + {0x0, 14, 15, 6774}, + {0x2f90f, 16, 16, 6775}, + {0x0, 5, 9, 6775}, + {0x0, 14, 15, 6779}, + {0x2f910, 16, 16, 6780}, + {0x0, 14, 15, 6780}, + {0x2f911, 16, 16, 6781}, + {0x0, 6, 7, 6781}, + {0x2f912, 16, 16, 6782}, + {0x0, 9, 10, 6782}, + {0x2f913, 16, 16, 6783}, + {0x0, 11, 15, 6783}, + {0x2f914, 16, 16, 6787}, + {0x2f915, 16, 16, 6787}, + {0x0, 6, 7, 6787}, + {0x2f916, 16, 16, 6788}, + {0x0, 10, 11, 6788}, + {0x2f917, 16, 16, 6789}, + {0x2f918, 16, 16, 6789}, + {0x2f919, 16, 16, 6789}, + {0x0, 13, 14, 6789}, + {0x2f91a, 16, 16, 6790}, + {0x0, 5, 6, 6790}, + {0x2f91b, 16, 16, 6791}, + {0x2f91c, 16, 16, 6791}, + {0x0, 2, 16, 6791}, + {0x0, 6, 7, 6805}, + {0x0, 3, 4, 6806}, + {0x2f91d, 16, 16, 6807}, + {0x0, 12, 13, 6807}, + {0x2f91e, 16, 16, 6808}, + {0x0, 10, 11, 6808}, + {0x0, 11, 12, 6809}, + {0x2f91f, 16, 16, 6810}, + {0x2f920, 16, 16, 6810}, + {0x0, 5, 6, 6810}, + {0x2f921, 16, 16, 6811}, {0x0, 0, 1, 6811}, + {0x2f922, 16, 16, 6812}, {0x0, 0, 1, 6812}, - {0x0, 11, 12, 6813}, - {0x0, 13, 14, 6814}, - {0x0, 7, 8, 6815}, - {0xb94, 16, 16, 6816}, - {0x0, 10, 11, 6816}, - {0x0, 11, 12, 6817}, - {0x2f961, 16, 16, 6818}, + {0x0, 8, 9, 6813}, + {0x2f923, 16, 16, 6814}, + {0x0, 0, 1, 6814}, + {0x2f924, 16, 16, 6815}, + {0x0, 5, 6, 6815}, + {0x2f925, 16, 16, 6816}, + {0x0, 3, 4, 6816}, + {0x0, 5, 6, 6817}, + {0x2f926, 16, 16, 6818}, {0x0, 1, 2, 6818}, - {0x213, 16, 16, 6819}, - {0x0, 1, 12, 6819}, - {0x1a0, 16, 16, 6830}, - {0x0, 0, 9, 6830}, - {0x3ca, 16, 16, 6839}, - {0x0, 11, 12, 6839}, - {0xf9f5, 16, 16, 6840}, - {0x3af, 16, 16, 6840}, - {0x1f76, 16, 16, 6840}, - {0x1fd1, 16, 16, 6840}, - {0x1fd0, 16, 16, 6840}, - {0x1e99, 16, 16, 6840}, - {0x0, 1, 2, 6840}, - {0xf9ca, 16, 16, 6841}, - {0x0, 1, 2, 6841}, - {0x2f802, 16, 16, 6842}, - {0x0, 0, 1, 6842}, - {0x0, 0, 1, 6843}, - {0x0, 6, 7, 6844}, - {0x0, 5, 6, 6845}, - {0x0, 4, 5, 6846}, - {0x624, 16, 16, 6847}, - {0x20e, 16, 16, 6847}, - {0x0, 0, 1, 6847}, - {0x0, 0, 1, 6848}, - {0x0, 3, 4, 6849}, - {0x0, 4, 5, 6850}, - {0x0, 5, 6, 6851}, - {0x1fae, 16, 16, 6852}, - {0x0, 4, 5, 6852}, - {0x2f8bd, 16, 16, 6853}, - {0x0, 9, 10, 6853}, - {0x2f949, 16, 16, 6854}, - {0x0, 4, 5, 6854}, - {0xf9a8, 16, 16, 6855}, - {0x0, 3, 9, 6855}, - {0x1e01, 16, 16, 6861}, - {0x1ea1, 16, 16, 6861}, - {0x1ef8, 16, 16, 6861}, - {0x0, 0, 16, 6861}, - {0x101, 16, 16, 6877}, - {0x105, 16, 16, 6877}, - {0x1f32, 16, 16, 6877}, - {0x0, 0, 1, 6877}, - {0x0, 3, 4, 6878}, - {0x0, 0, 1, 6879}, - {0x0, 9, 10, 6880}, - {0x0, 9, 10, 6881}, - {0x3069, 16, 16, 6882}, - {0x0, 1, 13, 6882}, - {0x139, 16, 16, 6894}, - {0x0, 12, 13, 6894}, - {0x2f9db, 16, 16, 6895}, - {0x0, 9, 10, 6895}, - {0xf96e, 16, 16, 6896}, - {0x0, 3, 4, 6896}, - {0x0, 0, 1, 6897}, - {0x2fa09, 16, 16, 6898}, - {0x0, 13, 14, 6898}, - {0xf99e, 16, 16, 6899}, - {0x0, 2, 3, 6899}, - {0x2f85e, 16, 16, 6900}, - {0x0, 13, 14, 6900}, - {0xf91f, 16, 16, 6901}, - {0x0, 13, 14, 6901}, - {0x2f91a, 16, 16, 6902}, - {0x13d, 16, 16, 6902}, - {0x0, 0, 1, 6902}, - {0x0, 3, 4, 6903}, - {0x0, 0, 1, 6904}, - {0x0, 9, 10, 6905}, - {0x0, 9, 10, 6906}, - {0x30f8, 16, 16, 6907}, - {0x0, 5, 6, 6907}, - {0x2f81d, 16, 16, 6908}, - {0x2f945, 16, 16, 6908}, - {0x0, 0, 1, 6908}, - {0x0, 3, 4, 6909}, - {0x0, 0, 1, 6910}, - {0x0, 9, 10, 6911}, - {0x0, 9, 10, 6912}, - {0x30fa, 16, 16, 6913}, - {0x0, 7, 12, 6913}, - {0xf929, 16, 16, 6918}, - {0x0, 14, 15, 6918}, - {0xf917, 16, 16, 6919}, - {0x0, 8, 12, 6919}, - {0xfa07, 16, 16, 6923}, - {0x0, 2, 6, 6923}, - {0x1f0e, 16, 16, 6927}, - {0x0, 0, 1, 6927}, - {0x0, 0, 1, 6928}, - {0x0, 3, 4, 6929}, - {0x0, 0, 1, 6930}, - {0x0, 1, 2, 6931}, - {0x45c, 16, 16, 6932}, - {0x1f88, 16, 16, 6932}, - {0x0, 0, 1, 6932}, - {0x0, 0, 1, 6933}, - {0x0, 3, 4, 6934}, - {0x0, 0, 1, 6935}, - {0x0, 0, 2, 6936}, - {0x1f4d, 16, 16, 6938}, - {0x1f4b, 16, 16, 6938}, - {0x0, 0, 1, 6938}, - {0x0, 0, 1, 6939}, - {0x0, 3, 4, 6940}, - {0x0, 3, 4, 6941}, - {0x0, 8, 9, 6942}, - {0x22eb, 16, 16, 6943}, - {0x0, 0, 1, 6943}, - {0x0, 0, 1, 6944}, - {0x0, 3, 4, 6945}, - {0x0, 3, 4, 6946}, - {0x0, 8, 9, 6947}, - {0x226e, 16, 16, 6948}, - {0x0, 0, 1, 6948}, - {0xf9cf, 16, 16, 6949}, - {0x0, 15, 16, 6949}, - {0x2f8f4, 16, 16, 6950}, - {0x0, 3, 5, 6950}, - {0x1f11, 16, 16, 6952}, - {0x1f10, 16, 16, 6952}, - {0x0, 0, 1, 6952}, - {0x0, 0, 1, 6953}, - {0x0, 3, 4, 6954}, - {0x0, 1, 2, 6955}, - {0x0, 3, 5, 6956}, - {0x1fe4, 16, 16, 6958}, - {0x2f9df, 16, 16, 6958}, - {0x1fe5, 16, 16, 6958}, - {0x0, 0, 1, 6958}, - {0x0, 3, 4, 6959}, - {0x0, 0, 1, 6960}, - {0x0, 9, 10, 6961}, - {0x0, 9, 10, 6962}, - {0x3067, 16, 16, 6963}, - {0x1f4c, 16, 16, 6963}, - {0x0, 6, 7, 6963}, - {0x0, 10, 11, 6964}, - {0xf987, 16, 16, 6965}, - {0x2f87f, 16, 16, 6965}, - {0x2f8d9, 16, 16, 6965}, + {0x0, 4, 5, 6819}, + {0x2f927, 16, 16, 6820}, + {0x2f928, 16, 16, 6820}, + {0x2f929, 16, 16, 6820}, + {0x0, 10, 12, 6820}, + {0x0, 12, 13, 6822}, + {0x2f92a, 16, 16, 6823}, + {0x0, 5, 6, 6823}, + {0x2f92b, 16, 16, 6824}, + {0x0, 8, 9, 6824}, + {0x2f92d, 16, 16, 6825}, + {0x0, 7, 8, 6825}, + {0x2f92e, 16, 16, 6826}, + {0x0, 12, 13, 6826}, + {0x2f92f, 16, 16, 6827}, + {0x0, 1, 2, 6827}, + {0x2f930, 16, 16, 6828}, + {0x2f931, 16, 16, 6828}, + {0x0, 10, 11, 6828}, + {0x2f932, 16, 16, 6829}, + {0x0, 1, 16, 6829}, + {0x0, 11, 12, 6844}, + {0x2f933, 16, 16, 6845}, + {0x0, 4, 5, 6845}, + {0x2f934, 16, 16, 6846}, + {0x0, 3, 10, 6846}, + {0x0, 6, 7, 6853}, + {0x2f935, 16, 16, 6854}, + {0x0, 14, 15, 6854}, + {0x2f936, 16, 16, 6855}, + {0x0, 2, 3, 6855}, + {0x2f937, 16, 16, 6856}, + {0x0, 15, 16, 6856}, + {0x2f939, 16, 16, 6857}, + {0x0, 0, 1, 6857}, + {0x2f93a, 16, 16, 6858}, + {0x0, 10, 12, 6858}, + {0x0, 1, 2, 6860}, + {0x2f93b, 16, 16, 6861}, + {0x0, 8, 9, 6861}, + {0x2f93c, 16, 16, 6862}, + {0x0, 0, 16, 6862}, + {0x0, 4, 16, 6878}, + {0x0, 4, 5, 6890}, + {0x2f93d, 16, 16, 6891}, + {0x0, 12, 13, 6891}, + {0x2f93e, 16, 16, 6892}, + {0x0, 0, 15, 6892}, + {0x0, 8, 9, 6907}, + {0x2f93f, 16, 16, 6908}, + {0x0, 4, 5, 6908}, + {0x2f940, 16, 16, 6909}, + {0x0, 2, 4, 6909}, + {0x2f941, 16, 16, 6911}, + {0x2f942, 16, 16, 6911}, + {0x0, 1, 4, 6911}, + {0x0, 9, 10, 6914}, + {0x2f943, 16, 16, 6915}, + {0x0, 3, 4, 6915}, + {0x2f944, 16, 16, 6916}, + {0x0, 14, 16, 6916}, + {0x2f945, 16, 16, 6918}, + {0x2f947, 16, 16, 6918}, + {0x0, 10, 11, 6918}, + {0x2f948, 16, 16, 6919}, + {0x0, 9, 10, 6919}, + {0x2f949, 16, 16, 6920}, + {0x0, 11, 12, 6920}, + {0x2f94a, 16, 16, 6921}, + {0x0, 6, 7, 6921}, + {0x2f94b, 16, 16, 6922}, + {0x0, 6, 7, 6922}, + {0x2f94c, 16, 16, 6923}, + {0x0, 1, 2, 6923}, + {0x0, 13, 14, 6924}, + {0x2f94d, 16, 16, 6925}, + {0x0, 14, 15, 6925}, + {0x2f94e, 16, 16, 6926}, + {0x2f950, 16, 16, 6926}, + {0x0, 3, 4, 6926}, + {0x2f951, 16, 16, 6927}, + {0x0, 2, 13, 6927}, + {0x0, 6, 7, 6938}, + {0x2f952, 16, 16, 6939}, + {0x0, 10, 11, 6939}, + {0x2f954, 16, 16, 6940}, + {0x0, 5, 6, 6940}, + {0x2f955, 16, 16, 6941}, + {0x0, 11, 12, 6941}, + {0x2f957, 16, 16, 6942}, + {0x0, 2, 3, 6942}, + {0x0, 15, 16, 6943}, + {0x2f958, 16, 16, 6944}, + {0x2f95a, 16, 16, 6944}, + {0x2f95b, 16, 16, 6944}, + {0x0, 7, 8, 6944}, + {0x0, 12, 13, 6945}, + {0x2f95c, 16, 16, 6946}, + {0x0, 10, 11, 6946}, + {0x0, 7, 8, 6947}, + {0x2f95e, 16, 16, 6948}, + {0x0, 14, 15, 6948}, + {0x2f95f, 16, 16, 6949}, + {0x0, 0, 11, 6949}, + {0x0, 2, 3, 6960}, + {0x2f960, 16, 16, 6961}, + {0x0, 10, 11, 6961}, + {0x0, 11, 12, 6962}, + {0x2f961, 16, 16, 6963}, + {0x2f962, 16, 16, 6963}, + {0x2f963, 16, 16, 6963}, + {0x0, 7, 8, 6963}, + {0x2f964, 16, 16, 6964}, + {0x0, 8, 9, 6964}, {0x0, 0, 1, 6965}, - {0xf990, 16, 16, 6966}, + {0x2f965, 16, 16, 6966}, + {0x2f966, 16, 16, 6966}, {0x0, 0, 1, 6966}, - {0x2f879, 16, 16, 6967}, - {0x1f73, 16, 16, 6967}, - {0x0, 7, 8, 6967}, - {0x2f9f0, 16, 16, 6968}, - {0x1f77, 16, 16, 6968}, - {0x1f71, 0, 1, 6968}, - {0x0, 3, 4, 6969}, - {0x0, 1, 2, 6970}, - {0x2f892, 16, 16, 6971}, + {0x2f967, 16, 16, 6967}, + {0x2f968, 16, 16, 6967}, + {0x2f969, 16, 16, 6967}, + {0x0, 0, 1, 6967}, + {0x2f96a, 16, 16, 6968}, + {0x0, 8, 9, 6968}, + {0x0, 6, 7, 6969}, + {0x2f96b, 16, 16, 6970}, + {0x0, 3, 4, 6970}, + {0x2f96c, 16, 16, 6971}, {0x0, 1, 2, 6971}, - {0x1e95, 16, 16, 6972}, - {0x0, 0, 1, 6972}, - {0x0, 0, 1, 6973}, - {0x0, 3, 4, 6974}, - {0x0, 4, 5, 6975}, - {0x0, 5, 6, 6976}, - {0x1fa5, 16, 16, 6977}, - {0x0, 0, 1, 6977}, - {0x0, 3, 4, 6978}, - {0x0, 4, 5, 6979}, - {0x0, 5, 6, 6980}, - {0x1fb4, 16, 16, 6981}, - {0xf925, 16, 16, 6981}, - {0xda, 16, 16, 6981}, - {0x0, 6, 10, 6981}, - {0xf9cc, 16, 16, 6985}, - {0xf9e4, 16, 16, 6985}, - {0x0, 3, 14, 6985}, - {0x145, 16, 16, 6996}, - {0x1e46, 16, 16, 6996}, - {0x0, 3, 4, 6996}, - {0x0, 5, 6, 6997}, - {0x2f926, 16, 16, 6998}, - {0x0, 2, 3, 6998}, - {0x1fc1, 16, 16, 6999}, - {0x0, 11, 12, 6999}, - {0x2f9ff, 16, 16, 7000}, - {0x0, 5, 6, 7000}, - {0x2f955, 16, 16, 7001}, - {0x0, 0, 1, 7001}, - {0x0, 0, 1, 7002}, - {0x0, 3, 4, 7003}, - {0x0, 0, 1, 7004}, - {0x0, 7, 8, 7005}, - {0x1e66, 16, 16, 7006}, - {0x0, 0, 1, 7006}, - {0x0, 0, 1, 7007}, + {0x2f96d, 16, 16, 6972}, + {0x0, 7, 8, 6972}, + {0x2f96e, 16, 16, 6973}, + {0x2f96f, 16, 16, 6973}, + {0x2f970, 16, 16, 6973}, + {0x0, 4, 5, 6973}, + {0x2f971, 16, 16, 6974}, + {0x0, 2, 14, 6974}, + {0x0, 8, 9, 6986}, + {0x2f972, 16, 16, 6987}, + {0x0, 7, 8, 6987}, + {0x2f973, 16, 16, 6988}, + {0x0, 9, 10, 6988}, + {0x2f974, 16, 16, 6989}, + {0x0, 9, 10, 6989}, + {0x2f975, 16, 16, 6990}, + {0x2f976, 16, 16, 6990}, + {0x0, 3, 4, 6990}, + {0x0, 14, 15, 6991}, + {0x2f977, 16, 16, 6992}, + {0x2f978, 16, 16, 6992}, + {0x0, 10, 11, 6992}, + {0x2f979, 16, 16, 6993}, + {0x0, 13, 14, 6993}, + {0x0, 10, 11, 6994}, + {0x2f97b, 16, 16, 6995}, + {0x0, 2, 11, 6995}, + {0x0, 3, 4, 7004}, + {0x2f97c, 16, 16, 7005}, + {0x2f97d, 16, 16, 7005}, + {0x0, 8, 9, 7005}, + {0x2f97e, 16, 16, 7006}, + {0x2f97f, 16, 16, 7006}, + {0x0, 15, 16, 7006}, + {0x2f980, 16, 16, 7007}, + {0x2f981, 16, 16, 7007}, + {0x0, 2, 3, 7007}, + {0x2f982, 16, 16, 7008}, {0x0, 3, 4, 7008}, - {0x0, 0, 1, 7009}, - {0x0, 8, 9, 7010}, - {0x4e6, 16, 16, 7011}, - {0x0, 1, 2, 7011}, - {0x1e3b, 16, 16, 7012}, - {0x0, 7, 8, 7012}, - {0x2f99e, 16, 16, 7013}, - {0x1e4a, 16, 16, 7013}, - {0xd9, 16, 16, 7013}, - {0x0, 3, 4, 7013}, - {0x1e7e, 16, 16, 7014}, - {0x0, 0, 1, 7014}, - {0x0, 0, 1, 7015}, - {0x0, 3, 4, 7016}, - {0x0, 0, 1, 7017}, - {0x0, 1, 9, 7018}, - {0x22d, 16, 16, 7026}, - {0x0, 0, 1, 7026}, - {0x0, 3, 4, 7027}, - {0x0, 0, 1, 7028}, - {0x0, 9, 10, 7029}, - {0x0, 9, 10, 7030}, - {0x30be, 16, 16, 7031}, - {0x1e4d, 16, 16, 7031}, - {0x1e4f, 16, 16, 7031}, - {0x0, 0, 1, 7031}, - {0x0, 0, 1, 7032}, - {0x0, 3, 4, 7033}, - {0x0, 3, 4, 7034}, - {0x0, 8, 9, 7035}, - {0x220c, 16, 16, 7036}, - {0x0, 4, 5, 7036}, - {0x2f84f, 16, 16, 7037}, - {0x0, 3, 12, 7037}, - {0xf931, 16, 16, 7046}, - {0x0, 3, 4, 7046}, - {0x2f849, 16, 16, 7047}, - {0x0, 0, 1, 7047}, - {0x0, 0, 1, 7048}, + {0x2f983, 16, 16, 7009}, + {0x0, 0, 7, 7009}, + {0x0, 11, 12, 7016}, + {0x2f984, 16, 16, 7017}, + {0x0, 14, 15, 7017}, + {0x2f985, 16, 16, 7018}, + {0x0, 5, 6, 7018}, + {0x2f986, 16, 16, 7019}, + {0x0, 10, 12, 7019}, + {0x0, 7, 8, 7021}, + {0x2f987, 16, 16, 7022}, + {0x0, 5, 6, 7022}, + {0x2f988, 16, 16, 7023}, + {0x0, 3, 13, 7023}, + {0x2f989, 16, 16, 7033}, + {0x2f98a, 16, 16, 7033}, + {0x2f98c, 16, 16, 7033}, + {0x0, 14, 15, 7033}, + {0x2f98d, 16, 16, 7034}, + {0x0, 11, 12, 7034}, + {0x2f98e, 16, 16, 7035}, + {0x0, 1, 14, 7035}, + {0x2f98f, 16, 16, 7048}, + {0x0, 11, 12, 7048}, + {0x2f990, 16, 16, 7049}, + {0x2f991, 16, 16, 7049}, {0x0, 3, 4, 7049}, - {0x0, 0, 1, 7050}, - {0x0, 0, 2, 7051}, - {0x1f1b, 16, 16, 7053}, - {0x1f1d, 16, 16, 7053}, - {0x0, 0, 1, 7053}, - {0x0, 0, 1, 7054}, - {0x0, 3, 4, 7055}, - {0x0, 0, 1, 7056}, - {0x0, 4, 5, 7057}, - {0x22b, 16, 16, 7058}, - {0x0, 8, 9, 7058}, - {0xfa38, 16, 16, 7059}, - {0x0, 7, 8, 7059}, - {0xc7, 16, 16, 7060}, - {0x0, 14, 15, 7060}, - {0x2f936, 16, 16, 7061}, - {0x0, 1, 9, 7061}, - {0xf948, 16, 16, 7069}, - {0x2f9d5, 16, 16, 7069}, - {0x0, 12, 13, 7069}, - {0x2f9a3, 16, 16, 7070}, - {0xf903, 16, 16, 7070}, - {0x2f8ed, 16, 16, 7070}, - {0x0, 8, 9, 7070}, - {0xf9b8, 16, 16, 7071}, - {0x0, 11, 12, 7071}, - {0x2f9da, 16, 16, 7072}, - {0x0, 0, 11, 7072}, - {0x2f9cf, 16, 16, 7083}, - {0x0, 0, 1, 7083}, - {0x0, 0, 1, 7084}, - {0x0, 3, 4, 7085}, - {0x0, 3, 4, 7086}, - {0x0, 8, 9, 7087}, - {0x2249, 16, 16, 7088}, - {0x0, 6, 8, 7088}, - {0x2f84b, 16, 16, 7090}, - {0x2f84d, 16, 16, 7090}, - {0x0, 6, 7, 7090}, - {0x2f821, 16, 16, 7091}, - {0x1ece, 16, 16, 7091}, - {0xd6, 16, 16, 7091}, - {0x22e, 16, 16, 7091}, - {0x14e, 16, 16, 7091}, - {0x14c, 16, 16, 7091}, - {0x0, 13, 14, 7091}, - {0x0, 10, 11, 7092}, - {0x2f97b, 16, 16, 7093}, - {0xd4, 16, 16, 7093}, - {0xd3, 16, 16, 7093}, - {0xd2, 16, 16, 7093}, - {0x1eb3, 16, 16, 7093}, - {0xfa40, 16, 16, 7093}, - {0x1eb5, 16, 16, 7093}, - {0x0, 13, 14, 7093}, - {0x2f854, 16, 16, 7094}, - {0x1eb1, 16, 16, 7094}, - {0x0, 14, 15, 7094}, - {0x2f890, 16, 16, 7095}, - {0x0, 8, 9, 7095}, - {0xfa67, 16, 16, 7096}, - {0x0, 10, 16, 7096}, - {0xdda, 16, 16, 7102}, - {0x0, 8, 9, 7102}, - {0xf9b4, 16, 16, 7103}, - {0xddc, 16, 16, 7103}, - {0xf9a1, 16, 16, 7103}, - {0x0, 0, 1, 7103}, - {0x0, 0, 1, 7104}, - {0x0, 3, 4, 7105}, - {0x0, 4, 5, 7106}, - {0x0, 5, 6, 7107}, - {0x1f8b, 16, 16, 7108}, - {0x0, 3, 4, 7108}, - {0x2f9f5, 16, 16, 7109}, - {0x0, 14, 15, 7109}, - {0x2f9b9, 16, 16, 7110}, - {0x20c, 16, 16, 7110}, - {0x0, 0, 1, 7110}, - {0x0, 0, 1, 7111}, - {0x0, 3, 4, 7112}, - {0x0, 3, 4, 7113}, - {0x0, 8, 9, 7114}, - {0x2284, 16, 16, 7115}, - {0x1d1, 16, 16, 7115}, - {0x150, 16, 16, 7115}, - {0x0, 7, 8, 7115}, - {0xfa5f, 16, 16, 7116}, - {0x0, 1, 13, 7116}, - {0x1e6, 16, 16, 7128}, - {0x0, 6, 7, 7128}, - {0x2f9fd, 16, 16, 7129}, - {0x0, 0, 1, 7129}, - {0x0, 5, 6, 7130}, - {0x2fa12, 16, 16, 7131}, - {0x0, 8, 10, 7131}, - {0x2fa04, 16, 16, 7133}, - {0xfa2c, 16, 16, 7133}, - {0x0, 15, 16, 7133}, - {0xf940, 16, 16, 7134}, - {0x0, 1, 2, 7134}, - {0xfa4b, 16, 16, 7135}, - {0x30d1, 16, 16, 7135}, - {0x0, 2, 11, 7135}, - {0x2f9f4, 16, 16, 7144}, - {0x0, 15, 16, 7144}, - {0xf94e, 16, 16, 7145}, - {0x0, 0, 1, 7145}, - {0x2f8d4, 16, 16, 7146}, - {0x1f00, 16, 16, 7146}, - {0x1f4, 16, 16, 7146}, - {0x11c, 16, 16, 7146}, - {0x1e20, 16, 16, 7146}, - {0x11e, 16, 16, 7146}, - {0x120, 16, 16, 7146}, - {0x0, 3, 4, 7146}, - {0x2f9f3, 16, 16, 7147}, - {0x0, 9, 10, 7147}, - {0xf9fb, 16, 16, 7148}, - {0x1fef, 16, 16, 7148}, - {0xf9ab, 16, 16, 7148}, - {0x0, 3, 4, 7148}, - {0xf94c, 16, 16, 7149}, - {0x0, 0, 1, 7149}, - {0x0, 0, 1, 7150}, - {0x0, 3, 4, 7151}, - {0x0, 4, 5, 7152}, - {0x0, 5, 6, 7153}, - {0x1f96, 16, 16, 7154}, - {0x0, 0, 1, 7154}, - {0x2f96a, 16, 16, 7155}, - {0x1f72, 16, 16, 7155}, - {0x0, 7, 12, 7155}, - {0x2f90c, 16, 16, 7160}, - {0x0, 0, 11, 7160}, - {0x2f9d1, 16, 16, 7171}, - {0x0, 0, 1, 7171}, - {0x0, 0, 1, 7172}, - {0x0, 3, 4, 7173}, - {0x0, 0, 1, 7174}, - {0x0, 1, 2, 7175}, - {0x40c, 16, 16, 7176}, - {0x0, 2, 12, 7176}, - {0x2f89a, 16, 16, 7186}, - {0x0, 7, 8, 7186}, - {0x123, 16, 16, 7187}, - {0x0, 5, 7, 7187}, - {0xf974, 16, 16, 7189}, - {0x2f996, 16, 16, 7189}, - {0x0, 3, 4, 7189}, - {0x1e93, 16, 16, 7190}, - {0x0, 2, 3, 7190}, - {0x1fe7, 16, 16, 7191}, - {0x0, 2, 3, 7191}, - {0x2f9fc, 16, 16, 7192}, - {0x2f90b, 16, 16, 7192}, - {0xf95a, 16, 16, 7192}, - {0x0, 3, 5, 7192}, - {0xfa02, 16, 16, 7194}, - {0x2f8b6, 16, 16, 7194}, - {0x0, 1, 2, 7194}, - {0x1e48, 16, 16, 7195}, - {0x4e4, 16, 16, 7195}, - {0x4e2, 16, 16, 7195}, - {0x0, 0, 1, 7195}, - {0x0, 0, 1, 7196}, - {0x0, 3, 4, 7197}, - {0x0, 3, 4, 7198}, - {0x0, 8, 9, 7199}, - {0x2278, 16, 16, 7200}, - {0x419, 16, 16, 7200}, - {0x0, 1, 2, 7200}, - {0x2f9c0, 16, 16, 7201}, - {0x2f899, 16, 16, 7201}, - {0x1e72, 16, 16, 7201}, - {0x0, 4, 5, 7201}, - {0xf98e, 16, 16, 7202}, - {0x0, 5, 6, 7202}, - {0x2f92b, 16, 16, 7203}, - {0x0, 0, 1, 7203}, - {0x2f9fa, 16, 16, 7204}, - {0x0, 3, 14, 7204}, - {0x1e0d, 16, 16, 7215}, - {0x0, 6, 7, 7215}, - {0x2f9f2, 16, 16, 7216}, - {0x1e11, 16, 16, 7216}, - {0x0, 14, 15, 7216}, - {0x2f851, 16, 16, 7217}, - {0x0, 6, 7, 7217}, - {0x2f9f9, 16, 16, 7218}, - {0x0, 2, 3, 7218}, - {0xf9f9, 16, 16, 7219}, - {0x0, 14, 15, 7219}, - {0xf9a5, 16, 16, 7220}, - {0x10f, 16, 16, 7220}, - {0x0, 2, 6, 7220}, - {0x1f0f, 16, 16, 7224}, - {0x1f89, 16, 16, 7224}, - {0x0, 15, 16, 7224}, - {0x0, 0, 1, 7225}, - {0x0, 0, 1, 7226}, - {0x0, 3, 4, 7227}, - {0x0, 0, 1, 7228}, - {0x0, 7, 8, 7229}, - {0x1e9b, 16, 16, 7230}, - {0x1e13, 16, 16, 7230}, - {0x0, 0, 3, 7230}, - {0x2f84a, 16, 16, 7233}, - {0xfa0d, 16, 16, 7233}, - {0x0, 1, 2, 7233}, - {0x2fa14, 16, 16, 7234}, - {0x0, 12, 13, 7234}, - {0x2f9ad, 16, 16, 7235}, - {0x0, 10, 12, 7235}, - {0xf9ff, 16, 16, 7237}, - {0x2f820, 16, 16, 7237}, - {0x0, 1, 2, 7237}, - {0x2f84e, 16, 16, 7238}, - {0x1fe8, 16, 16, 7238}, - {0x1e58, 16, 16, 7238}, - {0x1fe9, 16, 16, 7238}, - {0x1fea, 16, 16, 7238}, - {0x0, 13, 14, 7238}, - {0x2f8f7, 16, 16, 7239}, - {0x0, 0, 1, 7239}, - {0x0, 0, 1, 7240}, - {0x0, 3, 4, 7241}, - {0x0, 4, 5, 7242}, - {0x0, 5, 6, 7243}, - {0x1f97, 16, 16, 7244}, - {0x3ab, 16, 16, 7244}, - {0x0, 3, 4, 7244}, - {0xf9f1, 16, 16, 7245}, - {0x210, 16, 16, 7245}, - {0x2f9a2, 16, 16, 7245}, - {0x158, 16, 16, 7245}, - {0x0, 5, 6, 7245}, - {0x2f9c8, 16, 16, 7246}, - {0x0, 0, 2, 7246}, - {0x1fc8, 16, 16, 7248}, - {0x388, 16, 16, 7248}, - {0x0, 12, 13, 7248}, - {0xf9cb, 16, 16, 7249}, - {0x0, 1, 2, 7249}, - {0xfa62, 16, 16, 7250}, - {0x0, 9, 10, 7250}, - {0xf9a9, 16, 16, 7251}, - {0x0, 14, 15, 7251}, - {0xf9b6, 16, 16, 7252}, - {0x0, 5, 6, 7252}, - {0xf9e3, 16, 16, 7253}, - {0x0, 11, 12, 7253}, - {0xf9ce, 16, 16, 7254}, - {0x0, 3, 4, 7254}, - {0x1ef5, 16, 16, 7255}, + {0x2f992, 16, 16, 7050}, + {0x0, 1, 14, 7050}, + {0x2f993, 16, 16, 7063}, + {0x2f994, 16, 16, 7063}, + {0x2f995, 16, 16, 7063}, + {0x2f996, 16, 16, 7063}, + {0x0, 3, 4, 7063}, + {0x0, 12, 13, 7064}, + {0x2f997, 16, 16, 7065}, + {0x0, 13, 14, 7065}, + {0x2f999, 16, 16, 7066}, + {0x0, 3, 4, 7066}, + {0x2f99a, 16, 16, 7067}, + {0x0, 13, 14, 7067}, + {0x2f99b, 16, 16, 7068}, + {0x0, 3, 4, 7068}, + {0x2f99c, 16, 16, 7069}, + {0x0, 13, 14, 7069}, + {0x2f99d, 16, 16, 7070}, + {0x0, 7, 8, 7070}, + {0x2f99e, 16, 16, 7071}, + {0x0, 3, 4, 7071}, + {0x2f9a0, 16, 16, 7072}, + {0x2f9a1, 16, 16, 7072}, + {0x2f9a2, 16, 16, 7072}, + {0x0, 12, 13, 7072}, + {0x2f9a3, 16, 16, 7073}, + {0x0, 3, 14, 7073}, + {0x0, 6, 7, 7084}, + {0x2f9a4, 16, 16, 7085}, + {0x0, 6, 7, 7085}, + {0x0, 11, 12, 7086}, + {0x2f9a5, 16, 16, 7087}, + {0x0, 5, 6, 7087}, + {0x2f9a6, 16, 16, 7088}, + {0x0, 2, 16, 7088}, + {0x0, 11, 12, 7102}, + {0x2f9a7, 16, 16, 7103}, + {0x2f9a8, 16, 16, 7103}, + {0x2f9a9, 16, 16, 7103}, + {0x0, 6, 7, 7103}, + {0x2f9aa, 16, 16, 7104}, + {0x0, 0, 16, 7104}, + {0x0, 12, 13, 7120}, + {0x0, 10, 11, 7121}, + {0x2f9ab, 16, 16, 7122}, + {0x0, 4, 5, 7122}, + {0x2f9ac, 16, 16, 7123}, + {0x0, 2, 12, 7123}, + {0x0, 12, 13, 7133}, + {0x2f9ad, 16, 16, 7134}, + {0x0, 13, 14, 7134}, + {0x2f9ae, 16, 16, 7135}, + {0x0, 1, 12, 7135}, + {0x2f9af, 16, 16, 7146}, + {0x0, 1, 2, 7146}, + {0x2f9b0, 16, 16, 7147}, + {0x0, 13, 14, 7147}, + {0x0, 2, 3, 7148}, + {0x2f9b1, 16, 16, 7149}, + {0x2f9b2, 16, 16, 7149}, + {0x2f9b3, 16, 16, 7149}, + {0x0, 7, 10, 7149}, + {0x2f9b5, 16, 16, 7152}, + {0x2f9b6, 16, 16, 7152}, + {0x0, 9, 10, 7152}, + {0x2f9b7, 16, 16, 7153}, + {0x0, 8, 9, 7153}, + {0x2f9b8, 16, 16, 7154}, + {0x0, 14, 15, 7154}, + {0x2f9b9, 16, 16, 7155}, + {0x0, 2, 3, 7155}, + {0x2f9ba, 16, 16, 7156}, + {0x0, 9, 10, 7156}, + {0x2f9bb, 16, 16, 7157}, + {0x0, 8, 9, 7157}, + {0x2f9bc, 16, 16, 7158}, + {0x0, 11, 12, 7158}, + {0x2f9bd, 16, 16, 7159}, + {0x0, 6, 7, 7159}, + {0x2f9be, 16, 16, 7160}, + {0x0, 7, 8, 7160}, + {0x2f9bf, 16, 16, 7161}, + {0x0, 1, 2, 7161}, + {0x2f9c0, 16, 16, 7162}, + {0x0, 1, 2, 7162}, + {0x2f9c1, 16, 16, 7163}, + {0x0, 9, 10, 7163}, + {0x2f9c2, 16, 16, 7164}, + {0x0, 0, 4, 7164}, + {0x2f9c3, 16, 16, 7168}, + {0x2f9c4, 16, 16, 7168}, + {0x0, 6, 7, 7168}, + {0x0, 7, 8, 7169}, + {0x2f9c5, 16, 16, 7170}, + {0x0, 7, 15, 7170}, + {0x2f9c6, 16, 16, 7178}, + {0x2f9c7, 16, 16, 7178}, + {0x0, 3, 13, 7178}, + {0x0, 5, 6, 7188}, + {0x2f9c8, 16, 16, 7189}, + {0x2f9c9, 16, 16, 7189}, + {0x2f9ca, 16, 16, 7189}, + {0x0, 10, 11, 7189}, + {0x0, 14, 15, 7190}, + {0x2f9cb, 16, 16, 7191}, + {0x0, 6, 7, 7191}, + {0x0, 6, 7, 7192}, + {0x2f9cc, 16, 16, 7193}, + {0x0, 14, 15, 7193}, + {0x2f9cd, 16, 16, 7194}, + {0x0, 7, 8, 7194}, + {0x2f9ce, 16, 16, 7195}, + {0x2f9cf, 16, 16, 7195}, + {0x0, 13, 14, 7195}, + {0x2f9d0, 16, 16, 7196}, + {0x2f9d1, 16, 16, 7196}, + {0x0, 5, 6, 7196}, + {0x2f9d2, 16, 16, 7197}, + {0x0, 10, 11, 7197}, + {0x0, 8, 9, 7198}, + {0x2f9d3, 16, 16, 7199}, + {0x0, 11, 12, 7199}, + {0x2f9d4, 16, 16, 7200}, + {0x2f9d5, 16, 16, 7200}, + {0x0, 11, 12, 7200}, + {0x2f9d6, 16, 16, 7201}, + {0x0, 7, 8, 7201}, + {0x2f9d7, 16, 16, 7202}, + {0x0, 2, 3, 7202}, + {0x0, 15, 16, 7203}, + {0x2f9d8, 16, 16, 7204}, + {0x0, 0, 14, 7204}, + {0x0, 4, 5, 7218}, + {0x2f9d9, 16, 16, 7219}, + {0x0, 11, 12, 7219}, + {0x2f9da, 16, 16, 7220}, + {0x0, 12, 13, 7220}, + {0x2f9db, 16, 16, 7221}, + {0x0, 0, 1, 7221}, + {0x2f9dc, 16, 16, 7222}, + {0x0, 14, 15, 7222}, + {0x2f9dd, 16, 16, 7223}, + {0x0, 4, 5, 7223}, + {0x2f9de, 16, 16, 7224}, + {0x2f9df, 16, 16, 7224}, + {0x0, 5, 14, 7224}, + {0x0, 13, 15, 7233}, + {0x0, 2, 3, 7235}, + {0x2f9e0, 16, 16, 7236}, + {0x0, 13, 14, 7236}, + {0x2f9e1, 16, 16, 7237}, + {0x0, 4, 5, 7237}, + {0x2f9e2, 16, 16, 7238}, + {0x2f9e3, 16, 16, 7238}, + {0x0, 1, 12, 7238}, + {0x2f9e4, 16, 16, 7249}, + {0x0, 2, 3, 7249}, + {0x0, 14, 15, 7250}, + {0x2f9e5, 16, 16, 7251}, + {0x2f9e6, 16, 16, 7251}, + {0x2f9e7, 16, 16, 7251}, + {0x0, 7, 9, 7251}, + {0x2f9e8, 16, 16, 7253}, + {0x2f9e9, 16, 16, 7253}, + {0x0, 12, 13, 7253}, + {0x2f9ea, 16, 16, 7254}, + {0x0, 9, 10, 7254}, + {0x2f9eb, 16, 16, 7255}, {0x0, 1, 2, 7255}, - {0x1e49, 16, 16, 7256}, - {0x0, 0, 1, 7256}, - {0x0, 0, 1, 7257}, - {0x0, 3, 4, 7258}, - {0x0, 0, 1, 7259}, - {0x0, 0, 2, 7260}, - {0x1f1c, 16, 16, 7262}, - {0x1f1a, 16, 16, 7262}, - {0x0, 3, 4, 7262}, - {0xf99a, 16, 16, 7263}, - {0xe4, 16, 16, 7263}, - {0x1ea3, 16, 16, 7263}, - {0x0, 0, 1, 7263}, - {0x0, 3, 4, 7264}, - {0x0, 0, 1, 7265}, - {0x0, 9, 10, 7266}, - {0x0, 9, 10, 7267}, - {0x3054, 16, 16, 7268}, - {0x0, 1, 3, 7268}, - {0x2f856, 16, 16, 7270}, - {0x2f857, 16, 16, 7270}, - {0xe0, 16, 16, 7270}, - {0xe1, 16, 16, 7270}, - {0xe2, 16, 16, 7270}, - {0xe3, 16, 16, 7270}, - {0x0, 9, 10, 7270}, - {0x2f82c, 16, 16, 7271}, - {0x103, 16, 16, 7271}, - {0x227, 16, 16, 7271}, - {0x0, 0, 1, 7271}, - {0x0, 0, 1, 7272}, - {0x0, 3, 4, 7273}, - {0x0, 0, 1, 7274}, - {0x0, 0, 2, 7275}, - {0x1f13, 16, 16, 7277}, - {0x1f15, 16, 16, 7277}, - {0x0, 1, 2, 7277}, - {0x2f930, 16, 16, 7278}, - {0x0, 0, 2, 7278}, - {0x1f62, 16, 16, 7280}, - {0x1f64, 16, 16, 7280}, - {0x0, 2, 3, 7280}, - {0xf938, 16, 16, 7281}, - {0x0, 12, 13, 7281}, - {0xf93b, 16, 16, 7282}, - {0x0, 6, 7, 7282}, - {0xf935, 16, 16, 7283}, - {0x0, 0, 1, 7283}, + {0x0, 5, 6, 7256}, + {0x2f9ec, 16, 16, 7257}, + {0x0, 15, 16, 7257}, + {0x0, 10, 11, 7258}, + {0x2f9ed, 16, 16, 7259}, + {0x0, 11, 12, 7259}, + {0x2f9ee, 16, 16, 7260}, + {0x0, 9, 15, 7260}, + {0x0, 5, 6, 7266}, + {0x2f9ef, 16, 16, 7267}, + {0x0, 7, 8, 7267}, + {0x2f9f0, 16, 16, 7268}, + {0x0, 7, 8, 7268}, + {0x0, 7, 8, 7269}, + {0x2f9f1, 16, 16, 7270}, + {0x0, 6, 7, 7270}, + {0x2f9f2, 16, 16, 7271}, + {0x0, 3, 4, 7271}, + {0x2f9f3, 16, 16, 7272}, + {0x2f9f4, 16, 16, 7272}, + {0x0, 3, 4, 7272}, + {0x2f9f5, 16, 16, 7273}, + {0x0, 5, 6, 7273}, + {0x2f9f6, 16, 16, 7274}, + {0x0, 1, 2, 7274}, + {0x0, 10, 11, 7275}, + {0x2f9f7, 16, 16, 7276}, + {0x0, 6, 12, 7276}, + {0x0, 14, 15, 7282}, + {0x2f9f8, 16, 16, 7283}, + {0x0, 6, 7, 7283}, + {0x2f9f9, 16, 16, 7284}, {0x0, 0, 1, 7284}, - {0x0, 3, 4, 7285}, - {0x0, 4, 5, 7286}, - {0x0, 5, 6, 7287}, - {0x1f8c, 16, 16, 7288}, - {0x0, 0, 1, 7288}, - {0x0, 0, 1, 7289}, - {0x0, 3, 4, 7290}, - {0x0, 0, 1, 7291}, - {0x0, 2, 3, 7292}, - {0x1ed9, 16, 16, 7293}, - {0xe5, 16, 16, 7293}, - {0x1ce, 16, 16, 7293}, - {0x0, 11, 12, 7293}, - {0x2f9a7, 16, 16, 7294}, - {0x201, 16, 16, 7294}, - {0x0, 11, 12, 7294}, - {0x2f990, 16, 16, 7295}, - {0x0, 6, 7, 7295}, - {0x2f85c, 16, 16, 7296}, - {0x0, 0, 1, 7296}, - {0x0, 0, 1, 7297}, - {0x0, 3, 4, 7298}, - {0x0, 4, 5, 7299}, - {0x0, 5, 6, 7300}, - {0x1fa3, 16, 16, 7301}, + {0x2f9fa, 16, 16, 7285}, + {0x0, 0, 10, 7285}, + {0x0, 10, 11, 7295}, + {0x2f9fb, 16, 16, 7296}, + {0x0, 2, 3, 7296}, + {0x2f9fc, 16, 16, 7297}, + {0x0, 6, 7, 7297}, + {0x2f9fd, 16, 16, 7298}, + {0x0, 11, 12, 7298}, + {0x2f9ff, 16, 16, 7299}, + {0x0, 9, 10, 7299}, + {0x2fa00, 16, 16, 7300}, + {0x0, 11, 12, 7300}, {0x0, 6, 7, 7301}, - {0x2f9aa, 16, 16, 7302}, - {0x0, 6, 7, 7302}, - {0xf9b0, 16, 16, 7303}, - {0x0, 1, 3, 7303}, - {0x2f881, 16, 16, 7305}, - {0x2f882, 16, 16, 7305}, - {0x0, 2, 3, 7305}, - {0xf9c1, 16, 16, 7306}, - {0x0, 2, 7, 7306}, - {0xfa03, 16, 16, 7311}, - {0x0, 10, 11, 7311}, - {0x2f932, 16, 16, 7312}, - {0x2f966, 16, 16, 7312}, - {0x0, 10, 11, 7312}, - {0xf9ec, 16, 16, 7313}, - {0x1e50, 16, 16, 7313}, - {0x0, 6, 7, 7313}, - {0xfa61, 16, 16, 7314}, - {0x0, 1, 13, 7314}, - {0x109, 16, 16, 7326}, - {0x107, 16, 16, 7326}, - {0x10b, 16, 16, 7326}, - {0x0, 1, 2, 7326}, - {0x0, 0, 1, 7327}, - {0x0, 0, 1, 7328}, - {0x0, 6, 7, 7329}, - {0x0, 5, 6, 7330}, - {0x0, 4, 5, 7331}, - {0x6c2, 16, 16, 7332}, - {0x0, 2, 3, 7332}, - {0xf9bf, 16, 16, 7333}, - {0x0, 0, 1, 7333}, - {0x0, 0, 1, 7334}, - {0x2fa1d, 16, 16, 7335}, - {0x0, 3, 4, 7335}, - {0x1ef4, 16, 16, 7336}, - {0x0, 14, 15, 7336}, - {0x2f9dd, 16, 16, 7337}, - {0x0, 0, 4, 7337}, - {0x2f9c4, 16, 16, 7341}, - {0x0, 0, 1, 7341}, - {0x0, 0, 1, 7342}, - {0x0, 3, 4, 7343}, - {0x0, 4, 5, 7344}, - {0x0, 5, 6, 7345}, - {0x1f87, 16, 16, 7346}, - {0x2f9c3, 16, 16, 7346}, - {0x0, 11, 12, 7346}, - {0xf964, 16, 16, 7347}, - {0x0, 12, 15, 7347}, - {0xfa15, 16, 16, 7350}, - {0xf954, 16, 16, 7350}, - {0x0, 2, 3, 7350}, - {0xf946, 16, 16, 7351}, - {0x0, 0, 1, 7351}, - {0x0, 0, 1, 7352}, - {0x0, 3, 4, 7353}, - {0x0, 3, 4, 7354}, - {0x0, 8, 9, 7355}, - {0x2226, 16, 16, 7356}, - {0x1f79, 16, 16, 7356}, - {0x0, 0, 1, 7356}, - {0x0, 0, 1, 7357}, - {0x0, 3, 4, 7358}, - {0x0, 3, 4, 7359}, - {0x0, 8, 9, 7360}, - {0x21ce, 16, 16, 7361}, - {0x1d4, 16, 16, 7361}, - {0x1f7b, 16, 16, 7361}, - {0x10d, 16, 16, 7361}, - {0x0, 2, 10, 7361}, - {0x2f96f, 16, 16, 7369}, - {0xfa58, 16, 16, 7369}, + {0x2fa01, 16, 16, 7302}, + {0x2fa02, 16, 16, 7302}, + {0x0, 3, 13, 7302}, + {0x0, 3, 4, 7312}, + {0x2fa03, 16, 16, 7313}, + {0x2fa04, 16, 16, 7313}, + {0x0, 7, 8, 7313}, + {0x2fa05, 16, 16, 7314}, + {0x0, 2, 3, 7314}, + {0x2fa06, 16, 16, 7315}, + {0x2fa07, 16, 16, 7315}, + {0x0, 14, 15, 7315}, + {0x2fa08, 16, 16, 7316}, + {0x0, 3, 4, 7316}, + {0x0, 0, 1, 7317}, + {0x2fa09, 16, 16, 7318}, + {0x0, 2, 3, 7318}, + {0x2fa0a, 16, 16, 7319}, + {0x0, 0, 1, 7319}, + {0x2fa0b, 16, 16, 7320}, + {0x0, 13, 14, 7320}, + {0x2fa0c, 16, 16, 7321}, + {0x0, 12, 16, 7321}, + {0x0, 14, 15, 7325}, + {0x2fa0d, 16, 16, 7326}, + {0x0, 13, 14, 7326}, + {0x2fa0e, 16, 16, 7327}, + {0x0, 7, 8, 7327}, + {0x2fa0f, 16, 16, 7328}, + {0x0, 12, 13, 7328}, + {0x0, 14, 15, 7329}, + {0x2fa10, 16, 16, 7330}, + {0x0, 8, 9, 7330}, + {0x2fa11, 16, 16, 7331}, + {0x0, 0, 1, 7331}, + {0x0, 5, 6, 7332}, + {0x2fa12, 16, 16, 7333}, + {0x0, 0, 10, 7333}, + {0x0, 14, 15, 7343}, + {0x2fa13, 16, 16, 7344}, + {0x0, 1, 2, 7344}, + {0x2fa14, 16, 16, 7345}, + {0x0, 11, 12, 7345}, + {0x2fa15, 16, 16, 7346}, + {0x0, 5, 6, 7346}, + {0x0, 6, 7, 7347}, + {0x2fa16, 16, 16, 7348}, + {0x0, 9, 15, 7348}, + {0x2fa17, 16, 16, 7354}, + {0x2fa18, 16, 16, 7354}, + {0x0, 5, 16, 7354}, + {0x2fa19, 16, 16, 7365}, + {0x2fa1a, 16, 16, 7365}, + {0x0, 6, 7, 7365}, + {0x2fa1b, 16, 16, 7366}, + {0x0, 11, 12, 7366}, + {0x2fa1c, 16, 16, 7367}, + {0x0, 0, 1, 7367}, + {0x0, 0, 1, 7368}, + {0x2fa1d, 16, 16, 7369}, }; const unsigned short _wind_canon_next_table[] = { 1, 0, - 46, - 29, - 15, - 73, - 64, - 11, - 6, - 24, - 38, + 3716, 2, - 42, - 722, - 2119, + 1147, + 2397, + 2680, + 3010, + 3014, + 2998, + 3036, + 2994, + 3018, 3, - 140, - 1467, - 221, - 325, - 285, - 682, - 360, - 729, - 1610, - 635, - 106, - 2045, - 510, - 2830, - 0, + 467, + 431, + 608, + 745, 0, + 967, 0, 0, + 1010, 0, - 748, - 1101, - 4614, - 273, + 1040, + 1073, + 1104, 0, + 1136, + 622, 4, + 56, + 72, + 124, 0, 0, - 4440, + 624, + 638, + 417, + 397, + 424, + 404, 5, - 0, - 10, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 97, - 224, - 1388, - 270, - 249, - 1440, - 550, - 3741, - 2040, + 1158, + 16, + 159, + 22, + 1237, + 183, + 203, + 31, + 226, + 238, + 250, + 1309, + 40, + 46, + 6, 7, - 419, - 54, - 109, - 883, - 1230, - 275, - 336, - 4348, - 0, - 0, - 4568, - 3216, - 2891, - 0, - 0, - 0, - 0, - 1305, - 0, - 0, 8, - 4480, - 937, - 112, - 0, - 0, - 0, - 0, - 0, - 0, 9, - 1532, - 2106, - 1144, - 236, - 1215, - 1449, - 1624, - 0, - 0, + 528, + 145, + 10, + 11, 12, - 194, - 1718, - 1680, - 3611, - 217, - 398, 13, + 141, 0, - 0, - 0, - 0, - 4477, + 143, + 564, 14, - 2316, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 1544, + 15, 0, + 389, 0, 0, - 328, - 16, - 553, - 3511, + 526, 17, - 646, - 732, - 426, - 532, - 57, - 0, - 0, - 0, - 278, - 1790, - 0, - 0, - 658, - 695, - 2327, - 3451, - 3868, 18, - 666, - 4417, - 4518, - 391, - 1640, - 1458, - 567, - 340, - 2209, - 2458, - 1747, 19, + 149, + 0, 20, 21, - 22, 23, - 1307, - 304, - 1254, - 227, - 750, - 51, - 1120, - 1576, - 467, - 1270, - 2751, + 24, 25, - 1647, - 183, - 1785, - 363, - 1315, - 0, - 1982, - 0, - 0, - 2474, - 0, - 1656, - 0, - 4178, - 4486, 26, - 28, + 534, + 177, + 1221, 27, - 132, - 82, - 346, - 186, - 98, + 28, + 29, + 1602, + 171, 0, + 173, + 175, 30, + 1600, 0, 0, - 1028, - 0, - 1050, - 739, - 113, - 0, - 2135, - 1415, - 0, - 4020, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 4647, - 31, - 3197, + 181, 0, 0, + 532, 32, 33, 34, 35, + 540, + 221, + 1263, 36, 37, - 354, - 809, - 436, - 1736, + 38, + 215, + 217, + 0, + 219, + 225, 39, - 547, - 708, - 1945, - 850, - 367, - 594, - 1651, - 388, - 416, - 1251, - 705, - 4230, + 1635, 0, - 1894, 0, - 886, - 424, - 40, - 4586, - 2250, - 1941, + 391, 0, 0, - 4635, + 538, 41, - 1224, - 1391, - 813, - 1807, - 3757, - 308, - 442, + 42, 43, - 439, - 121, - 4198, - 1596, - 1298, - 529, - 1244, - 1948, - 4367, - 4591, - 2500, - 2808, - 0, - 0, - 0, + 44, 0, + 270, + 1331, + 498, + 268, 0, + 45, 0, 0, 0, - 4473, - 44, - 45, - 239, - 1073, - 1218, - 543, - 506, - 124, - 47, - 128, - 772, - 725, - 291, - 3715, - 357, - 3693, - 4339, - 759, + 1327, 0, - 2181, 0, 0, 0, - 3076, + 274, + 47, 48, - 2065, - 0, - 3213, 49, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1375, 50, - 1333, - 0, - 1993, - 1665, - 0, + 381, + 463, + 51, 52, - 0, - 0, - 1352, - 0, - 3457, 53, - 1249, - 55, - 0, - 0, - 0, - 1627, - 0, - 0, + 54, + 276, 0, + 278, + 592, + 55, + 1641, 0, - 1920, - 56, - 2143, + 280, + 393, 0, 0, + 544, + 1356, 0, + 282, + 300, + 320, + 57, + 1476, + 350, + 1504, + 66, + 365, 58, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 2970, 59, 60, 61, + 385, + 346, + 1446, 62, 63, - 65, - 0, - 0, - 0, - 1683, - 403, - 1593, - 1555, - 862, - 2420, - 151, - 259, - 1010, - 2377, - 2719, - 385, - 2542, - 0, - 0, + 64, + 336, + 338, 0, - 826, - 894, - 66, - 610, + 340, 0, - 2676, - 513, - 90, - 452, - 1152, - 1560, - 470, - 3342, + 65, + 1699, + 342, + 344, + 395, 0, 0, + 554, 67, - 0, - 4191, - 0, - 4103, - 0, - 0, - 0, - 0, - 0, - 0, - 1443, 68, 69, 70, + 0, + 1725, + 1723, 71, - 72, - 539, - 985, - 74, - 1870, + 362, + 1731, + 606, 0, - 675, - 1542, - 75, 0, - 1085, - 210, - 2259, - 2582, - 498, - 295, + 1518, + 364, + 1729, + 2369, + 73, + 1164, + 84, + 165, + 90, + 1243, + 189, + 209, + 99, + 232, + 244, + 256, + 1315, + 108, + 114, + 74, + 75, 76, - 0, - 3605, - 0, - 0, - 4323, - 0, - 0, - 0, - 0, - 1741, 77, + 530, + 147, 78, 79, 80, 81, - 2790, - 587, - 0, + 142, 0, - 978, - 1368, + 144, + 565, + 82, + 1545, 83, - 4492, - 0, - 0, - 161, - 2601, - 0, - 0, - 628, - 4245, - 2052, - 0, - 0, - 0, 0, + 390, 0, 0, - 2488, - 2098, - 1037, - 84, + 527, 85, 86, 87, + 151, + 0, 88, 89, - 372, - 0, - 154, - 0, - 3528, - 0, - 1493, - 0, 91, - 0, - 1275, - 0, - 4271, - 0, - 2079, 92, 93, 94, + 536, + 179, + 1223, 95, 96, - 3288, - 1345, - 1907, - 99, - 1176, - 2738, - 0, - 3255, - 0, - 0, - 0, + 97, + 1603, + 172, 0, + 174, + 176, + 98, + 1601, 0, - 1615, - 2341, - 764, 0, + 182, 0, - 1103, 0, - 1711, - 2982, + 533, 100, - 143, - 0, - 4150, - 0, - 0, - 0, - 3444, 101, 102, 103, + 542, + 223, + 1265, 104, 105, - 527, - 881, - 0, - 0, - 0, + 106, + 216, + 218, 0, + 220, 0, 107, + 1636, 0, 0, - 0, - 4111, - 4319, - 0, - 2519, - 2853, - 108, - 1939, + 392, 0, 0, + 539, + 109, 110, - 0, - 0, - 0, - 0, - 3917, - 0, - 0, - 0, - 2192, - 1883, - 1470, - 1202, 111, - 318, + 112, 0, + 272, + 1333, + 499, + 269, 0, + 113, 0, 0, 0, + 1328, 0, 0, 0, - 114, - 2770, - 0, 0, + 275, 115, 116, 117, 118, + 383, + 465, 119, 120, - 4389, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 2672, - 0, - 2002, - 0, - 0, + 121, 122, - 123, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 277, 0, + 279, + 593, + 123, + 1642, 0, + 281, + 394, 0, 0, + 545, + 1362, 0, - 179, - 925, + 288, + 306, + 326, 125, - 0, - 0, - 1310, - 0, - 1686, - 0, - 0, - 1571, - 3387, - 4056, - 1539, - 0, - 0, - 3187, + 1482, + 356, + 1510, + 134, + 371, 126, - 0, - 954, 127, - 1047, - 0, - 0, - 1771, - 0, - 0, - 3590, - 0, - 3849, - 3246, - 0, - 0, + 128, 129, - 0, - 0, - 433, + 387, + 348, + 1448, 130, 131, - 3069, + 132, + 337, + 339, + 0, + 341, + 0, 133, - 197, - 168, - 1797, + 1700, + 343, + 345, + 396, 0, 0, - 579, - 1377, - 445, - 2552, - 460, - 2528, - 1957, - 1845, - 134, - 2847, - 901, - 1326, - 3859, - 3234, - 1193, - 993, - 753, - 3534, - 520, - 2171, - 2023, + 555, 135, 136, 137, 138, 0, - 4306, - 181, - 182, - 0, - 0, - 0, - 0, - 180, - 0, - 0, - 0, - 0, + 1727, + 1724, 139, - 842, - 1889, - 1537, - 0, - 2198, - 3252, + 363, + 1732, + 607, 0, 0, + 1519, + 140, + 1730, + 1534, + 1542, 0, - 2711, - 3762, - 3357, - 4313, - 4259, - 141, - 142, - 144, - 145, - 146, - 147, - 160, + 1156, 0, 0, + 146, + 1543, 0, - 150, + 1157, 0, - 149, 0, 148, - 3760, - 0, - 0, + 150, + 153, 0, - 152, 0, 0, 0, + 155, 0, 0, 0, 0, - 2861, - 153, - 155, - 156, 157, - 158, - 159, - 1382, - 1759, + 152, + 154, 0, 0, 0, 0, + 156, 0, 0, 0, 0, + 158, + 160, + 161, + 162, + 163, 0, + 1192, + 1196, + 1190, 0, 0, 0, 0, - 162, - 163, 164, - 165, 166, - 0, - 958, - 799, 167, + 168, + 169, 0, - 175, - 0, + 1194, + 1198, + 1191, 0, 0, 0, 0, - 177, - 4413, - 312, - 479, - 792, - 561, - 169, - 3769, - 3920, - 1487, - 230, - 1065, - 2427, - 3365, - 573, - 1452, - 204, 170, - 171, - 172, - 962, - 1366, - 173, - 2855, - 174, + 1598, 0, 0, 0, - 176, + 566, 178, 0, 0, 0, 0, - 220, - 3165, - 0, - 2515, - 4072, - 0, - 3470, - 2736, - 685, - 0, - 0, + 1219, + 1599, 0, - 4065, - 956, - 1426, - 184, - 185, - 1529, - 1199, 0, 0, + 567, + 180, 0, 0, 0, 0, - 1294, - 252, + 1220, + 184, + 185, + 186, 187, - 406, - 263, - 802, - 3985, - 0, - 0, 0, + 199, + 496, 188, 0, + 1249, 0, + 195, + 197, 0, - 2521, 0, 0, - 4211, - 4207, - 1549, - 4210, - 189, + 0, + 457, 190, 191, - 3706, 192, 193, - 195, - 4482, 0, + 201, + 497, + 194, 0, + 1250, 0, - 4447, 196, - 3144, - 0, 198, - 1689, - 1971, - 3023, - 3687, - 844, - 1257, - 816, - 2650, - 199, + 0, + 0, + 0, + 0, + 458, 200, - 201, - 1569, 202, - 623, - 1006, - 203, + 204, 205, 206, 207, - 2194, - 208, - 2835, - 209, - 0, - 0, - 0, - 0, 0, + 1253, + 208, 0, 0, 0, 0, - 1869, - 2545, - 2111, + 1251, + 1257, 0, 0, - 4458, - 3207, 0, - 0, - 3111, - 491, - 243, + 562, + 210, 211, 212, 213, - 214, - 215, - 216, - 218, 0, + 1255, + 1530, + 214, 0, - 3956, - 4074, 0, 0, 0, - 2374, + 1252, + 1258, 0, - 2864, 0, - 2217, 0, - 4093, - 219, - 4624, + 563, + 1637, 0, 0, 0, 0, - 3181, + 222, + 1638, 0, 0, 0, 0, + 224, + 227, + 228, + 229, + 230, + 231, + 233, + 234, + 235, + 236, + 237, 0, - 1313, 0, 0, - 222, - 223, - 225, 0, - 960, 0, 0, 0, 0, - 3964, 0, - 2070, + 495, + 239, + 240, + 241, + 459, 0, + 242, + 1283, + 1281, 0, - 3710, - 3722, - 1821, - 226, - 228, 0, - 2337, - 2010, - 1739, - 3930, 0, - 2844, + 243, + 245, + 246, + 247, + 461, 0, - 2205, + 248, + 1285, + 1282, 0, - 4089, - 229, - 231, - 232, - 233, - 234, - 2125, - 1147, - 1504, - 1852, - 1853, - 1854, - 1855, - 1856, 0, - 1857, 0, - 1858, - 1859, + 249, + 251, + 252, + 253, + 254, 0, + 262, + 1303, + 255, 0, - 235, 0, 0, - 1893, - 2151, 0, 0, - 2478, 0, - 237, 0, 0, 0, 0, + 266, + 257, + 258, + 259, + 260, 0, + 264, + 1305, + 261, 0, 0, - 3627, - 238, - 3084, 0, 0, 0, - 240, - 3098, 0, - 3417, 0, - 2733, - 288, - 4042, - 241, 0, - 3183, - 242, - 244, - 245, - 246, - 247, - 248, - 1464, - 1829, 0, - 2409, - 4575, - 250, 0, - 1026, + 267, + 1287, 0, 0, 0, + 263, 0, - 422, - 3040, - 3298, - 3659, - 311, 0, 0, 0, 0, + 1307, + 1288, 0, 0, 0, + 265, 0, - 251, - 3254, - 1774, 0, 0, 0, - 253, 0, - 378, + 1308, + 1329, 0, - 2976, 0, 0, + 271, 0, 0, 0, - 2353, - 254, - 255, - 256, - 4532, - 257, - 262, - 258, - 3195, - 260, 0, 0, - 2060, + 1335, + 1330, 0, 0, 0, + 273, 0, - 3061, - 261, - 4183, 0, 0, 0, - 2127, 0, + 1336, + 283, + 284, + 285, + 286, + 550, + 294, + 1387, + 287, 0, 0, - 1703, - 2090, - 1263, - 4685, - 4693, - 264, - 265, - 266, - 267, - 268, - 269, - 1017, - 644, - 271, - 4507, - 4332, 0, 0, - 3482, - 3765, - 3492, - 3442, - 3526, - 3205, - 2857, - 2559, - 701, - 272, - 307, 0, + 1370, 0, 0, 0, 0, + 298, 0, 0, + 548, + 289, + 290, + 291, + 292, + 552, + 296, + 1389, + 293, 0, 0, 0, 0, - 274, - 2989, - 3322, 0, + 1371, 0, - 1608, - 4469, 0, 0, - 2068, - 302, - 1380, - 276, - 626, - 4351, - 277, - 3593, 0, + 299, 0, 0, + 549, + 1372, 0, 0, 0, + 295, + 1373, 0, 0, - 279, - 280, - 281, - 282, - 3789, 0, + 297, + 301, + 302, + 303, + 304, 0, + 314, + 305, + 312, 0, - 283, - 284, - 4369, 0, - 286, 0, 0, + 1391, 0, - 3021, - 3494, - 1812, 0, 0, - 2284, 0, + 318, + 307, + 308, + 309, + 310, 0, - 4465, - 287, - 289, - 290, - 1317, - 4386, - 2437, - 292, + 316, + 311, + 313, 0, 0, - 4656, - 293, - 294, - 2033, - 4164, - 296, - 3461, - 297, - 298, - 299, - 300, - 301, - 1015, 0, 0, - 1016, + 1392, 0, 0, - 303, - 1905, 0, - 2597, - 2301, - 305, - 2348, - 2104, - 3179, 0, - 3830, + 319, + 1393, 0, - 2359, - 306, - 309, 0, - 477, - 4208, - 310, - 313, - 314, + 558, 315, - 4099, - 316, - 4095, + 1394, + 0, + 0, + 559, 317, - 319, - 3561, - 320, 321, 322, - 3163, - 0, 323, + 332, + 0, 324, - 4595, - 326, - 4122, - 2012, + 1438, + 1436, 0, - 1788, - 719, 0, - 2058, + 560, + 325, 0, - 2075, 0, 0, 0, - 3390, - 327, - 1058, 0, - 712, - 408, + 1442, + 327, + 328, + 329, + 334, 0, + 330, + 1440, + 1437, 0, 0, - 329, - 1629, - 1110, - 330, - 2162, + 561, 331, - 332, - 333, - 334, - 335, 0, 0, 0, - 339, - 3940, 0, - 3286, 0, + 1443, + 1434, 0, - 337, - 4436, 0, - 1343, - 871, - 1287, 0, - 1301, - 3655, 0, - 2995, - 338, - 341, - 342, - 343, - 344, - 345, - 347, + 333, + 1435, + 1532, 0, 0, 0, + 335, + 1697, + 1444, 0, 0, 0, - 3013, + 347, 0, - 3885, - 3735, - 2293, - 919, - 348, 0, 0, 0, + 1450, + 1698, + 1445, + 0, + 0, 0, - 1396, - 2223, 349, - 350, + 0, + 0, + 0, + 0, + 1451, 351, 352, 353, - 2502, - 0, - 2168, - 1591, - 0, + 354, 0, + 1500, + 1492, + 1494, 355, 0, - 4411, - 4124, 0, - 1008, - 3222, - 402, 0, 0, + 1498, + 1496, + 357, + 358, + 359, + 360, 0, + 1502, + 1493, + 1495, + 361, 0, 0, 0, - 401, 0, + 1499, + 1497, 0, + 1533, + 366, + 367, + 368, + 369, 0, + 1522, + 1526, + 370, + 1520, 0, 0, - 356, - 3038, 0, - 2386, 0, + 377, 0, 0, 0, 0, + 379, + 372, + 373, + 374, + 375, 0, + 1524, + 1528, + 376, + 1521, 0, 0, - 358, - 359, - 2866, 0, 0, + 378, 0, 0, - 3271, 0, - 361, - 4641, - 362, - 4399, 0, - 364, + 380, + 546, 0, 0, 0, - 3883, 0, 0, 0, 0, 0, - 3876, 0, - 1922, - 2314, - 366, - 365, - 3249, - 1663, - 1241, - 1558, - 1903, - 2215, - 368, + 382, + 547, 0, - 4541, 0, - 687, 0, - 3490, - 370, - 369, - 371, - 373, - 374, - 375, - 376, - 377, - 379, - 380, - 381, - 382, - 865, 0, 0, - 1924, - 383, - 384, - 3670, 0, 0, 0, 0, + 384, + 556, 0, 0, 0, @@ -17083,361 +16580,245 @@ const unsigned short _wind_canon_next_table[] = { 0, 0, 386, - 387, - 1408, - 0, + 557, 0, - 2423, 0, 0, - 4484, 0, - 2946, 0, - 4633, - 389, - 1864, 0, 0, 0, - 1879, - 390, - 392, - 393, - 394, - 3865, 0, + 388, + 1643, + 580, + 568, 0, + 514, 0, - 395, - 396, 0, 0, - 397, + 398, 399, - 0, - 1969, - 0, - 3392, - 2333, 400, - 404, - 405, - 407, - 1019, - 0, + 401, + 402, + 415, + 411, 0, 0, - 2745, + 403, 0, - 1136, 0, - 415, 0, 0, 0, 0, 0, - 2949, - 835, - 409, - 410, - 411, - 412, 413, - 414, - 653, - 4423, - 4176, - 3845, + 1649, + 586, + 574, 0, + 520, 0, 0, - 417, 0, + 405, + 406, + 407, + 408, + 409, + 416, + 412, 0, 0, - 2599, - 2291, - 1934, + 410, 0, 0, - 3574, - 418, - 4616, - 420, - 4120, 0, - 1510, - 1862, - 762, - 1191, 0, 0, 0, 0, + 414, + 1546, 0, - 3095, - 3484, - 421, - 505, + 418, + 500, + 445, + 1178, 0, 0, + 1604, 0, 0, 0, 0, + 1267, + 419, + 420, + 421, + 422, 423, - 425, - 999, - 597, + 1552, 0, + 425, + 506, + 451, + 1184, 0, 0, + 1610, 0, 0, 0, 0, + 1273, + 426, 427, 428, 429, 430, - 3914, - 0, - 0, - 0, - 431, 432, - 434, - 435, - 437, - 1581, - 1239, - 0, - 3895, - 4677, - 0, - 3603, - 3274, - 0, - 0, - 1507, 0, 0, - 3082, - 438, - 0, 0, 0, 0, 0, + 488, 0, + 620, + 433, + 439, + 1225, + 1231, 0, 0, 0, 0, - 1726, - 4241, - 4357, - 703, + 594, + 600, + 434, + 435, + 436, + 437, + 438, 440, - 0, - 1043, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 2797, - 3720, 441, - 2824, - 0, - 2177, - 0, - 0, - 1092, - 1434, - 0, - 4525, - 4317, - 4409, - 0, + 442, 443, - 3123, - 459, 444, - 1512, - 0, - 855, 446, - 3312, - 970, - 0, + 447, + 448, + 449, + 512, 0, - 2722, 0, + 450, + 452, + 453, + 454, + 455, + 513, 0, 0, + 456, + 1279, 0, - 1838, - 447, - 448, - 449, - 450, - 451, - 1523, 0, 0, - 3410, 0, - 689, 0, - 453, 0, 0, 0, 0, 0, + 460, + 1280, 0, - 875, - 454, - 455, - 456, - 457, - 458, - 1727, 0, - 2305, - 928, - 485, - 461, 0, 0, - 2278, 0, 0, 0, 0, - 1823, - 462, - 463, - 464, - 465, - 466, - 1932, 0, 0, + 462, + 1639, 0, - 468, 0, 0, - 1303, 0, - 3423, - 469, - 4127, - 471, - 4136, + 464, + 1640, 0, 0, 0, 0, + 466, + 1577, + 1204, 0, 0, + 1341, + 1395, + 1408, + 1535, 0, 0, + 1674, + 481, 0, 0, - 2464, + 468, + 469, + 475, + 470, + 471, 472, 473, 474, - 475, 476, + 477, 478, + 479, 480, - 481, + 1707, + 0, + 0, + 0, + 0, + 0, + 0, 482, 483, - 0, - 3191, - 873, 484, + 485, 486, 487, - 488, 489, 490, - 0, - 0, - 497, + 491, 492, 493, 494, - 495, - 496, - 3810, - 0, - 0, - 0, - 0, - 0, - 604, - 2380, - 0, - 499, - 500, 501, 502, 503, 504, - 3552, - 1954, - 0, - 0, - 951, - 4236, - 3402, - 0, - 0, - 0, + 505, 507, - 0, - 0, - 2868, - 2608, - 0, - 0, - 0, - 0, - 0, 508, 509, - 3887, - 4146, - 0, - 0, + 510, 511, - 0, - 0, - 2252, - 0, - 2122, - 512, - 3117, - 0, - 0, - 0, - 0, - 1695, - 0, - 888, - 0, - 514, 515, 516, 517, @@ -17447,1077 +16828,824 @@ const unsigned short _wind_canon_next_table[] = { 522, 523, 524, - 0, - 1296, 525, - 0, - 0, - 0, - 0, - 0, - 526, - 528, - 2580, - 0, - 0, - 0, - 0, - 1991, - 0, - 0, - 0, - 530, + 529, 531, - 3472, - 786, - 3153, - 4618, - 3901, - 4217, - 2388, - 3042, - 2452, - 2697, - 533, - 2908, - 2873, - 1753, - 4083, - 1402, - 534, 535, - 536, 537, - 538, - 540, - 542, 541, - 2449, - 0, - 544, - 1667, - 934, - 0, - 2403, - 0, - 3160, - 0, - 868, - 0, - 1133, - 3542, - 2266, - 2186, - 545, - 546, - 548, - 4308, - 0, - 1670, - 1967, - 2289, - 0, - 0, - 0, - 0, - 0, - 0, - 3487, - 549, - 3702, - 0, - 0, - 0, - 2401, - 1428, - 0, - 672, - 1045, + 543, 551, - 4289, - 4500, - 552, - 941, - 554, - 1337, - 3724, - 2535, - 2509, - 1599, - 4665, - 779, - 1355, - 3614, - 4361, - 4597, - 3676, - 638, - 3948, - 555, - 556, - 557, - 1979, - 0, - 0, - 0, - 558, - 559, - 0, - 0, - 560, - 562, - 563, - 564, - 565, - 0, - 4475, - 1430, - 566, - 0, - 0, - 0, - 0, - 4488, - 568, + 553, 569, 570, 571, 572, - 574, + 573, 575, 576, - 1804, - 0, 577, 578, - 580, + 579, 581, 582, 583, 584, + 1337, 0, 0, - 0, - 4239, 585, - 586, - 1815, - 588, - 589, - 590, - 591, - 592, - 3190, - 593, - 3819, - 0, 0, - 2153, 0, 0, + 1339, + 587, + 588, + 589, + 590, + 1338, 0, - 770, 0, + 591, 0, 0, - 2688, 0, + 1340, 595, 596, + 597, 598, 599, - 600, 601, - 0, - 0, - 0, - 2004, 602, 603, + 604, 605, - 606, - 607, - 608, 609, - 3435, + 612, + 0, + 0, 0, 0, - 1585, 0, 0, + 2278, + 631, + 664, + 686, + 677, + 737, + 610, 611, 0, 0, - 617, - 612, - 613, + 0, + 0, + 0, + 0, 614, + 613, 615, 616, - 950, + 617, 618, 619, - 620, 621, - 940, - 622, - 624, - 0, - 0, - 0, + 623, + 2519, + 2500, + 2525, 625, + 626, 627, + 628, 629, - 1208, + 0, + 0, + 0, + 2282, + 2367, 630, - 631, + 2323, 632, - 633, - 634, - 3269, - 2006, 0, 0, 0, + 640, 0, - 3731, + 646, 0, - 4310, + 652, + 0, + 0, + 0, + 0, + 0, + 658, + 633, + 634, + 635, 636, - 637, - 639, - 640, - 641, - 642, - 643, - 645, - 1170, - 1320, + 1756, 0, 0, + 2280, + 2277, + 637, 0, 0, + 2276, 0, + 2275, + 2396, 0, - 1832, + 0, + 639, + 641, + 642, + 643, + 644, + 1795, + 2305, + 645, 647, 648, 649, 650, - 651, - 0, + 1834, 0, 0, - 2133, - 3450, - 652, + 2309, + 2307, + 651, + 653, 654, 655, - 4063, - 3782, - 0, - 0, 656, + 1877, + 2330, 657, - 2885, - 0, - 0, - 0, 0, 0, + 2329, 0, + 2328, 0, + 684, 659, 660, 661, 662, + 1916, + 2390, 663, + 2361, 0, 0, 0, - 2063, 665, - 664, + 0, + 0, + 0, + 671, + 0, + 0, + 2010, + 2012, + 2014, + 2016, + 666, 667, 668, 669, + 1955, + 2359, 670, - 671, - 674, 0, 0, + 2358, + 0, + 2357, + 0, + 685, + 672, 673, + 674, + 675, + 1988, + 0, + 0, + 2394, + 2392, 676, + 2346, 0, - 4679, - 677, + 0, + 0, + 718, + 0, + 0, + 0, + 731, 678, + 711, + 2018, + 2020, + 2022, 679, 680, 681, - 2966, - 3324, + 682, 0, 0, + 0, + 2326, + 2322, 683, + 2345, + 687, 0, - 4663, 0, 0, + 693, + 0, + 699, + 0, + 705, 0, 0, 0, - 1117, - 1149, - 1567, - 1865, - 684, - 686, + 0, + 0, + 724, 688, + 689, 690, 691, + 1733, + 0, + 0, + 2260, + 2009, 692, - 693, + 0, + 0, + 2252, + 0, + 2251, 694, + 695, 696, 697, + 1777, + 2011, 698, - 699, - 0, - 0, - 0, - 3891, 700, - 2696, + 701, 702, + 703, + 1812, 0, 0, - 0, - 0, - 2247, + 2290, + 2013, 704, 706, - 1228, - 800, - 0, - 2859, - 0, - 0, - 0, - 3278, - 711, - 0, - 0, - 0, - 0, - 0, - 0, 707, - 747, - 3266, - 0, - 0, - 4631, - 0, - 777, + 708, + 709, + 1855, 0, 0, + 2324, + 2015, + 710, 0, 0, + 2321, 0, - 709, + 2320, 0, - 1574, - 2565, - 710, - 1673, + 717, + 712, 713, 714, 715, - 716, - 717, - 718, - 720, - 0, - 721, - 3508, - 0, - 0, - 0, - 4626, - 0, - 723, - 1205, - 3975, - 0, - 1965, - 2339, - 776, - 0, - 0, - 0, - 0, - 0, - 0, 0, 0, 0, + 2355, + 2344, + 716, + 719, + 720, + 721, + 722, + 1933, 0, 0, + 2353, + 2019, + 730, 0, 0, + 2343, 0, - 724, - 2072, - 3816, + 2342, 0, - 2900, + 723, + 725, 726, - 0, - 0, - 0, - 0, - 0, - 4115, 727, 728, - 4321, + 1898, + 2017, + 729, + 732, + 733, + 734, + 735, + 1966, 0, 0, - 1499, - 1071, - 730, - 731, + 2376, + 2021, + 736, + 738, + 739, + 740, + 741, + 742, + 743, 0, 0, 0, 0, 0, - 3686, - 2394, - 2643, 0, + 744, + 760, + 746, + 779, + 787, + 821, + 807, 0, + 828, 0, 0, 0, 0, - 733, - 4157, - 734, - 735, - 736, - 737, - 738, - 4197, - 740, 0, + 869, + 912, + 853, 0, 0, + 754, 0, + 747, + 841, + 884, + 773, 0, + 767, 0, - 3966, - 1159, - 741, - 742, - 743, - 744, - 745, - 746, + 0, + 0, + 900, + 748, 749, - 2517, + 750, + 751, + 752, 0, 0, 0, - 3657, - 3893, 0, - 1363, 0, + 867, 0, - 751, - 752, - 754, + 753, 755, 756, - 1867, - 0, - 1168, 757, 758, - 760, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 2623, + 759, 761, + 762, 763, + 764, 765, 766, - 767, 768, 769, - 0, - 3768, + 770, 771, - 2350, + 772, + 774, + 775, + 776, + 777, + 778, 0, - 1289, 0, 0, + 896, 0, - 773, + 786, 0, - 2914, - 774, - 775, - 778, + 898, 780, + 0, + 0, + 0, + 943, + 0, + 0, + 0, + 955, + 0, + 925, 781, 782, 783, + 784, + 937, 0, + 785, 0, + 939, 0, - 4148, - 784, - 785, - 787, + 0, + 941, + 859, + 0, + 0, + 801, + 0, + 794, + 847, + 890, 788, - 789, - 2219, + 0, + 814, 0, 0, 0, + 906, + 789, 790, 791, + 792, + 820, 0, 0, - 798, + 0, + 897, + 0, 793, - 794, - 795, - 4643, 0, + 899, + 795, 796, 797, - 801, + 798, + 799, 0, 0, 0, 0, - 861, + 0, + 868, + 0, + 800, + 802, 803, 804, 805, 806, - 807, - 812, - 0, - 0, - 0, - 0, - 0, - 0, 808, - 1914, - 0, - 2611, - 0, - 0, + 809, 810, - 0, - 0, - 1432, - 3708, 811, - 1166, - 0, - 0, + 812, + 813, + 815, + 816, + 817, + 818, + 819, + 822, 0, - 1769, 0, 0, + 949, 0, 0, 0, - 814, - 841, - 815, - 817, - 818, - 819, - 820, + 961, 0, - 4659, + 931, 823, - 822, - 821, - 4098, + 824, 825, + 826, + 938, 0, - 0, - 824, - 834, - 833, 827, 0, + 940, 0, 0, - 0, - 2482, - 0, - 3996, - 0, - 3381, - 828, + 942, 829, + 835, 830, 831, 832, + 833, + 834, 836, 837, 838, 839, 840, + 842, 843, + 844, 845, 846, - 847, - 848, 0, - 1583, - 4046, + 882, + 848, 849, - 853, - 0, - 0, - 0, - 0, - 854, - 4005, + 850, 851, - 0, - 4545, - 0, - 4593, - 4394, - 0, - 0, - 2882, - 0, - 0, - 4672, 852, + 0, + 883, + 854, + 855, 856, 857, 858, - 859, - 860, - 1124, - 0, - 0, - 0, - 2433, - 2048, - 0, - 0, - 0, - 0, - 3569, 0, + 865, + 860, + 861, + 862, 863, 864, - 866, - 867, - 4516, - 0, - 0, - 0, - 0, - 0, 0, - 869, + 866, 870, + 876, + 871, 872, + 873, 874, - 876, + 875, 877, 878, 879, 880, - 4396, - 882, - 1658, - 0, - 2361, - 2656, - 0, - 0, - 884, - 0, - 1410, - 0, - 0, - 0, - 4205, - 916, - 0, - 915, - 0, - 918, - 917, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 881, 885, + 886, 887, + 888, 889, - 890, 891, 892, 893, - 2837, - 0, - 4562, - 0, - 1926, - 0, + 894, 895, - 0, - 3048, - 0, - 2627, - 0, - 3696, - 0, - 3645, - 896, - 897, - 898, - 899, - 900, + 901, 902, 903, 904, 905, - 1292, - 1638, - 1952, - 910, - 911, + 907, 908, 909, - 914, - 0, - 912, + 910, + 911, 913, - 906, - 907, - 0, - 0, - 947, - 0, - 0, - 948, + 919, + 914, + 915, + 916, + 917, + 918, 920, 921, 922, 923, 924, 926, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 2229, 927, + 928, 929, 930, - 931, 932, 933, + 934, 935, 936, - 939, - 0, - 0, - 0, - 0, - 938, - 942, - 943, 944, - 2311, - 0, - 0, - 0, 945, 946, - 0, - 0, - 949, + 947, + 948, + 950, + 951, 952, 953, - 955, + 954, + 956, 957, + 958, 959, - 961, - 966, - 967, - 968, - 969, + 960, + 962, 963, - 0, 964, 965, + 966, + 968, + 0, 976, - 977, 0, 0, - 1014, 0, 0, - 1013, + 0, + 0, + 0, + 997, + 990, + 969, + 970, 971, 972, 973, 974, 975, + 983, + 977, + 0, + 984, + 978, 979, - 2660, 980, 981, 982, - 983, - 4640, - 984, - 1126, - 0, - 0, - 0, + 985, 986, - 1472, - 0, 987, - 0, - 4686, 988, 989, - 990, + 1004, + 0, + 0, 991, 992, + 993, 994, 995, 996, - 997, 998, + 999, 1000, 1001, 1002, 1003, - 0, - 0, - 0, - 2368, 1005, - 1004, + 1006, 1007, + 1008, 1009, - 2233, - 0, - 0, 1011, - 1012, 1018, 0, 0, 0, - 1025, - 1020, - 1021, - 1022, - 1412, - 1023, - 0, - 0, - 2799, - 4403, - 1024, - 1123, - 0, - 1119, 0, 0, 0, 0, 0, + 1031, + 1012, + 1013, + 1014, + 1015, + 1016, + 1017, + 1019, 0, 0, + 1025, + 1020, + 1021, + 1022, + 1023, + 1024, + 1026, 1027, - 0, - 1036, - 2442, + 1028, 1029, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1078, 1030, - 0, - 0, - 3173, - 1031, 1032, 1033, 1034, 1035, + 1036, + 0, 1038, + 1037, 1039, - 1040, 1041, - 1042, - 1044, - 1046, 0, 0, 0, - 1094, - 1048, - 1049, - 1051, - 0, - 0, 0, + 1051, 0, - 4049, 0, + 1058, + 1042, + 1043, + 1044, + 1045, + 1048, 0, - 1184, + 1046, + 1047, + 1050, + 1049, 1052, 1053, 1054, 1055, 1056, - 0, - 3108, 1057, - 1281, 1059, + 1065, 1060, 1061, 1062, 1063, + 0, + 1071, 1064, 1066, 1067, 1068, 1069, 1070, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1142, 1072, - 3991, - 0, - 1987, - 0, - 0, - 2577, - 0, - 2879, - 0, 1074, - 1709, - 0, - 0, - 0, - 0, - 0, - 0, - 0, 0, 0, 0, 0, 0, 0, + 1081, + 1088, 1075, - 1077, - 0, 1076, + 1077, + 1078, 1079, 1080, - 1081, 1082, 1083, - 0, - 3836, 1084, - 1478, - 0, - 0, + 1085, 1086, - 1095, 1087, - 1088, 1089, - 1090, - 1091, - 1093, 0, 0, - 1109, + 0, + 1098, + 1090, + 1091, + 1092, 1096, + 1093, + 1094, + 1095, 1097, - 1098, 1099, 1100, + 1101, 1102, - 1104, + 1103, 1105, - 1106, - 1107, - 1108, - 1111, - 4603, - 1112, - 1113, - 1114, - 1115, - 1116, - 3852, - 0, - 0, - 0, 0, 0, 0, @@ -18526,583 +17654,311 @@ const unsigned short _wind_canon_next_table[] = { 0, 0, 0, + 1120, + 1106, + 1112, + 1107, + 1108, + 1109, + 1110, 0, 1118, - 2021, - 0, - 0, - 3625, - 0, - 0, - 2625, - 2303, - 2658, - 0, - 2589, - 2904, + 1111, + 1113, + 1114, + 1115, + 1116, + 1117, + 1119, + 1121, 0, 0, - 1121, + 1128, 1122, + 1123, + 1124, + 1125, + 1134, + 1126, 0, 0, 0, - 1207, - 1125, - 2923, - 0, - 3373, 0, 1127, - 1128, 1129, 1130, 1131, 1132, - 1134, + 1133, 1135, 1137, 1138, 1139, - 1484, 1140, - 0, - 0, - 2785, - 1143, 1141, - 2440, - 0, - 1810, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 1142, 1145, - 1146, - 1151, - 0, - 0, - 0, + 1143, 0, + 1144, + 1146, 1148, - 1222, 0, 0, 0, 0, 0, 0, - 1150, - 2414, 0, 0, - 3639, 0, 0, - 2494, 0, 0, + 0, + 1289, + 1736, + 1149, + 1150, + 1151, + 1152, 1153, 1154, 1155, - 1156, - 1157, - 1158, - 1214, - 3089, - 0, - 0, - 0, + 1159, 1160, 1161, 1162, + 0, + 1170, + 1174, 1163, - 1164, 1165, - 1204, - 0, - 0, - 0, + 1166, 1167, - 1169, - 0, - 0, + 1168, 0, - 1183, - 1171, 1172, + 1176, + 1169, + 1171, 1173, - 2506, - 0, - 0, - 0, - 1174, 1175, 1177, - 0, - 0, - 0, - 3127, - 0, - 0, - 0, - 1233, - 0, - 3545, - 1178, 1179, 1180, 1181, - 2768, - 0, 1182, - 0, - 2776, - 0, - 0, - 2818, + 1183, 1185, - 3803, 1186, 1187, 1188, - 3874, - 0, 1189, - 1190, - 1192, - 1194, - 1195, - 1196, - 1197, - 3087, - 3425, - 2425, - 2781, - 2782, - 2779, - 2780, - 2778, - 0, - 1201, - 2777, - 2769, - 1198, - 0, + 1193, 0, - 2823, 0, 0, - 2820, 1200, - 1203, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1223, - 1206, 0, 0, 0, 0, 0, + 1202, + 1195, 0, 0, 0, + 1201, 0, 0, 0, 0, 0, - 1227, + 1203, + 1197, + 1199, + 1205, + 1211, + 1206, + 1207, + 1208, 1209, 1210, - 1211, + 1217, 1212, 1213, + 1214, + 1215, 1216, - 0, - 0, - 0, - 0, - 0, - 3668, - 1217, - 2275, - 0, - 4212, - 0, - 0, - 1219, - 0, - 0, - 0, - 0, - 1660, - 1220, - 1221, - 4558, - 4353, - 0, - 0, - 0, - 1225, - 3785, - 1885, - 0, - 0, - 1520, - 0, - 0, - 3067, + 1218, + 1222, + 1224, 1226, + 1227, + 1228, 1229, - 1701, - 0, - 0, - 3309, - 2997, - 4002, - 3661, - 0, - 0, - 0, - 4397, - 0, - 0, - 4628, - 1231, + 1230, 1232, + 1233, 1234, 1235, 1236, - 1237, 1238, + 1239, 1240, - 1243, + 1241, 1242, - 3847, - 0, - 0, - 0, - 0, - 0, - 4392, - 0, - 1247, - 0, + 1244, 1245, - 1654, - 0, - 0, - 2575, 1246, + 1247, 1248, + 1254, 0, 0, 0, + 1259, 0, 0, 0, 0, - 1273, - 1250, - 4695, - 0, - 0, - 1252, - 1605, - 1253, - 4203, - 2043, - 2363, - 0, - 0, - 3420, 0, 0, + 1261, + 1256, 0, 0, 0, - 3935, - 1255, - 4451, + 1260, 0, - 2077, - 4228, 0, 0, 0, 0, 0, - 1256, - 1258, - 1259, - 1260, - 1261, 1262, - 1274, 1264, - 1265, 1266, - 1267, - 0, - 0, - 0, - 4445, - 1269, 1268, - 2906, - 0, - 0, + 1269, + 1270, 1271, - 0, - 0, - 0, - 0, - 0, - 1535, - 0, - 0, - 0, - 2783, 1272, + 1274, + 1275, 1276, 1277, 1278, - 1279, - 1280, - 1282, - 1283, 1284, - 1285, 1286, - 1288, 1290, - 1291, - 1293, - 3557, - 3556, 0, - 3560, - 1295, - 3525, + 1374, + 1421, 0, - 3524, 0, - 3523, - 3522, + 0, + 1564, + 1622, + 1661, + 1291, 1297, + 1292, + 1293, + 1294, + 1295, + 1296, + 1298, 1299, - 3319, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1394, 1300, + 1301, 1302, - 3571, - 0, - 0, - 0, 1304, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 3624, 1306, + 1310, + 1311, + 1312, + 1313, 0, + 1323, + 1314, 0, 0, - 1336, - 1308, - 0, - 0, - 0, - 0, - 0, - 0, - 3622, - 3889, - 0, - 0, - 2269, - 0, - 1622, - 1309, 0, 0, 0, + 1321, + 1316, + 1317, + 1318, + 1319, 0, + 1325, + 1320, 0, 0, 0, 0, 0, - 1335, - 1311, - 1312, - 1314, - 1316, - 1318, - 1319, - 1321, 1322, - 1323, 1324, - 0, - 0, - 0, - 2810, - 1325, + 1326, 1332, - 1327, - 1328, - 1329, - 1330, - 1331, 1334, - 1338, - 1339, - 1340, - 1341, 1342, + 1348, + 1343, 1344, - 3240, - 0, - 0, - 4006, - 0, + 1345, 1346, - 2690, - 2940, - 3138, - 0, - 4430, - 0, - 0, - 0, - 4251, 1347, - 1348, + 1354, 1349, 1350, - 1354, - 0, - 0, - 0, - 0, - 0, 1351, - 0, - 1362, + 1352, 1353, - 1356, + 1355, 1357, 1358, 1359, + 1360, + 1361, 0, 0, 0, - 4489, - 1361, - 1360, - 1365, 0, 0, + 1368, + 1363, 1364, + 1365, + 1366, 1367, - 1369, - 3349, - 1370, - 1371, - 1372, - 1373, - 1374, - 1376, - 1379, 0, 0, - 1378, - 1425, + 0, + 0, + 0, + 1369, + 1375, 1381, + 1376, + 1377, + 1378, + 1379, + 1380, + 1382, 1383, 1384, 1385, - 2029, - 0, 1386, - 1387, - 2050, - 2435, - 1389, - 1782, - 2812, - 3101, - 3276, - 2109, - 3227, - 4674, - 0, - 4133, - 1436, - 0, - 0, - 1437, - 0, - 1438, - 0, - 0, - 0, + 1388, 1390, - 1392, - 0, - 0, - 0, - 0, - 3712, - 0, - 0, - 0, - 0, - 3478, - 3827, - 2821, - 1439, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1393, - 1395, + 1396, + 1402, 1397, 1398, 1399, @@ -19114,92 +17970,47 @@ const unsigned short _wind_canon_next_table[] = { 1406, 1407, 1409, - 1411, - 1414, - 1413, + 1415, 0, 0, - 1423, 0, - 1424, + 0, + 0, + 0, + 1452, + 1458, + 1464, + 1470, + 1410, + 1411, + 1412, + 1413, + 1414, 1416, 1417, 1418, 1419, 1420, - 2413, - 1421, 1422, + 1428, + 1423, + 1424, + 1425, + 1426, 1427, 1429, + 1430, 1431, + 1432, 1433, - 1435, - 1860, + 1439, 1441, - 0, - 2179, - 3151, - 0, - 3780, - 0, - 0, - 4047, - 2683, - 4118, - 0, - 0, - 0, - 2207, - 1442, - 1444, - 1445, - 1446, 1447, - 1509, - 1448, - 4611, - 0, - 0, - 1765, - 1450, - 0, - 0, - 0, - 0, - 0, - 0, - 3775, - 0, - 3134, - 1451, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1506, + 1449, 1453, 1454, 1455, - 2117, - 0, 1456, - 4549, - 1502, - 0, - 0, - 0, - 1503, - 0, - 0, - 0, - 0, - 0, 1457, 1459, 1460, @@ -19208,342 +18019,220 @@ const unsigned short _wind_canon_next_table[] = { 1463, 1465, 1466, - 1877, - 4113, - 4380, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 1467, 1468, - 1880, 1469, - 3012, - 0, - 0, - 0, - 0, - 0, - 0, 1471, + 1472, 1473, 1474, 1475, - 1476, 1477, + 1478, 1479, 1480, + 0, + 1488, 1481, - 1482, 1483, - 1486, + 1484, 1485, - 1488, - 1489, - 1490, - 2470, + 1486, 0, - 1767, + 1490, + 1487, + 1489, 1491, - 1492, - 1494, - 1495, - 1496, - 1497, - 1498, - 1500, - 0, - 0, - 0, 1501, + 1503, 1505, + 1506, + 1507, 1508, + 1509, + 1516, 1511, + 1512, 1513, 1514, 1515, - 1516, 1517, - 1518, - 0, - 1519, - 0, - 0, - 0, - 0, - 0, - 1522, - 1521, - 1524, + 1523, 1525, - 1526, 1527, - 1528, - 1530, + 1529, 1531, - 0, - 0, - 0, - 0, - 0, - 0, - 2637, - 3193, - 0, - 0, - 4091, - 1891, - 0, - 0, - 0, - 0, - 1533, - 0, - 0, - 0, - 0, - 2184, - 1534, 1536, + 1537, 1538, + 1539, 1540, 1541, - 1543, - 1544, - 1545, - 1546, 1547, 1548, + 1549, 1550, + 1558, 1551, - 1552, - 1553, - 1554, - 1556, - 1557, - 1580, 0, + 1562, 0, 0, 0, 0, - 1579, 0, + 1560, + 1553, + 1554, + 1555, + 1556, + 1559, + 1557, + 0, + 1563, 0, 0, 0, 0, 0, - 3060, - 1559, 1561, - 1562, - 1563, - 1564, 1565, + 1571, 1566, + 1567, 1568, + 1569, 1570, 0, 0, 0, - 0, - 0, - 4513, - 0, - 0, - 0, - 0, - 4529, - 0, - 0, - 4527, + 1596, 1572, 1573, + 1574, 1575, - 4401, - 4142, - 3854, - 0, - 3229, - 2960, - 0, - 2287, - 1943, - 1613, - 0, - 0, - 0, - 0, + 1576, 0, - 1577, - 1722, 0, 0, + 1597, + 1578, + 1584, + 1579, + 1580, + 1581, + 1582, + 1590, + 1583, 0, + 1594, 0, 0, 0, - 1578, - 1582, 0, 0, - 3268, - 1584, + 1592, + 1585, 1586, 1587, 1588, + 1591, 1589, - 3081, - 1590, - 1592, - 1636, - 1594, + 0, 1595, - 1597, 0, 0, 0, 0, - 2613, - 1598, - 1600, - 1601, - 1602, - 1603, - 1604, - 1606, - 0, - 0, 0, + 1593, + 1605, + 1606, 1607, + 1608, + 1616, 1609, - 4537, 0, + 1620, 0, - 2254, 0, - 1611, 0, 0, - 4428, + 0, + 1618, + 1611, 1612, + 1613, 1614, - 1616, - 1897, 1617, - 1618, - 1619, - 1620, - 1621, - 1623, - 4530, - 0, + 1615, 0, + 1621, 0, 0, 0, 0, 0, + 1619, + 1623, + 1629, + 1624, 1625, - 1984, 1626, + 1627, 1628, - 3280, 1630, 1631, 1632, 1633, 1634, - 1635, - 1637, - 1650, - 0, - 0, - 0, - 1646, - 1639, - 0, - 0, - 0, - 0, - 1672, - 1641, - 1642, - 1643, 1644, - 0, - 0, - 0, - 2937, - 3683, 1645, - 2324, - 0, - 1648, - 0, - 3576, - 0, - 0, - 3058, - 2816, - 0, - 4543, - 1649, - 1652, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 3306, - 1653, + 1646, + 1647, 1655, - 1657, - 0, - 0, - 0, + 1648, 0, - 1679, 1659, - 3795, - 0, - 0, - 0, 0, 0, 0, 0, 0, + 1657, + 1650, + 1651, + 1652, + 1653, + 1656, + 1654, 0, + 1660, 0, 0, 0, 0, 0, - 1661, + 1658, 1662, + 1668, + 1663, 1664, - 0, - 3635, + 1665, 1666, - 2248, + 1667, + 1669, + 1670, + 1671, + 1672, + 1673, + 1675, + 1681, 0, 0, 0, - 1668, 0, 0, - 3880, - 3663, 0, 0, 0, @@ -19552,400 +18241,383 @@ const unsigned short _wind_canon_next_table[] = { 0, 0, 0, - 1669, - 1671, - 1674, - 1675, + 1701, 1676, 1677, 1678, - 3620, - 0, - 1681, - 2621, - 1682, - 2245, - 0, - 2273, + 1679, 0, - 1684, - 1685, + 1693, 1687, + 1680, 0, + 1691, 0, 0, 0, 0, 0, - 2633, - 0, + 1689, + 1682, + 1683, + 1684, + 1685, 0, - 4243, + 1695, 1688, - 1690, - 1691, - 1692, - 1693, - 0, - 2370, - 1724, - 1725, - 0, + 1686, 0, + 1692, 0, 0, - 1723, - 0, 0, 0, 0, + 1690, 1694, 1696, - 1697, - 1698, - 1699, - 1700, 1702, + 1703, 1704, 1705, - 1706, - 1707, - 2476, 0, - 0, - 3467, - 2062, - 1708, - 1710, - 1712, + 1719, 1713, - 1714, - 1715, - 1717, - 0, + 1706, 0, + 1717, 0, 0, 0, - 1721, 0, - 1716, - 1719, 0, + 1715, + 1708, + 1709, + 1710, + 1711, 0, + 1721, + 1714, + 1712, 0, + 1718, 0, 0, 0, 0, 0, - 3558, + 1716, 1720, + 1722, + 1726, 1728, - 1729, - 1730, - 1731, - 1733, 1734, - 0, - 1732, - 0, - 0, - 0, - 0, - 0, 1735, 1737, + 1780, + 1815, + 1858, + 1901, + 1936, + 1969, + 2253, 0, 0, 0, + 2268, + 2298, 0, - 2271, - 3843, 0, - 4471, - 3684, - 0, - 4144, + 2332, 1738, + 1744, + 2025, + 2031, + 2037, + 2043, + 2049, + 2055, + 1759, + 1765, + 2063, + 2069, + 2075, + 2081, + 2087, + 2093, + 1739, 1740, + 1741, 1742, + 0, + 0, + 0, + 1752, 1743, - 1744, + 1750, 1745, 1746, + 1747, 1748, + 0, + 0, + 0, + 1754, 1749, - 1750, 1751, - 1752, - 1754, + 1753, + 0, + 0, + 2023, 1755, - 1756, + 0, + 0, + 2024, 1757, 1758, 1760, 1761, 1762, - 2406, - 0, 1763, - 1764, - 1766, - 1851, - 0, - 0, - 0, - 1844, 0, 0, 0, + 1773, + 1764, + 1771, + 1766, + 1767, + 1768, + 1769, 0, 0, 0, - 1768, + 1775, 1770, 1772, - 1773, - 1775, - 1776, - 1777, - 1778, - 2085, - 0, + 1774, 0, - 3063, - 1779, - 1780, 0, + 2061, + 1776, 0, - 1784, 0, + 2062, + 1778, + 1779, 1781, - 1783, - 2190, - 3056, - 0, - 0, - 0, - 1786, - 0, - 0, - 4535, - 0, - 4638, - 4426, - 2962, 1787, - 1831, - 0, - 0, - 0, - 0, - 0, 0, 0, 0, 0, 0, 0, + 1798, + 1804, + 1782, + 1783, + 1784, + 1785, + 1786, + 1793, + 1788, 1789, + 1790, 1791, 1792, - 1793, 1794, - 1795, 1796, - 2014, - 0, - 2591, - 2754, - 2931, - 3006, - 2239, - 3167, - 1798, - 4030, - 3907, + 1797, 1799, 1800, 1801, 1802, 1803, - 1814, + 1810, 1805, - 0, - 0, - 0, - 0, - 0, 1806, + 1807, 1808, - 0, - 0, - 0, - 3672, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 2159, 1809, 1811, 1813, + 1814, 1816, + 1822, + 2101, + 2107, + 2113, + 2119, + 2125, + 2131, + 1837, + 1843, + 2139, + 2145, + 2151, + 2157, + 2163, + 2169, 1817, 1818, 1819, 1820, - 3653, - 1822, + 0, + 0, + 0, + 1830, + 1821, + 1828, + 1823, 1824, 1825, 1826, + 0, + 0, + 0, + 1832, 1827, - 1828, - 1830, - 1833, - 1834, - 1835, - 3105, + 1829, + 1831, 0, 0, + 2099, + 1833, + 0, 0, + 2100, + 1835, 1836, - 1837, + 1838, 1839, 1840, 1841, - 1842, - 1843, - 1846, - 1847, - 1848, - 2787, - 0, - 2149, - 1849, - 1850, - 1861, - 0, - 0, - 0, - 0, 0, 0, 0, + 1851, + 1842, + 1849, + 1844, + 1845, + 1846, + 1847, 0, - 1887, - 1863, - 3714, 0, - 1866, - 1868, 0, + 1853, + 1848, + 1850, + 1852, 0, 0, + 2137, + 1854, 0, 0, + 2138, + 1856, + 1857, + 1859, + 1865, 0, 0, 0, 0, 0, - 1888, - 2713, 0, + 1880, + 1886, + 1860, + 1861, + 1862, + 1863, 0, 0, 0, + 1873, + 1864, 1871, + 1866, + 1867, + 1868, + 1869, 0, 0, - 4279, + 0, + 1875, + 1870, 1872, - 1873, 1874, - 1875, 1876, 1878, - 1882, - 0, + 1879, 1881, + 1882, + 1883, + 1884, 0, 0, 0, - 0, - 0, + 1894, + 1885, + 1892, + 1887, + 1888, + 1889, + 1890, 0, 0, 0, 1896, - 1884, - 1886, - 1890, - 1892, + 1891, + 1893, 1895, - 1898, + 1897, 1899, 1900, - 1901, 1902, - 1904, - 1936, - 0, - 0, - 0, - 1938, - 0, - 0, - 0, - 1906, - 0, - 1916, 1908, 0, 0, 0, - 2801, 0, 0, 0, - 3821, - 0, - 2893, + 1919, + 1925, + 1903, + 1904, + 1905, + 1906, + 1907, + 1914, 1909, 1910, 1911, 1912, - 1919, - 0, - 1918, - 0, 1913, - 0, - 0, - 1937, - 1917, - 0, - 0, - 0, 1915, + 1917, + 1918, + 1920, 1921, + 1922, 1923, - 1925, + 1924, + 1931, + 1926, 1927, 1928, 1929, 1930, - 1931, - 1933, + 1932, + 1934, + 1935, + 1937, + 1943, 0, 0, 0, @@ -19953,657 +18625,511 @@ const unsigned short _wind_canon_next_table[] = { 0, 0, 0, - 1951, - 1935, + 1957, + 1938, + 1939, 1940, - 1942, - 1944, - 3897, - 2257, - 0, - 0, - 2685, + 1941, 0, 0, 0, + 1951, + 1942, + 1949, + 1944, + 1945, 1946, 1947, - 3840, - 3567, - 0, - 2958, 0, 0, 0, - 0, - 1949, - 3225, - 1950, 1953, - 1955, + 1948, + 1950, + 1952, + 1954, 1956, 1958, 1959, 1960, 1961, - 2335, - 2669, - 2000, - 2001, - 1998, - 1999, - 1997, 0, - 1995, - 1996, - 2008, - 2009, - 1964, - 0, - 1963, 0, 0, + 1964, 1962, - 1966, + 1963, + 1965, + 1967, 1968, - 1986, - 0, - 0, - 0, - 0, 1970, + 1976, + 2177, + 2183, + 2189, + 2195, + 2201, + 2207, + 1991, + 1997, + 2215, + 2221, + 2227, + 2233, + 2239, + 2245, + 1971, 1972, 1973, 1974, - 2635, 0, - 1975, - 2299, - 1978, 0, 0, - 1976, + 1984, + 1975, + 1982, 1977, + 1978, + 1979, + 1980, 0, 0, 0, - 0, - 0, - 1990, + 1986, 1981, - 1980, 1983, 1985, - 1988, 0, 0, + 2175, + 1987, 0, - 3394, + 0, + 2176, 1989, + 1990, 1992, + 1993, 1994, - 2003, - 2005, - 2007, - 2011, - 2013, - 2015, - 2016, - 2017, - 2018, - 2020, + 1995, 0, 0, 0, + 2005, + 1996, + 2003, + 1998, + 1999, + 2000, + 2001, 0, 0, - 2019, - 2022, - 2024, - 2025, - 2026, - 2027, - 4061, - 3801, - 4344, - 4343, - 4342, - 2028, - 4338, 0, - 4337, - 4336, - 4335, - 4334, + 2007, + 2002, + 2004, + 2006, 0, - 4379, - 4378, 0, + 2213, + 2008, 0, - 4371, - 2032, - 2031, 0, + 2214, + 2262, + 2292, + 2378, + 2026, + 2027, + 2028, + 2029, 2030, - 0, - 0, - 0, - 0, - 0, - 2039, + 2032, + 2033, 2034, 2035, 2036, - 2037, 2038, - 4329, - 0, - 0, - 0, - 0, - 0, - 0, - 2814, - 0, - 0, - 0, + 2039, + 2040, 2041, - 0, - 0, - 3079, 2042, 2044, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 2087, - 2365, + 2045, 2046, 2047, - 2049, - 2097, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 2048, + 2050, 2051, + 2052, 2053, 2054, - 2055, 2056, 2057, + 2058, 2059, - 2061, + 2060, 2064, + 2065, 2066, 2067, - 2069, + 2068, + 2070, 2071, - 3878, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 2072, 2073, 2074, 2076, - 2089, - 0, + 2077, 2078, + 2079, 2080, - 2081, 2082, 2083, 2084, + 2085, 2086, 2088, + 2089, + 2090, 2091, 2092, - 2093, 2094, - 0, - 0, - 0, - 3400, 2095, 2096, - 2099, - 2100, - 2101, + 2097, + 2098, 2102, 2103, + 2104, 2105, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 2222, - 2107, + 2106, 2108, + 2109, 2110, - 0, - 2929, + 2111, 2112, - 2113, 2114, 2115, 2116, - 2157, - 2158, - 0, - 2161, - 0, - 0, - 0, - 2156, - 0, - 0, - 0, - 0, + 2117, 2118, - 3219, - 0, - 0, 2120, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 2833, - 2504, 2121, - 2124, - 0, - 0, - 0, - 0, - 0, + 2122, 2123, + 2124, 2126, + 2127, 2128, 2129, 2130, - 3428, - 3754, - 0, - 0, - 2131, 2132, + 2133, 2134, + 2135, 2136, - 2137, - 2138, - 2139, 2140, - 3777, 2141, 2142, + 2143, 2144, - 2145, 2146, 2147, 2148, + 2149, 2150, 2152, - 2189, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 2155, - 0, - 0, - 0, - 0, + 2153, 2154, + 2155, + 2156, + 2158, + 2159, 2160, - 2163, + 2161, + 2162, 2164, 2165, 2166, 2167, - 0, - 0, - 0, + 2168, 2170, - 2169, + 2171, 2172, 2173, 2174, - 2175, - 0, - 4233, - 4454, - 3665, - 3666, - 0, - 3664, - 0, - 0, - 0, - 3667, - 0, - 0, - 0, - 0, - 2176, - 2232, - 0, 2178, + 2179, 2180, + 2181, 2182, - 3136, - 2183, + 2184, 2185, + 2186, 2187, - 0, - 0, - 3185, 2188, + 2190, 2191, + 2192, 2193, - 2202, - 2201, - 2204, - 2203, - 2197, - 0, - 2200, - 2367, + 2194, 2196, - 2195, - 0, - 2238, - 2237, - 0, - 0, - 2236, + 2197, + 2198, 2199, + 2200, + 2202, + 2203, + 2204, + 2205, 2206, 2208, + 2209, 2210, 2211, 2212, - 2213, - 2214, 2216, + 2217, 2218, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 2235, - 2221, + 2219, 2220, + 2222, + 2223, 2224, 2225, 2226, - 2227, 2228, + 2229, 2230, 2231, + 2232, 2234, + 2235, + 2236, + 2237, + 2238, 2240, 2241, 2242, - 2871, - 0, 2243, 2244, 2246, + 2247, + 2248, 2249, - 2251, + 2250, + 2254, 0, 0, 0, - 2256, - 2253, + 2284, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 2370, 2255, - 4135, + 2256, + 2257, 2258, - 4372, - 2762, + 2259, + 2267, 0, 0, - 3000, - 2260, 2261, - 2262, 2263, 2264, 2265, - 2267, - 2268, - 2270, - 2272, + 2266, + 2269, 0, 0, 0, 0, - 2286, - 2274, 0, - 2326, - 2667, - 2276, - 2277, - 2279, - 2280, - 2281, - 2282, - 2283, - 2957, 0, - 2956, 0, 0, + 2311, + 2270, + 2271, + 2272, + 2273, + 2274, + 2368, + 2279, 0, + 2306, + 2308, + 2331, 0, + 2391, 0, - 2948, + 2360, + 2393, + 2281, + 2283, 2285, + 2286, + 2287, 2288, - 2290, - 2292, + 2289, + 2297, + 0, + 0, + 2291, + 2293, 2294, 2295, 2296, - 2297, - 2298, + 2299, 2300, + 2301, 2302, + 2303, 2304, - 2306, - 2307, - 2308, - 2309, 2310, 2312, 2313, + 2314, 2315, - 2317, + 0, + 0, + 0, 2318, + 2316, + 2317, 2319, - 2320, - 2321, - 2322, - 2323, 2325, - 2328, - 2329, - 2330, - 2331, + 2327, + 2384, 0, 0, 0, - 3651, - 3273, - 2332, - 2334, 0, 0, 0, - 2930, + 0, + 2333, + 2334, + 2335, 2336, - 2338, + 2337, + 0, + 0, + 0, 2340, - 2342, - 3502, - 2343, - 2344, - 2345, - 2346, + 2338, + 2339, + 2341, 2347, + 2348, 2349, - 2731, + 2350, 2351, 2352, 2354, - 2355, 2356, - 2357, - 3408, - 3730, - 2358, - 4346, - 0, - 0, - 0, - 2360, 2362, + 2363, 2364, + 2365, 2366, - 2369, - 2373, - 0, - 0, - 2372, 2371, - 2376, - 0, - 0, - 0, + 2372, + 2373, + 2374, 2375, - 3704, - 0, - 0, - 0, + 2383, 0, 0, - 2378, + 2377, 2379, + 2380, 2381, 2382, - 2383, - 2384, 2385, + 2386, 2387, + 2388, 2389, - 2390, - 2391, - 2392, - 2393, 2395, - 2396, - 2397, 2398, + 2402, + 2441, 2399, 2400, - 2402, - 2404, - 2405, - 2407, - 2408, - 0, - 2411, + 2401, + 2403, 0, 0, 0, + 2422, + 2404, 0, + 2410, 0, + 2416, + 2405, + 2406, + 2407, + 2408, + 2409, + 2411, 2412, - 2410, + 2413, + 2414, 2415, - 2416, 2417, 2418, 2419, - 2480, + 2420, 2421, + 2423, 0, - 3065, - 2422, + 2435, + 0, + 2429, 2424, + 2425, 2426, + 2427, 2428, - 2429, 2430, - 3054, - 0, 2431, - 3432, 2432, - 0, - 0, - 0, - 3753, + 2433, 2434, 2436, + 2437, 2438, + 2439, + 2440, + 2442, 0, + 2461, + 2474, + 2481, 0, + 2506, + 2543, + 2580, + 2642, + 2605, + 2655, + 2443, 0, 0, 0, 0, + 2449, 0, 0, - 4503, - 2439, - 2441, - 2443, + 2455, 2444, 2445, 2446, @@ -20611,43 +19137,44 @@ const unsigned short _wind_canon_next_table[] = { 2448, 2450, 2451, + 2452, 2453, 2454, - 2455, - 3750, - 0, - 0, - 0, 2456, - 3919, - 0, - 0, 2457, + 2458, 2459, 2460, - 2461, 2462, + 0, + 2468, 2463, + 2464, 2465, 2466, 2467, - 2468, 2469, + 2470, + 2471, + 2472, 2473, + 2475, + 2476, + 2477, + 2478, + 2479, + 2480, + 2482, 0, + 2488, 0, 0, + 2494, 0, - 2472, - 2471, 0, 0, 0, - 3832, - 2475, - 2477, - 2481, - 2479, + 2513, 2483, 2484, 2485, @@ -20663,501 +19190,494 @@ const unsigned short _wind_canon_next_table[] = { 2497, 2498, 2499, - 2551, 2501, - 2508, - 0, - 0, + 2502, 2503, - 2541, - 0, - 0, - 0, - 0, + 2504, 2505, - 4102, 2507, + 0, + 0, + 2531, + 2537, + 2508, + 2509, 2510, 2511, 2512, - 2513, 2514, + 2515, 2516, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 2564, + 2517, 2518, 2520, + 2521, 2522, 2523, 2524, - 2525, - 2827, - 0, - 0, - 3797, 2526, 2527, - 3942, - 4265, - 4298, - 0, + 2528, 2529, - 0, - 0, - 0, - 3359, 2530, - 2531, 2532, 2533, 2534, + 2535, 2536, - 2537, 2538, 2539, 2540, - 2543, + 2541, + 2542, 2544, - 2546, - 2547, - 2548, - 2549, 2550, - 2553, - 2567, - 2917, 0, - 2704, 0, + 2556, + 2562, 0, 0, - 3584, + 2568, + 2574, + 2630, + 2636, + 2545, + 2546, + 2547, + 2548, + 2549, + 2551, + 2552, + 2553, 2554, 2555, - 2556, 2557, - 2562, - 2561, - 0, - 2563, - 0, - 0, - 0, - 0, - 0, 2558, + 2559, 2560, + 2561, + 2563, + 2564, + 2565, 2566, - 2568, + 2567, 2569, 2570, 2571, - 2573, - 0, - 0, - 2574, - 0, - 0, - 0, 2572, - 2610, - 0, - 0, - 0, - 0, + 2573, + 2575, 2576, + 2577, 2578, 2579, 2581, + 2587, + 0, + 0, + 2593, + 2599, + 2582, 2583, - 3744, 2584, 2585, 2586, - 2587, 2588, + 2589, 2590, + 2591, 2592, - 2593, 2594, 2595, - 4059, - 3125, - 3459, 2596, - 0, - 0, - 0, - 0, - 0, - 3767, - 0, - 0, - 0, - 0, - 3719, - 0, - 0, - 3718, + 2597, 2598, 2600, + 2601, 2602, + 2603, + 2604, + 2606, 0, 0, 0, 0, 0, + 2612, + 2618, 0, - 2615, - 2603, - 2604, - 2605, - 3296, - 0, - 2606, + 2624, 2607, + 2608, 2609, - 2612, + 2610, + 2611, + 2613, 2614, + 2615, 2616, 2617, - 2618, 2619, 2620, + 2621, 2622, - 2624, + 2623, + 2625, 2626, + 2627, 2628, 2629, - 2630, 2631, 2632, + 2633, 2634, - 2636, - 0, - 0, - 0, - 0, - 2671, + 2635, + 2637, 2638, 2639, 2640, 2641, - 2642, + 2643, + 2649, 2644, 2645, 2646, 2647, - 2649, 2648, + 2650, 2651, 2652, 2653, - 3572, - 0, - 2964, 2654, - 2655, + 2656, + 2662, + 2668, + 2674, 2657, + 2658, 2659, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 2687, + 2660, 2661, - 2662, 2663, 2664, 2665, 2666, - 2668, - 2674, - 0, - 2675, - 0, - 0, + 2667, + 2669, 2670, + 2671, + 2672, 2673, + 2675, + 2676, 2677, 2678, 2679, - 2680, 2681, + 0, + 0, + 0, + 3732, + 3775, + 3881, + 3909, + 3931, + 3991, + 4042, + 4062, + 4117, + 4165, + 4230, + 4246, 2682, + 0, + 0, + 0, + 2685, + 2704, + 2753, + 2785, + 0, + 2820, + 2827, + 2846, + 2895, + 2927, + 2962, + 2969, + 2683, 2684, + 2814, + 0, + 0, + 0, + 0, 2686, + 0, + 2692, + 0, + 2698, + 2687, + 2688, 2689, + 2690, 2691, - 2692, 2693, 2694, 2695, - 0, - 2703, - 2698, + 2696, + 2697, 2699, 2700, - 3961, + 2701, + 2702, + 2703, + 2705, 0, + 2711, 0, + 2717, 0, - 2701, - 2702, + 2723, 0, + 2729, 0, - 2710, - 2705, + 2735, + 0, + 2741, + 0, + 2747, 2706, 2707, 2708, 2709, + 2710, 2712, + 2713, 2714, 2715, 2716, - 2717, 2718, - 3326, + 2719, 2720, 2721, - 2723, + 2722, 2724, 2725, 2726, - 2729, + 2727, 2728, - 0, 2730, - 0, - 0, - 0, - 0, - 0, - 2727, + 2731, 2732, + 2733, 2734, - 2735, - 3799, + 2736, 2737, + 2738, 2739, 2740, - 2741, 2742, 2743, 2744, + 2745, 2746, - 2747, 2748, 2749, - 4180, - 4425, 2750, - 4654, - 4415, + 2751, + 2752, + 2754, 0, 0, + 2760, 0, + 2766, 0, + 2772, 0, 0, 0, 0, - 2752, 0, 0, - 4287, - 2753, + 2778, 2755, 2756, 2757, - 3355, - 0, 2758, 2759, - 0, - 0, 2761, - 2760, + 2762, 2763, 2764, 2765, - 2766, 2767, + 2768, + 2769, + 2770, 2771, - 2772, 2773, - 4355, 2774, 2775, + 2776, + 2777, + 2779, + 2780, + 2781, + 2782, + 2783, 2784, - 2789, + 2786, 0, 0, - 2786, + 2793, + 0, + 0, + 2800, + 0, + 0, + 2807, + 2787, 2788, - 3029, + 2789, + 2790, 2791, 2792, - 2793, 2794, 2795, - 4350, 2796, - 0, - 4347, - 0, - 0, - 0, - 0, - 0, - 4345, + 2797, 2798, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 2826, - 2807, - 0, - 0, - 2800, + 2799, + 2801, 2802, 2803, 2804, 2805, 2806, + 2808, 2809, + 2810, 2811, + 2812, 2813, 2815, - 2819, + 2816, 2817, + 2818, + 2819, + 2821, 2822, + 2823, + 2824, 2825, - 2828, - 2829, - 2832, + 2826, + 2956, 0, 0, - 2831, - 2834, - 2836, 0, 0, + 2828, 0, + 2834, 0, - 2843, + 2840, + 2829, + 2830, + 2831, + 2832, + 2833, + 2835, + 2836, + 2837, 2838, 2839, - 2840, 2841, 2842, + 2843, + 2844, 2845, + 2847, 0, + 2853, 0, + 2859, 0, + 2865, 0, + 2871, 0, + 2877, 0, + 2883, 0, - 0, - 2846, + 2889, 2848, 2849, 2850, 2851, - 0, - 3519, - 3203, 2852, - 0, - 0, - 0, - 0, - 2863, 2854, + 2855, 2856, + 2857, 2858, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 2903, 2860, + 2861, 2862, - 2865, + 2863, + 2864, + 2866, 2867, + 2868, 2869, - 3232, 2870, 2872, + 2873, 2874, 2875, 2876, - 2877, 2878, + 2879, 2880, 2881, - 2883, - 0, + 2882, 2884, + 2885, 2886, 2887, 2888, - 2889, 2890, - 2899, - 0, - 0, - 0, + 2891, 2892, + 2893, 2894, - 2895, 2896, - 2897, - 2898, - 2901, 0, 0, + 2902, 0, + 2908, 0, + 2914, 0, 0, 0, 0, - 4384, - 2902, + 0, + 0, + 2920, + 2897, + 2898, + 2899, + 2900, + 2901, + 2903, + 2904, 2905, + 2906, 2907, 2909, 2910, @@ -21166,48 +19686,63 @@ const unsigned short _wind_canon_next_table[] = { 2913, 2915, 2916, + 2917, 2918, 2919, - 2920, 2921, 2922, + 2923, 2924, 2925, 2926, - 2927, 2928, - 2932, - 2933, - 2934, - 2935, 0, - 3601, - 3899, - 2968, - 2969, 0, + 2935, 0, 0, - 2936, - 2939, + 2942, 0, 0, + 2949, + 2929, + 2930, + 2931, + 2932, + 2933, + 2934, + 2936, + 2937, 2938, + 2939, + 2940, 2941, - 2942, 2943, 2944, 2945, + 2946, 2947, + 2948, 2950, 2951, 2952, 2953, - 3328, 2954, 2955, + 2957, + 2958, 2959, - 3551, + 2960, + 2961, + 2963, + 2964, + 2965, + 2966, + 2967, + 2968, + 2970, + 2976, + 2982, 0, 0, 0, @@ -21218,10 +19753,7 @@ const unsigned short _wind_canon_next_table[] = { 0, 0, 0, - 2961, - 2963, - 2965, - 2967, + 2988, 2971, 2972, 2973, @@ -21231,454 +19763,1516 @@ const unsigned short _wind_canon_next_table[] = { 2978, 2979, 2980, - 3302, - 2991, - 2992, - 0, - 0, - 2994, - 0, - 2993, - 0, 2981, 2983, 2984, 2985, 2986, 2987, - 0, - 2988, + 2989, 2990, + 2991, + 2992, + 2993, + 3139, + 3105, + 3285, + 3167, + 3067, + 3096, + 3043, + 3046, + 3049, + 3099, + 3175, + 3230, + 2995, + 3146, + 3002, + 3278, 2996, + 4538, 0, 0, 0, + 0, + 4543, + 0, + 3005, + 3702, + 2997, + 3240, + 3033, + 3102, + 3288, + 3131, + 3261, 2999, - 2998, + 3113, + 3298, + 4100, + 3055, + 3079, + 3258, + 3058, + 3007, + 3093, + 3493, + 0, + 0, + 4060, + 0, + 0, + 3582, + 3445, + 3652, + 0, + 3566, + 3335, + 0, + 0, + 3000, 3001, - 3002, + 0, + 0, + 0, + 4059, 3003, + 4564, 3004, - 3005, - 3007, + 4545, + 3193, + 0, + 0, + 0, + 0, + 0, + 3006, + 3657, + 4161, + 0, + 0, + 0, + 4163, + 0, + 0, + 3457, + 0, + 3514, + 4168, 3008, 3009, - 3331, - 3010, - 3980, - 3674, - 3020, + 4273, + 4316, + 4329, + 4076, + 4395, + 4456, + 4519, + 0, + 0, + 4598, + 4618, + 4640, + 4660, + 4682, + 3011, + 3122, + 3256, 0, 0, + 3012, + 3714, 0, 0, 0, + 3075, 0, + 3293, + 0, + 3549, + 0, + 3392, + 3013, 0, 0, 0, - 3011, - 3014, + 0, + 0, + 3713, + 3236, + 0, + 0, + 0, + 3712, + 3427, + 3125, + 3128, 3015, + 3310, + 3028, + 3394, + 3828, + 3178, + 3022, + 3872, + 3237, + 3198, + 3090, + 3110, + 3181, + 3780, + 3248, + 0, + 3512, + 3783, + 3627, + 0, + 3077, + 0, + 0, + 0, + 0, + 3265, + 3795, 3016, + 3801, 3017, - 3018, + 0, + 0, + 0, + 0, + 0, + 3800, + 3052, + 3025, + 3408, + 3170, + 4590, + 3323, + 3194, + 3149, + 3414, + 3072, + 3326, + 3152, + 3526, + 3155, + 3087, 3019, - 3022, + 4688, + 4691, + 0, + 4693, + 0, + 0, + 0, + 0, + 3443, + 3020, + 3021, + 3857, + 3859, + 3861, + 0, + 3031, + 3023, + 3863, + 3313, + 0, + 0, + 0, + 0, + 0, + 3877, + 3870, 3024, - 3025, + 4576, + 0, + 0, + 0, + 0, + 3070, + 0, + 0, + 0, + 0, + 3420, + 3306, 3026, - 3973, - 3733, - 3337, 3027, - 3028, + 3815, + 0, + 0, + 0, + 3817, + 3819, + 0, + 3029, + 3629, + 3823, + 3825, + 3579, + 3821, + 0, + 0, 3030, - 3031, 3032, - 3033, + 3482, + 0, + 3643, + 4004, + 3645, + 3343, + 4008, + 4006, + 0, + 4011, + 0, 3034, + 3647, + 0, + 0, + 0, 3035, + 3061, + 3351, + 3082, + 3064, + 3354, + 3245, + 3037, + 3269, + 3158, + 3161, + 3221, + 3538, + 3184, + 3164, + 3209, + 3040, + 4260, 0, - 3036, + 0, + 3437, + 0, + 3038, 0, 0, 0, 0, 0, - 3037, + 3587, + 0, + 3137, + 4276, 3039, + 3504, 3041, - 3043, + 3404, + 0, + 3601, + 0, + 0, + 0, + 4376, + 3042, + 3142, + 3603, + 3085, 3044, + 0, + 3144, + 4483, + 0, + 4488, + 0, + 4486, + 0, + 0, + 0, + 4492, 3045, - 3046, + 4490, + 0, + 4496, + 0, + 0, + 0, + 4498, + 4494, + 4500, + 0, + 0, 3047, - 3049, + 0, + 0, + 4504, + 3048, + 4506, + 3108, + 0, + 0, + 3570, + 0, + 4510, + 0, + 0, + 0, + 0, + 0, + 3379, + 4516, + 3507, 3050, 3051, - 3052, + 0, + 4522, + 3367, + 3606, + 0, + 0, + 0, + 3441, 3053, - 3097, + 4573, 0, 0, + 3120, 0, 0, + 3608, + 3054, + 3056, + 3201, 0, 0, 0, 0, 0, 0, - 3055, + 0, + 0, + 4111, + 0, + 0, + 3134, 3057, 3059, - 3062, - 3064, - 3066, - 3104, 0, + 4151, + 3455, + 0, + 3116, + 3655, + 4155, + 0, + 0, + 0, + 3532, + 3203, + 3477, + 4174, + 4150, + 0, + 0, + 0, + 0, + 3060, + 0, + 0, + 3565, + 4187, 0, + 4185, + 4192, 0, 0, + 3792, 0, + 3545, + 4196, 0, + 3377, + 3062, + 3063, + 3585, 0, 0, 0, 0, + 3390, + 3243, + 0, + 4233, + 3400, 0, + 3065, + 3066, 3068, - 3637, - 4170, - 3070, - 3578, + 3272, + 3692, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3365, + 3439, + 3069, 3071, - 3072, + 3614, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 4644, + 0, + 4646, + 0, + 0, 3073, 3074, - 3075, - 3077, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 4648, + 3076, + 0, + 0, + 0, + 3426, + 3786, + 0, 3078, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3787, + 0, + 3788, 3080, + 0, + 4120, + 0, + 0, + 4125, + 0, + 3337, + 0, + 4130, + 3386, + 3276, + 3081, 3083, - 3085, + 3662, + 4211, + 0, + 4213, + 3189, + 0, + 4218, + 4220, + 0, + 0, + 3543, + 0, + 0, + 3118, + 3136, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3084, 3086, 3088, - 3090, + 0, + 0, + 0, + 0, + 0, + 3173, + 0, + 3329, + 0, + 4680, + 3331, + 0, + 0, + 4685, + 3089, + 3475, + 0, + 0, + 3920, 3091, + 3923, + 3926, + 0, + 0, + 0, + 3397, + 0, + 0, + 3928, + 3934, 3092, - 3093, - 4028, + 3205, + 0, + 3349, + 0, + 0, + 0, + 4176, + 0, + 0, + 0, + 0, + 0, + 4183, + 0, 3094, - 3096, - 3099, + 3319, + 3095, + 4461, + 0, + 0, + 0, + 0, + 4467, + 0, + 0, + 0, + 0, + 0, + 3097, + 0, + 0, + 3522, + 3098, + 3694, + 0, + 0, + 0, + 0, 3100, + 0, + 3573, + 3696, + 3101, + 3345, + 4013, + 3470, + 0, + 0, + 4016, + 0, + 0, + 0, + 0, + 0, + 4018, 3103, + 3559, + 0, + 3283, + 3104, + 0, + 0, + 0, + 0, + 0, + 3233, + 4393, + 0, + 0, + 4398, + 0, + 0, + 0, + 0, + 0, + 0, 0, 0, - 3231, 0, - 3102, - 3107, 3106, + 3534, + 3107, 3109, - 3110, + 3936, + 3938, + 0, + 0, + 3940, + 3341, + 0, + 0, + 3557, + 3950, + 3111, + 3575, + 3315, + 3958, + 3381, 3112, - 3113, + 4071, 3114, + 4080, + 0, + 3495, + 4082, + 0, + 3451, + 4091, + 3530, + 0, + 0, + 0, + 0, + 0, + 3453, 3115, - 3116, - 3118, + 0, + 0, + 0, + 4079, + 4153, + 3117, 3119, - 3120, 3121, - 3122, + 3721, + 0, + 3123, + 0, + 3618, + 3252, 3124, + 0, + 0, + 0, + 0, + 3417, + 3577, + 3738, 3295, + 3741, + 3749, + 3753, + 3755, 3126, + 3219, + 3217, 0, + 3764, + 3759, 0, + 3127, + 3555, + 3371, + 3488, + 3553, + 3770, 0, - 3133, - 3128, + 0, + 3772, + 3449, + 3333, + 3373, + 4420, + 3623, 3129, + 3625, + 3308, + 3214, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, 3130, - 3131, + 4037, + 0, + 0, + 0, + 4045, + 4047, + 0, + 3347, + 0, + 0, 3132, + 3133, 3135, - 3137, - 3139, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 4116, + 3138, 3140, + 0, + 0, + 0, + 3406, + 0, + 3361, + 3187, + 3215, + 0, + 4074, + 4391, 3141, - 3142, + 0, + 0, + 0, + 3688, 3143, + 4482, + 0, + 0, + 0, + 0, + 0, + 0, 0, 0, 0, - 4457, 0, - 4464, 0, - 4456, 3145, - 3146, + 3704, + 4546, + 0, + 0, + 0, + 0, + 0, + 4548, + 0, + 0, + 0, + 4558, + 4556, + 0, 3147, + 4560, 3148, + 4611, 3150, + 3412, + 3597, 0, 0, 0, 0, 0, - 3149, - 3159, 0, 0, 0, + 4623, + 3708, + 3151, + 4654, 0, 0, - 3152, + 0, + 0, + 3153, 3154, - 3155, + 4665, + 0, + 0, + 0, + 0, + 3616, + 0, + 0, + 0, 3156, 3157, - 3158, - 3161, + 4302, + 0, + 3463, + 0, + 3159, + 3666, + 0, + 0, + 3191, + 0, + 0, + 3250, + 3160, + 3321, + 3589, + 3669, + 3591, + 3593, 3162, - 3164, - 3166, + 3595, 0, + 3418, + 0, + 3357, + 0, + 4314, + 3163, + 4347, + 3465, + 3207, 0, 0, 0, + 4352, + 0, + 0, + 0, + 3165, 3224, + 4356, 0, 0, - 3221, + 3359, + 3166, + 4430, + 4436, + 3551, + 0, + 4442, + 4432, + 0, + 0, + 0, + 4434, + 4438, 3168, + 4446, + 4440, + 3226, 3169, - 3170, - 3787, + 4444, 0, + 4445, 3171, + 0, + 0, + 0, + 3369, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 4588, 3172, 3174, - 3175, + 3274, + 0, + 0, 3176, + 4535, + 3234, + 3305, + 0, + 0, + 0, 3177, - 3178, + 3842, + 0, + 0, + 3846, + 3635, + 3267, + 0, + 0, + 0, + 0, + 3637, + 0, + 0, + 3179, + 3836, + 3854, + 3197, + 0, + 0, + 0, + 0, + 0, + 0, 3180, 3182, - 3184, + 0, + 3965, + 0, + 0, + 3905, + 3977, + 0, + 3480, + 3982, + 3254, + 0, + 3984, + 3986, + 0, + 3382, + 3183, + 3388, + 0, + 0, + 3185, + 0, + 0, + 3541, + 0, + 3599, + 0, + 3561, + 3301, 3186, + 4387, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, 3188, - 3189, + 3190, 3192, - 3194, + 0, + 4304, + 3447, + 0, + 3212, + 0, + 0, + 3228, + 3486, + 0, + 3524, + 3422, + 4608, + 0, + 3510, + 3195, + 3411, 3196, - 3198, + 3903, + 0, + 3907, + 3431, + 0, + 0, 3199, + 0, + 3915, + 0, + 0, + 0, + 3913, + 3912, + 0, 3200, - 3201, + 0, + 3639, + 3492, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3640, 3202, 3204, - 3218, - 0, 3206, + 3264, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, 3208, - 3209, + 3683, + 0, + 0, 3210, + 3685, 3211, - 3212, - 4505, + 3213, + 0, + 3572, + 3216, + 3218, 0, + 3584, + 3297, 0, 0, + 3220, + 3222, 0, 0, + 3677, 0, 0, 0, - 3214, - 3215, - 3217, - 3220, + 3679, + 0, + 0, + 0, + 3536, + 0, + 4327, 3223, - 3226, - 3265, + 3225, + 3227, + 3229, + 0, + 0, + 3472, + 3698, + 0, + 0, + 3700, + 0, + 3547, + 0, + 0, + 3231, + 3232, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 4537, + 3605, + 0, + 0, + 0, 0, 0, - 3228, - 3230, - 3233, 3235, - 3236, - 3237, - 3238, + 3886, 0, - 3838, - 3264, 0, + 3888, 0, 0, 0, - 3263, - 3262, + 0, + 3563, 0, 0, 0, + 3893, + 3895, + 3238, + 3897, 3239, + 0, + 0, + 0, + 0, + 0, + 0, + 3430, 3241, + 0, + 0, + 0, + 0, + 0, + 0, + 3989, + 3641, + 0, + 0, + 3999, + 0, + 3424, 3242, - 3243, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3399, 3244, - 3245, 0, - 3251, + 0, + 0, + 4229, + 4249, + 4254, + 0, + 3461, + 3291, + 3246, + 0, + 0, + 0, + 0, + 0, + 0, + 3502, 3247, - 3248, - 3250, + 3249, + 3251, + 3723, + 0, + 0, + 0, 3253, - 3496, - 3256, + 3255, 3257, - 3258, + 4140, + 0, + 4148, + 0, + 3281, + 0, + 0, + 4145, 3259, + 0, + 3499, 3260, - 3261, - 3267, + 4147, + 3648, + 0, + 4053, + 3262, + 0, + 3433, + 0, + 0, + 3317, + 0, + 3650, + 3263, + 3266, + 0, + 0, + 0, + 0, + 0, + 0, + 3794, + 3581, + 0, + 0, + 0, + 3268, 3270, - 3272, + 4286, + 0, + 0, + 4289, + 0, + 0, + 0, + 4293, + 3271, + 3273, + 4534, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, 3275, 3277, + 4132, + 3363, + 3568, + 0, + 0, + 3339, 0, 0, + 4411, 0, + 3279, + 3280, 0, 0, 0, 0, - 3842, - 3279, - 3281, + 0, + 3706, 3282, - 3283, + 4028, + 0, 3284, - 3285, + 3963, + 0, + 0, + 0, + 0, + 0, + 3303, + 3690, + 4417, + 4415, + 0, + 4422, + 0, + 0, + 3286, 3287, + 4426, + 4026, + 0, + 4021, + 4029, + 3384, + 4031, + 0, 3289, + 0, + 4039, + 0, + 4033, 3290, - 3291, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 4041, 3292, - 3293, 3294, - 3300, - 3301, + 3740, 0, - 3304, 0, + 3748, 0, + 3296, 0, 0, 0, - 3297, - 3321, + 3469, + 3484, 0, 0, 0, + 4093, 0, 0, 3299, - 3303, - 3305, - 3308, + 0, + 3497, + 3300, + 0, + 0, + 0, + 3654, + 0, + 0, 0, 0, 0, 0, 0, + 0, + 4098, + 4346, + 0, + 0, + 0, + 3302, + 4345, + 3304, + 3509, + 0, + 0, 3307, + 3309, 0, 0, + 0, + 0, + 3779, + 3490, + 3516, + 0, + 3806, 3311, - 3310, - 3313, + 0, + 3809, + 0, + 0, + 3804, + 3811, + 3375, + 0, + 0, + 0, + 3813, + 3312, + 0, + 0, + 0, + 0, + 0, + 3808, 3314, - 3315, 3316, 3318, - 0, - 0, - 3317, 3320, - 3323, + 3322, + 4596, + 0, + 3324, + 4601, 3325, 3327, - 3329, + 3328, 3330, - 3333, - 3332, - 3335, - 3334, - 3336, 0, - 3339, 0, - 3341, - 3340, - 3371, - 3379, - 4692, 0, 0, - 3380, - 3338, - 4468, 0, 0, 0, - 3348, + 3529, + 3332, + 3334, + 3336, + 4129, 0, 0, 0, 0, - 3372, - 3343, + 3338, + 3340, + 3342, 3344, - 3345, 3346, - 3347, + 3348, + 0, + 0, + 4049, + 3659, 3350, - 3351, 3352, - 3353, - 3354, - 3406, - 3405, 0, + 3660, 0, 0, + 4205, + 0, + 0, + 3435, + 3518, + 4200, 0, - 3407, 0, 0, + 3353, + 3459, + 0, + 3664, + 0, + 4237, + 4239, + 3402, + 4241, + 3355, + 3520, + 0, + 0, + 4244, + 4243, + 0, 0, 0, 3356, - 3416, 3358, - 0, - 4528, 3360, - 3361, - 3362, - 3363, - 3397, - 3398, + 4384, + 0, + 0, + 0, 0, 0, - 3399, 0, 0, 0, @@ -21686,15 +21280,22 @@ const unsigned short _wind_canon_next_table[] = { 0, 0, 0, + 0, + 0, + 3362, 3364, + 0, + 0, + 0, + 3479, 3366, - 3367, 3368, - 3369, - 0, - 3982, - 4257, 3370, + 3372, + 3374, + 3376, + 3378, + 3380, 0, 0, 0, @@ -21705,979 +21306,1256 @@ const unsigned short _wind_canon_next_table[] = { 0, 0, 0, - 3396, - 3374, - 3375, - 3376, - 3377, - 3378, - 3382, + 0, + 0, + 3506, 3383, - 3384, + 0, + 0, + 0, + 3988, 3385, - 3386, - 3388, + 3387, 3389, 3391, + 0, + 0, + 0, + 0, + 4228, 3393, + 3631, + 0, + 0, + 0, + 0, + 3832, + 3633, + 3834, + 0, + 0, + 0, + 0, + 0, + 0, + 0, 3395, + 3396, + 4610, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3398, 3401, 3403, - 3404, - 3422, + 4375, + 0, + 0, + 0, + 0, + 3405, + 3407, 3409, - 3411, - 3412, - 3413, - 3414, - 3415, - 3418, 0, 0, 0, + 4586, 0, 0, 0, 0, 0, + 4583, + 3410, 0, 0, 0, + 4582, + 3413, + 4632, + 3415, + 4634, + 3710, 0, - 4661, + 3467, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3610, + 3612, + 3416, 3419, 3421, - 3424, - 3426, + 3423, + 3425, + 3724, 0, + 3473, 0, 0, 0, - 3427, - 3429, - 3430, 0, + 3726, 0, - 3431, + 3728, 0, - 3434, 0, - 3441, - 3433, + 3730, + 3428, + 3620, + 3429, + 3432, + 3434, 3436, - 3437, 3438, - 3439, - 3481, + 4459, + 0, + 4460, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, 3440, - 3443, - 3445, + 3442, + 3444, 3446, - 3447, 3448, - 3449, + 3450, 3452, - 3453, 3454, - 3455, + 0, + 0, + 0, + 0, + 0, + 0, + 4090, 3456, 3458, - 4004, + 3501, + 0, + 0, 3460, 3462, - 3463, 3464, - 3465, 3466, 3468, - 0, - 0, - 3469, - 3489, 3471, - 3473, 3474, - 3475, - 4588, + 3476, + 3478, + 3481, + 3483, 0, 0, 0, - 3476, - 3480, + 4001, + 0, + 0, + 0, + 4002, + 0, + 4003, + 3485, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 4099, + 3487, + 3489, + 3803, + 0, + 0, 0, 0, - 3477, - 3479, - 3486, 0, 0, 0, 0, - 3483, - 3485, - 3488, 3491, - 3493, - 3495, - 3497, + 3494, + 3496, 3498, - 3499, 3500, - 3501, 3503, - 3504, - 3505, - 3506, - 3507, - 3510, - 0, - 0, - 0, - 3509, - 3512, - 4579, + 3687, 0, 0, 0, 0, 0, 0, - 4551, - 4291, + 3505, + 4371, + 3508, + 3511, + 3707, 3513, - 3514, 3515, - 3516, - 3518, 3517, - 3520, + 3519, + 3521, + 3523, + 3525, + 4656, + 3527, 0, 0, 0, - 3521, 0, 0, 0, 0, 0, - 3541, - 3527, - 3529, - 3530, + 0, + 4658, + 3528, 3531, - 3532, 3533, 3535, - 3536, - 3537, - 4109, 0, - 3538, - 3834, + 0, + 0, + 0, + 3689, + 3537, 3539, 0, 0, 0, - 3540, 0, 0, 0, 0, 0, - 3555, - 3543, + 0, + 3681, + 3540, + 3542, 3544, 3546, - 3547, 3548, - 3549, 3550, - 3553, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3757, + 3552, 3554, - 3559, + 3769, + 3766, + 0, + 0, + 0, + 3556, + 3558, + 3560, + 4020, + 4342, + 0, + 0, + 0, 3562, - 3563, 3564, - 3565, - 3566, - 3568, - 3570, - 3630, - 3629, + 3567, + 4566, 0, 0, + 3569, + 3571, + 3574, + 3576, + 3578, 0, 0, - 3632, 0, 0, 0, 0, - 3573, - 3575, - 3577, - 3579, + 0, + 0, + 0, + 0, + 0, + 0, + 3622, 3580, - 3581, - 3582, + 0, + 3827, 3583, - 3585, 3586, - 3587, 3588, - 3599, - 3600, + 3590, 0, + 3668, + 3672, 0, - 3589, 0, 0, 0, 0, + 3673, 0, 0, 0, - 3638, - 3591, + 0, + 0, + 0, + 3674, 3592, 3594, - 3595, + 3675, + 3676, 3596, - 3597, 3598, - 3636, + 3600, + 3602, + 3604, + 3607, + 4575, + 0, + 0, + 0, + 0, 0, 0, - 3633, - 3634, 0, 0, 0, 0, 0, - 3602, - 3604, - 3606, - 3607, - 3608, 3609, - 3610, - 3612, + 4639, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 3611, 3613, 3615, - 3616, + 4643, 3617, - 3618, 3619, 3621, - 3623, + 3778, + 0, + 3624, 3626, - 3631, + 3628, 0, 0, 0, - 3628, - 3640, - 3641, + 0, + 0, + 0, + 0, + 0, + 3785, + 3822, + 0, + 0, + 0, + 3630, + 3632, + 3634, + 3636, + 3638, + 0, + 0, + 0, + 3849, 3642, - 3643, - 3682, 3644, 3646, - 3647, - 3648, 3649, - 3650, - 3654, + 3651, + 4058, + 3653, 0, 0, - 3652, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 4073, 3656, + 4154, 3658, - 3660, - 3662, - 3669, + 3661, + 4210, + 0, + 0, + 3663, + 3665, + 3667, 3671, - 3673, - 3675, - 3677, + 3670, 3678, - 3679, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 4319, + 0, + 0, + 0, + 0, + 4320, 3680, - 3681, - 3685, - 3688, - 3689, - 3690, - 3691, + 3682, 0, - 4263, - 3692, - 3694, + 0, + 0, + 0, + 0, + 4335, + 0, + 0, + 4336, + 4358, + 0, + 0, + 0, + 0, + 0, + 0, + 3684, + 3686, + 0, + 0, + 0, + 4359, + 3691, + 3693, 3695, 3697, - 3698, 3699, - 3700, 3701, 3703, 3705, - 4515, - 3707, + 3709, + 3711, + 3715, + 3717, + 3850, + 3944, + 3969, + 4201, + 4267, + 3973, + 4463, + 4567, + 3760, + 3954, + 3718, 0, 0, - 4514, 0, - 4512, + 3743, + 3735, 0, - 4524, - 3709, - 3711, - 3713, - 3716, - 3717, - 3721, - 3723, + 4553, + 0, + 3789, + 3797, + 3719, + 3720, + 3722, 3725, - 3726, 3727, - 3728, 3729, - 3732, + 3731, + 3733, + 0, + 3746, + 0, + 3767, 3734, + 3736, + 3737, + 3739, + 3742, + 3744, + 4198, 0, + 3751, + 3745, + 3747, 0, + 4523, + 3750, + 3752, + 4069, 0, 0, + 4070, 0, + 3754, + 3756, 0, 0, 0, 0, - 3764, - 3736, - 3737, - 3738, - 3739, - 3740, - 3742, 0, 0, 0, + 3758, + 3761, + 4615, 0, - 4510, - 4304, - 4285, + 4625, + 4636, 0, 0, 0, 0, 0, + 4651, + 4613, 0, 0, - 4539, - 3743, - 3745, - 3746, - 3747, - 3748, - 3749, - 3751, - 3752, - 3756, - 3755, - 3758, - 3759, - 3761, + 0, + 0, + 0, + 0, + 0, + 0, + 3762, 3763, - 3766, - 3770, + 3765, + 3768, 3771, - 3772, 3773, + 0, + 0, + 0, + 0, 3774, 3776, - 3778, - 0, - 3779, + 3777, 3781, - 3783, + 3782, 3784, - 3786, - 3794, + 3790, + 3791, 3793, - 3792, 0, 0, 0, 0, - 3788, - 3800, 0, - 3833, - 3790, - 3791, - 3796, - 3798, - 3802, 0, + 4195, 0, 0, 0, - 3809, - 3804, + 0, + 0, + 4194, + 3796, + 3798, + 3799, + 3802, 3805, - 3806, 3807, - 3808, - 3811, + 3810, 3812, - 3813, 3814, - 3815, - 3817, + 3816, 3818, 3820, - 3822, - 3823, 3824, - 3825, 3826, - 3828, - 0, - 0, 3829, - 3831, - 3835, - 3837, - 3856, 0, 0, 0, - 3853, - 0, - 0, - 0, - 0, - 0, - 0, - 3839, - 3857, - 0, 0, 0, 0, + 3844, 0, 0, 0, + 3838, 0, 0, + 3840, + 3830, + 3831, + 3833, + 3835, + 3837, + 3839, 3841, - 3858, - 0, - 0, - 0, - 3844, - 3882, - 0, - 0, - 0, + 3843, + 3845, + 3848, + 3847, + 3851, 0, + 3865, 0, 0, + 3890, 0, + 3899, 0, + 3917, + 3852, + 3853, + 3855, 0, 0, 0, 0, - 3846, - 3848, - 3850, - 3851, - 3855, + 3856, + 3858, 3860, - 3861, 3862, - 4382, - 0, - 3863, 3864, 3866, + 0, + 0, + 0, + 3868, 3867, 3869, - 3870, 3871, - 3872, 3873, 3875, - 3877, + 0, + 0, + 0, 3879, - 3881, - 3884, - 3886, - 3888, 0, 0, 0, - 3937, - 3890, + 0, + 4400, + 3874, + 3876, + 3878, + 3880, + 3882, + 3884, + 3883, + 3885, + 3887, + 3889, + 3891, 3892, + 3894, + 3896, + 3898, + 0, + 0, + 0, 0, 0, - 3913, - 3938, 0, 0, 0, 0, 0, 0, - 3894, - 3896, - 3898, - 3900, 3902, - 3903, + 3900, + 3901, 3904, - 3905, 3906, 3908, - 3909, 3910, 3911, + 3914, + 3916, + 4136, + 0, + 0, + 0, + 0, 0, - 4443, - 4215, - 3933, - 3934, 0, 0, 0, 0, - 3932, 0, 0, 0, 0, - 3912, - 3915, - 3916, 3918, - 3921, + 3919, + 0, 3922, - 3923, - 3924, + 3921, + 3925, 0, - 4438, - 3929, - 3928, 0, + 3924, 3927, + 3929, + 3930, + 3932, 0, - 3925, - 3926, + 0, + 0, + 3942, + 3948, 0, 0, 0, 0, + 3967, + 0, + 3980, + 3933, + 3935, + 3937, 3939, - 3931, - 3936, 3941, 3943, - 3944, 3945, - 3946, - 3955, - 3954, 0, - 3947, + 3960, + 0, 0, + 3996, 0, 0, 0, 0, - 3959, + 4023, + 3946, + 4258, + 3947, 3949, - 3950, 3951, - 3952, - 3953, - 3960, 0, 0, + 3952, 0, 0, + 3953, + 4667, + 4672, + 4675, + 3955, 0, - 3958, - 3957, 0, + 4695, + 3956, + 3957, + 3959, + 3961, + 3962, + 3964, 0, 0, - 3994, - 3963, - 3962, - 3965, - 3967, + 4410, + 3966, 3968, - 3969, + 4055, + 0, 3970, - 3971, - 3972, - 4262, - 4229, - 4019, - 4018, - 4017, + 4085, + 4095, 0, - 4016, + 4113, 0, - 4014, - 4013, - 3979, - 3978, - 3977, + 4122, 0, + 4133, 0, + 4142, + 4157, + 4171, + 4178, + 3971, + 3972, 3974, - 3976, - 4015, - 4027, - 0, - 0, + 4362, + 4372, + 4378, + 4381, 0, - 4012, + 4402, 0, 0, 0, + 4427, + 4448, + 4451, 0, - 3981, - 3984, + 4469, + 3975, + 3976, + 3978, 0, 0, 0, - 3983, 0, 0, 0, 0, 0, - 3995, - 3986, + 3979, + 3981, + 3983, + 3985, 3987, - 3988, - 3989, 3990, + 3994, + 0, 3992, 3993, + 3995, 3997, 3998, - 3999, 4000, - 4001, - 4201, - 0, - 0, - 4003, + 4005, 4007, - 4008, 4009, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, 4010, - 4011, - 4076, + 4012, + 4014, 0, - 4021, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 4015, + 4017, + 4019, 4022, - 4023, 4024, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 4035, 4025, - 4026, - 4029, - 4037, - 4031, + 4027, + 4030, 4032, - 4033, 4034, - 0, - 4547, - 4039, + 4036, 4038, - 4041, 4040, - 4035, + 4043, 0, 0, - 4036, - 4045, + 0, + 4051, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 4067, 4044, - 4071, - 4043, - 4048, + 4046, 4050, - 4051, + 0, + 0, + 0, + 0, + 0, + 0, + 4048, 4052, - 4053, 4054, - 4055, + 4056, 4057, - 4058, - 4060, - 4082, + 4061, + 4065, + 4063, 0, 0, + 4088, 0, 0, 0, 0, + 4103, + 4064, + 4066, + 4068, + 4072, + 4075, + 4354, + 0, + 0, + 4360, + 0, + 4367, 0, 0, 0, - 4062, - 4068, - 4067, 0, 0, - 4069, 0, - 4070, 0, - 4064, - 4066, - 4073, - 4075, 4077, + 4390, + 0, + 0, + 0, 4078, - 4079, - 4080, 4081, 4084, - 4085, - 4086, - 4087, - 4088, - 4090, - 4092, - 4094, - 4097, 0, - 4096, 0, 0, - 4101, - 4571, - 4572, - 4573, - 4574, - 4100, 0, - 4577, - 4578, - 4560, - 4561, - 4609, 0, - 4610, 0, 0, - 4613, - 4104, - 4105, - 4106, - 4107, - 4108, - 4110, 0, 0, 0, + 4083, + 4388, 0, 0, 0, + 4407, 0, 0, + 4086, + 4087, + 4089, + 4092, + 4094, + 4096, + 4097, + 4101, 0, 0, - 4126, + 4105, + 0, + 0, + 0, + 0, + 0, + 4107, + 0, + 0, + 0, + 4109, + 4102, + 4104, + 4106, + 4108, + 4110, 4112, 4114, - 4116, - 4117, + 4115, + 4118, + 0, + 0, + 4127, 4119, 4121, 4123, - 4125, + 4124, + 4126, 4128, - 4129, - 4130, 4131, - 4132, 4134, - 4137, + 0, + 0, + 0, + 0, + 0, + 0, 4138, + 4135, + 4137, 4139, - 4140, 4141, 4143, + 4144, + 4146, + 4149, + 4160, + 0, + 0, 0, 0, 0, - 4202, - 4145, - 4189, 0, 0, - 4147, - 4149, 0, 0, - 4156, - 4151, 4152, - 4153, - 4154, - 4155, + 4156, 4158, 4159, - 4160, - 4161, - 4163, 4162, - 4165, + 4164, 4166, + 0, + 0, + 0, + 0, + 0, + 4190, 4167, - 4168, + 4170, + 0, + 0, + 0, 4169, - 4171, 4172, 4173, - 4174, 4175, 4177, 4179, - 4182, + 0, + 0, 4181, + 4180, + 4182, 4184, - 4185, 4186, - 4187, + 4189, + 0, + 0, 4188, - 4190, - 4192, + 4191, 4193, - 4194, - 4195, - 4196, + 4197, 4199, - 4200, + 4202, + 4207, + 0, + 0, + 4215, + 4222, + 4225, + 0, + 0, + 0, + 4251, + 0, + 0, + 4262, + 4203, 4204, 4206, + 4208, 4209, - 4223, - 4213, + 4212, 4214, 4216, - 4218, + 4217, 4219, - 4220, 4221, - 4222, + 4223, 4224, - 4225, 4226, 4227, + 4231, + 4235, 4232, + 4234, + 4236, + 4238, + 4240, + 4242, + 4245, + 4247, 0, 0, - 4231, - 4235, 0, 0, 0, - 4234, 0, 0, 0, 0, 0, - 4261, - 4237, - 4238, - 4240, - 4242, - 4244, - 4246, - 4247, + 0, + 0, + 0, + 4271, 4248, - 4249, 4250, 4252, + 0, + 0, + 0, + 0, + 0, + 4256, 4253, - 4254, 4255, - 4256, - 4258, - 4260, + 4257, + 4259, + 4261, + 4263, + 4265, 4264, 4266, - 4267, 4268, + 4281, + 0, + 0, + 4299, + 0, + 4307, + 0, + 0, + 4321, + 4324, + 4332, + 4339, + 0, + 0, + 4349, 4269, - 4277, 0, 0, - 4270, + 0, + 0, + 0, + 0, + 0, 0, 0, 0, 4278, + 4270, 4272, - 4273, 4274, - 4275, - 4276, - 4280, - 4281, - 4282, - 4283, - 4284, - 4286, - 4288, + 0, + 0, + 4291, + 4295, + 0, 0, 0, 0, + 4297, 0, 0, 0, 0, - 4316, + 4305, + 4275, + 4277, + 4280, + 4279, + 4282, + 0, + 4284, + 4283, + 4285, + 4287, + 4288, 4290, 4292, - 4293, 4294, - 4295, 4296, - 4297, - 4299, + 4298, 4300, 4301, - 4302, 4303, - 4305, - 4307, - 4309, - 4312, - 4311, + 4306, + 4308, 0, 0, 0, 0, 0, + 0, + 4310, + 0, + 0, + 4312, + 4309, + 4311, + 4313, 4315, - 4314, + 4317, 4318, - 4320, 4322, + 4323, + 4325, + 4326, + 4328, + 4330, 0, + 4337, 0, 0, 0, @@ -22685,86 +22563,86 @@ const unsigned short _wind_canon_next_table[] = { 0, 0, 0, - 0, - 4360, - 4324, - 4325, - 4326, - 4327, - 4328, - 4330, + 4343, 4331, 4333, + 4334, + 4338, 4340, 4341, - 4349, - 4352, - 4354, - 4356, + 4344, + 4348, + 4350, + 4351, + 4353, + 4355, + 4357, + 4361, + 4363, 0, + 4365, 0, 0, 0, - 4359, - 4358, - 4362, - 4363, + 0, + 0, + 0, + 0, + 0, + 4369, 4364, - 4365, 4366, 4368, 4370, 4373, 4374, - 4375, - 4376, 4377, - 4381, - 4404, - 4405, + 4379, + 4380, + 4382, + 0, 0, - 4406, 0, - 4407, - 4408, 0, 0, 0, 0, - 4383, 4385, - 4387, - 4388, - 4391, - 4390, - 4393, - 4395, - 4398, + 4383, + 4386, + 4389, + 4392, + 4394, + 4396, 0, 0, 0, 0, 0, + 4413, + 4397, + 4399, + 4401, + 4403, + 4405, + 4404, + 4406, + 4408, 0, 0, - 4414, - 4400, - 4402, - 4410, + 0, + 0, + 0, + 0, + 0, + 0, + 4409, 4412, + 4414, 4416, - 4418, - 4419, - 4420, - 4421, - 4422, - 4424, - 4427, 0, 0, 0, - 4449, - 4450, 0, 0, 0, @@ -22773,14 +22651,33 @@ const unsigned short _wind_canon_next_table[] = { 0, 0, 0, + 4419, + 4418, + 4421, + 4423, + 0, + 4424, + 0, + 0, + 0, 0, + 0, + 0, + 0, + 0, + 0, + 4425, + 4428, 4429, 4431, - 4432, 4433, - 4434, 4435, - 4467, + 4437, + 4439, + 4441, + 4443, + 4447, + 4449, 0, 0, 0, @@ -22789,189 +22686,292 @@ const unsigned short _wind_canon_next_table[] = { 0, 0, 0, - 4437, - 4439, - 4441, - 4442, - 4444, - 4446, - 4448, + 0, + 4454, + 4450, 4452, 4453, 4455, - 4459, - 4460, - 4461, + 4457, + 0, + 0, + 4472, + 4474, + 0, + 0, + 0, + 0, + 0, + 0, + 4502, + 0, + 4508, + 4458, 4462, - 4463, + 4478, + 0, + 0, + 4464, + 0, + 0, + 4513, + 0, + 4524, + 4527, + 0, + 0, + 4540, + 0, + 0, + 4550, + 4465, 4466, + 4468, 4470, - 4472, - 4474, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, 4476, + 4471, + 4473, + 4475, + 0, 0, 0, 0, - 4479, 0, 0, 0, 0, 0, - 4499, - 4478, 4481, - 4483, + 4477, + 4479, + 4480, + 4484, + 0, 4485, 4487, - 4490, - 0, - 0, + 4489, 4491, 4493, - 4494, 4495, - 4496, 4497, - 4498, - 4502, - 0, + 4499, 4501, - 4504, - 4506, - 4508, + 4503, + 4505, + 4507, 4509, 4511, + 0, + 0, + 4512, + 4514, + 4515, 4517, - 4519, + 0, + 0, + 0, + 0, + 0, + 0, + 4518, 4520, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 4530, + 4532, 4521, - 4522, - 4523, + 4525, 4526, + 4528, + 4529, 4531, 4533, - 4534, 4536, - 4538, - 4540, + 4539, + 4541, 4542, 4544, - 4546, - 4548, - 4550, + 4547, + 4549, + 4551, 4552, - 4553, 4554, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 4562, 4555, 4557, - 4556, 4559, + 4561, 4563, - 4564, 4565, - 4566, - 4567, - 4570, + 4568, + 0, + 4578, + 0, + 0, + 0, + 4593, + 0, + 4603, 4569, - 4576, - 4580, + 4571, + 4570, + 4572, + 4574, + 4577, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, 4581, - 4582, - 4583, + 4579, + 4580, 4584, 4585, 4587, 4589, - 4590, + 4591, 4592, 4594, - 4596, - 4598, + 4595, + 4597, 4599, + 0, + 0, + 0, + 0, + 4606, 4600, - 4601, 4602, 4604, 4605, - 4606, 4607, - 4608, + 4609, 4612, - 4615, + 4614, + 4616, 4617, 4619, - 4620, 4621, + 0, + 0, + 0, + 4628, + 4620, 4622, - 4623, - 4625, - 4627, - 4629, - 4630, - 4632, - 4637, + 4624, + 4626, 0, 0, 0, - 4634, - 4636, - 4639, - 4642, - 4645, - 4644, 0, 0, 0, 0, - 4646, + 0, + 4630, + 4627, + 4629, + 4631, + 4633, + 4635, + 4637, + 4638, + 4641, + 0, + 0, + 0, + 0, 0, 0, 0, 0, - 4694, - 4648, 4649, + 4642, + 4645, + 4647, 4650, - 4651, 4652, 4653, 4655, 4657, - 4658, - 4660, - 4662, - 4671, - 0, + 4659, + 4661, 0, + 4663, + 4670, + 4662, 4664, 4666, - 4667, 4668, 4669, - 4670, + 4671, 4673, + 4674, 4676, 0, - 4675, + 0, + 0, + 0, + 0, + 0, + 0, + 0, 4678, - 4680, + 4677, + 4679, 4681, - 4682, 4683, 4684, + 4686, + 0, + 0, + 0, + 0, 4687, - 4688, 4689, - 4690, - 4691, - 4696, 0, 0, 0, 0, 0, 0, + 0, + 0, + 0, + 4690, + 4692, + 4694, + 4696, 4697, }; diff --git a/lib/wind/normalize_table.h b/lib/wind/normalize_table.h index d82cc26d4c03..a476bcea9ea5 100644 --- a/lib/wind/normalize_table.h +++ b/lib/wind/normalize_table.h @@ -1,5 +1,5 @@ /* ./normalize_table.h */ -/* Automatically generated at 2019-06-07T02:26:41.685585 */ +/* Automatically generated at 2022-11-15T13:59:51.864870 */ #ifndef NORMALIZE_TABLE_H #define NORMALIZE_TABLE_H 1 diff --git a/lib/wind/punycode_examples.c b/lib/wind/punycode_examples.c index 7336f3eacfea..5b66c421d728 100644 --- a/lib/wind/punycode_examples.c +++ b/lib/wind/punycode_examples.c @@ -1,5 +1,5 @@ /* ./punycode_examples.c */ -/* Automatically generated at 2019-06-07T02:40:18.438604 */ +/* Automatically generated at 2022-11-15T14:04:18.893543 */ #ifndef PUNYCODE_EXAMPLES_C #define PUNYCODE_EXAMPLES_C 1 diff --git a/lib/wind/punycode_examples.h b/lib/wind/punycode_examples.h index 3f4ced096b9e..ae21f2c50ebf 100644 --- a/lib/wind/punycode_examples.h +++ b/lib/wind/punycode_examples.h @@ -1,5 +1,5 @@ /* ./punycode_examples.h */ -/* Automatically generated at 2019-06-07T02:40:18.438347 */ +/* Automatically generated at 2022-11-15T14:04:18.893502 */ #ifndef PUNYCODE_EXAMPLES_H #define PUNYCODE_EXAMPLES_H 1 diff --git a/lib/wind/test-normalize.c b/lib/wind/test-normalize.c index 3e13aeec90cd..ef4d01cb2f2a 100644 --- a/lib/wind/test-normalize.c +++ b/lib/wind/test-normalize.c @@ -155,9 +155,13 @@ main(int argc, char **argv) if (f == NULL) { const char *srcdir = getenv("srcdir"); if (srcdir != NULL) { - char longname[256]; - snprintf(longname, sizeof(longname), "%s/%s", srcdir, filename); + char *longname = NULL; + + if (asprintf(&longname, "%s/%s", srcdir, filename) == -1 || + longname == NULL) + errx(1, "Out of memory"); f = fopen(longname, "r"); + free(longname); } if (f == NULL) err(1, "open %s", filename); diff --git a/lib/wind/utf8.c b/lib/wind/utf8.c index e1a1eb7b2b45..d69db0c0cec1 100644 --- a/lib/wind/utf8.c +++ b/lib/wind/utf8.c @@ -205,14 +205,18 @@ wind_ucs4utf8(const uint32_t *in, size_t in_len, char *out, size_t *out_len) case 4: out[3] = (ch | 0x80) & 0xbf; ch = ch >> 6; + /* FALLTHROUGH */ case 3: out[2] = (ch | 0x80) & 0xbf; ch = ch >> 6; + /* FALLTHROUGH */ case 2: out[1] = (ch | 0x80) & 0xbf; ch = ch >> 6; + /* FALLTHROUGH */ case 1: out[0] = ch | first_char[len - 1]; + /* FALLTHROUGH */ } } out += len; @@ -480,11 +484,14 @@ wind_ucs2utf8(const uint16_t *in, size_t in_len, char *out, size_t *out_len) case 3: out[2] = (ch | 0x80) & 0xbf; ch = ch >> 6; + /* FALLTHROUGH */ case 2: out[1] = (ch | 0x80) & 0xbf; ch = ch >> 6; + /* FALLTHROUGH */ case 1: out[0] = ch | first_char[len - 1]; + /* FALLTHROUGH */ } out += len; } |