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

2021-07-29 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed regressions in rdimport(1) and the WebGet service
	that threw 500 errors when connecting to WebGet.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-07-29 13:13:27 -04:00
parent 195394988a
commit 60f39a8c17
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -22123,3 +22123,6 @@
* Fixed a bug in rdimport(1) that caused the cart title
uniqueness check to be applied to the incorrect string when
the '--set-string-title=' switch was used.
2021-07-29 Fred Gleason <fredg@paravelsystems.com>
* Fixed regressions in rdimport(1) and the WebGet service
that threw 500 errors when connecting to WebGet.

3
utils/rdimport/rdimport.cpp
View File

@ -2340,7 +2340,8 @@ void MainObject::ErrorExit(RDApplication::ExitCode code) const
int main(int argc,char *argv[])
{
QCoreApplication a(argc,argv,false);
QCoreApplication::setSetuidAllowed(true);
QCoreApplication a(argc,argv);
new MainObject();
return a.exec();
}

9
web/webget/webget.cpp
View File

@ -66,12 +66,14 @@ MainObject::MainObject(QObject *parent)
//
// Drop root permissions
//
/*
if(setgid(rda->config()->gid())<0) {
TextExit("Unable to set Rivendell group",500,LINE_NUMBER);
}
if(setuid(rda->config()->uid())<0) {
TextExit("Unable to set Rivendell user",500,LINE_NUMBER);
}
*/
if(getuid()==0) {
TextExit("Rivendell user should never be \"root\"!",500,LINE_NUMBER);
}
@ -643,7 +645,7 @@ void MainObject::ServeForm()
QString().sprintf("`GROUPS`.`DEFAULT_CART_TYPE`=%u && ",RDCart::Audio)+
"`GROUPS`.`DEFAULT_LOW_CART`>0 && "+
"`GROUPS`.`DEFAULT_HIGH_CART`>0 "+
"order by `GROUPS.NAME`";
"order by `GROUPS`.`NAME`";
q=new RDSqlQuery(sql);
while(q->next()) {
printf(" <option value=\"%s\">%s</option>\n",
@ -773,6 +775,7 @@ void MainObject::Exit(int code)
if(webget_post!=NULL) {
delete webget_post;
}
rda->syslog(LOG_NOTICE,"EXIT 1");
exit(code);
}
@ -791,13 +794,15 @@ void MainObject::TextExit(const QString &msg,int code,int srcline) const
printf("\n");
printf("[Line: %d]\n",srcline);
#endif // RDXPORT_DEBUG
rda->syslog(LOG_NOTICE,"EXIT 2");
exit(0);
}
int main(int argc,char *argv[])
{
QCoreApplication a(argc,argv,false);
QCoreApplication::setSetuidAllowed(true);
QCoreApplication a(argc,argv);
new MainObject();
return a.exec();
}