Commit 844605e4 authored by jan.koester's avatar jan.koester
Browse files

need test

parent 7bdc042c
Loading
Loading
Loading
Loading
Loading
+10 −9
Changes for src/admin.cpp: 10 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -1168,8 +1168,8 @@ namespace authdb {

                     if(curec.Data.storage==TextStorage &&
                         strcmp(curec.Data.fieldname,"groupmembers")==0){

                         members.emplace_back(curformdat->Value.data());
                         curformdat->Value.push_back('\0');
                         editrec.addMember(curformdat->Value.data());
                     }else if(curec.Data.storage==TextStorage) {
                         curformdat->Value.push_back('\0');
                         curec.Data.datasize=curformdat->Value.size();
@@ -1203,7 +1203,7 @@ namespace authdb {

                if(data){
                    for(auto mem : members){
                        editrec.addMember(mem);
                        std::cout << mem.c_str() << std::endl;
                    }
                    editRecord(*backend,editrec,GroupData);
                    libhttppp::HttpResponse rep;
@@ -1240,19 +1240,18 @@ namespace authdb {
                        cur->data = new char[cur->datasize];
                        backend->read((unsigned char*)cur->data,cur->datasize);
                        try {
                            form   << "<td><input type=\"text\" name=\"" << cur->data << "\" value=\""
                            form   << "<td><input type=\"text\" groupname=\"" << cur->data << "\" value=\""
                                   << cur->data <<"\"></td>";
                        }catch(AuthBackendError &e){
                            std::cerr << e.what() << std::endl;
                        }
                        delete[] cur->data;
                    }else if(cur->storage==BinaryStorage && strcmp(cur->fieldname ,"groupmembers")==0){

                        form   << "<td><select name=\"" << cur->fieldname << "\" multiple>";
                        std::cout << "test" << std::endl;
                        form   << "<td><select name=\"groupmembers\" multiple>";

                        std::vector<uuid> mrecs;
                        class Group grp;
                        class GroupData gdat(cur->uuid);
                        class GroupData gdat(gid);

                        size_t pos=sizeof(AuthHeader);

@@ -1275,7 +1274,8 @@ namespace authdb {
                                uuid_unparse(curu->uuid,cuuid);

                                form << "<option value=\"" << cuuid << "\" ";
                                for(auto mrec : mrecs){
                                for(const uuid &mrec : mrecs){
                                    std::cout << mrec.c_str() << cuuid <<  std::endl;
                                    if(mrec == curu->uuid ){
                                        form << " selected ";
                                        break;
@@ -1291,6 +1291,7 @@ namespace authdb {
                    }
                    backend->setPos(rd);
                    form << "</td>";
                    break;
                }
            }

+3 −3
Changes for src/authdb.cpp: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -107,11 +107,11 @@ namespace authdb {

                    authdb::User user;

                    uuid_t adminid,admingid;
                    uuid adminid,admingid;

                    uuid_generate(adminid);
                    adminid.generate();;

                    uuid_generate(admingid);
                    admingid.generate();;

                    class authdb::UserData udat(adminid);

+0 −1
Changes for src/gpo.cpp: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ void authdb::GpoData::setAllowed(std::vector<uuid> &allowed){
           &al.value[0]+sizeof(uuid_t),
           data+csize
        );
        char tmp[255];
        csize+=sizeof(uuid_t);
    }

+5 −5
Changes for src/group.cpp: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ void authdb::GroupData::addMember(const uuid &uid){
           &mem.value[0]+sizeof(uuid_t),
           data+wsize
        );
        char tmp[255];
        wsize+=sizeof(uuid_t);
    }

@@ -160,7 +159,6 @@ void authdb::GroupData::remMember(const uuid& uid){
           &mem.value[0]+sizeof(uuid_t),
           data+wsize
        );
        char tmp[255];
        wsize+=sizeof(uuid_t);
    }

@@ -206,6 +204,8 @@ bool authdb::GroupData::isMember(const uuid uid){
}

void authdb::GroupData::getMembers(std::vector<uuid>& members){
    size_t asize=0;

    try{
        if(!getAuthData<char>(DataType::GroupData,StorageType::BinaryStorage,
                                                                        this,&_Members,"groupmembers"))
@@ -213,18 +213,18 @@ void authdb::GroupData::getMembers(std::vector<uuid>& members){
    }catch(...){
        return;
    }
    size_t asize=0;

    std::copy(_Members->data,_Members->data+sizeof(size_t),&asize);

    if(asize==0)
        return;

    std::copy(_Members->data,_Members->data+sizeof(size_t),&asize);

    asize*=sizeof(uuid_t);

    char *start=_Members->data+sizeof(size_t);

    for(size_t i =0; i<asize; i+=sizeof(uuid_t) ){
        std::cout << "test" << std::endl;
        uuid_t tmp;
        std::copy(start+i,start+i+sizeof(uuid_t),&tmp[0]);
        members.emplace_back(tmp);