Re: [Minios-devel] [UNIKRAFT PATCH 1/1] lib/ukunistd: Imlement getpwnam, getpwuid and getpwent

[Felipe Huici <Felipe.Huici@xxxxxxxxx>]

Hi Vlad, this patch looks good, thanks.

-- Felipe

Reviewed-by: Felipe Huici <felipe.huici@xxxxxxxxx>

On 27.08.19, 18:37, "Minios-devel on behalf of Vlad-Andrei BĂDOIU (78692)" 
<minios-devel-bounces@xxxxxxxxxxxxxxxxxxxx on behalf of 
vlad_andrei.badoiu@xxxxxxxxxxxxxxx> wrote:

    Our implementation uses a list for the password database. Since we have no 
shell
    available on Unikraft, the pw_shell field is set to NULL.
    
    Signed-off-by: Vlad-Andrei Badoiu <vlad_andrei.badoiu@xxxxxxxxxxxxxxx>
    ---
     lib/ukunistd/user.c | 77 ++++++++++++++++++++++++++++++++++++++-------
     1 file changed, 66 insertions(+), 11 deletions(-)
    
    diff --git a/lib/ukunistd/user.c b/lib/ukunistd/user.c
    index 8fe991e4..9d39aed8 100644
    --- a/lib/ukunistd/user.c
    +++ b/lib/ukunistd/user.c
    @@ -35,8 +35,39 @@
     
     #include <unistd.h>
     #include <pwd.h>
    +#include <string.h>
     #include <sys/types.h>
     #include <uk/essentials.h>
    +#include <uk/list.h>
    +
    +static struct passwd_entry {
    +   struct passwd *passwd;
    +
    +   UK_SLIST_ENTRY(struct passwd_entry) entries;
    +} *iter;
    +
    +UK_SLIST_HEAD(uk_entry_list, struct passwd_entry);
    +
    +static struct uk_entry_list passwds;
    +
    +void __constructor init_ukunistd()
    +{
    +   static struct passwd_entry p1;
    +   static struct passwd passwd = {
    +           .pw_name = "root",
    +           .pw_passwd = "password",
    +           .pw_uid = 0,
    +           .pw_gid = 0,
    +           .pw_gecos = "root",
    +           .pw_dir = "/",
    +           .pw_shell = NULL,
    +   };
    +
    +   p1.passwd = &passwd;
    +
    +   UK_SLIST_INIT(&passwds);
    +   UK_SLIST_INSERT_HEAD(&passwds, &p1, entries);
    +}
     
     uid_t getuid(void)
     {
    @@ -78,14 +109,37 @@ char *getlogin(void)
        return 0;
     }
     
    -struct passwd *getpwnam(const char *name __unused)
    +void setpwent(void)
    +{
    +   iter = UK_SLIST_FIRST(&passwds);
    +}
    +
    +void endpwent(void)
    +{
    +}
    +
    +struct passwd *getpwnam(const char *name)
     {
    -   return NULL;
    +   struct passwd *pwd;
    +
    +   setpwent();
    +   while ((pwd = getpwent()) && strcmp(pwd->pw_name, name))
    +           ;
    +   endpwent();
    +
    +   return pwd;
     }
     
    -struct passwd *getpwuid(uid_t uid __unused)
    +struct passwd *getpwuid(uid_t uid)
     {
    -   return NULL;
    +   struct passwd *pwd;
    +
    +   setpwent();
    +   while ((pwd = getpwent()) && pwd->pw_uid != uid)
    +           ;
    +   endpwent();
    +
    +   return pwd;
     }
     
     int getpwnam_r(const char *name __unused, struct passwd *pwd __unused,
    @@ -104,15 +158,16 @@ int getpwuid_r(uid_t uid __unused, struct passwd *pwd 
__unused,
     
     struct passwd *getpwent(void)
     {
    -   return NULL;
    -}
    +   struct passwd *pwd;
    +   
    +   if (iter == NULL)
    +           return NULL;
     
    -void setpwent(void)
    -{
    -}
    +   pwd = iter->passwd;
     
    -void endpwent(void)
    -{
    +   iter = UK_SLIST_NEXT(iter, entries);
    +
    +   return pwd;
     }
     
     gid_t getgid(void)
    -- 
    2.20.1
    
    
    _______________________________________________
    Minios-devel mailing list
    Minios-devel@xxxxxxxxxxxxxxxxxxxx
    https://lists.xenproject.org/mailman/listinfo/minios-devel

_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel