From c4aa4bb7a3bab3da5f1257a969972e9b44a963a0 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 23 Apr 2013 16:45:08 +0000 Subject: (lu_homedir_populate) rename as my_homedir_populate thus fixing compiling with latest libuser --- USER/USER.xs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'USER') diff --git a/USER/USER.xs b/USER/USER.xs index ef6f1fb..15759e0 100644 --- a/USER/USER.xs +++ b/USER/USER.xs @@ -67,7 +67,7 @@ static SV ** convert_value_array_list(register SV **sp, GValueArray *array) { * directory, setting all ownerships as given, and setting the mode of * the top-level directory as given. */ int -lu_homedir_populate(const char *skeleton, const char *directory, +my_homedir_populate(const char *skeleton, const char *directory, uid_t owner, gid_t group, mode_t mode, USER__ERR **error) { @@ -120,7 +120,7 @@ lu_homedir_populate(const char *skeleton, const char *directory, timebuf.modtime = st.st_mtime; /* If it's a directory, descend into it. */ if (S_ISDIR(st.st_mode)) { - if (!lu_homedir_populate(skelpath, + if (!my_homedir_populate(skelpath, path, owner, st.st_gid ?: group, @@ -264,7 +264,7 @@ lu_homedir_move(const char *oldhome, const char *newhome, /* If the directory exists... */ if (stat(oldhome, &st) != -1) { /* ... and we can copy it ... */ - if (lu_homedir_populate(oldhome, newhome, + if (my_homedir_populate(oldhome, newhome, st.st_uid, st.st_gid, st.st_mode, error)) { /* ... remove the old one. */ @@ -520,7 +520,7 @@ Admin_UserAdd(self, ent, is_system, dont_create_home) value = g_value_array_get_nth(values, 0); homeDirectory = g_value_get_string(value); - if (lu_homedir_populate(skeleton, homeDirectory, + if (my_homedir_populate(skeleton, homeDirectory, uidNumber, gidNumber, 0700, &error) == 0) { warn(_("Error creating `%s': %s"), homeDirectory, error ? error->string : "unknown error"); -- cgit v1.2.1