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

groups now wokring

parent 1084a553
Loading
Loading
Loading
Loading
Loading
+3 −6
Changes for src/authdb.cpp: 3 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -1534,7 +1534,8 @@ VALUEFOUND:
        _next=nullptr;
    }

    AuthData::AuthData(const AuthData &src) :AuthData(src.Data->uuid){
    AuthData::AuthData(const AuthData &src){
        AuthData(src.Data->uuid);
        AuthData *dest=this;

        for(const AuthData *cursrc=&src; cursrc; cursrc=cursrc->next()){
@@ -1567,11 +1568,7 @@ VALUEFOUND:
        AuthData *curec=this,*next=this;
        if(!curec->_next && curec->Data->datasize==0){
            for(const AuthData *cursrc=&src; cursrc; cursrc=cursrc->next()){
                next->append(*src.Data);
                if(cursrc->next()){
                    next->_next=new AuthData(Data->uuid);
                    next=next->_next;
                }
                next=next->append(*src.Data);
            }
            return curec;
        }
+12 −4
Changes for src/domain.cpp: 12 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -38,10 +38,13 @@ namespace authdb {

        AuthData *curec=dat;

        uuid_t gid;
        uuid_copy(gid,dat->Data->uuid);

        if(!target){
            while(curec){
                if(curec->Data->type == authdb::DomainData &&
                    uuid_compare(curec->Data->uuid,dat->Data->uuid)==0 &&
                    uuid_compare(curec->Data->uuid,target->uuid)==0 &&
                    strcmp(curec->Data->fieldname,varname)==0
                ){

@@ -58,10 +61,11 @@ namespace authdb {
        if(!target){
            target=new AuthData::Record;
            *varclass=dat->append(*target)->Data;
            target=*varclass;
        }

        target->start=0xFE;
        uuid_copy(target->uuid,dat->Data->uuid);
        uuid_copy(target->uuid,gid);
        target->type=DataType::DomainData;
        target->storage=StorageType::TextStorage;

@@ -97,10 +101,13 @@ namespace authdb {

        AuthData *curec=dat;

        uuid_t gid;
        uuid_copy(gid,dat->Data->uuid);

        if(!target){
            while(curec){
                if(curec->Data->type == authdb::DomainData &&
                    uuid_compare(curec->Data->uuid,dat->Data->uuid)==0 &&
                    uuid_compare(curec->Data->uuid,target->uuid)==0 &&
                    strcmp(curec->Data->fieldname,varname)==0
                ){

@@ -117,10 +124,11 @@ namespace authdb {
        if(!target){
            target=new AuthData::Record;
            *varclass=dat->append(*target)->Data;
            target=*varclass;
        }

        target->start=0xFE;
        uuid_copy(target->uuid,dat->Data->uuid);
        uuid_copy(target->uuid,gid);
        target->type=DataType::DomainData;
        target->storage=StorageType::IntStorage;

+22 −10
Changes for src/group.cpp: 22 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -35,12 +35,15 @@ namespace authdb{
    inline void setGroupData(AuthData *dat,AuthData::Record **varclass,const char *varname,const char *value){
        AuthData::Record *target=*varclass;

        AuthData *curec=dat;
        const AuthData *curec=dat;

        uuid_t gid;
        uuid_copy(gid,dat->Data->uuid);

        if(!target){
            while(curec){
                if(curec->Data->type == authdb::GroupData &&
                    uuid_compare(curec->Data->uuid,dat->Data->uuid)==0 &&
                    uuid_compare(curec->Data->uuid,target->uuid)==0 &&
                    strcmp(curec->Data->fieldname,varname)==0
                ){

@@ -55,14 +58,14 @@ namespace authdb{
        }

        if(!target){
            target=new AuthData::Record;
            *varclass=dat->append(*target)->Data;
            AuthData::Record tmp;
            target=dat->append(tmp)->Data;
        }

        memset(target,0,sizeof(AuthData::Record));

        target->start=0xFE;
        uuid_copy(target->uuid,dat->Data->uuid);
        uuid_copy(target->uuid,gid);
        target->type=DataType::GroupData;
        target->storage=StorageType::TextStorage;

@@ -70,6 +73,8 @@ namespace authdb{
        target->datasize=strlen(value)+1;
        target->data= new char[target->datasize];
        strcpy(target->data,value);

        *varclass=target;
    }

    inline const char *getGroupData(const AuthData *dat,AuthData::Record **varclass,const char *varname){
@@ -93,11 +98,14 @@ namespace authdb{
};

authdb::GroupData::GroupData(uuid_t gid) : AuthData(gid){
    uuid_copy(_Gid,gid);
    _Name=nullptr;
    _Members=nullptr;
}

authdb::GroupData::GroupData(const GroupData& src) : AuthData(src){
}


authdb::GroupData::~GroupData(){
}

@@ -138,7 +146,7 @@ void authdb::GroupData::addMember(const MemberUids &uid){
        memset(_Members,0,sizeof(AuthData::Record));

        _Members->start=0xFE;
        uuid_copy(_Members->uuid,_Gid);
        uuid_copy(_Members->uuid,Data->uuid);
        _Members->type=DataType::GroupData;
        _Members->storage=StorageType::BinaryStorage;

@@ -184,7 +192,10 @@ bool authdb::Group::exits(AuthBackend& backend, uuid_t* gid, const char* name, i
void authdb::Group::create(AuthBackend& backend, class GroupData* dat){
    int exi=0;

    if(exits(backend,&dat->_Gid,dat->getName(),exi)){
    if(uuid_is_null(dat->Data->uuid))
        throw authdb::AuthBackendError("Create Group: GUID not set !");

    if(exits(backend,&dat->Data->uuid,dat->getName(),exi)){
       switch(exi){
           case 1:
                throw authdb::AuthBackendError("Create Group: Groupname already Exists aborting!");
@@ -207,7 +218,7 @@ void authdb::Group::create(AuthBackend& backend, class GroupData* dat){
void authdb::Group::info(AuthBackend &backend, class GroupData& dat, size_t &pos){
    size_t end=backend.end();

    if(uuid_is_null(dat._Gid))
    if(uuid_is_null(dat.Data->uuid))
        throw AuthBackendError("group info gid required!");

    while(pos<end){
@@ -215,7 +226,8 @@ void authdb::Group::info(AuthBackend &backend, class GroupData& dat, size_t &pos
        backend.setPos(pos);
        backend.read((unsigned char*)cur,sizeof(AuthData::Record));
        pos=backend.getPos()+cur->datasize;
        if(cur->type == GroupData && uuid_compare(dat._Gid,cur->uuid) == 0){
        if(cur->type == GroupData && uuid_compare(dat.Data->uuid,cur->uuid) == 0
        ){

            if(!getRecord(backend,dat,DataType::GroupData))
                continue;
+0 −1
Changes for src/group.h: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ namespace authdb {
        bool isMember(const MemberUids &uid);

    private:
        uuid_t            _Gid;
        AuthData::Record *_Name;
        AuthData::Record *_Members;
        friend class Group;
+6 −2
Changes for src/user.cpp: 6 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -51,10 +51,13 @@ namespace authdb {

        AuthData *curec=dat;

        uuid_t gid;
        uuid_copy(gid,dat->Data->uuid);

        if(!target){
            while(curec){
                if(curec->Data->type == authdb::UserData &&
                    uuid_compare(curec->Data->uuid,dat->Data->uuid)==0 &&
                    uuid_compare(curec->Data->uuid,target->uuid)==0 &&
                    strcmp(curec->Data->fieldname,varname)==0
                ){

@@ -71,10 +74,11 @@ namespace authdb {
        if(!target){
            target=new AuthData::Record;
            *varclass=dat->append(*target)->Data;
            target=*varclass;
        }

        target->start=0xFE;
        uuid_copy(target->uuid,dat->Data->uuid);
        uuid_copy(target->uuid,gid);
        target->type=DataType::UserData;
        target->storage=StorageType::TextStorage;