From 80e8422263e24a201bad6417abec22001c716b6f Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Tue, 16 Mar 2004 20:54:51 +0000
Subject: [PATCH] Fix for mbuseradd on Fedora

---
 ChangeLog        | 4 ++++
 TODO             | 3 +++
 unix/mbuseradd.c | 4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d00b5789..4c4658ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,6 +82,10 @@ v0.51.2		06-Mar-2004
 		Changed default charset for new mailgroups and message areas
 		to CP437.
 
+	mbuseradd:
+		Fixed removing of a OS created homedir. This may solve problems
+		on RH and Fedora (under test).
+
 	examples:
 		Updated English, German, Spanish and Dutch macro files:
 		html.nodes and filemgr.status.
diff --git a/TODO b/TODO
index 5a710637..a09c67ba 100644
--- a/TODO
+++ b/TODO
@@ -14,6 +14,9 @@ $Id$
                  L = Cosmetic or nice to have.
 		 X = Will not be done unless it's really needed.
 
+general:
+	N: Investigate the wait logmessages on Fedora.
+
 everything:
 	L: Consider XML format for databases.
 
diff --git a/unix/mbuseradd.c b/unix/mbuseradd.c
index 6da2deeb..e87f7734 100644
--- a/unix/mbuseradd.c
+++ b/unix/mbuseradd.c
@@ -103,7 +103,7 @@ int execute(char **args, char *in, char *out, char *err)
 void makedir(char *path, mode_t mode, uid_t owner, gid_t group)
 {
     if (mkdir(path, mode) != 0) {
-	syslog(LOG_WARNING, "Can't create directory %s", path);
+	syslog(LOG_WARNING, "Can't create directory %s:%s", path, strerror(errno));
 	exit(2);
     }
     if ((chown(path, owner, group)) == -1) {
@@ -248,7 +248,7 @@ int main(int argc, char *argv[])
      * some systems have already created a home directory. If one is found
      * it is removed to create a fresh one.
      */
-    if ((access(temp, R_OK)) == 0) {
+    if ((access(homedir, R_OK)) == 0) {
 	if ((access("/bin/rm", X_OK)) == 0)
 	    args[0] = (char *)"/bin/rm";
 	else if ((access("/usr/bin/rm", X_OK)) == 0)