Loading src/authdb.h +16 −4 Changes for src/authdb.h: 16 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -92,7 +92,7 @@ namespace authdb { }; template<class T,class Y> void setAuthData(int type,int storage,AuthData *dat,AuthData::Record **varclass, void setAuthData(int type,int storage,const T *src,AuthData *dat,AuthData::Record **varclass, const char *varname,const Y *value,size_t count){ AuthData::Record *target=*varclass; Loading Loading @@ -131,16 +131,28 @@ namespace authdb { target->storage=storage; snprintf(target->fieldname,255,"%s",varname); target->datasize = sizeof(T)+(sizeof(Y)*count); if(src) target->datasize = sizeof(*src)+(sizeof(Y)*count); else target->datasize = (sizeof(Y)*count); target->data=new char[target->datasize]; memset(target->data,0,target->datasize); memcpy(target->data,(char*)value,sizeof(T)); char *start= (char*) target->data+sizeof(T)-sizeof(Y); if(src) memcpy(target->data,src,sizeof(*src)); char *start; if(src) start= (char*) target->data+sizeof(*src); else start= (char*) target->data; for(int i=0; i< count; ++i){ memcpy(start+(sizeof(Y)*i),&value[i],sizeof(Y)); } *varclass=target; } Loading src/client.cpp +2 −2 Changes for src/client.cpp: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -56,7 +56,7 @@ authdb::ClientData::~ClientData(){ } void authdb::ClientData::setKey(const char *key){ setAuthData<char,char>(DataType::ClientData,StorageType::TextStorage, setAuthData<char,char>(DataType::ClientData,StorageType::TextStorage,nullptr, this,&ClientKey,"clientkey",key,strlen(key)+1); } Loading @@ -66,7 +66,7 @@ const char *authdb::ClientData::getKey(){ } void authdb::ClientData::setName(const char* name){ setAuthData<char,char>(DataType::ClientData,StorageType::TextStorage, setAuthData<char,char>(DataType::ClientData,StorageType::TextStorage,nullptr, this,&ClientName,"clientname",name,strlen(name)+1); } Loading src/domain.cpp +3 −3 Changes for src/domain.cpp: 3 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -43,7 +43,7 @@ authdb::DomainData::~DomainData(){ } void authdb::DomainData::setDomainName(const char* name){ setAuthData<char,char>(DataType::DomainData,StorageType::TextStorage, setAuthData<char,char>(DataType::DomainData,StorageType::TextStorage,nullptr, this,&_name,"domainname",name,strlen(name)); } Loading @@ -53,7 +53,7 @@ const char * authdb::DomainData::getDomainName(){ void authdb::DomainData::setStorageType(const int type){ setAuthData<int,int>(DataType::DomainData,StorageType::IntStorage, setAuthData<int,int>(DataType::DomainData,StorageType::IntStorage,nullptr, this,&_storageType,"domainstorage",&type,1); } Loading @@ -62,7 +62,7 @@ const int authdb::DomainData::getStorageType(){ } void authdb::DomainData::setStorageOptions(const char *opts){ return setAuthData<char,char>(DataType::DomainData,StorageType::TextStorage, return setAuthData<char,char>(DataType::DomainData,StorageType::TextStorage,nullptr, this,&_storageOptions,"domainoptions",opts,strlen(opts)); } Loading src/gpo.cpp +4 −4 Changes for src/gpo.cpp: 4 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -31,7 +31,7 @@ #include "gpo.h" void authdb::GpoData::setName(const char* src){ setAuthData<char,char>(DataType::PolicyData,StorageType::TextStorage, setAuthData<char,char>(DataType::PolicyData,StorageType::TextStorage,nullptr, this,&_Name,"gponame",src,strlen(src)); } Loading @@ -41,7 +41,7 @@ const char * authdb::GpoData::getName(){ } void authdb::GpoData::setDesc(const char* src){ setAuthData<char,char>(DataType::PolicyData,StorageType::TextStorage, setAuthData<char,char>(DataType::PolicyData,StorageType::TextStorage,nullptr, this,&_Desc,"gpodesc",src,strlen(src)); } Loading @@ -51,7 +51,7 @@ const char * authdb::GpoData::getDesc(){ } void authdb::GpoData::setGpoValue(const bool dest){ setAuthData<bool,bool>(DataType::PolicyData,StorageType::BoolStorage, setAuthData<bool,bool>(DataType::PolicyData,StorageType::BoolStorage,nullptr, this,&_GpoDefault,"gpodefault",&dest,1); } Loading @@ -61,7 +61,7 @@ bool authdb::GpoData::getGpoValue(){ } void authdb::GpoData::setAllowed(Allow &allowed){ setAuthData<Allow,uuid_t>(DataType::PolicyData,StorageType::BinaryStorage, setAuthData<Allow,uuid_t>(DataType::PolicyData,StorageType::BinaryStorage,&allowed, this,&_Allowed,"gpoallowed",allowed.uid,allowed.count); } Loading src/group.cpp +2 −2 Changes for src/group.cpp: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -46,7 +46,7 @@ authdb::GroupData::~GroupData(){ } void authdb::GroupData::setName(const char* name){ setAuthData<char,char>(DataType::GroupData,StorageType::TextStorage, setAuthData<char,char>(DataType::GroupData,StorageType::TextStorage,nullptr, this,&_Name,"groupname",name,strlen(name)); } Loading @@ -56,7 +56,7 @@ const char* authdb::GroupData::getName(){ } void authdb::GroupData::addMember(const MemberUids &uid){ setAuthData<MemberUids,uuid_t>(DataType::GroupData,StorageType::BinaryStorage, setAuthData<MemberUids,uuid_t>(DataType::GroupData,StorageType::BinaryStorage,&uid, this,&_Members,"groupmembers",uid.uid,uid.count); } Loading Loading
src/authdb.h +16 −4 Changes for src/authdb.h: 16 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -92,7 +92,7 @@ namespace authdb { }; template<class T,class Y> void setAuthData(int type,int storage,AuthData *dat,AuthData::Record **varclass, void setAuthData(int type,int storage,const T *src,AuthData *dat,AuthData::Record **varclass, const char *varname,const Y *value,size_t count){ AuthData::Record *target=*varclass; Loading Loading @@ -131,16 +131,28 @@ namespace authdb { target->storage=storage; snprintf(target->fieldname,255,"%s",varname); target->datasize = sizeof(T)+(sizeof(Y)*count); if(src) target->datasize = sizeof(*src)+(sizeof(Y)*count); else target->datasize = (sizeof(Y)*count); target->data=new char[target->datasize]; memset(target->data,0,target->datasize); memcpy(target->data,(char*)value,sizeof(T)); char *start= (char*) target->data+sizeof(T)-sizeof(Y); if(src) memcpy(target->data,src,sizeof(*src)); char *start; if(src) start= (char*) target->data+sizeof(*src); else start= (char*) target->data; for(int i=0; i< count; ++i){ memcpy(start+(sizeof(Y)*i),&value[i],sizeof(Y)); } *varclass=target; } Loading
src/client.cpp +2 −2 Changes for src/client.cpp: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -56,7 +56,7 @@ authdb::ClientData::~ClientData(){ } void authdb::ClientData::setKey(const char *key){ setAuthData<char,char>(DataType::ClientData,StorageType::TextStorage, setAuthData<char,char>(DataType::ClientData,StorageType::TextStorage,nullptr, this,&ClientKey,"clientkey",key,strlen(key)+1); } Loading @@ -66,7 +66,7 @@ const char *authdb::ClientData::getKey(){ } void authdb::ClientData::setName(const char* name){ setAuthData<char,char>(DataType::ClientData,StorageType::TextStorage, setAuthData<char,char>(DataType::ClientData,StorageType::TextStorage,nullptr, this,&ClientName,"clientname",name,strlen(name)+1); } Loading
src/domain.cpp +3 −3 Changes for src/domain.cpp: 3 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -43,7 +43,7 @@ authdb::DomainData::~DomainData(){ } void authdb::DomainData::setDomainName(const char* name){ setAuthData<char,char>(DataType::DomainData,StorageType::TextStorage, setAuthData<char,char>(DataType::DomainData,StorageType::TextStorage,nullptr, this,&_name,"domainname",name,strlen(name)); } Loading @@ -53,7 +53,7 @@ const char * authdb::DomainData::getDomainName(){ void authdb::DomainData::setStorageType(const int type){ setAuthData<int,int>(DataType::DomainData,StorageType::IntStorage, setAuthData<int,int>(DataType::DomainData,StorageType::IntStorage,nullptr, this,&_storageType,"domainstorage",&type,1); } Loading @@ -62,7 +62,7 @@ const int authdb::DomainData::getStorageType(){ } void authdb::DomainData::setStorageOptions(const char *opts){ return setAuthData<char,char>(DataType::DomainData,StorageType::TextStorage, return setAuthData<char,char>(DataType::DomainData,StorageType::TextStorage,nullptr, this,&_storageOptions,"domainoptions",opts,strlen(opts)); } Loading
src/gpo.cpp +4 −4 Changes for src/gpo.cpp: 4 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -31,7 +31,7 @@ #include "gpo.h" void authdb::GpoData::setName(const char* src){ setAuthData<char,char>(DataType::PolicyData,StorageType::TextStorage, setAuthData<char,char>(DataType::PolicyData,StorageType::TextStorage,nullptr, this,&_Name,"gponame",src,strlen(src)); } Loading @@ -41,7 +41,7 @@ const char * authdb::GpoData::getName(){ } void authdb::GpoData::setDesc(const char* src){ setAuthData<char,char>(DataType::PolicyData,StorageType::TextStorage, setAuthData<char,char>(DataType::PolicyData,StorageType::TextStorage,nullptr, this,&_Desc,"gpodesc",src,strlen(src)); } Loading @@ -51,7 +51,7 @@ const char * authdb::GpoData::getDesc(){ } void authdb::GpoData::setGpoValue(const bool dest){ setAuthData<bool,bool>(DataType::PolicyData,StorageType::BoolStorage, setAuthData<bool,bool>(DataType::PolicyData,StorageType::BoolStorage,nullptr, this,&_GpoDefault,"gpodefault",&dest,1); } Loading @@ -61,7 +61,7 @@ bool authdb::GpoData::getGpoValue(){ } void authdb::GpoData::setAllowed(Allow &allowed){ setAuthData<Allow,uuid_t>(DataType::PolicyData,StorageType::BinaryStorage, setAuthData<Allow,uuid_t>(DataType::PolicyData,StorageType::BinaryStorage,&allowed, this,&_Allowed,"gpoallowed",allowed.uid,allowed.count); } Loading
src/group.cpp +2 −2 Changes for src/group.cpp: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -46,7 +46,7 @@ authdb::GroupData::~GroupData(){ } void authdb::GroupData::setName(const char* name){ setAuthData<char,char>(DataType::GroupData,StorageType::TextStorage, setAuthData<char,char>(DataType::GroupData,StorageType::TextStorage,nullptr, this,&_Name,"groupname",name,strlen(name)); } Loading @@ -56,7 +56,7 @@ const char* authdb::GroupData::getName(){ } void authdb::GroupData::addMember(const MemberUids &uid){ setAuthData<MemberUids,uuid_t>(DataType::GroupData,StorageType::BinaryStorage, setAuthData<MemberUids,uuid_t>(DataType::GroupData,StorageType::BinaryStorage,&uid, this,&_Members,"groupmembers",uid.uid,uid.count); } Loading