(main): redo the v4/v5 selection for consistency.

-4 -> try only v4
-5 -> try only v5
none, -45 -> try v5, v4


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7297 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-11-02 22:45:10 +00:00
parent 272e2c7053
commit ac5267f34c
4 changed files with 30 additions and 30 deletions

View File

@@ -713,15 +713,11 @@ main(int argc, char **argv)
argv += optind;
#if defined(KRB4) && defined(KRB5)
if(use_v4 == -1 && use_v5 == -1)
use_v4 = use_v5 = 1;
#elif defined(KRB4)
if (use_v4 == -1)
use_v4 = 1;
#elif defined(KRB5)
if (use_v5 == -1)
use_v5 = 1;
#endif
if(use_v4 == -1 && use_v5 == 1)
use_v4 = 0;
if(use_v5 == -1 && use_v4 == 1)
use_v5 = 0;
#endif
if (do_help)
usage (0);