This commit was generated by cvs2svn to compensate for changes in r145,

which included commits to RCS files with non-trunk default branches.

git-svn-id: svn://svn.1ts.org/debian/trunk/zephyr@146 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/acinclude.m4 b/acinclude.m4
index 63e5fd14999bc177a1ade13db24c0c0b8c51c271..1a87fd0bbc5ebe4e05e383ba9961cad2565ff327 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -92,8 +92,16 @@ AC_DEFUN(ATHENA_UTIL_COM_ERR,
        [com_err="$withval"], [com_err=yes])
 if test "$com_err" != no; then
        if test "$com_err" != yes; then
-               CPPFLAGS="$CPPFLAGS -I$com_err/include"
+               if test -f $com_err/include/krb5/com_right.h; then
+                       CPPFLAGS="$CPPFLAGS -I$com_err/include/krb5"
+               else
+                       CPPFLAGS="$CPPFLAGS -I$com_err/include"
+               fi
                LDFLAGS="$LDFLAGS -L$com_err/lib"
+       else
+               if test -f /usr/include/krb5/com_right.h; then
+                       CPPFLAGS="$CPPFLAGS -I/usr/include/krb5"
+               fi
        fi
        AC_CHECK_LIB(com_err, com_err, :,
                     [AC_MSG_ERROR(com_err library not found)])
@@ -107,20 +115,31 @@ AC_DEFUN(ATHENA_UTIL_SS,
 [AC_ARG_WITH(ss,
        [  --with-ss=PREFIX        Specify location of ss (requires com_err)],
        [ss="$withval"], [ss=yes])
-if test "$ss" != no; then
-       if test "$ss" != yes; then
-               CPPFLAGS="$CPPFLAGS -I$ss/include"
-               LDFLAGS="$LDFLAGS -L$ss/lib"
+if test "$ss" = no; then
+       AC_MSG_ERROR(This package requires ss.)
+fi
+if test "$ss" != yes; then
+       CPPFLAGS="$CPPFLAGS -I$ss/include"
+       if test -f $ss/include/krb5/sl.h; then
+               CPPFLAGS="$CPPFLAGS -I$ss/include/krb5"
        fi
-       AC_CHECK_LIB(ss, ss_perror, :,
-                    [unset ac_cv_lib_ss_ss_perror
-                     AC_CHECK_LIB(ss, ss_perror, :,
-                                  [AC_MSG_ERROR(ss library not found)],
-                                  -ledit -lroken -ltermcap -lcom_err)],
-                    -lcom_err)
+       LDFLAGS="$LDFLAGS -L$ss/lib"
 else
-       AC_MSG_ERROR(This package requires ss.)
-fi])
+       if test -f /usr/include/krb5/sl.h; then
+               CPPFLAGS="$CPPFLAGS -I/usr/include/krb5"
+       fi
+fi
+AC_CHECK_HEADERS(ss/ss.h krb5/ss.h)
+
+AC_CHECK_LIB(ss, ss_perror, [SS_LIBS="-lss"],
+            [unset ac_cv_lib_ss_ss_perror
+             S="-ledit -lroken -ltermcap -lcom_err -lcrypt"
+             AC_CHECK_LIB(ss, ss_perror,
+                          [SS_LIBS="-lss $S"],
+                          [AC_MSG_ERROR(ss library not found)],
+                          $S)],
+            -lcom_err)
+AC_SUBST(SS_LIBS)])
 
 dnl ----- Regular expressions -----
 

diff --git a/clients/zctl/zctl.c b/clients/zctl/zctl.c
index 4cf17b6c4370d164e75ee0bd4d82487d7433c742..5231deabe83f27fa61d7283669e077921fdf2be2 100644 (file)
--- a/clients/zctl/zctl.c
+++ b/clients/zctl/zctl.c
@@ -13,7 +13,13 @@
 
 #include <sysdep.h>
 #include <zephyr/zephyr.h>
+#ifdef HAVE_SS_SS_H
 #include <ss/ss.h>
+#else
+# ifdef HAVE_KRB5_SS_H
+# include <krb5/ss.h>
+# endif
+#endif
 #include <com_err.h>
 #include <pwd.h>
 #include <netdb.h>

diff --git a/lib/ZMkAuth.c b/lib/ZMkAuth.c
index 3e09763994c4ab8a5057d781471f820f50eea56b..1d1629686ab3ed20820adca4343da4f6f496061f 100644 (file)
--- a/lib/ZMkAuth.c
+++ b/lib/ZMkAuth.c
@@ -42,7 +42,6 @@ Code_t ZMakeAuthentication(notice, buffer, buffer_len, phdr_len)
     char *krealm, *cksum_start, *cstart, *cend;
     ZChecksum_t checksum;
     CREDENTIALS cred;
-    extern unsigned long des_quad_cksum();
 
     if (notice->z_dest_galaxy && *notice->z_dest_galaxy) {
        for (i=0; i<__ngalaxies; i++) {