svn rev #21684: branches/mskrb-integ/src/ config/ lib/kadm5/srv/ tests/dejagnu/krb-standalone/
hartmans@MIT.EDU
hartmans at MIT.EDU
Sat Jan 3 15:22:37 EST 2009
http://src.mit.edu/fisheye/changelog/krb5/?cs=21684
Commit By: hartmans
Log Message:
git-svn managed to generate a bogus commit or otherwise get into a state where it believed that changes had been merged onto the branch
when they had in fact not been merged.
This re-applies these changes.
This reverts commit d2f51f02bac81d852f6f020373718d08b6abd02f.
Conflicts:
src/lib/crypto/Makefile.in
src/lib/crypto/arcfour/Makefile.in
src/lib/crypto/des/Makefile.in
src/lib/crypto/enc_provider/Makefile.in
src/lib/crypto/keyhash_provider/Makefile.in
src/lib/krb5/krb/rd_req_dec.c
Changed Files:
U branches/mskrb-integ/src/aclocal.m4
U branches/mskrb-integ/src/config/pre.in
U branches/mskrb-integ/src/lib/kadm5/srv/svr_iters.c
U branches/mskrb-integ/src/tests/dejagnu/krb-standalone/kadmin.exp
Modified: branches/mskrb-integ/src/aclocal.m4
===================================================================
--- branches/mskrb-integ/src/aclocal.m4 2009-01-03 12:40:53 UTC (rev 21683)
+++ branches/mskrb-integ/src/aclocal.m4 2009-01-03 20:22:35 UTC (rev 21684)
@@ -506,9 +506,11 @@
AC_BEFORE([$0],[AC_PROG_CXX])
krb5_ac_cflags_set=${CFLAGS+set}
krb5_ac_cxxflags_set=${CXXFLAGS+set}
+krb5_ac_warn_cflags_set=${WARN_CFLAGS+set}
+krb5_ac_warn_cxxflags_set=${WARN_CXXFLAGS+set}
])
dnl
-AC_DEFUN(TRY_CC_FLAG,[dnl
+AC_DEFUN(TRY_WARN_CC_FLAG,[dnl
cachevar=`echo "krb5_cv_cc_flag_$1" | sed s/[[^a-zA-Z0-9_]]/_/g`
AC_CACHE_CHECK([if C compiler supports $1], [$cachevar],
[# first try without, then with
@@ -519,7 +521,7 @@
CFLAGS="$old_cflags"],
[AC_MSG_ERROR(compiling simple test program with $CFLAGS failed)])])
if eval test '"${'$cachevar'}"' = yes; then
- CFLAGS="$CFLAGS $1"
+ WARN_CFLAGS="$WARN_CFLAGS $1"
fi
eval flag_supported='${'$cachevar'}'
])dnl
@@ -550,7 +552,7 @@
AC_DEFINE(CONFIG_SMALL,1,[Define to reduce code size even if it means more cpu usage])
fi
# -Wno-long-long, if needed, for k5-platform.h without inttypes.h etc.
-extra_gcc_warn_opts="-Wall -Wcast-qual -Wcast-align -Wconversion -Wshadow"
+extra_gcc_warn_opts="-Wall -Wcast-qual -Wcast-align -Wshadow"
# -Wmissing-prototypes
if test "$GCC" = yes ; then
# Putting this here means we get -Os after -O2, which works.
@@ -562,32 +564,32 @@
*) CFLAGS="$CFLAGS -Os" ;;
esac
fi
- if test "x$krb5_ac_cflags_set" = xset ; then
- AC_MSG_NOTICE(not adding extra gcc warning flags because CFLAGS was set)
+ if test "x$krb5_ac_warn_cflags_set" = xset ; then
+ AC_MSG_NOTICE(not adding extra gcc warning flags because WARN_CFLAGS was set)
else
AC_MSG_NOTICE(adding extra warning flags for gcc)
- CFLAGS="$CFLAGS $extra_gcc_warn_opts -Wmissing-prototypes"
+ WARN_CFLAGS="$WARN_CFLAGS $extra_gcc_warn_opts -Wmissing-prototypes"
if test "`uname -s`" = Darwin ; then
AC_MSG_NOTICE(skipping pedantic warnings on Darwin)
elif test "`uname -s`" = Linux ; then
AC_MSG_NOTICE(skipping pedantic warnings on Linux)
else
- CFLAGS="$CFLAGS -pedantic"
+ WARN_CFLAGS="$WARN_CFLAGS -pedantic"
fi
if test "$ac_cv_cxx_compiler_gnu" = yes; then
- if test "x$krb5_ac_cxxflags_set" = xset ; then
- AC_MSG_NOTICE(not adding extra g++ warnings because CXXFLAGS was set)
+ if test "x$krb5_ac_warn_cxxflags_set" = xset ; then
+ AC_MSG_NOTICE(not adding extra g++ warnings because WARN_CXXFLAGS was set)
else
AC_MSG_NOTICE(adding extra warning flags for g++)
- CXXFLAGS="$CXXFLAGS $extra_gcc_warn_opts"
+ WARN_CXXFLAGS="$WARN_CXXFLAGS $extra_gcc_warn_opts"
fi
fi
# Currently, G++ does not support -Wno-format-zero-length.
- TRY_CC_FLAG(-Wno-format-zero-length)
+ TRY_WARN_CC_FLAG(-Wno-format-zero-length)
# Other flags here may not be supported on some versions of
# gcc that people want to use.
for flag in overflow strict-overflow missing-format-attribute missing-prototypes return-type missing-braces parentheses switch unused-function unused-label unused-variable unused-value unknown-pragmas sign-compare newline-eof ; do
- TRY_CC_FLAG(-W$flag)
+ TRY_WARN_CC_FLAG(-W$flag)
done
# old-style-definition? generates many, many warnings
#
@@ -603,9 +605,9 @@
# We're currently targeting C89+, not C99, so disallow some
# constructs.
for flag in declaration-after-statement variadic-macros ; do
- TRY_CC_FLAG(-Werror=$flag)
+ TRY_WARN_CC_FLAG(-Werror=$flag)
if test "$flag_supported" = no; then
- TRY_CC_FLAG(-W$flag)
+ TRY_WARN_CC_FLAG(-W$flag)
fi
done
# missing-prototypes? maybe someday
@@ -667,6 +669,8 @@
WARN_CXXFLAGS="-errtags=yes +w +w2 -xport64"
fi
fi
+AC_SUBST(WARN_CFLAGS)
+AC_SUBST(WARN_CXXFLAGS)
])dnl
dnl
dnl
Modified: branches/mskrb-integ/src/config/pre.in
===================================================================
--- branches/mskrb-integ/src/config/pre.in 2009-01-03 12:40:53 UTC (rev 21683)
+++ branches/mskrb-integ/src/config/pre.in 2009-01-03 20:22:35 UTC (rev 21684)
@@ -152,17 +152,20 @@
# LOCALINCLUDES set by local Makefile.in
# CPPFLAGS user override
# CFLAGS user override but starts off set by configure
+# WARN_CFLAGS user override but starts off set by configure
# PTHREAD_CFLAGS set by configure, not included in CFLAGS so that we
# don't pull the pthreads library into shared libraries
ALL_CFLAGS = $(DEFS) $(DEFINES) $(KRB_INCLUDES) $(LOCALINCLUDES) \
-DKRB5_DEPRECATED=1 \
- $(CPPFLAGS) $(CFLAGS) $(PTHREAD_CFLAGS)
+ $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(PTHREAD_CFLAGS)
ALL_CXXFLAGS = $(DEFS) $(DEFINES) $(KRB_INCLUDES) $(LOCALINCLUDES) \
-DKRB5_DEPRECATED=1 \
- $(CPPFLAGS) $(CXXFLAGS) $(PTHREAD_CFLAGS)
+ $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(PTHREAD_CFLAGS)
CFLAGS = @CFLAGS@
CXXFLAGS = @CXXFLAGS@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CXXFLAGS = @WARN_CXXFLAGS@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
THREAD_LINKOPTS = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
Modified: branches/mskrb-integ/src/lib/kadm5/srv/svr_iters.c
===================================================================
--- branches/mskrb-integ/src/lib/kadm5/srv/svr_iters.c 2009-01-03 12:40:53 UTC (rev 21683)
+++ branches/mskrb-integ/src/lib/kadm5/srv/svr_iters.c 2009-01-03 20:22:35 UTC (rev 21684)
@@ -86,7 +86,7 @@
/* and trailing null. If glob has no @, also allocate space for */
/* the realm. */
append_realm = (realm != NULL) && (strchr(glob, '@') == NULL);
- p = (char *) malloc(strlen(glob)*2+ 3 + (append_realm ? 2 : 0));
+ p = (char *) malloc(strlen(glob)*2+ 3 + (append_realm ? 3 : 0));
if (p == NULL)
return ENOMEM;
*regexp = p;
@@ -120,6 +120,7 @@
if (append_realm) {
*p++ = '@';
+ *p++ = '.';
*p++ = '*';
}
Modified: branches/mskrb-integ/src/tests/dejagnu/krb-standalone/kadmin.exp
===================================================================
--- branches/mskrb-integ/src/tests/dejagnu/krb-standalone/kadmin.exp 2009-01-03 12:40:53 UTC (rev 21683)
+++ branches/mskrb-integ/src/tests/dejagnu/krb-standalone/kadmin.exp 2009-01-03 20:22:35 UTC (rev 21684)
@@ -383,7 +383,9 @@
global KEY
global spawn_id
- spawn $KADMIN -p krbtest/admin@$REALMNAME -q "get_principals *"
+ # "*" would match everything
+ # "*n" should match a few like kadmin/admin but see ticket 5667
+ spawn $KADMIN -p krbtest/admin@$REALMNAME -q "get_principals *n"
expect_after {
"Cannot contact any KDC" {
fail "kadmin ldb lost KDC"
More information about the cvs-krb5
mailing list