Changeset 481 for trunk/src/trustfile.c

Timestamp:

Jul 18, 2015, 5:06:52 PM (9 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:

• trunk/src/trustfile.c (modified) (17 diffs)

trunk/src/trustfile.c

@@ -102 +102 @@
 
 
-#ifndef TRUST_MAIN
+#if !defined(TRUST_MAIN)
 
 #include "slib.h"
@@ -121 +121 @@
 
 #define TRUST_DEBUG
-#define SL_FALSE 0
-#define SL_TRUE  1
+#define S_FALSE 0
+#define S_TRUE  1
 #define SL_ENTER(string)
 #define SL_IRETURN(a, b)  return a
@@ -222 +222 @@
 
 uid_t tf_euid = tf_uid_neg;
-int EUIDSLOT = sizeof(test_rootonly)/sizeof(uid_t);
-int ORIG_EUIDSLOT = sizeof(test_rootonly)/sizeof(uid_t);
+unsigned int EUIDSLOT = sizeof(test_rootonly)/sizeof(uid_t);
+unsigned int ORIG_EUIDSLOT = sizeof(test_rootonly)/sizeof(uid_t);
 
 char  tf_path[MAXFILENAME];             /* error path for trust function */
@@ -381 +381 @@
   SL_ENTER(_("isin"));
   if (list == NULL)
-    SL_IRETURN(SL_FALSE, _("isin"));
+    SL_IRETURN(S_FALSE, _("isin"));
 
   while(*list != tf_uid_neg && *list != n)
@@ -400 +400 @@
                (UID_CAST) n);
 #endif 
-      SL_IRETURN(SL_FALSE, _("isin"));
+      SL_IRETURN(S_FALSE, _("isin"));
     }
 
@@ -408 +408 @@
            (UID_CAST)n, (UID_CAST)*list);
 #endif 
-  SL_IRETURN(SL_TRUE, _("isin"));
+  SL_IRETURN(S_TRUE, _("isin"));
 }
 
@@ -506 +506 @@
   if (pbuffer) free(pbuffer);
 #endif
-  SL_IRETURN(SL_FALSE, _("isingrp"));
+  SL_IRETURN(S_FALSE, _("isingrp"));
 
  end_true:
@@ -513 +513 @@
   if (pbuffer) free(pbuffer);
 #endif
-  SL_IRETURN(SL_TRUE, _("isingrp"));
+  SL_IRETURN(S_TRUE, _("isingrp"));
 }
 
@@ -537 +537 @@
 #endif
 
-  int retval = SL_FALSE;
+  int retval = S_FALSE;
 
   SL_ENTER(_("onlytrustedingrp"));
@@ -567 +567 @@
               (UID_CAST)grp); 
 #endif
-      retval = SL_FALSE;
+      retval = S_FALSE;
       goto end_retval;
     }
@@ -574 +574 @@
    
   if(g->gr_mem == NULL || g->gr_mem[0] == NULL )
-    SL_IRETURN(SL_TRUE, _("onlytrustedingrp") );
+    SL_IRETURN(S_TRUE, _("onlytrustedingrp") );
   */
 
@@ -640 +640 @@
 #endif 
           tf_baduid = w->pw_uid;
-          retval = SL_FALSE;
+          retval = S_FALSE;
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRGID_R)
           if (pbuffer) free(pbuffer);
@@ -698 +698 @@
 #endif
               tf_baduid = w->pw_uid;
-              retval = SL_FALSE;
+              retval = S_FALSE;
               goto out;
-              /* SL_IRETURN(SL_FALSE, _("onlytrustedingrp")); */
-            }
-        }
-    }
-  retval = SL_TRUE;
+              /* SL_IRETURN(S_FALSE, _("onlytrustedingrp")); */
+            }
+        }
+    }
+  retval = S_TRUE;
 
  out:
@@ -720 +720 @@
 
 #ifdef TRUST_DEBUG
-  if (retval == SL_TRUE)
+  if (retval == S_TRUE)
     fprintf(stderr,
             "trustfile: group %ld:  all members are trusted users --> OK\n", 
@@ -849 +849 @@
           char * csym;                  /* contents of symlink file  */
           char * full;                  /* "full" name of symlink    */
-          register char *b, *t;         /* used to copy stuff around */
-          register int lsym;            /* num chars in symlink ref  */
-          register int i;               /* trustworthy or not?       */
+          char *b;                      /* used to copy stuff around */
+          const char *t;                /* used to copy stuff around */
+          int lsym;                     /* num chars in symlink ref  */
+          int i;                        /* trustworthy or not?       */
           const char * t_const;
           char *end;
@@ -915 +916 @@
               /* smack on the /../ 
                */
-              t_const = "/../"; t = (char *)t_const;
+              t_const = "/../"; t = (const char *)t_const;
               while(*t && b < end)
                 *b++ = *t++;
@@ -997 +998 @@
        * file regardless of permissions, so bomb
        */
-      if (((okusers != NULL && SL_FALSE == isin((uid_t)stbuf.st_uid,okusers))||
-           (badusers != NULL && SL_TRUE == isin((uid_t)stbuf.st_uid,badusers))))
+      if (((okusers != NULL && S_FALSE == isin((uid_t)stbuf.st_uid,okusers))||
+           (badusers != NULL && S_TRUE == isin((uid_t)stbuf.st_uid,badusers))))
         {
 #ifdef TRUST_DEBUG