Browse Source

Merge pull request #2 from frantsao/master

some minor changes
master
IGP 8 years ago
committed by GitHub
parent
commit
d50d2bdb4a
25 changed files with 56 additions and 51 deletions
  1. +1
    -1
      COPYING
  2. +9
    -4
      Makefile
  3. +2
    -2
      src/conf.c
  4. +2
    -2
      src/conf.h
  5. +2
    -2
      src/device.c
  6. +2
    -2
      src/device.h
  7. +2
    -2
      src/hal.c
  8. +2
    -2
      src/hal.h
  9. +2
    -2
      src/local.c
  10. +2
    -2
      src/local.h
  11. +2
    -2
      src/log.c
  12. +2
    -2
      src/log.h
  13. +2
    -2
      src/mem.c
  14. +2
    -2
      src/mem.h
  15. +2
    -2
      src/pad.c
  16. +2
    -2
      src/pad.h
  17. +2
    -2
      src/pam.c
  18. +2
    -2
      src/pamusb-check.c
  19. +2
    -2
      src/version.h
  20. +2
    -2
      src/volume.c
  21. +2
    -2
      src/volume.h
  22. +2
    -2
      src/xpath.c
  23. +2
    -2
      src/xpath.h
  24. +2
    -2
      tools/pamusb-agent
  25. +2
    -2
      tools/pamusb-conf

+ 1
- 1
COPYING View File

@ -2,7 +2,7 @@
Version 2, June 1991 Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc. Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.


+ 9
- 4
Makefile View File

@ -1,8 +1,13 @@
# Set to 'yes' to include debugging information, e.g. DEBUG=yes make -e # Set to 'yes' to include debugging information, e.g. DEBUG=yes make -e
DEBUG := no
DEBUG := yes
PREFIX ?= /usr PREFIX ?= /usr
LIBDIR ?= lib
ARCH := $(shell getconf LONG_BIT)
ifeq ($(ARCH),64)
LIBDIR := lib64
else
LIBDIR := lib
endif
# compiler/linker options # compiler/linker options
CC := gcc CC := gcc
@ -43,11 +48,11 @@ TOOLS_SRC := tools
# Conf # Conf
CONFS := doc/pamusb.conf CONFS := doc/pamusb.conf
CONFS_DEST := $(DESTDIR)/etc
CONFS_DEST := $(DESTDIR)/etc/security
# Doc # Doc
DOCS := doc/CONFIGURATION.md DOCS := doc/CONFIGURATION.md
DOCS_DEST := $(DESTDIR)$(PREFIX)/share/doc/pamusb
DOCS_DEST := $(DESTDIR)$(PREFIX)/share/doc/pam_usb
# Man # Man
MANS := doc/pamusb-conf.1.gz doc/pamusb-agent.1.gz doc/pamusb-check.1.gz MANS := doc/pamusb-conf.1.gz doc/pamusb-agent.1.gz doc/pamusb-check.1.gz


+ 2
- 2
src/conf.c View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <sys/utsname.h> #include <sys/utsname.h>


+ 2
- 2
src/conf.h View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef PUSB_CONF_H_ #ifndef PUSB_CONF_H_


+ 2
- 2
src/device.c View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <unistd.h> #include <unistd.h>


+ 2
- 2
src/device.h View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef PUSB_DEVICE_H_ #ifndef PUSB_DEVICE_H_


+ 2
- 2
src/hal.c View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdlib.h> #include <stdlib.h>


+ 2
- 2
src/hal.h View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef PUSB_HAL_H_ #ifndef PUSB_HAL_H_


+ 2
- 2
src/local.c View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdio.h> #include <stdio.h>


+ 2
- 2
src/local.h View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef PUSB_LOCAL_H_ #ifndef PUSB_LOCAL_H_


+ 2
- 2
src/log.c View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdio.h> #include <stdio.h>


+ 2
- 2
src/log.h View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef PUSB_LOG_H_ #ifndef PUSB_LOG_H_


+ 2
- 2
src/mem.c View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <assert.h> #include <assert.h>


+ 2
- 2
src/mem.h View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef PUSB_MEM_H_ #ifndef PUSB_MEM_H_


+ 2
- 2
src/pad.c View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdio.h> #include <stdio.h>


+ 2
- 2
src/pad.h View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef PUSB_OTP_H_ #ifndef PUSB_OTP_H_


+ 2
- 2
src/pam.c View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#define PAM_SM_AUTH #define PAM_SM_AUTH


+ 2
- 2
src/pamusb-check.c View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdio.h> #include <stdio.h>


+ 2
- 2
src/version.h View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef PUSB_VERSION_H_ #ifndef PUSB_VERSION_H_


+ 2
- 2
src/volume.c View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdio.h> #include <stdio.h>


+ 2
- 2
src/volume.h View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef VOLUME_H_ #ifndef VOLUME_H_


+ 2
- 2
src/xpath.c View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <libxml/xpath.h> #include <libxml/xpath.h>


+ 2
- 2
src/xpath.h View File

@ -11,8 +11,8 @@
* details. * details.
* *
* You should have received a copy of the GNU General Public License along with * 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., 59 Temple
* Place, Suite 330, Boston, MA 02111-1307 USA
* this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
* Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef PUSB_XPATH_H_ #ifndef PUSB_XPATH_H_


+ 2
- 2
tools/pamusb-agent View File

@ -12,8 +12,8 @@
# details. # details.
# #
# You should have received a copy of the GNU General Public License along with # 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., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA
# this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
# Street, Fifth Floor, Boston, MA 02110-1301 USA.
import os import os
import sys import sys


+ 2
- 2
tools/pamusb-conf View File

@ -12,8 +12,8 @@
# details. # details.
# #
# You should have received a copy of the GNU General Public License along with # 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., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA
# this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
# Street, Fifth Floor, Boston, MA 02110-1301 USA.
import dbus import dbus


Loading…
Cancel
Save