Fix conflicts.

1 files changed, 17 insertions, 1 deletions

diff --git a/contrib/amd/amd/amd.c b/contrib/amd/amd/amd.c
index 191a5e182e28..07022e7de4e6 100644
--- a/contrib/amd/amd/amd.c
+++ b/contrib/amd/amd/amd.c
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: amd.c,v 1.5 1999/02/04 07:24:14 ezk Exp $
+ * $Id: amd.c,v 1.6 1999/09/30 21:01:29 ezk Exp $
  * $FreeBSD$
  *
  */
@@ -249,6 +249,12 @@ init_global_options(void)
   /* OS version */
   gopt.op_sys_ver = HOST_OS_VERSION;
 
+  /* full OS name and version */
+  gopt.op_sys_full = HOST_OS;
+
+  /* OS version */
+  gopt.op_sys_vendor = HOST_VENDOR;
+
   /* pid file */
   gopt.pid_file = "/dev/stdout";
 
@@ -499,6 +505,16 @@ main(int argc, char *argv[])
    */
 #ifdef HAVE_PLOCK
   if (gopt.flags & CFM_PROCESS_LOCK) {
+# ifdef _AIX
+    /*
+     * On AIX you must lower the stack size using ulimit() before calling
+     * plock.  Otherwise plock will reserve a lot of memory space based on
+     * your maximum stack size limit.  Since it is not easily possible to
+     * tell what should the limit be, I print a warning before calling
+     * plock().  See the manual pages for ulimit(1,3,4) on your AIX system.
+     */
+    plog(XLOG_WARNING, "AIX: may need to lower stack size using ulimit(3) before calling plock");
+# endif /* _AIX */
     if (plock(PROCLOCK) != 0) {
       plog(XLOG_WARNING, "Couldn't lock process text and data segment in memory: %m");
     } else {