about summary refs log tree commit diff
path: root/nis
diff options
context:
space:
mode:
Diffstat (limited to 'nis')
-rw-r--r--nis/nis_call.c5
-rw-r--r--nis/nis_file.c22
-rw-r--r--nis/nis_free.c4
-rw-r--r--nis/nis_local_names.c33
-rw-r--r--nis/rpcsvc/nis.h4
-rw-r--r--nis/rpcsvc/ypclnt.h59
-rw-r--r--nis/ypclnt.c12
7 files changed, 69 insertions, 70 deletions
diff --git a/nis/nis_call.c b/nis/nis_call.c
index cd1b6170d4..bf64558adc 100644
--- a/nis/nis_call.c
+++ b/nis/nis_call.c
@@ -176,7 +176,10 @@ __do_niscall (const nis_server *serv, int serv_len, u_long prog,
     {
       dir = readColdStartFile ();
       if (dir == NULL)
-	return NIS_UNAVAIL;
+	{
+	  fputs (_("Error: could not find a NIS_COLD_START file\n"), stderr);
+	  return NIS_UNAVAIL;
+	}
       server = dir->do_servers.do_servers_val;
       server_len = dir->do_servers.do_servers_len;
     }
diff --git a/nis/nis_file.c b/nis/nis_file.c
index ccff52f0bc..84818519b0 100644
--- a/nis/nis_file.c
+++ b/nis/nis_file.c
@@ -35,17 +35,11 @@ readColdStartFile (void)
 
   in = fopen (cold_start_file, "rb");
   if (in == NULL)
-    {
-      printf (_("Error while opening %s for reading: %m"), cold_start_file);
-      return NULL;
-    }
+    return NULL;
   memset (&obj, '\0', sizeof (obj));
   xdrstdio_create (&xdrs, in, XDR_DECODE);
   if (!xdr_directory_obj (&xdrs, &obj))
-    {
-      printf (_("Error while reading %s: %m"), cold_start_file);
-      return NULL;
-    }
+    return NULL;
 
   return nis_clone_directory (&obj, NULL);
 }
@@ -58,19 +52,11 @@ writeColdStartFile (const directory_obj *obj)
 
   out = fopen (cold_start_file, "wb");
   if (out == NULL)
-    {
-      printf (_("Error while opening %s for writing: %m"), cold_start_file);
-      return FALSE;
-    }
+    return FALSE;
 
   xdrstdio_create (&xdrs, out, XDR_ENCODE);
-  /* XXX The following cast is bad!  Shouldn't the XDR functions take
-     pointers to const objects?  */
   if (!xdr_directory_obj (&xdrs, (directory_obj *) obj))
-    {
-      printf (_("Error while writing %s: %m"), cold_start_file);
-      return FALSE;
-    }
+    return FALSE;
 
   return TRUE;
 }
