Use rxgk in afsconf_BuildServerSecurityObjects

[openafs.git] / tests / auth / authcon-t.c

diff --git a/tests/auth/authcon-t.c b/tests/auth/authcon-t.c
index 359b3a3..5bcd74c 100644 (file)
--- a/tests/auth/authcon-t.c
+++ b/tests/auth/authcon-t.c
@@ -49,14 +49,18 @@ main(int argc, char **argv)
     int secIndex;
     int numClasses;
     struct afsconf_typedKey *key;
+    int code = 0;
 
-    plan(9);
+    afstest_SkipTestsIfBadHostname();
+
+    plan(8);
     dirname = afstest_BuildTestConfig();
 
     dir = afsconf_Open(dirname);
     if (dir == NULL) {
        fprintf(stderr, "Unable to configure directory.\n");
-        exit(1);
+       code = 1;
+       goto out;
     }
 
     rx_Init(0);
@@ -64,15 +68,10 @@ main(int argc, char **argv)
     /* Server Security objects */
 
     afsconf_BuildServerSecurityObjects(dir, &classes, &numClasses);
-    is_int(3, numClasses, "3 security classes are returned, as expected");
+    is_int(5, numClasses, "5 security classes are returned, as expected");
     ok(classes[1] == NULL, "The rxvab class is undefined, as requested");
     free(classes);
 
-    afsconf_SetSecurityFlags(dir, AFSCONF_SECOPTS_ALWAYSENCRYPT);
-
-    afsconf_BuildServerSecurityObjects(dir, &classes, &numClasses);
-    is_int(4, numClasses, "When encryption is enabled, 4 classes are returned");
-
     /* Up to date checks */
 
     ok(afsconf_UpToDate(dir), "Newly opened directory is up to date");
@@ -87,5 +86,7 @@ main(int argc, char **argv)
     afsconf_GetLatestKeyByTypes(dir, afsconf_rxkad, 0, &key);
     ok(afsconf_UpToDate(dir), "afsconf_GetLatestKeyByTypes resest UpToDate");
 
-    return 0;
+out:
+    afstest_UnlinkTestConfig(dirname);
+    return code;
 }