Commit ecc06f71 authored by jan.koester's avatar jan.koester
Browse files

test

parent 0eddfd6f

modules/shares/shares.cpp

+1 −1
Changes for modules/shares/shares.cpp: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ namespace { 


using Fields = std::vector<std::pair<std::string, std::string>>;



const unsigned FirstUid = 1000;

const uid_t FirstUid = 1000;



const char *yesNo(bool b) { return b ? "yes" : "no"; }

modules/users/users.cpp

+5 −5
Changes for modules/users/users.cpp: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ using webctl::jstr; 


namespace {



const unsigned FirstUid = 1000;

const uid_t FirstUid = 1000;

const size_t MinPassword = 8;



struct User {
@@ -485,8 +485,8 @@ json_object *list() { 
    return out;

}



unsigned freeId(const Db &db, bool group, unsigned wanted) {

    auto taken = [&](unsigned id) {

uid_t freeId(const Db &db, bool group, uid_t wanted) {

    auto taken = [&](uid_t id) {

        if (group) {

            for (auto &g : db.groups) if (g.gid == id) return true;

        } else {
@@ -495,7 +495,7 @@ unsigned freeId(const Db &db, bool group, unsigned wanted) { 
        return false;

    };

    if (wanted >= FirstUid && !taken(wanted)) return wanted;

    unsigned id = FirstUid;

    uid_t id = FirstUid;

    while (taken(id)) ++id;

    return id;

}
@@ -524,7 +524,7 @@ json_object *create(json_object *a) { 
    if (uidArg != -1)

        for (auto &u : db.users)

            if (u.uid == (uid_t)uidArg) return error(tr("uid %1 belongs to %2", "UID %1 gehört bereits %2", {std::to_string(uidArg), u.name}), 409);

    unsigned uid = uidArg != -1 ? (unsigned)uidArg : freeId(db, false, FirstUid);

    uid_t uid = uidArg != -1 ? (uid_t)uidArg : freeId(db, false, FirstUid);



    gid_t gid;

    std::string groupName = webctl::str(a, "group");