back out accidental check-in

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13209 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in
index 912d2f43ff30534dad10b45c7464ff209113923a..b49587b253c822d615409354055383dd7f578e02 100644 (file)
--- a/src/krb524/Makefile.in
+++ b/src/krb524/Makefile.in
@@ -129,11 +129,3 @@ clean-unix:: clean-libs clean-libobjs
 
 $(KRB524_HDR): krb524.h
        $(CP) krb524.h $@
-
-PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH)
-PROG_RPATH=$(KRB5_LIBDIR)$(TCL_RPATH)
-
-tcltest: tcltest.o $(KRB524_DEPLIB) $(KRB4COMPAT_DEPLIBS)
-       $(CC_LINK) -o tcltest tcltest.o $(KRB524_LIB) $(KRB4COMPAT_LIBS) \
-               $(TCL_LIBS)
-tcltest.o: tcltest.c

diff --git a/src/krb524/configure.in b/src/krb524/configure.in
index 96fbc51008045949d85a03b3335c974315dc73ed..eca1642cdb0c58a2054e5f64ca13aa079ed043cc 100644 (file)
--- a/src/krb524/configure.in
+++ b/src/krb524/configure.in
@@ -4,7 +4,6 @@ AC_PROG_INSTALL
 KRB5_BUILD_LIBRARY_STATIC
 KRB5_BUILD_LIBOBJS
 AC_PROG_AWK
-AC_KRB5_TCL
 AC_CHECK_HEADERS(sys/select.h) dnl
 AC_TYPE_SIGNAL
 

diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c
index 80c55054482aa8378a13a44b8835e5452065d3fd..ab3d038b927622e1171586e56ff652b6c6b2bafc 100644 (file)
--- a/src/krb524/krb524d.c
+++ b/src/krb524/krb524d.c
@@ -65,7 +65,7 @@ krb5_error_code  kdc_get_server_key(krb5_context, krb5_principal,
 static void usage(context)
      krb5_context context;
 {
-     fprintf(stderr, "Usage: %s [-k[eytab]] [-m[aster] [-r realm]] [-nofork] [-p portnum]\n", whoami);
+     fprintf(stderr, "Usage: %s [-k[eytab]] [-m[aster] [-r realm]] [-nofork]\n", whoami);
      cleanup_and_exit(1, context);
 }
 
@@ -99,7 +99,6 @@ int main(argc, argv)
      krb5_context context;
      krb5_error_code retval;
      kadm5_config_params config_params;
-     int port = 0;
 
      retval = krb5_init_context(&context);
      if (retval) {
@@ -127,14 +126,6 @@ int main(argc, argv)
               config_params.mask |= KADM5_CONFIG_REALM;
               config_params.realm = *argv;
          }
-         else if (strcmp(*argv, "-p") == 0) {
-             argv++; argc--;
-             if (argc == 0)
-                 usage (context);
-             port = atoi (*argv);
-             if (port <= 0 || port > 65535)
-                 usage (context);
-         }
          else
               break;
          argv++; argc--;
@@ -157,16 +148,12 @@ int main(argc, argv)
      memset((char *) &saddr, 0, sizeof(struct sockaddr_in));
      saddr.sin_family = AF_INET;
      saddr.sin_addr.s_addr = INADDR_ANY;
-     if (port == 0) {
-        serv = getservbyname(KRB524_SERVICE, "udp");
-        if (serv == NULL) {
-            com_err(whoami, 0, "service entry not found, using %d",
-                    KRB524_PORT);
-            saddr.sin_port = htons(KRB524_PORT);
-        } else
-            saddr.sin_port = serv->s_port;
+     serv = getservbyname(KRB524_SERVICE, "udp");
+     if (serv == NULL) {
+         com_err(whoami, 0, "service entry not found, using %d", KRB524_PORT);
+         saddr.sin_port = htons(KRB524_PORT);
      } else
-        saddr.sin_port = htons(port);
+         saddr.sin_port = serv->s_port;
          
      if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
          com_err(whoami, errno, "creating main socket");