auth: force sync to work around an possible pw bug

src/etc/inc/auth.inc

@@ -331,7 +331,7 @@ function local_sync_accounts()
 	global $config;
 
 	/* remove local users to avoid uid conflicts */
-	$fd = popen('/usr/sbin/pw usershow -a', 'r');
+	$fd = popen('/usr/local/sbin/pwsync usershow -a', 'r');
 	if ($fd) {
 		while (!feof($fd)) {
 			$line = explode(':',fgets($fd));
@@ -343,14 +343,14 @@ function local_sync_accounts()
 			 * can cause issues. Just remove crontab before run it when necessary
 			 */
 			@unlink("/var/cron/tabs/{$line[0]}");
-			mwexecf('/usr/sbin/pw userdel -n %s', $line[0]);
+			mwexecf('/usr/local/sbin/pwsync userdel -n %s', $line[0]);
 		}
 		pclose($fd);
 	}
 
 	/* remove local groups to avoid gid conflicts */
 	$gids = array();
-	$fd = popen('/usr/sbin/pw groupshow -a', 'r');
+	$fd = popen('/usr/local/sbin/pwsync groupshow -a', 'r');
 	if ($fd) {
 		while (!feof($fd)) {
 			$line = explode(':',fgets($fd));
@@ -363,7 +363,7 @@ function local_sync_accounts()
 			if ($line[2] > 65000) {
 				continue;
 			}
-			mwexecf('/usr/sbin/pw groupdel %s', $line[2]);
+			mwexecf('/usr/local/sbin/pwsync groupdel %s', $line[2]);
 		}
 		pclose($fd);
 	}
@@ -432,7 +432,7 @@ function local_user_set(&$user)
 	}
 
 	/* read from pw db */
-	$fd = popen("/usr/sbin/pw usershow -n {$user_name} 2>&1", "r");
+	$fd = popen("/usr/local/sbin/pwsync usershow -n {$user_name} 2>&1", "r");
 	$pwread = fgets($fd);
 	pclose($fd);
 	$userattrs = explode(":", trim($pwread));
@@ -446,7 +446,7 @@ function local_user_set(&$user)
 
 	$comment = str_replace(array(':', '!', '@'), ' ', $user['descr']);
 	/* add or mod pw db */
-	$cmd = "/usr/sbin/pw {$user_op} -q -u {$user_uid} -n {$user_name}".
+	$cmd = "/usr/local/sbin/pwsync {$user_op} -q -u {$user_uid} -n {$user_name}".
 		" -g {$user_group} -s {$user_shell} -d {$user_home}".
 		" -c ".escapeshellarg($comment)." -H 0 2>&1";
 	$fd = popen($cmd, 'w');
@@ -469,7 +469,7 @@ function local_user_set(&$user)
 		@unlink("{$user_home}/.ssh/authorized_keys");
 	}
 
-	mwexecf('/usr/sbin/pw %s %s', array($lock_account, $user_name), true);
+	mwexecf('/usr/local/sbin/pwsync %s %s', array($lock_account, $user_name), true);
 }
 
 function local_user_del($user)
@@ -478,7 +478,7 @@ function local_user_del($user)
 	local_user_set_groups($user);
 
 	/* delete from pw db */
-	mwexecf('/usr/sbin/pw userdel -n %s -r', $user['name']);
+	mwexecf('/usr/local/sbin/pwsync userdel -n %s -r', $user['name']);
 
 	/* Delete user from groups needs a call to write_config() */
 	local_group_del_user($user);
@@ -605,20 +605,20 @@ function local_group_set($group, $reset = false)
 		$group_members = implode(',', $group['member']);
 	}
 
-	$ret = mwexecf('/usr/sbin/pw groupshow %s', $group_name, true);
+	$ret = mwexecf('/usr/local/sbin/pwsync groupshow %s', $group_name, true);
 	if ($ret) {
 		$group_op = 'groupadd';
 	} else {
 		$group_op = 'groupmod';
 	}
 
-	mwexecf('/usr/sbin/pw %s %s -g %s -M %s', array($group_op, $group_name, $group_gid, $group_members));
+	mwexecf('/usr/local/sbin/pwsync %s %s -g %s -M %s', array($group_op, $group_name, $group_gid, $group_members));
 }
 
 function local_group_del($group)
 {
 	/* delete from group db */
-	mwexecf('/usr/sbin/pw groupdel %s', $group['name']);
+	mwexecf('/usr/local/sbin/pwsync groupdel %s', $group['name']);
 }
 
 function ldap_test_connection($authcfg)

src/sbin/pwsync

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+pw "${@}"
+RET=${?}
+
+# work around a missing fsync()
+sync && sync
+
+exit ${RET}