Commit 4f0b58b0 authored by jan.koester's avatar jan.koester
Browse files

test

parent 0be0411a
Loading
Loading
Loading
Loading
+14 −6
Changes for src/admin.cpp: 14 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -1820,14 +1820,20 @@ namespace authdb {
                                << "<tr><td><label for=\"gpoid\">Policy ID:</label></td>"
                                << "<td></td><td><input  type=\"text\" name=\"gpoid\" value=\"" << cgpid << "\" class=\"gpoform\" readonly></td></tr>"
                                << "<tr><td><label for=\"gponame\">Policy Name:</label></td>"
                                << "<td></td><td><input type=\"text\" name=\"gponame\"  class=\"gpoform\"  readonly></td></tr>"
                                << "<td></td><td><input type=\"text\" name=\"gponame\"  class=\"gpoform\"  value=\"" << gdat.getName() <<"\" readonly></td></tr>"
                                << "<tr><td><label for=\"gpodesc\">Policy Description:</label></td>"
                                << "<td></td><td><input type=\"text\" name=\"gpodesc\"  class=\"gpoform\" ></td></tr>"
                                << "<td></td><td><input type=\"text\" name=\"gpodesc\"  class=\"gpoform\" value=\"" << gdat.getDesc() <<"\"></td></tr>"
                                << "<tr><td><label for=\"gpodefaultvalue\">Default Value:</label></td>"
                                << "<td></td><td><select name=\"gpodefaultvalue\" id=\"gpodefaultvalue\">"
                                << "<option value=\"false\">Permitted</option>"
                                << "<option value=\"true\">Allowed</option>"
                                << "</select></td></tr>"
                                << "<td></td><td><select name=\"gpodefaultvalue\" id=\"gpodefaultvalue\">";

                                if(gdat.getGpoValue())
                                    form << "<option value=\"false\">Permitted</option>"
                                            << "<option value=\"true\" default>Allowed</option>";
                                else
                                    form << "<option value=\"false\" default>Permitted</option>"
                                            << "<option value=\"true\">Allowed</option>";

                       form  << "</select></td></tr>"
                                <<"<tr><td><select id=\"notingroup\" class=\"selectionlist\" multiple>"
                                <<"</select></td><td class=\"switchgpogroup\">"
                                << "<p><a class=\"button\" onclick=\"moveElement('notingroup','gpoingroup')\">&rarr;</a>"
@@ -1860,6 +1866,7 @@ namespace authdb {
                                        uuid_unparse(cur.uuid,curcuid);

                                        libhtmlpp::HtmlElement opt("option");

                                        libhtmlpp::TextElement optname(cur.data) ;

                                        opt.setAttribute("value",curcuid);
@@ -1888,6 +1895,7 @@ namespace authdb {
            libhtmlpp::HtmlElement root=_IndexElement;
            libhtmlpp::HtmlElement *content=root.getElementbyID("content");

            if(formel)
                content->insertChild(formel);

            libhtmlpp::print(&root,out,true);
+16 −1
Changes for src/gpo.cpp: 16 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -231,9 +231,24 @@ void authdb::GpoData::setAllowed(Allow *allowed){
}

void authdb::GpoData::getAlowed(Allow *allowed){
    if(!_Allowed){
        for(const AuthData *curdat=this; curdat; curdat=curdat->next()){
            if(
                curdat->Data && curdat->Data->storage &&
                curdat->Data->type==DataType::PolicyData &&
                strcmp(curdat->Data->fieldname,"gpoallowed") ==0
            ){
                _Allowed=curdat->Data;
                allowed->count =((Allow*)_Allowed->data)->count;
                allowed->uid = new uuid_t[allowed->count];
    memcpy((char*)(((Allow*)_Allowed->data)->uid),allowed->uid,allowed->count);
                for(size_t i=0; i<allowed->count; ++i){
                    memcpy(allowed->uid[i],_Allowed+(i*sizeof(uuid_t)),sizeof(uuid_t));
                }
                return;
            }
        }
        throw(authdb::AuthBackendError("gpoallowed data not found"));
    }
}