From 4e851eedf36e382a9ac0cd11f8669b6e4da958d0 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 24 Oct 2018 16:15:44 -0400 Subject: [PATCH] 2018-10-24 Fred Gleason * Fixed a bug in rddbmgr(8) that caused multiple default records to be created in 'SERVICE_PERMS' when creating a new database. --- ChangeLog | 3 +++ utils/rddbmgr/create.cpp | 32 -------------------------------- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9fb0d8c..827ecce3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17899,3 +17899,6 @@ two files. * Added an rdselect_helper(1) SETUID helper program. * Removed the SETUID bit from rdselect(1). +2018-10-24 Fred Gleason + * Fixed a bug in rddbmgr(8) that caused multiple default records + to be created in 'SERVICE_PERMS' when creating a new database. diff --git a/utils/rddbmgr/create.cpp b/utils/rddbmgr/create.cpp index a78e6d12..5366a52c 100644 --- a/utils/rddbmgr/create.cpp +++ b/utils/rddbmgr/create.cpp @@ -2184,21 +2184,6 @@ bool MainObject::InititalizeNewDb(const QString &station_name,bool gen_audio, 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 // @@ -2340,23 +2325,6 @@ bool MainObject::InititalizeNewDb(const QString &station_name,bool gen_audio, } } 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++) { sql=QString("insert into SERVICE_CLOCKS set ")+