From b94cf4a837621513e7af47660a044dbbda729b9f Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Fri, 19 Mar 2004 19:16:13 +0000
Subject: [PATCH] Updated execute in mbpasswd en mbuseradd

---
 ChangeLog        |  4 ++++
 unix/mbpasswd.c  | 42 ++++++++++++++++++++++++++++++++++++++++--
 unix/mbuseradd.c | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4b3d53b7..079a9c93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -95,6 +95,10 @@ v0.51.2		06-Mar-2004
 	mbuseradd:
 		Fixed removing of a OS created homedir. This may solve problems
 		on RH and Fedora (under test).
+		Added msleep delay in execute child process.
+
+	mbpasswd:
+		Added msleep delay in execute child process.
 
 	examples:
 		Updated English, German, Spanish and Dutch macro files:
diff --git a/unix/mbpasswd.c b/unix/mbpasswd.c
index 7b5de56f..85a81877 100644
--- a/unix/mbpasswd.c
+++ b/unix/mbpasswd.c
@@ -121,8 +121,44 @@ static char *myname;	/* The current user's name */
 static int  force;	/* Force update of locked passwords */
 
 
-
 #ifdef _VPOPMAIL_PATH
+
+/*
+ * Milliseconds timer, returns 0 on success.
+ */
+int msleep(int msecs)
+{
+    int             rc;
+    struct timespec req, rem;
+
+    rem.tv_sec = 0;
+    rem.tv_nsec = 0;
+    req.tv_sec = msecs / 1000;
+    req.tv_nsec = (msecs % 1000) * 1000000;
+
+    while (1) {
+
+	rc = nanosleep(&req, &rem);
+	if (rc == 0)
+	    break;
+	if ((errno == EINVAL) || (errno == EFAULT)) {
+	    break;
+	}
+
+	/*
+	 * Error was EINTR, run timer again to complete.
+	 */
+	req.tv_sec = rem.tv_sec;
+	req.tv_nsec = rem.tv_nsec;
+	rem.tv_sec = 0;
+	rem.tv_nsec = 0;
+    }
+
+    return rc;
+}
+
+
+
 int execute(char **args, char *in, char *out, char *err)
 {
     char    buf[PATH_MAX];
@@ -139,6 +175,8 @@ int execute(char **args, char *in, char *out, char *err)
     fflush(stderr);
 
     if ((pid = fork()) == 0) {
+	msleep(150);
+
         if (in) {
             close(0);
             if (open(in, O_RDONLY) != 0) {
@@ -987,7 +1025,7 @@ int main(int argc, char *argv[])
 	fflush(stdin);
 	memset(args, 0, sizeof(args));
     
-	sprintf(temp, "%s/vpasswd", _VPOPMAIL_PATH);
+	sprintf(temp, "%s/vpasswd", (char *)_VPOPMAIL_PATH);
 	args[0] = temp;
 	args[1] = argv[2];
 	args[2] = argv[3];
diff --git a/unix/mbuseradd.c b/unix/mbuseradd.c
index e87f7734..914184df 100644
--- a/unix/mbuseradd.c
+++ b/unix/mbuseradd.c
@@ -42,10 +42,43 @@
 #include <sys/wait.h>
 #include <sys/param.h>
 #include <syslog.h>
+#include <time.h>
 
 #include "mbuseradd.h"
 
 
+/*
+ * Milliseconds timer, returns 0 on success.
+ */
+int msleep(int msecs)
+{
+    int             rc;
+    struct timespec req, rem;
+
+    rem.tv_sec = 0;
+    rem.tv_nsec = 0;
+    req.tv_sec = msecs / 1000;
+    req.tv_nsec = (msecs % 1000) * 1000000;
+
+    while (1) {
+	rc = nanosleep(&req, &rem);
+	if (rc == 0)
+	    break;
+	if ((errno == EINVAL) || (errno == EFAULT))
+	    break;
+
+	/*
+	 * Error was EINTR, run timer again to complete.
+	 */
+	req.tv_sec = rem.tv_sec;
+	req.tv_nsec = rem.tv_nsec;
+	rem.tv_sec = 0;
+	rem.tv_nsec = 0;
+    }
+
+    return rc;
+}
+
 
 
 int execute(char **args, char *in, char *out, char *err)
@@ -65,6 +98,7 @@ int execute(char **args, char *in, char *out, char *err)
     fflush(stderr);
 
     if ((pid = fork()) == 0) {
+	msleep(150);
 	if (in) {
 	    close(0);
 	    if (open(in, O_RDONLY) != 0) {