Relevant BUGIDs:

Purpose of commit: cleanup

Commit summary:
---------------

2006-06-16  Thorsten Kukuk  <kukuk@thkukuk.de>

        * modules/pam_time/pam_time.c: Replace type boolean with int.
        * modules/pam_group/pam_group.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index b3a9c6f5b327cae86b06dd50280ab8ca14f68e9d..92447561e23d1ade724d8585c3e32470373f5b77 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-16  Thorsten Kukuk  <kukuk@thkukuk.de>
+
+       * modules/pam_time/pam_time.c: Replace type boolean with int.
+       * modules/pam_group/pam_group.c: Likewise.
+
 2006-06-15  Thorsten Kukuk  <kukuk@thkukuk.de>
 
        * modules/pam_unix/bigcrypt.h: New.

diff --git a/modules/pam_group/pam_group.c b/modules/pam_group/pam_group.c
index dd0bfcce56b31af9a18800be755ebf35eb9358c6..1dc329ef8120c00c0b3dbca1b194a9f1f9fa1d66 100644 (file)
--- a/modules/pam_group/pam_group.c
+++ b/modules/pam_group/pam_group.c
@@ -25,14 +25,13 @@
 #define PAM_GROUP_BUFLEN        1000
 #define FIELD_SEPARATOR         ';'   /* this is new as of .02 */
 
-#ifdef TRUE
-# undef TRUE
+#ifndef TRUE
+# define TRUE 1
 #endif
-#ifdef FALSE
-# undef FALSE
+#ifndef FALSE
+# define FALSE 0
 #endif
 
-typedef enum { FALSE, TRUE } boolean;
 typedef enum { AND, OR } operator;
 
 /*
@@ -260,13 +259,13 @@ static int logic_member(const char *string, int *at)
 
 typedef enum { VAL, OP } expect;
 
-static boolean
+static int
 logic_field (const pam_handle_t *pamh, const void *me,
              const char *x, int rule,
-             boolean (*agrees)(const pam_handle_t *pamh, const void *,
+             int (*agrees)(const pam_handle_t *pamh, const void *,
                                const char *, int, int))
 {
-     boolean left=FALSE, right, not=FALSE;
+     int left=FALSE, right, not=FALSE;
      operator oper=OR;
      int at=0, l;
      expect next=VAL;
@@ -314,7 +313,7 @@ logic_field (const pam_handle_t *pamh, const void *me,
      return left;
 }
 
-static boolean
+static int
 is_same (const pam_handle_t *pamh UNUSED,
          const void *A, const char *b, int len, int rule UNUSED)
 {
@@ -371,11 +370,11 @@ static TIME time_now(void)
 }
 
 /* take the current date and see if the range "date" passes it */
-static boolean
+static int
 check_time (const pam_handle_t *pamh, const void *AT,
             const char *times, int len, int rule)
 {
-     boolean not,pass;
+     int not,pass;
      int marked_day, time_start, time_end;
      const TIME *at;
      int i,j=0;

diff --git a/modules/pam_time/pam_time.c b/modules/pam_time/pam_time.c
index 075d951fd1c5bae9f828a48fb84a5eeb36f44a96..43b716f0e147cea40481e57ef3440ff7f7e7d9eb 100644 (file)
--- a/modules/pam_time/pam_time.c
+++ b/modules/pam_time/pam_time.c
@@ -25,14 +25,13 @@
 #define PAM_TIME_BUFLEN        1000
 #define FIELD_SEPARATOR        ';'   /* this is new as of .02 */
 
-#ifdef TRUE
-# undef TRUE
+#ifndef TRUE
+# define TRUE 1
 #endif
-#ifdef FALSE
-# undef FALSE
+#ifndef FALSE
+# define FALSE 0
 #endif
 
-typedef enum { FALSE, TRUE } boolean;
 typedef enum { AND, OR } operator;
 
 /*
@@ -256,12 +255,12 @@ logic_member(const char *string, int *at)
 
 typedef enum { VAL, OP } expect;
 
-static boolean
+static int
 logic_field(pam_handle_t *pamh, const void *me, const char *x, int rule,
-           boolean (*agrees)(pam_handle_t *pamh,
+           int (*agrees)(pam_handle_t *pamh,
                              const void *, const char *, int, int))
 {
-     boolean left=FALSE, right, not=FALSE;
+     int left=FALSE, right, not=FALSE;
      operator oper=OR;
      int at=0, l;
      expect next=VAL;
@@ -309,7 +308,7 @@ logic_field(pam_handle_t *pamh, const void *me, const char *x, int rule,
      return left;
 }
 
-static boolean
+static int
 is_same(pam_handle_t *pamh UNUSED, const void *A, const char *b,
        int len, int rule UNUSED)
 {
@@ -367,11 +366,11 @@ time_now(void)
 }
 
 /* take the current date and see if the range "date" passes it */
-static boolean
+static int
 check_time(pam_handle_t *pamh, const void *AT, const char *times,
           int len, int rule)
 {
-     boolean not,pass;
+     int not,pass;
      int marked_day, time_start, time_end;
      const TIME *at;
      int i,j=0;
@@ -482,7 +481,7 @@ check_account(pam_handle_t *pamh, const char *service,
 
      here_and_now = time_now();                     /* find current time */
      do {
-         boolean good=TRUE,intime;
+         int good=TRUE,intime;
 
          /* here we get the service name field */