Use rxgk in afsconf_BuildServerSecurityObjects

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

diff --git a/tests/auth/keys-t.c b/tests/auth/keys-t.c
index ba7391e..789b49b 100644 (file)
--- a/tests/auth/keys-t.c
+++ b/tests/auth/keys-t.c
@@ -36,7 +36,7 @@
 #include <afs/afsutil.h>
 #include <rx/rxkad.h>
 
-#include <tap/basic.h>
+#include <tests/tap/basic.h>
 
 #include "test.h"
 #include "common.h"
@@ -45,8 +45,9 @@ static int
 copy(char *inFile, char *outFile)
 {
     int in, out;
-    char *block;
-    size_t len;
+    char *block, *block_out;
+    ssize_t len;
+    size_t len_out;
 
     in = open(inFile, O_RDONLY);
     if (in<0)
@@ -59,8 +60,17 @@ copy(char *inFile, char *outFile)
     block = malloc(1024);
     do {
        len = read(in, block, 1024);
-       if (len > 0)
-           write(out, block, len);
+       if (len <= 0)
+           break;
+       len_out = len;
+       block_out = block;
+       do {
+           len = write(out, block_out, len_out);
+           if (len <= 0)
+               break;
+           block_out += len;
+           len_out -= len;
+       } while (len_out > 0);
     } while (len > 0);
     free(block);
 
@@ -106,11 +116,13 @@ int main(int argc, char **argv)
     int code;
     int i;
 
+    afstest_SkipTestsIfBadHostname();
+
     plan(134);
 
     /* Create a temporary afs configuration directory */
 
-    dirname = buildTestConfig();
+    dirname = afstest_BuildTestConfig();
 
     if (asprintf(&keyfile, "%s/KeyFile", dirname) == -1)
        goto out;
@@ -557,12 +569,12 @@ int main(int argc, char **argv)
 
     afsconf_Close(dir);
 
-    unlinkTestConfig(dirname);
+    afstest_UnlinkTestConfig(dirname);
     free(dirname);
     free(keyfile);
 
     /* Start a new test configuration */
-    dirname = buildTestConfig();
+    dirname = afstest_BuildTestConfig();
     dir = afsconf_Open(dirname);
     ok(dir != NULL, "Sucessfully opened brand new config directory");
     if (dir == NULL)
@@ -583,7 +595,7 @@ int main(int argc, char **argv)
        " ... with the right key");
 
 out:
-    unlinkTestConfig(dirname);
+    afstest_UnlinkTestConfig(dirname);
 
     return 0;
 }