@@ -2189,6 +2189,7 @@ out:
void qmp_guest_set_user_password(const char *username,
const char *password,
bool crypted,
+ bool has_create, bool create,
Error **errp)
{
char *passwd_path = NULL;
@@ -2227,6 +2228,24 @@ void qmp_guest_set_user_password(const char *username,
goto out;
}
+ /* create new user if requested */
+ if (has_create && create) {
+ char *str = g_shell_quote(username);
+ char *cmd = g_strdup_printf(
+ /* we want output only from useradd command */
+ "id -u %s >/dev/null 2>&1 || useradd -m %s",
+ str, str);
+ const char *argv[] = {
+ "/bin/sh", "-c", cmd, NULL
+ };
+ run_command(argv, NULL, errp);
+ g_free(str);
+ g_free(cmd);
+ if (*errp) {
+ goto out;
+ }
+ }
+
const char *argv[] = {
#ifdef __FreeBSD__
passwd_path, "pw", "usermod", "-n", username,
@@ -1921,6 +1921,7 @@ get_net_error_message(gint error)
void qmp_guest_set_user_password(const char *username,
const char *password,
bool crypted,
+ bool has_create, bool create,
Error **errp)
{
NET_API_STATUS nas;
@@ -1952,6 +1953,27 @@ void qmp_guest_set_user_password(const char *username,
goto done;
}
+ if (has_create && create) {
+ USER_INFO_1 ui = { 0 };
+
+ ui.usri1_name = user;
+ ui.usri1_password = wpass;
+ ui.usri1_priv = USER_PRIV_USER;
+ ui.usri1_flags = UF_SCRIPT | UF_DONT_EXPIRE_PASSWD;
+ nas = NetUserAdd(NULL, 1, (LPBYTE) & ui, NULL);
+
+ if (nas == NERR_Success) {
+ goto done;
+ }
+
+ if (nas != NERR_UserExists) {
+ gchar *msg = get_net_error_message(nas);
+ error_setg(errp, "failed to add user: %s", msg);
+ g_free(msg);
+ goto done;
+ }
+ }
+
pi1003.usri1003_password = wpass;
nas = NetUserSetInfo(NULL, user,
1003, (LPBYTE)&pi1003,
@@ -1059,6 +1059,8 @@
# @password: the new password entry string, base64 encoded
#
# @crypted: true if password is already crypt()d, false if raw
+# @create: #optinal user will be created if it does not exist yet.
+# The default value is false. (since 8.2)
#
# If the @crypted flag is true, it is the caller's responsibility to
# ensure the correct crypt() encryption scheme is used. This command
@@ -1078,7 +1080,8 @@
# Since: 2.3
##
{ 'command': 'guest-set-user-password',
- 'data': { 'username': 'str', 'password': 'str', 'crypted': 'bool' } }
+ 'data': { 'username': 'str', 'password': 'str', 'crypted': 'bool',
+ '*create': 'bool' } }
##
# @GuestMemoryBlock:
Add an optional argument "create" to guest-set-user-password command to create a user with provided username and password. Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com> --- qga/commands-posix.c | 19 +++++++++++++++++++ qga/commands-win32.c | 22 ++++++++++++++++++++++ qga/qapi-schema.json | 5 ++++- 3 files changed, 45 insertions(+), 1 deletion(-)