1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
From 387df8aa7c950ab546a52edb36b39db5252dcd1e Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Sun, 11 Jan 2015 20:50:13 +0100
Subject: [PATCH] Use wheel group instead of sudo
from Fedora/Arch
https://github.com/linuxmint/Cinnamon/issues/3576
---
.../cinnamon-settings-users.py | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
index 6fa9374..364c155 100755
--- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
+++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
@@ -146,12 +146,11 @@ class EditableEntry (Gtk.Notebook):
class PasswordDialog(Gtk.Dialog):
- def __init__ (self, user, password_mask, group_mask):
+ def __init__ (self, user, password_mask):
super(PasswordDialog, self).__init__()
self.user = user
self.password_mask = password_mask
- self.group_mask = group_mask
self.set_modal(True)
self.set_skip_taskbar_hint(True)
@@ -217,14 +216,7 @@ class PasswordDialog(Gtk.Dialog):
def change_password(self):
newpass = self.new_password.get_text()
self.user.set_password(newpass, "")
- mask = self.group_mask.get_text()
- if "nopasswdlogin" in mask:
- os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name())
- mask = mask.split(", ")
- mask.remove("nopasswdlogin")
- mask = ", ".join(mask)
- self.group_mask.set_text(mask)
- self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
+ self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
self.destroy()
def set_passwords_visibility(self):
@@ -522,7 +514,7 @@ class Module:
model, treeiter = self.users_treeview.get_selection().get_selected()
if treeiter != None:
user = model[treeiter][INDEX_USER_OBJECT]
- dialog = PasswordDialog(user, self.password_mask, self.groups_label)
+ dialog = PasswordDialog(user, self.password_mask)
response = dialog.run()
def _on_groups_button_clicked(self, widget):
@@ -766,11 +758,11 @@ class Module:
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
description = "<b>%s</b>\n%s" % (fullname, username)
piter = self.users.append(None, [new_user, pixbuf, description])
- # Add the user to his/her own group and sudo if Administrator was selected
+ # Add the user to his/her own group and wheel if Administrator was selected
if dialog.account_type_combo.get_active() == 1:
- os.system("usermod %s -G %s,sudo,nopasswdlogin" % (username, username))
+ os.system("usermod %s -G %s,wheel" % (username, username))
else:
- os.system("usermod %s -G %s,nopasswdlogin" % (username, username))
+ os.system("usermod %s -G %s" % (username, username))
self.load_groups()
dialog.destroy()
--
2.4.3
|