Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions accounts1/exported_methods_auto.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 0 additions & 29 deletions accounts1/user_ifc.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,35 +78,6 @@ func (u *User) SetFullName(sender dbus.Sender, name string) *dbus.Error {
return nil
}

func (u *User) SetHomeDir(sender dbus.Sender, home string) *dbus.Error {
logger.Debug("[SetHomeDir] new home:", home)

err := u.checkAuth(sender, false, "")
if err != nil {
logger.Debug("[SetHomeDir] access denied:", err)
return dbusutil.ToError(err)
}

if dutils.IsFileExist(home) {
// if new home already exists, the `usermod -m -d` command will fail.
return dbusutil.ToError(errors.New("new home already exists"))
}

u.PropsMu.Lock()
defer u.PropsMu.Unlock()

if u.HomeDir != home {
if err := users.ModifyHome(home, u.UserName); err != nil {
logger.Warning("DoAction: modify home failed:", err)
return dbusutil.ToError(err)
}
u.HomeDir = home
_ = u.emitPropChangedHomeDir(home)
}

return nil
}

func (u *User) SetShell(sender dbus.Sender, shell string) *dbus.Error {
logger.Debug("[SetShell] new shell:", shell)

Expand Down
20 changes: 1 addition & 19 deletions accounts1/users/prop.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -139,24 +139,6 @@ func modifyComment(comment, username string) error {
return cmd.Run()
}

func ModifyHome(dir, username string) error {
if len(dir) == 0 {
return errInvalidParam
}

user, err := GetUserInfoByName(username)
if err != nil {
return err
}
user.Home = dir
err = user.checkLength()
if err != nil {
return err
}

return doAction(userCmdModify, []string{"-m", "-d", dir, username})
}

func ModifyShell(shell, username string) error {
if len(shell) == 0 {
return errInvalidParam
Expand Down