diff --git a/nis/nis_free.c b/nis/nis_free.c
index 60399c1655..a4ab7378e6 100644
--- a/nis/nis_free.c
+++ b/nis/nis_free.c
@@ -69,7 +69,7 @@ nis_free_request (ib_request *ibreq)
 void
 nis_free_endpoints (endpoint *ep, unsigned int len)
 {
-  int i;
+  unsigned int i;
 
   if (ep == NULL)
     return;
@@ -97,7 +97,7 @@ nis_free_endpoints (endpoint *ep, unsigned int len)
 void
 nis_free_servers (nis_server *obj, unsigned int len)
 {
-  int i;
+  unsigned int i;
 
   if (obj == NULL)
     return;
diff --git a/nis/nis_local_names.c b/nis/nis_local_names.c
index 50120a6f73..e760f433b2 100644
--- a/nis/nis_local_names.c
+++ b/nis/nis_local_names.c
@@ -158,26 +158,29 @@ nis_local_host (void)
 
   if (__nishostname[0] == '\0')
     {
-      char *cp = __nishostname;
-
       if (gethostname (__nishostname, NIS_MAXNAMELEN) < 0)
-	cp = stpcpy (cp, "\0");
+	__nishostname[0] = '\0';
+      else
+	{
+	  char *cp;
+	  len = strlen(__nishostname);
 
-      len = cp - __nishostname;
+	  /* Hostname already fully qualified? */
+	  if (__nishostname[len - 1] == '.')
+	    return __nishostname;
 
-      /* Hostname already fully qualified? */
-      if (__nishostname[len - 1] == '.')
-	return __nishostname;
+	  if ((strlen (__nishostname) + strlen (nis_local_directory ()) + 1) >
+	      NIS_MAXNAMELEN)
+	    {
+	      __nishostname[0] = '\0';
+	      return __nishostname;
+	    }
 
-      if (strlen (__nishostname + strlen (nis_local_directory ()) + 1) >
-	  NIS_MAXNAMELEN)
-	{
-	  __nishostname[0] = '\0';
-	  return __nishostname;
+	  cp = &__nishostname[len];
+	  *cp++ = '.';
+	  strncpy (cp, nis_local_directory (), NIS_MAXNAMELEN - len -1);
+	  __nishostname[NIS_MAXNAMELEN] = '\0';
 	}
-
-      *cp++ = '.';
-      stpcpy (cp, nis_local_directory ());
     }
 
   return __nishostname;
diff --git a/nis/rpcsvc/nis.h b/nis/rpcsvc/nis.h
index c2c5319abd..b91ce19903 100644
--- a/nis/rpcsvc/nis.h
+++ b/nis/rpcsvc/nis.h
@@ -998,7 +998,11 @@ extern  nis_error * nis_updkeys_3();
 extern  nis_error * nis_updkeys_3_svc();
 #endif /* Old Style C */
 struct rpcgen_table {
+#if defined __cplusplus || __STDC__
+	char	*(*proc)(void);
+#else
 	char	*(*proc)();
+#endif
 	xdrproc_t	xdr_arg;
 	unsigned	len_arg;
 	xdrproc_t	xdr_res;
diff --git a/nis/rpcsvc/ypclnt.h b/nis/rpcsvc/ypclnt.h
index b61a498417..ed5e1e72d6 100644
--- a/nis/rpcsvc/ypclnt.h
+++ b/nis/rpcsvc/ypclnt.h
@@ -1,23 +1,22 @@
-/*
-** Copyright (c) 1996 Thorsten Kukuk, Germany
-**
-** This 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.
-** 
-** This 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.
-** 
-** You should have received a copy of the GNU Library General Public
-** License along with this library; if not, write to the Free
-** Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-**
-** Author: Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
-**
-*/
+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996.
+
+   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.
+
+   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.
+
+   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.  */
+
 
 #ifndef	__RPCSVC_YPCLNT_H__
 #define	__RPCSVC_YPCLNT_H__
@@ -52,24 +51,26 @@
 __BEGIN_DECLS
 
 /* struct ypall_callback * is the arg which must be passed to yp_all */
-struct ypall_callback {
-	int (*foreach)();
-	char *data;
-};
+struct ypall_callback
+  {
+    int (*foreach) __P ((int __status, char *__key, int __keylen,
+			 char *__val, int __vallen, char *__data));
+    char *data;
+  };
 
 /* External NIS client function references. */
 extern int yp_bind __P ((__const char *));
 extern void yp_unbind __P ((__const char *));
 extern int yp_get_default_domain __P ((char **));
-extern int yp_match __P ((__const char *, __const char *, __const char *, 
+extern int yp_match __P ((__const char *, __const char *, __const char *,
 			  __const int, char **, int *));
-extern int yp_first __P ((__const char *, __const char *, char **, 
+extern int yp_first __P ((__const char *, __const char *, char **,
 			  int *, char **, int *));
-extern int yp_next __P ((__const char *, __const char *, __const char *, 
+extern int yp_next __P ((__const char *, __const char *, __const char *,
 			 __const int, char **, int *, char **, int *));
 extern int yp_master __P ((__const char *, __const char *, char **));
 extern int yp_order __P ((__const char *, __const char *, unsigned int *));
-extern int yp_all __P ((__const char *, __const char *, 
+extern int yp_all __P ((__const char *, __const char *,
 			__const struct ypall_callback *));
 extern __const char *yperr_string __P ((__const int));
 extern __const char *ypbinderr_string __P ((__const int));
@@ -81,7 +82,7 @@ extern int yp_maplist __P ((__const char *, struct ypmaplist **));
 #endif
 
 /* Exist only under BSD and Linux systems */
-extern int __yp_check __P ((char **)); 
+extern int __yp_check __P ((char **));
 
 __END_DECLS
 
diff --git a/nis/ypclnt.c b/nis/ypclnt.c
index b128ad6366..e4667f79a6 100644
--- a/nis/ypclnt.c
+++ b/nis/ypclnt.c
@@ -123,9 +123,9 @@ __yp_bind (const char *domain, dom_binding ** ypdb)
             }
 
           if (clnt_call (client, YPBINDPROC_DOMAIN,
-                         (xdrproc_t) xdr_domainname, &domain,
+                         (xdrproc_t) xdr_domainname, (caddr_t) &domain,
                          (xdrproc_t) xdr_ypbind_resp,
-                         &ypbr, TIMEOUT) != RPC_SUCCESS)
+                         (caddr_t) &ypbr, TIMEOUT) != RPC_SUCCESS)
             {
               clnt_destroy (client);
               if (is_new)
@@ -526,7 +526,8 @@ yp_order (const char *indomain, const char *inmap, unsigned int *outorder)
 }
 
 static void *ypall_data;
-static int (*ypall_foreach) ();
+static int (*ypall_foreach) __P ((int status, char *key, int keylen,
+				  char *val, int vallen, char *data));
 
 static bool_t
 __xdr_ypresp_all (XDR * xdrs, u_long * objp)
@@ -628,8 +629,9 @@ yp_all (const char *indomain, const char *inmap,
       ypall_foreach = incallback->foreach;
       ypall_data = (void *) incallback->data;
 
-      result = clnt_call (clnt, YPPROC_ALL, (xdrproc_t) xdr_ypreq_nokey, &req,
-			  (xdrproc_t) __xdr_ypresp_all, &status, TIMEOUT);
+      result = clnt_call (clnt, YPPROC_ALL, (xdrproc_t) xdr_ypreq_nokey,
+			  (caddr_t) &req, (xdrproc_t) __xdr_ypresp_all,
+			  (caddr_t) &status, TIMEOUT);
 
       if (result != RPC_SUCCESS)
 	{
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-17 00:35:10 +0000