Merge pull request #1790 from renard/allow-star-password-on-openbsd-2015-07-24
[user] Allow '*' as empty password.
This commit is contained in:
commit
a2b713edad
1 changed files with 3 additions and 2 deletions
|
@ -916,7 +916,7 @@ class OpenBSDUser(User):
|
||||||
cmd.append('-L')
|
cmd.append('-L')
|
||||||
cmd.append(self.login_class)
|
cmd.append(self.login_class)
|
||||||
|
|
||||||
if self.password is not None:
|
if self.password is not None and self.password != '*':
|
||||||
cmd.append('-p')
|
cmd.append('-p')
|
||||||
cmd.append(self.password)
|
cmd.append(self.password)
|
||||||
|
|
||||||
|
@ -1010,7 +1010,8 @@ class OpenBSDUser(User):
|
||||||
cmd.append('-L')
|
cmd.append('-L')
|
||||||
cmd.append(self.login_class)
|
cmd.append(self.login_class)
|
||||||
|
|
||||||
if self.update_password == 'always' and self.password is not None and info[1] != self.password:
|
if self.update_password == 'always' and self.password is not None \
|
||||||
|
and self.password != '*' and info[1] != self.password:
|
||||||
cmd.append('-p')
|
cmd.append('-p')
|
||||||
cmd.append(self.password)
|
cmd.append(self.password)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue