Commit 5315bea3 authored by jan.koester's avatar jan.koester
Browse files

test

parent 063dbe4e
Loading
Loading
Loading
Loading
+23 −21
Changes for src/admin.cpp: 23 added lines, 21 removed lines.
Original line number Diff line number Diff line
@@ -1012,22 +1012,23 @@ namespace authdb {
                  << "<tr><td>Members:</td>"
                  << "<td><select name=\"groupmembers\" multiple>";
            while(rd<end){
                authdb::AuthData::Record cur;
                std::shared_ptr <authdb::AuthData::Record> cur=std::make_shared<authdb::AuthData::Record>();


                cur.type=EmptyData;
                cur->type=EmptyData;

                backend->setPos(rd);
                backend->read((unsigned char*)&cur,sizeof(AuthData::Record));

                rd=backend->getPos()+cur.datasize;
                rd=backend->getPos()+cur->datasize;

                if(cur.type == UserData && strcmp(cur.fieldname,"username")==0){
                    cur.data=new char[cur.datasize];
                    backend->read((unsigned char*)cur.data,cur.datasize);
                if(cur->type == UserData && strcmp(cur->fieldname,"username")==0){
                    cur->data=new char[cur->datasize];
                    backend->read((unsigned char*)cur.get(),cur->datasize);
                    char cuid[255];
                    uuid_unparse(cur.uuid,cuid);
                    form << "<option value=\"" << cuid << "\">" << cur.data << "</option>";
                    delete[] cur.data;
                    uuid_unparse(cur->uuid,cuid);
                    form << "<option value=\"" << cuid << "\">" << cur->data << "</option>";
                    delete[] cur->data;
                }

            }
@@ -1847,23 +1848,24 @@ namespace authdb {
            domel.appendChild(gpoli.parse());

            while(rd<end){
                authdb::AuthData::Record cur;
                std::shared_ptr <authdb::AuthData::Record> cur=std::make_shared<authdb::AuthData::Record>();

                cur.type=EmptyData;

                cur->type=EmptyData;

                backend->setPos(rd);
                backend->read((unsigned char*)&cur,sizeof(AuthData::Record));

                rd=backend->getPos()+cur.datasize;
                rd=backend->getPos()+cur->datasize;

                if(cur.type == PolicyData && strcmp(cur.fieldname,"gponame")==0){
                    class GpoData gdat(cur.uuid);
                if(cur->type == PolicyData && strcmp(cur->fieldname,"gponame")==0){
                    class GpoData gdat(cur->uuid);
                    try {
                        size_t upos=sizeof(authdb::AuthHeader);
                        gpo.info(*backend,gdat,upos);

                        char cruid[255];
                        uuid_unparse(cur.uuid,cruid);
                        uuid_unparse(cur->uuid,cruid);

                        gpoli.clear();

@@ -2436,24 +2438,24 @@ namespace authdb {
                    size_t rd=sizeof(authdb::AuthHeader),end=_AdminBackend.end();

                    while(rd<end){
                        authdb::AuthData::Record cur;
                        std::shared_ptr <authdb::AuthData::Record> cur=std::make_shared<authdb::AuthData::Record>();

                        cur.type=EmptyData;
                        cur->type=EmptyData;

                        _AdminBackend.setPos(rd);
                        _AdminBackend.read((unsigned char*)&cur,sizeof(AuthData::Record));

                        rd=_AdminBackend.getPos()+cur.datasize;
                        rd=_AdminBackend.getPos()+cur->datasize;

                        if(cur.type == DataType::DomainData && strcmp(cur.fieldname,"domainname")==0){
                            class DomainData ddat(cur.uuid);
                        if(cur->type == DataType::DomainData && strcmp(cur->fieldname,"domainname")==0){
                            class DomainData ddat(cur->uuid);

                            try {
                                size_t dpos=sizeof(authdb::AuthHeader);
                                domain.info(_AdminBackend,ddat,dpos);

                                char crdid[255];
                                uuid_unparse(cur.uuid,crdid);
                                uuid_unparse(cur->uuid,crdid);

                                *dform << "<option value=\"" << crdid << "\" >"
                                << ddat.getDomainName()