Remove the variable use_other_realm, is not actually necessary for the

new -r realm code.

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

diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 4bb96657f0b029d59138ad1a3ccc241c76169f17..28f0adb8007d06dcab2220db85a092e8a3d9eafd 100644 (file)
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jul 18 22:10:29 1998  Geoffrey King  <gjking@mit.edu>
+
+       * krb524d.c (main): Remove the variable use_other_realm.
+       It is not actually necessary for the new -r realm code.
+
 Fri Jul 17 04:11:47 1998  Geoffrey King  <gjking@mit.edu>
 
        * krb524d.c (main): Accept a -r command line option to specify

diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c
index ae77e55c8218bd535bbaa656a4c6e6fdef2b563e..e9ab662d155656c6af4e345055bc582e63958c8c 100644 (file)
--- a/src/krb524/krb524d.c
+++ b/src/krb524/krb524d.c
@@ -47,7 +47,7 @@ int signalled = 0;
 static int debug = 0;
 void *handle;
 
-int use_keytab, use_master, use_other_realm;
+int use_keytab, use_master;
 char *keytab = NULL;
 krb5_keytab kt;
 
@@ -101,7 +101,7 @@ int main(argc, argv)
      whoami = ((whoami = strrchr(argv[0], '/')) ? whoami + 1 : argv[0]);
 
      argv++; argc--;
-     use_master = use_keytab = use_other_realm = 0;
+     use_master = use_keytab = 0;
      config_params.mask = 0;
      
      while (argc) {
@@ -110,7 +110,6 @@ int main(argc, argv)
          else if (strncmp(*argv, "-m", 2) == 0)
               use_master = 1;
          else if (strcmp(*argv, "-r") == 0) {
-              use_other_realm = 1;
               argv++; argc--;
               if (argc == 0 || !use_master)
                    usage(context);
@@ -122,9 +121,8 @@ int main(argc, argv)
          argv++; argc--;
      }
      if (argc || use_keytab + use_master > 1 ||
-        use_keytab + use_other_realm > 1 ||
         use_keytab + use_master == 0) {
-         use_keytab = use_master = use_other_realm = 0;
+         use_keytab = use_master = 0;
          usage(context);
      }