diff --git a/ChangeLog b/ChangeLog index 0c2cd360..0e7947ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15910,3 +15910,5 @@ 2017-07-28 Fred Gleason * Refactored the 'RDUser::authenticated()' method to eliminate use of rdauth(8). +2017-07-28 Fred Gleason + * Removed rdauth(8). diff --git a/configure.ac b/configure.ac index 8fdb3ca1..9b02cc58 100644 --- a/configure.ac +++ b/configure.ac @@ -470,7 +470,6 @@ AC_CONFIG_FILES([rivendell.spec \ cae/Makefile \ utils/Makefile \ utils/rdalsaconfig/Makefile \ - utils/rdauth/Makefile \ utils/rdcheckcuts/Makefile \ utils/rdchunk/Makefile \ utils/rdcleandirs/Makefile \ diff --git a/rivendell.spec.in b/rivendell.spec.in index fa43b1c7..7212ccd1 100644 --- a/rivendell.spec.in +++ b/rivendell.spec.in @@ -212,7 +212,6 @@ rm -rf $RPM_BUILD_ROOT @LOCAL_PREFIX@/@RD_LIB_PATH@/rivendell/*.rlm @LOCAL_PREFIX@/bin/rdadmin @LOCAL_PREFIX@/bin/rdairplay -%attr(6755,root,root)@LOCAL_PREFIX@/bin/rdauth @LOCAL_PREFIX@/bin/rdpanel @LOCAL_PREFIX@/bin/rdcartslots @LOCAL_PREFIX@/bin/rdcatch diff --git a/utils/Makefile.am b/utils/Makefile.am index 9cb9a543..eb60ceda 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -28,7 +28,6 @@ if ALSA_RD_AM endif SUBDIRS = $(ALSACONFIG_RD_OPT)\ $(HPIINFO_RD_OPT)\ - rdauth\ rddbcheck\ rddgimport\ rdcheckcuts\ diff --git a/utils/rdauth/Makefile.am b/utils/rdauth/Makefile.am deleted file mode 100644 index 141b7a84..00000000 --- a/utils/rdauth/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -## automake.am -## -## Automake.am for rivendell/utils/rdauth -## -## (C) Copyright 2017 Fred Gleason -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License version 2 as -## published by the Free Software Foundation. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public -## License along with this program; if not, write to the Free Software -## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -## -## Use automake to process this into a Makefile.in - -AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -DQTDIR=\"@QT_DIR@\" @QT_CXXFLAGS@ -I$(top_srcdir)/lib -LIBS = @QT_LIBS@ -L$(top_srcdir)/lib -MOC = @QT_MOC@ - -# The dependency for qt's Meta Object Compiler (moc) -moc_%.cpp: %.h - $(MOC) $< -o $@ - -install-exec-hook: - if test -z $(DESTDIR) ; then chown root $(DESTDIR)$(prefix)/bin/rdauth ; chmod 4755 $(DESTDIR)$(prefix)/bin/rdauth ; fi - -bin_PROGRAMS = rdauth - -dist_rdauth_SOURCES = rdauth.cpp rdauth.h - -rdauth_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ - -CLEANFILES = *~\ - *.idb\ - *ilk\ - *.obj\ - *.pdb\ - *.qm\ - moc_* - -MAINTAINERCLEANFILES = *~\ - Makefile.in\ - moc_* diff --git a/utils/rdauth/rdauth.cpp b/utils/rdauth/rdauth.cpp deleted file mode 100644 index 3259a6f3..00000000 --- a/utils/rdauth/rdauth.cpp +++ /dev/null @@ -1,63 +0,0 @@ -// rdauth.cpp -// -// Authenticate against a PAM service. -// -// (C) Copyright 2017 Fred Gleason -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2 as -// published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public -// License along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -// - -#include - -#include - -#include "rdauth.h" - -MainObject::MainObject(QObject *parent) - :QObject(parent) -{ - // - // Read Command Options - // - QString service_name; - QString user; - QString password=""; - RDCmdSwitch *cmd= - new RDCmdSwitch(qApp->argc(),qApp->argv(),"rdauth",RDAUTH_USAGE); - if(cmd->keys()==3) { - password=cmd->key(2); - } - else { - if(cmd->keys()!=2) { - fprintf(stderr,"rdauth: invalid arguments\n"); - exit(256); - } - } - service_name=cmd->key(0); - user=cmd->key(1); - - RDPam *pam=new RDPam(service_name); - if(pam->authenticate(user,password)) { - exit(0); - } - exit(1); -} - - -int main(int argc,char *argv[]) -{ - QApplication a(argc,argv,false); - new MainObject(); - return a.exec(); -} diff --git a/utils/rdauth/rdauth.h b/utils/rdauth/rdauth.h deleted file mode 100644 index b38bc8d0..00000000 --- a/utils/rdauth/rdauth.h +++ /dev/null @@ -1,42 +0,0 @@ -// rdauth.h -// -// Authenticate against a PAM service. -// -// (C) Copyright 2017 Fred Gleason -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2 as -// published by the Free Software Foundation. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public -// License along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -// - -#ifndef RDAUTH_H -#define RDAUTH_H - -#include - -#include -#include - -#include -#include -#include - -#define RDAUTH_USAGE "\n" - -class MainObject : public QObject -{ - public: - MainObject(QObject *parent=0); -}; - - -#endif // RDAUTH_H