Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-19 09:01:18 +02:00
Code Issues Projects Releases Wiki Activity

2018-10-24 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rddbmgr(8) that caused multiple default records
	to be created in 'SERVICE_PERMS' when creating a new database.
This commit is contained in:
Fred Gleason
2018-10-24 16:15:44 -04:00
parent 9d25af4c5f
commit 4e851eedf3
2 changed files with 3 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -17899,3 +17899,6 @@
two files. two files.
* Added an rdselect_helper(1) SETUID helper program. * Added an rdselect_helper(1) SETUID helper program.
* Removed the SETUID bit from rdselect(1). * Removed the SETUID bit from rdselect(1).
2018-10-24 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rddbmgr(8) that caused multiple default records
to be created in 'SERVICE_PERMS' when creating a new database.

32
utils/rddbmgr/create.cpp
View File

@@ -2184,21 +2184,6 @@ bool MainObject::InititalizeNewDb(const QString &station_name,bool gen_audio,
return false; return false;
} }
//
// Create Service Perms
//
sql=QString("select NAME from SERVICES");
q=new RDSqlQuery(sql);
while(q->next()) {
sql=QString("insert into SERVICE_PERMS set ")+
"SERVICE_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+
"STATION_NAME=\""+RDEscapeString(station_name)+"\"";
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
}
delete q;
// //
// RDAirPlay/RDPanel Channel Data // RDAirPlay/RDPanel Channel Data
// //
@@ -2341,23 +2326,6 @@ bool MainObject::InititalizeNewDb(const QString &station_name,bool gen_audio,
} }
delete q; delete q;
//
// Create Station Perms
//
sql="select NAME from STATIONS";
q=new RDSqlQuery(sql);
while(q->next()) {
sql=QString().sprintf("insert into SERVICE_PERMS set\
STATION_NAME=\"%s\",SERVICE_NAME=\"%s\"",
(const char *)
RDEscapeString(q->value(0).toString()),
(const char *)RDEscapeString(RD_SERVICE_NAME));
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
}
delete q;
for(int i=0;i<168;i++) { for(int i=0;i<168;i++) {
sql=QString("insert into SERVICE_CLOCKS set ")+ sql=QString("insert into SERVICE_CLOCKS set ")+
"SERVICE_NAME=\""+RDEscapeString(RD_SERVICE_NAME)+"\","+ "SERVICE_NAME=\""+RDEscapeString(RD_SERVICE_NAME)+"\","+