Relevant BUGIDs: 436057, 476970

Purpose of commit: cleanup

Commit summary:
---------------
general comment, make and include cleanup.

diff --git a/CHANGELOG b/CHANGELOG
index fde469939d7902c4abfac16ae9756b21ff8f14d1..f33fec753c437dbeb7b6cd522213d85abb3b4cf4 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -49,6 +49,8 @@ bug report - outstanding bugs are listed here:
 0.76: please submit patches for this section with actual code/doc
       patches!
 
+* pam_filter cleanup (including moving the filter directory) Nalin
+  and Harald Welte (Bugs 436057, 476970 - agmorgan)
 * pam_limits can handle negative priority limits now (which can apply
   to the superuser too) - base on patch from Nalin. (Bug 476990 -
   agmorgan)

diff --git a/modules/pam_filter/Makefile b/modules/pam_filter/Makefile
index c1394574e25b6e92ba5757f8eca408ef57bd0b8e..48411497cd45582eac88abc113b8dbe93b09d947 100644 (file)
--- a/modules/pam_filter/Makefile
+++ b/modules/pam_filter/Makefile
@@ -18,7 +18,7 @@ include ../../Make.Rules
 
 TITLE=pam_filter
 FILTERS=upperLOWER
-FILTERSDIR=$(SUPLEMENTED)/pam_filter
+FILTERSDIR=$(SECUREDIR)/pam_filter
 export FILTERSDIR
 
 CFLAGS += -Iinclude

diff --git a/modules/pam_filter/pam_filter.c b/modules/pam_filter/pam_filter.c
index f67ec0d28634c61fce0096891d1012bc1355d3a7..9a6fc8c5d15900c9a6005e346fa2ba06b8f7d91f 100644 (file)
--- a/modules/pam_filter/pam_filter.c
+++ b/modules/pam_filter/pam_filter.c
@@ -150,7 +150,7 @@ static int process_args(pam_handle_t *pamh
 
        /* the "ARGS" variable */
 
-#define ARGS_OFFSET    5                          /*  sizeof("ARGS=");  */
+#define ARGS_OFFSET    5                          /*  sizeof('ARGS=');  */
 #define ARGS_NAME      "ARGS="
 
        size += ARGS_OFFSET;
@@ -174,7 +174,7 @@ static int process_args(pam_handle_t *pamh
 
        /* the "SERVICE" variable */
 
-#define SERVICE_OFFSET    8                    /*  sizeof("SERVICE=");  */
+#define SERVICE_OFFSET    8                    /*  sizeof('SERVICE=');  */
 #define SERVICE_NAME      "SERVICE="
 
        pam_get_item(pamh, PAM_SERVICE, (const void **)&tmp);
@@ -196,7 +196,7 @@ static int process_args(pam_handle_t *pamh
 
        /* the "USER" variable */
 
-#define USER_OFFSET    5                          /*  sizeof("USER=");  */
+#define USER_OFFSET    5                          /*  sizeof('USER=');  */
 #define USER_NAME      "USER="
 
        pam_get_user(pamh, &tmp, NULL);
@@ -222,7 +222,7 @@ static int process_args(pam_handle_t *pamh
 
        /* the "USER" variable */
 
-#define TYPE_OFFSET    5                          /*  sizeof("TYPE=");  */
+#define TYPE_OFFSET    5                          /*  sizeof('TYPE=');  */
 #define TYPE_NAME      "TYPE="
 
        size = TYPE_OFFSET+strlen(type);

diff --git a/modules/pam_filter/upperLOWER/Makefile b/modules/pam_filter/upperLOWER/Makefile
index 6db8d6e34c0eda366407fa87e65c07634229eb71..77bc4102d9004d5a91352b68e6deb2ff29be58d4 100644 (file)
--- a/modules/pam_filter/upperLOWER/Makefile
+++ b/modules/pam_filter/upperLOWER/Makefile
@@ -21,7 +21,7 @@ OBJS = $(TITLE).o
 all: $(TITLE)
 
 $(TITLE): $(OBJS)
-       $(CC) -o $(TITLE) $(OBJS)
+       $(CC) $(CFLAGS) -o $(TITLE) $(OBJS)
        $(STRIP) $(TITLE)
 
 install:

diff --git a/modules/pam_filter/upperLOWER/upperLOWER.c b/modules/pam_filter/upperLOWER/upperLOWER.c
index c85a950ab7bfa3899773f8ede537cf60dd279488..c5f9366c45b216ed4b20f659773f97412b01ece4 100644 (file)
--- a/modules/pam_filter/upperLOWER/upperLOWER.c
+++ b/modules/pam_filter/upperLOWER/upperLOWER.c
@@ -10,6 +10,7 @@
 #include <security/_pam_aconf.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <syslog.h>
 #include <sys/time.h>
 #include <sys/types.h>