Include shlib-compat.h in many sunrpc/nis source files.

[thirdparty/glibc.git] / nis / nis_ismember.c

diff --git a/nis/nis_ismember.c b/nis/nis_ismember.c
index 4a33f02cffc184c98f68cb300e59b0f63c539914..5aba3367f58692274140d96e805b1bdc6655c203 100644 (file)
--- a/nis/nis_ismember.c
+++ b/nis/nis_ismember.c
@@ -1,24 +1,24 @@
-/* Copyright (c) 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (c) 1997-2017 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
+   Contributed by Thorsten Kukuk <kukuk@suse.de>, 1997.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library 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
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA. */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 /* internal_nis_ismember ()
    return codes: -1 principal is in -group
@@ -43,13 +43,20 @@ internal_ismember (const_nis_name principal, const_nis_name group)
       *cp++ = '.';
       strcpy (cp, cp2);
     }
+
   res = nis_lookup (buf, EXPAND_NAME|FOLLOW_LINKS);
-  if (NIS_RES_STATUS (res) != NIS_SUCCESS)
-    return 0;
+  if (res == NULL || NIS_RES_STATUS (res) != NIS_SUCCESS)
+    {
+      nis_freeresult (res);
+      return 0;
+    }
 
   if ((NIS_RES_NUMOBJ (res) != 1) ||
       (__type_of (NIS_RES_OBJECT (res)) != NIS_GROUP_OBJ))
-    return 0;
+    {
+      nis_freeresult (res);
+      return 0;
+    }
 
   /* We search twice in the list, at first, if we have the name
      with a "-", then if without. "-member" has priority */
@@ -59,14 +66,19 @@ internal_ismember (const_nis_name principal, const_nis_name group)
       if (cp[0] == '-')
        {
          if (strcmp (&cp[1], principal) == 0)
-           return -1;
+           {
+             nis_freeresult (res);
+             return -1;
+           }
          if (cp[1] == '@')
            switch (internal_ismember (principal, &cp[2]))
              {
              case -1:
+               nis_freeresult (res);
                return -1;
              case 1:
-               return -1;
+               nis_freeresult (res);
+               return 1;
              default:
                break;
              }
@@ -76,26 +88,34 @@ internal_ismember (const_nis_name principal, const_nis_name group)
                char buf1[strlen (principal) + 2];
                char buf2[strlen (cp) + 2];
 
-               strcpy (buf1, nis_domain_of (principal));
-               strcpy (buf2, nis_domain_of (cp));
-               if (strcmp (buf1, buf2) == 0)
-                 return -1;
+               if (strcmp (nis_domain_of_r (principal, buf1, sizeof buf1),
+                           nis_domain_of_r (cp, buf2, sizeof buf2)) == 0)
+                 {
+                   nis_freeresult (res);
+                   return -1;
+                 }
              }
        }
     }
+
   for (i = 0; i < NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_len; ++i)
     {
       cp = NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_val[i];
       if (cp[0] != '-')
        {
          if (strcmp (cp, principal) == 0)
-           return 1;
+           {
+             nis_freeresult (res);
+             return 1;
+           }
          if (cp[0] == '@')
            switch (internal_ismember (principal, &cp[1]))
              {
              case -1:
+               nis_freeresult (res);
                return -1;
              case 1:
+               nis_freeresult (res);
                return 1;
              default:
                break;
@@ -108,10 +128,14 @@ internal_ismember (const_nis_name principal, const_nis_name group)
 
                if (strcmp (nis_domain_of_r (principal, buf1, sizeof buf1),
                            nis_domain_of_r (cp, buf2, sizeof buf2)) == 0)
-                 return 1;
+                 {
+                   nis_freeresult (res);
+                   return 1;
+                 }
              }
        }
     }
+  nis_freeresult (res);
   return 0;
 }
 
@@ -123,3 +147,4 @@ nis_ismember (const_nis_name principal, const_nis_name group)
   else
     return FALSE;
 }
+libnsl_hidden_nolink_def (nis_ismember, GLIBC_2_1)