X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=tests%2Fcommon%2Fconfig.c;h=4783753ddf69362d49361a93e5f33e9bf7141fa7;hp=75744656c4adc17c38dc7d4df8b4adb70ce0ac92;hb=bf4cda8a5551719a005e4f927dfd1fb25dc2c219;hpb=954aa2338ce3fbaee81defe45a4d99da69d0baf7

diff --git a/tests/common/config.c b/tests/common/config.c
index 7574465..4783753 100644
--- a/tests/common/config.c
+++ b/tests/common/config.c
@@ -74,6 +74,9 @@ char *
 afstest_BuildTestConfig(void) {
     char *dir = NULL;
     FILE *file;
+    struct hostent *host;
+    char hostname[255];
+    struct in_addr iaddr;
 
     if (asprintf(&dir, "%s/afs_XXXXXX", gettmpdir()) == -1)
 	goto fail;
@@ -81,10 +84,20 @@ afstest_BuildTestConfig(void) {
     if (mkdtemp(dir) == NULL)
 	goto fail;
 
-    /* Create a CellServDB */
+    /* Work out which IP address to use in our CellServDB. We figure this out
+     * according to the IP address which ubik is most likely to pick for one of
+     * our db servers */
+
+    gethostname(hostname, sizeof(hostname));
+    host = gethostbyname(hostname);
+    if (!host)
+	return NULL;
+
+    memcpy(&iaddr, host->h_addr, 4);
+
     file = openConfigFile(dir, "CellServDB");
     fprintf(file, ">example.org # An example cell\n");
-    fprintf(file, "127.0.0.1 #test.example.org\n");
+    fprintf(file, "%s #test.example.org\n", inet_ntoa(iaddr));
     fclose(file);
 
     /* Create a ThisCell file */
@@ -107,11 +120,16 @@ fail:
 void
 afstest_UnlinkTestConfig(char *dir)
 {
-    unlinkConfigFile(dir, "KeyFile");
-    unlinkConfigFile(dir, "CellServDB");
-    unlinkConfigFile(dir, "ThisCell");
-    unlinkConfigFile(dir, "UserList");
-    rmdir(dir);
+    if (getenv("MAKECHECK") != NULL) {
+	unlinkConfigFile(dir, "KeyFile");
+	unlinkConfigFile(dir, "KeyFileExt");
+	unlinkConfigFile(dir, "CellServDB");
+	unlinkConfigFile(dir, "ThisCell");
+	unlinkConfigFile(dir, "UserList");
+	unlinkConfigFile(dir, "krb.conf");
+	unlinkConfigFile(dir, "krb.excl");
+	rmdir(dir);
+    }
 }
 
 int