955274: DMAPI qa test fixes

Merge of master-melb:xfs-cmds:27241a by kenmcd.

  avoid negative number LONG_MAX + 1

diff --git a/dmapi/src/sample_hsm/migfind.c b/dmapi/src/sample_hsm/migfind.c
index d3718a4845783ed70ffa1c6a5cd4665189da5225..be86761052178dfd2e923da1a233887e8eddf196 100644 (file)
--- a/dmapi/src/sample_hsm/migfind.c
+++ b/dmapi/src/sample_hsm/migfind.c
@@ -33,8 +33,8 @@
 #include <getopt.h>
 
 #define NUMLEN 16              /* arbitrary max len of input size */
-#define MAX_K   (((u_int)LONG_MAX + 1) / 1024)
-#define MAX_M   (((u_int)LONG_MAX + 1) / (1024*1024))
+#define MAX_K   (((u_int)LONG_MAX) / 1024)
+#define MAX_M   (((u_int)LONG_MAX) / (1024*1024))
 
 
 

diff --git a/dmapi/src/sample_hsm/migin.c b/dmapi/src/sample_hsm/migin.c
index 0e242eaf8144bc585281ee2e828f1a0f6be46b7e..ff2166ce57278e44b11c7da4e0ddfc4d376bdef4 100644 (file)
--- a/dmapi/src/sample_hsm/migin.c
+++ b/dmapi/src/sample_hsm/migin.c
@@ -261,7 +261,7 @@ spawn_kid(
                                WORKER_BEE, WORKER_BEE, action, sidbuf,
                                tokenbuf);
                }
-               execlp(WORKER_BEE, WORKER_BEE, action, "-s", sidbuf, 
+               execlp("./"WORKER_BEE, WORKER_BEE, action, "-s", sidbuf, 
                        "-t", tokenbuf, NULL);
                errno_msg("execlp of worker bee failed");
                (void)dm_respond_event(sid, token, DM_RESP_ABORT,